diff options
| -rw-r--r-- | altosui/Makefile.am | 9 | ||||
| -rwxr-xr-x | jenkins.sh | 7 |
2 files changed, 11 insertions, 5 deletions
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 - @@ -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 |