summaryrefslogtreecommitdiff
path: root/scripts/release-common.sh
diff options
context:
space:
mode:
authorDon Bright <hugh.m.bright@gmail.com>2013-05-17 03:59:58 (GMT)
committerDon Bright <hugh.m.bright@gmail.com>2013-05-17 03:59:58 (GMT)
commitbe87d30f427a4ffff8a21c3871e0304670443710 (patch)
tree9163d650d0d5c7c320659ee636a418ae5a82d3aa /scripts/release-common.sh
parent293f3cc7c9c6dfec76120714b33a458f54792545 (diff)
enable both win32 and win64 build and upload (beta level) from same script
Diffstat (limited to 'scripts/release-common.sh')
-rwxr-xr-xscripts/release-common.sh14
1 files changed, 8 insertions, 6 deletions
diff --git a/scripts/release-common.sh b/scripts/release-common.sh
index 035fa3f..85b719c 100755
--- a/scripts/release-common.sh
+++ b/scripts/release-common.sh
@@ -116,6 +116,13 @@ fi
echo "Building openscad-$VERSION ($VERSIONDATE) $CONFIGURATION..."
+if [ ! $NUMCPU ]; then
+ echo "note: you can 'export NUMCPU=x' for multi-core compiles (x=number)";
+ NUMCPU=2
+else
+ echo "NUMCPU: " $NUMCPU
+fi
+
CONFIG=deploy
case $OS in
LINUX|MACOSX)
@@ -169,17 +176,12 @@ case $OS in
;;
esac
-if [ ! $NUMCPU ]; then
- echo "note: you can 'export NUMCPU=x' for multi-core compiles (x=number)";
- NUMCPU=2
-fi
-
case $OS in
LINXWIN)
# make || make enables paralell builds, thanks Tony Theodore
# make main openscad.exe
cd $DEPLOYDIR
- make $TARGET -j$NUMCPU || make $TARGET -j $NUMCPU ## comment 4 test
+ make $TARGET -j$NUMCPU || make $TARGET -j$NUMCPU ## comment 4 test
if [ ! -e $TARGET/openscad.exe ]; then
echo "cant find $TARGET/openscad.exe. build failed. stopping."
exit
contact: Jan Huwald // Impressum