X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/71e4e3a4367ae2a642ddeb4038e98f7955838b9a..10d080a0d3132dc092bd61c47535eaa97cbcdbc8:/tools/jenkins/build.sh?ds=sidebyside

diff --git a/tools/jenkins/build.sh b/tools/jenkins/build.sh
index b4ae59eeaa..ae085a7c17 100755
--- a/tools/jenkins/build.sh
+++ b/tools/jenkins/build.sh
@@ -5,8 +5,6 @@
 # See https://ci.inria.fr/simgrid/job/SimGrid/configure
 # See https://ci.inria.fr/simgrid/job/Simgrid-Windows/configure
 
-set -e
-
 # ensure that the locales are set, so that perl keeps its nerves
 export LC_ALL=C
 
@@ -14,11 +12,13 @@ echo "XXXX Cleanup previous attempts. Remaining content of /tmp:"
 rm -rf /tmp/simgrid-java*
 rm -rf /var/tmp/simgrid-java*
 rm -rf /tmp/jvm-*
-find /builds/workspace/SimGrid/ -name "hs_err_pid*.log" -exec rm -f {} +
+find $WORKSPACE -name "hs_err_pid*.log" -exec rm -f {} +
 ls /tmp
 df -h
 echo "XXXX Let's go"
 
+set -e
+
 # Help older cmakes
 if [ -e /usr/lib/jvm/java-7-openjdk-amd64 ] ;
 then
@@ -31,7 +31,7 @@ die () {
   shift
   [ $# -gt 0 ] || set -- "Error - Halting"
   echo "$@" >&2
-  exit $status
+  exit "$status"
 }
 
 # Get an ON/OFF string from a command:
@@ -103,11 +103,11 @@ build_mode="$1"
 echo "Build mode $build_mode on $(uname -np)" >&2
 case "$build_mode" in
   "Debug")
-      INSTALL="/builds/simgrid_install"
+      INSTALL="$HOME/simgrid_install"
   ;;
 
   "ModelChecker")
-      INSTALL="/builds/mc_simgrid_install"
+      INSTALL="$HOME/mc_simgrid_install"
   ;;
 
   "DynamicAnalysis")
@@ -134,13 +134,13 @@ ulimit -c 0 || true
 echo "XX"
 echo "XX Get out of the tree"
 echo "XX"
-if [ -d $WORKSPACE/build ]
+if [ -d "$WORKSPACE"/build ]
 then
   # Windows cannot remove the directory if it's still used by the previous build
-  rm -rf $WORKSPACE/build || sleep 10 && rm -rf $WORKSPACE/build || sleep 10 && rm -rf $WORKSPACE/build
+  rm -rf "$WORKSPACE"/build || sleep 10 && rm -rf "$WORKSPACE"/build || sleep 10 && rm -rf "$WORKSPACE"/build
 fi
-mkdir $WORKSPACE/build
-cd $WORKSPACE/build
+mkdir "$WORKSPACE"/build
+cd "$WORKSPACE"/build
 
 have_NS3="no"
 if dpkg -l libns3-dev 2>&1|grep -q "ii  libns3-dev" ; then
@@ -153,25 +153,25 @@ PATH="$WORKSPACE/build/lib:$PATH"
 
 echo "XX"
 echo "XX Build the archive out of the tree"
-echo "XX   pwd: "$(pwd)
+echo "XX   pwd: $(pwd)"
 echo "XX"
 
-cmake -G"$GENERATOR" -Denable_documentation=OFF $WORKSPACE
+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 ${SIMGRID_VERSION}.tar.gz
-tar xf ${SIMGRID_VERSION}.tar
-mkdir ${WORKSPACE}/build/${SIMGRID_VERSION}/build
-cd ${WORKSPACE}/build/${SIMGRID_VERSION}/build
+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   pwd: $(pwd)"
 echo "XX"
 set -x
 
@@ -183,13 +183,6 @@ else
   MAY_DISABLE_SOURCE_CHANGE="-DCMAKE_DISABLE_SOURCE_CHANGES=ON"
 fi
 
-if [ "$os" = "NixOS" ] && [ "$(gcc -dumpversion)" = "7.4.0" ]; then
-    echo "Temporary disable LTO, believed to be broken on this system."
-    MAY_DISABLE_LTO=-Denable_lto=OFF
-else
-    MAY_DISABLE_LTO=
-fi
-
 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") \
@@ -200,8 +193,11 @@ cmake -G"$GENERATOR" ${INSTALL:+-DCMAKE_INSTALL_PREFIX=$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 ${MAY_DISABLE_SOURCE_CHANGE} ${MAY_DISABLE_LTO} \
-  $SRCFOLDER
+  -Denable_jedule=OFF -Denable_lua=OFF ${MAY_DISABLE_SOURCE_CHANGE} \
+  -Denable_java=$(onoff test "$build_mode" = "ModelChecker") \
+  -Denable_msg=$(onoff test "$build_mode" = "ModelChecker") \
+  -DLTO_EXTRA_FLAG="auto" \
+  "$SRCFOLDER"
 #  -Denable_lua=$(onoff test "$build_mode" != "DynamicAnalysis") \
 set +x
 
@@ -214,7 +210,7 @@ echo "XX"
 
 ctest -T test --output-on-failure --no-compress-output || true
 
-if test -n "$INSTALL" && [ ${branch_name} = "origin/master" ] ; then
+if test -n "$INSTALL" && [ "${branch_name}" = "origin/master" ] ; then
   echo "XX"
   echo "XX Test done. Install everything since it's a regular build, not on a Windows."
   echo "XX"