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

diff --git a/tools/jenkins/build.sh b/tools/jenkins/build.sh
index 87c311b94f..3ceb6d8612 100755
--- a/tools/jenkins/build.sh
+++ b/tools/jenkins/build.sh
@@ -7,6 +7,10 @@
 
 set -e
 
+# Ensure that the locales are set, so that Perl keeps its nerves.
+# Not forgeting UTF to not drive Python crazy.
+export LC_ALL=C.UTF-8
+
 echo "XXXX Cleanup previous attempts. Remaining content of /tmp:"
 rm -rf /tmp/simgrid-java*
 rm -rf /tmp/jvm-* 
@@ -85,6 +89,9 @@ fi
 mkdir $WORKSPACE/build
 cd $WORKSPACE/build
 
+# This is for Windows:
+PATH="$WORKSPACE/build/lib:$PATH"
+
 if test "$(uname -o)" != "Msys"; then
   echo "XX"
   echo "XX Build the archive out of the tree"
@@ -97,9 +104,12 @@ if test "$(uname -o)" != "Msys"; then
   echo "XX"
   echo "XX Open the resulting archive"
   echo "XX"
-  tar xzf `cat VERSION`.tar.gz
+  gunzip `cat VERSION`.tar.gz
+  tar xf `cat VERSION`.tar
   cd `cat VERSION`
-  SRCFOLDER="."
+  mkdir build
+  cd build
+  SRCFOLDER=".."
 else
 #for windows we don't make dist, but we still want to build out of source
   SRCFOLDER=$WORKSPACE
@@ -118,16 +128,14 @@ cmake -G"$GENERATOR"\
   -Denable_mallocators=$(onoff test "$build_mode" != "DynamicAnalysis") \
   -Denable_memcheck=$(onoff test "$build_mode" = "DynamicAnalysis") \
   -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 $SRCFOLDER
+  -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
   cd $WORKSPACE/build
-  cd `cat VERSION`
+  cd `cat VERSION`/build
 fi
 
 TRES=0
@@ -146,20 +154,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`