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

diff --git a/tools/jenkins/build.sh b/tools/jenkins/build.sh
index 1ce50ae751..d4a00073a7 100755
--- a/tools/jenkins/build.sh
+++ b/tools/jenkins/build.sh
@@ -2,7 +2,7 @@
 
 # This script is used by various build projects on Jenkins
 
-# See https://ci.inria.fr/simgrid/job/SimGrid-Multi/configure
+# See https://ci.inria.fr/simgrid/job/SimGrid/configure
 # See https://ci.inria.fr/simgrid/job/Simgrid-Windows/configure
 
 set -e
@@ -13,7 +13,7 @@ export LC_ALL=C
 echo "XXXX Cleanup previous attempts. Remaining content of /tmp:"
 rm -rf /tmp/simgrid-java*
 rm -rf /tmp/jvm-*
-find /builds/workspace/SimGrid-Multi/ -name "hs_err_pid*.log" | xargs rm -f
+find /builds/workspace/SimGrid/ -name "hs_err_pid*.log" | xargs rm -f
 ls /tmp
 df -h
 echo "XXXX Let's go"
@@ -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=""
   ;;
 
   *)
@@ -66,15 +69,8 @@ case "$build_mode" in
   ;;
 esac
 
-if test "$(uname)" = "Msys"; then
-  if [ -z "$NUMBER_OF_PROCESSORS" ]; then
-    NUMBER_OF_PROCESSORS=1
-  fi
-  GENERATOR="MSYS Makefiles"
-else
-  NUMBER_OF_PROCESSORS="$(nproc)" || NUMBER_OF_PROCESSORS=1
-  GENERATOR="Unix Makefiles"
-fi
+NUMBER_OF_PROCESSORS="$(nproc)" || NUMBER_OF_PROCESSORS=1
+GENERATOR="Unix Makefiles"
 
 ulimit -c 0 || true
 
@@ -98,40 +94,39 @@ echo "XX have_NS3: ${have_NS3}"
 # This is for Windows:
 PATH="$WORKSPACE/build/lib:$PATH"
 
-if test "$(uname)" != "Msys"; then
-  echo "XX"
-  echo "XX Build the archive out of the tree"
-  echo "XX   pwd: "$(pwd)
-  echo "XX"
+echo "XX"
+echo "XX Build the archive out of the tree"
+echo "XX   pwd: "$(pwd)
+echo "XX"
 
-  cmake -G"$GENERATOR" -Denable_documentation=OFF $WORKSPACE
-  make dist -j$NUMBER_OF_PROCESSORS
+cmake -G"$GENERATOR" -Denable_documentation=OFF $WORKSPACE
+make dist -j$NUMBER_OF_PROCESSORS
+SIMGRID_VERSION=$(cat VERSION)
 
-  echo "XX"
-  echo "XX Open the resulting archive"
-  echo "XX"
-  gunzip $(cat VERSION).tar.gz
-  tar xf $(cat VERSION).tar
-  cd $(cat VERSION)
-  mkdir build
-  cd build
-  SRCFOLDER=".."
-else
-#for windows we don't make dist, but we still want to build out of source
-  SRCFOLDER=$WORKSPACE
-fi
+echo "XX"
+echo "XX Open the resulting archive"
+echo "XX"
+gunzip ${SIMGRID_VERSION}.tar.gz
+tar xf ${SIMGRID_VERSION}.tar
+mkdir ${WORKSPACE}/build/${SIMGRID_VERSION}/build
+cd ${WORKSPACE}/build/${SIMGRID_VERSION}/build
+SRCFOLDER="${WORKSPACE}/build/${SIMGRID_VERSION}"
 
 echo "XX"
 echo "XX Configure and build SimGrid"
 echo "XX   pwd: "$(pwd)
 echo "XX"
 set -x
-if [ "$build_mode" = "ModelChecker" ] ;
-   INSTALL="-DCMAKE_INSTALL_PREFIX=/builds/mc_simgrid_install"
-elif [ "$build_mode" = "Debug" ] ;
-   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") \
@@ -141,17 +136,13 @@ 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 $SRCFOLDER
+  -Denable_jedule=OFF -Denable_java=ON -Denable_lua=OFF ${MAY_DISABLE_SOURCE_CHANGE} \
+  $SRCFOLDER
 #  -Denable_lua=$(onoff test "$build_mode" != "DynamicAnalysis") \
 set +x
 
 make -j$NUMBER_OF_PROCESSORS VERBOSE=1
 
-if test "$(uname)" != "Msys"; then
-  cd $WORKSPACE/build
-  cd $(cat VERSION)/build
-fi
-
 echo "XX"
 echo "XX Run the tests"
 echo "XX   pwd: "$(pwd)
@@ -163,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