Jenkins: sh syntax error when speaking to windows

[simgrid.git] / buildtools / jenkins / build.sh

diff --git a/buildtools/jenkins/build.sh b/buildtools/jenkins/build.sh
index cea66c3..eb87979 100755 (executable)
--- a/buildtools/jenkins/build.sh
+++ b/buildtools/jenkins/build.sh
@@ -2,11 +2,35 @@
 
 set -e
 
-build_mode="$1"
+echo "Running $0 with arguments:" >&2
+for arg in "$@"; do
+  echo "- $arg"
+done
 
+build_mode="$1"
 echo "Build mode $build_mode on $(uname -np)" >&2
+case "$build_mode" in
+  "Debug")
+  ;;
+
+  "ModelChecker")
+  ;;
+
+  "DynamicAnalysis")
+  ;;
+
+  *)
+    if test "$(uname -o)" = "Msys"; then
+      echo "On Windows, jenkins is not willing to expand variables for some reason" >&2
+      echo "Force use Debug mode" >&2
+    else
+      echo "Unknown build_mode $build_mode"
+      exit 1
+    fi
+  ;;
+esac
 
-if test "$(uname -o)" = "Msys";
+if test "$(uname -o)" = "Msys"; then
   if [ -z "$NUMBER_OF_PROCESSORS" ]; then
     NUMBER_OF_PROCESSORS=1
   fi
@@ -34,7 +58,7 @@ onoff() {
   fi
 }
 
-ulimit -c 0
+ulimit -c 0 || true
 
 if [ -d $WORKSPACE/build ]
 then
@@ -48,21 +72,6 @@ make dist -j$NUMBER_OF_PROCESSORS
 tar xzf `cat VERSION`.tar.gz
 cd `cat VERSION`
 
-case "$build_mode" in
-  "Debug")
-  ;;
-
-  "ModelChecker")
-  ;;
-
-  "DynamicAnalysis")
-  ;;
-
-  *)
-  die 1 "Unknown build_mode $build_mode"
-  ;;
-esac
-
 cmake -G"$GENERATOR"\
   -Denable_debug=ON -Denable_documentation=OFF -Denable_coverage=OFF \
   -Denable_model-checking=$(onoff test "$build_mode" = "ModelChecker") \