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

diff --git a/tools/jenkins/build.sh b/tools/jenkins/build.sh
index 893553886f..81beefdb5e 100755
--- a/tools/jenkins/build.sh
+++ b/tools/jenkins/build.sh
@@ -75,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`"
@@ -99,6 +99,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"
@@ -115,7 +119,7 @@ cmake -G"$GENERATOR"\
   -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
+  -Denable_tracing=ON -Denable_java=ON -Denable_lua=OFF $SRCFOLDER
 #  -Denable_lua=$(onoff test "$build_mode" != "DynamicAnalysis") \
 
 
@@ -142,20 +146,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`