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

diff --git a/tools/jenkins/build.sh b/tools/jenkins/build.sh
index 32b598cd65..7d44f01300 100755
--- a/tools/jenkins/build.sh
+++ b/tools/jenkins/build.sh
@@ -7,9 +7,13 @@
 
 set -e
 
-# Cleanup previous attempts
-rm -rf /tmp/simgrid*tmp
-rm -rf /tmp/surf-java*tmp
+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
+echo "XXXX Let's go"
 
 # Help older cmakes
 if [ -e /usr/lib/jvm/java-7-openjdk-amd64 ] ; 
@@ -35,6 +39,13 @@ onoff() {
   fi
 }
 
+# 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
 case "$build_mode" in
@@ -64,17 +75,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`"
@@ -88,6 +99,10 @@ if test "$(uname -o)" != "Msys"; then
   echo "XX"
   tar xzf `cat VERSION`.tar.gz
   cd `cat VERSION`
+  SRCFOLDER=$WORKSPACE/build
+else
+#for windows we don't make dist, but we still want to build out of source
+  SRCFOLDER=$WORKSPACE
 fi
 
 echo "XX"
@@ -102,9 +117,9 @@ 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_compile_warnings=$(onoff test "$GENERATOR" != "MSYS Makefiles") -Denable_smpi=ON \
   -Denable_latency_bound_tracking=OFF -Denable_jedule=OFF \
-  -Denable_tracing=ON -Denable_java=ON -Denable_lua=OFF
+  -Denable_tracing=ON -Denable_java=ON -Denable_lua=OFF $SRCFOLDER
 #  -Denable_lua=$(onoff test "$build_mode" != "DynamicAnalysis") \