From: Tom Marble <tmarble@info9.net>
Date: Wed, 28 May 2014 19:08:02 +0000 (-0500)
Subject: jenkins.sh: make -j 4 can fail, fix for altosui-test
X-Git-Tag: 1.3.2.2~56
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=9b9e4bf1b51c45553879141811748e65debfc251;ds=sidebyside

jenkins.sh: make -j 4 can fail, fix for altosui-test
---

diff --git a/altosui/Makefile.am b/altosui/Makefile.am
index 0440b4af..df9fe5d1 100644
--- a/altosui/Makefile.am
+++ b/altosui/Makefile.am
@@ -263,8 +263,12 @@ altosui: Makefile
 	chmod +x $@
 
 altosui-test: Makefile
-	echo "#!/bin/sh" > $@
-	echo 'exec java -Djava.library.path="../libaltos/.libs" -jar altosui.jar "$$@"' >> $@
+	echo '#!/bin/sh' > $@
+	echo 'dir="$$(dirname $$0)"' >> $@
+	echo 'cd "$$dir"' >> $@
+	echo 'altosui="$$(pwd -P)"' >> $@
+	echo 'altos="$$(dirname $$altosui)"' >> $@
+	echo 'exec java -Djava.library.path="$$altos/libaltos/.libs" -jar "$$altosui/altosui.jar" "$$@"' >> $@
 	chmod +x $@
 
 altosui-jdb: Makefile
@@ -364,4 +368,3 @@ $(MACOSX_DIST): $(MACOSX_FILES) $(MACOSX_EXTRA) Makefile
 $(WINDOWS_DIST): $(WINDOWS_FILES) altos-windows.nsi
 	-rm -f $@
 	makensis -Oaltos-windows.log "-XOutFile $@" "-DVERSION=$(VERSION)" altos-windows.nsi
-
diff --git a/jenkins.sh b/jenkins.sh
index 74e48bd5..e6cc7da4 100755
--- a/jenkins.sh
+++ b/jenkins.sh
@@ -11,6 +11,9 @@ time=`which time`
 if [ -n "$time" ]; then
     time="$time -v"
 fi
+# NOTE: the build process may fail on multi-cpu systems. If it fails try setting cpus=1
+# cpus=$(nproc)
+cpus=1
 
 echo "=== starting altos build at $(date) ==="
 env
@@ -18,5 +21,5 @@ echo "======================================="
 set -x
 
 ./autogen.sh $prefix $android
-make -j $(nproc) clean
-$time make -j $(nproc) all fat
+make -j $cpus clean
+$time make -j $cpus all fat