From 1321d9e16f9c51e49aa8d062a721a119d11842f4 Mon Sep 17 00:00:00 2001 From: johnyma22 Date: Fri, 16 Nov 2012 20:17:25 +0000 Subject: [PATCH 1/3] Resolve #1171 by not including tests in windows build --- bin/buildForWindows.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/buildForWindows.sh b/bin/buildForWindows.sh index 2f906238..d80b1c28 100755 --- a/bin/buildForWindows.sh +++ b/bin/buildForWindows.sh @@ -57,7 +57,7 @@ rm -rf .git/objects echo "create the zip..." cd /tmp -zip -9 -r etherpad-lite-win.zip etherpad-lite-win +zip -9 -r etherpad-lite-win.zip etherpad-lite-win -x "src/node_modules/jsdom-nocontextifiy/test/*" mv etherpad-lite-win.zip $START_FOLDER echo "clean up..." From 27c5e8691f41bfcab79f88ba388222f9e8747f71 Mon Sep 17 00:00:00 2001 From: johnyma22 Date: Fri, 16 Nov 2012 20:51:08 +0000 Subject: [PATCH 2/3] mheh, better way of handling the buidl for windows script --- bin/buildForWindows.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/bin/buildForWindows.sh b/bin/buildForWindows.sh index d80b1c28..27165bfa 100755 --- a/bin/buildForWindows.sh +++ b/bin/buildForWindows.sh @@ -55,12 +55,16 @@ wget "http://nodejs.org/dist/v$NODE_VERSION/node.exe" -O ../node.exe echo "remove git history to reduce folder size" rm -rf .git/objects +echo "remove windows jsdom-nocontextify/test folder" +rm -rf /tmp/etherpad-lite-win/node_modules/ep_etherpad-lite/node_modules/jsdom-nocontextifiy/test/ +rm -rf /tmp/etherpad-lite-win/src/node_modules/jsdom-nocontextifiy/test/ + echo "create the zip..." cd /tmp -zip -9 -r etherpad-lite-win.zip etherpad-lite-win -x "src/node_modules/jsdom-nocontextifiy/test/*" +zip -9 -r etherpad-lite-win.zip etherpad-lite-win mv etherpad-lite-win.zip $START_FOLDER echo "clean up..." -rm -rf /tmp/etherpad-lite-win +# rm -rf /tmp/etherpad-lite-win echo "Finished. You can find the zip in the Etherpad Lite root folder, it's called etherpad-lite-win.zip" From fbe16da728528ffecd388949a59f6960adcba8aa Mon Sep 17 00:00:00 2001 From: johnyma22 Date: Fri, 16 Nov 2012 20:52:19 +0000 Subject: [PATCH 3/3] dont forget to allow for cleanup --- bin/buildForWindows.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/buildForWindows.sh b/bin/buildForWindows.sh index 27165bfa..c67a3701 100755 --- a/bin/buildForWindows.sh +++ b/bin/buildForWindows.sh @@ -65,6 +65,6 @@ zip -9 -r etherpad-lite-win.zip etherpad-lite-win mv etherpad-lite-win.zip $START_FOLDER echo "clean up..." -# rm -rf /tmp/etherpad-lite-win +rm -rf /tmp/etherpad-lite-win echo "Finished. You can find the zip in the Etherpad Lite root folder, it's called etherpad-lite-win.zip"