X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1de2cea69ed077bfc9b387814f95dc35db3083dc..bc329fdcac67ce8a8a95af432ca68392fb9122f7:/tools/jenkins/build.sh

diff --git a/tools/jenkins/build.sh b/tools/jenkins/build.sh
index 9379aef4b8..32b598cd65 100755
--- a/tools/jenkins/build.sh
+++ b/tools/jenkins/build.sh
@@ -11,6 +11,12 @@ set -e
 rm -rf /tmp/simgrid*tmp
 rm -rf /tmp/surf-java*tmp
 
+# Help older cmakes
+if [ -e /usr/lib/jvm/java-7-openjdk-amd64 ] ; 
+then
+  export JAVA_HOME=/usr/lib/jvm/java-7-openjdk-amd64
+fi
+
 # usage: die status message...
 die () {
   local status=${1:-1}
@@ -94,12 +100,14 @@ cmake -G"$GENERATOR"\
   -Denable_smpi_ISP_testsuite=$(onoff test "$build_mode" = "ModelChecker") \
   -Denable_compile_optimizations=$(onoff test "$build_mode" = "Debug") \
   -Denable_smpi_MPICH3_testsuite=$(onoff test "$build_mode" != "DynamicAnalysis") \
-  -Denable_lua=$(onoff test "$build_mode" != "DynamicAnalysis") \
   -Denable_mallocators=$(onoff test "$build_mode" != "DynamicAnalysis") \
   -Denable_memcheck=$(onoff test "$build_mode" = "DynamicAnalysis") \
-  -Denable_compile_warnings=ON -Denable_smpi=ON -Denable_lib_static=OFF \
+  -Denable_compile_warnings=ON -Denable_smpi=ON \
   -Denable_latency_bound_tracking=OFF -Denable_jedule=OFF \
-  -Denable_tracing=ON -Denable_java=ON
+  -Denable_tracing=ON -Denable_java=ON -Denable_lua=OFF
+#  -Denable_lua=$(onoff test "$build_mode" != "DynamicAnalysis") \
+
+
 make -j$NUMBER_OF_PROCESSORS VERBOSE=1
 
 if test "$(uname -o)" != "Msys"; then
@@ -116,7 +124,7 @@ echo "XX"
 
 ctest -T test --output-on-failure --no-compress-output || true
 if [ -f Testing/TAG ] ; then
-   xsltproc $WORKSPACE/buildtools/jenkins/ctest2junit.xsl Testing/`head -n 1 < Testing/TAG`/Test.xml > CTestResults.xml
+   xsltproc $WORKSPACE/tools/jenkins/ctest2junit.xsl Testing/`head -n 1 < Testing/TAG`/Test.xml > CTestResults.xml
    mv CTestResults.xml $WORKSPACE
 fi