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

diff --git a/tools/jenkins/build.sh b/tools/jenkins/build.sh
index ec2325a9d3..aa72529c2f 100755
--- a/tools/jenkins/build.sh
+++ b/tools/jenkins/build.sh
@@ -7,8 +7,12 @@
 
 set -e
 
+# ensure that the locales are set, so that perl keeps its nerves
+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
 ls /tmp
 df -h
@@ -38,11 +42,12 @@ onoff() {
   fi
 }
 
-# Check that we have what we need, or die quickly
-test -e /bin/tar  || die "I need tar to compile. Please fix your slave."
-test -e /bin/gzip || die "I need gzip to compile. Please fix your slave."
-test -e /usr/include/libunwind.h || die "I need libunwind to compile. Please fix your slave."
-test -e /usr/include/valgrind/valgrind.h || die "I need valgrind to compile. Please fix your slave."
+# Check that we have what we need, or die quickly.
+# The paths are not the same on all platforms, unfortunately.
+#test -e /bin/tar  || die 1 "I need tar to compile. Please fix your slave."
+#test -e /bin/gzip || die 1 "I need gzip to compile. Please fix your slave."
+#test -e /usr/include/libunwind.h || die 1 "I need libunwind to compile. Please fix your slave."
+#test -e /usr/include/valgrind/valgrind.h || die 1 "I need valgrind to compile. Please fix your slave."
 
 build_mode="$1"
 echo "Build mode $build_mode on $(uname -np)" >&2
@@ -73,17 +78,17 @@ fi
 
 ulimit -c 0 || true
 
-if test "$(uname -o)" != "Msys"; then
-  echo "XX"
-  echo "XX Get out of the tree"
-  echo "XX"
-  if [ -d $WORKSPACE/build ]
-  then
-    rm -rf $WORKSPACE/build
-  fi
-  mkdir $WORKSPACE/build
-  cd $WORKSPACE/build
+echo "XX"
+echo "XX Get out of the tree"
+echo "XX"
+if [ -d $WORKSPACE/build ]
+then
+  rm -rf $WORKSPACE/build
+fi
+mkdir $WORKSPACE/build
+cd $WORKSPACE/build
 
+if test "$(uname -o)" != "Msys"; then
   echo "XX"
   echo "XX Build the archive out of the tree"
   echo "XX   pwd: `pwd`"
@@ -97,6 +102,10 @@ if test "$(uname -o)" != "Msys"; then
   echo "XX"
   tar xzf `cat VERSION`.tar.gz
   cd `cat VERSION`
+  SRCFOLDER="."
+else
+#for windows we don't make dist, but we still want to build out of source
+  SRCFOLDER=$WORKSPACE
 fi
 
 echo "XX"
@@ -111,12 +120,10 @@ cmake -G"$GENERATOR"\
   -Denable_smpi_MPICH3_testsuite=$(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_latency_bound_tracking=OFF -Denable_jedule=OFF \
-  -Denable_tracing=ON -Denable_java=ON -Denable_lua=OFF
+  -Denable_compile_warnings=$(onoff test "$GENERATOR" != "MSYS Makefiles") -Denable_smpi=ON \
+  -Denable_jedule=OFF -Denable_java=ON -Denable_lua=OFF $SRCFOLDER
 #  -Denable_lua=$(onoff test "$build_mode" != "DynamicAnalysis") \
 
-
 make -j$NUMBER_OF_PROCESSORS VERBOSE=1
 
 if test "$(uname -o)" != "Msys"; then
@@ -140,20 +147,3 @@ fi
 echo "XX"
 echo "XX Done. Return the results to cmake"
 echo "XX"
-
-if [ "$build_mode" = "DynamicAnalysis" ]
-then
-  ctest -D ContinuousStart
-  ctest -D ContinuousConfigure
-  ctest -D ContinuousBuild
-  ctest -D ContinuousMemCheck
-  ctest -D ContinuousSubmit
-fi
-
-ctest -D ContinuousStart
-ctest -D ContinuousConfigure
-ctest -D ContinuousBuild
-ctest -D ContinuousTest
-ctest -D ContinuousSubmit
-
-rm -rf `cat VERSION`