X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7a4a0f13a2547b37b1eab2a9ecfc1f95a3426a37..ba404620ba1ee7677e7bfa5b13b8f4e6bab10e3b:/tools/jenkins/build.sh

diff --git a/tools/jenkins/build.sh b/tools/jenkins/build.sh
index 0bad846ad9..264f755de6 100755
--- a/tools/jenkins/build.sh
+++ b/tools/jenkins/build.sh
@@ -53,12 +53,15 @@ build_mode="$1"
 echo "Build mode $build_mode on $(uname -np)" >&2
 case "$build_mode" in
   "Debug")
+      INSTALL="/builds/simgrid_install"
   ;;
 
   "ModelChecker")
+      INSTALL="/builds/mc_simgrid_install"
   ;;
 
   "DynamicAnalysis")
+      INSTALL=""
   ;;
 
   *)
@@ -105,9 +108,8 @@ echo "XX Open the resulting archive"
 echo "XX"
 gunzip ${SIMGRID_VERSION}.tar.gz
 tar xf ${SIMGRID_VERSION}.tar
-cd ${SIMGRID_VERSION}
-mkdir build
-cd build
+mkdir ${WORKSPACE}/build/${SIMGRID_VERSION}/build
+cd ${WORKSPACE}/build/${SIMGRID_VERSION}/build
 SRCFOLDER="${WORKSPACE}/build/${SIMGRID_VERSION}"
 
 echo "XX"
@@ -115,12 +117,16 @@ echo "XX Configure and build SimGrid"
 echo "XX   pwd: "$(pwd)
 echo "XX"
 set -x
-if [ "$build_mode" = "ModelChecker" ] ; then
-   INSTALL="-DCMAKE_INSTALL_PREFIX=/builds/mc_simgrid_install"
-elif [ "$build_mode" = "Debug" ] ; then
-   INSTALL="-DCMAKE_INSTALL_PREFIX=/builds/simgrid_install"
+
+if cmake --version | grep -q 3\.11 ; then
+  # -DCMAKE_DISABLE_SOURCE_CHANGES=ON is broken with java on CMake 3.11
+  # https://gitlab.kitware.com/cmake/cmake/issues/17933
+  MAY_DISABLE_SOURCE_CHANGE=""
+else 
+  MAY_DISABLE_SOURCE_CHANGE="-DCMAKE_DISABLE_SOURCE_CHANGES=ON"
 fi
-cmake -G"$GENERATOR" $INSTALL \
+
+cmake -G"$GENERATOR" ${INSTALL:+-DCMAKE_INSTALL_PREFIX=$INSTALL} \
   -Denable_debug=ON -Denable_documentation=OFF -Denable_coverage=OFF \
   -Denable_model-checking=$(onoff test "$build_mode" = "ModelChecker") \
   -Denable_smpi_ISP_testsuite=$(onoff test "$build_mode" = "ModelChecker") \
@@ -130,7 +136,7 @@ cmake -G"$GENERATOR" $INSTALL \
   -Denable_memcheck=$(onoff test "$build_mode" = "DynamicAnalysis") \
   -Denable_compile_warnings=$(onoff test "$GENERATOR" != "MSYS Makefiles") -Denable_smpi=ON \
   -Denable_ns3=$(onoff test "$have_NS3" = "yes" -a "$build_mode" = "Debug") \
-  -Denable_jedule=OFF -Denable_java=ON -Denable_lua=OFF -DCMAKE_DISABLE_SOURCE_CHANGES=ON \
+  -Denable_jedule=OFF -Denable_java=ON -Denable_lua=OFF ${MAY_DISABLE_SOURCE_CHANGE} \
   $SRCFOLDER
 #  -Denable_lua=$(onoff test "$build_mode" != "DynamicAnalysis") \
 set +x
@@ -148,13 +154,12 @@ if [ -f Testing/TAG ] ; then
    mv CTestResults.xml $WORKSPACE
 fi
 
-if test "$(uname)" != "Msys" && test "${build_mode}" = "Debug" -o "${build_mode}" = "ModelChecker" ; then
+if test -n "$INSTALL"; then
   echo "XX"
   echo "XX Test done. Install everything since it's a regular build, not on a Windows."
   echo "XX"
 
-  test "${build_mode}" = "Debug"        && rm -rf /builds/simgrid_install
-  test "${build_mode}" = "ModelChecker" && rm -rf /builds/mc_simgrid_install
+  rm -rf "$INSTALL"
 
   make install
 fi