avoid failing the tar extraction and working on previous version instead

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

diff --git a/buildtools/jenkins/run.sh b/buildtools/jenkins/run.sh
index 06b3f2b..c1141b3 100755 (executable)
--- a/buildtools/jenkins/run.sh
+++ b/buildtools/jenkins/run.sh
@@ -12,14 +12,13 @@ cd $WORKSPACE/build
 
 export PATH=./lib/:../../lib:$PATH
 
-
-tar xzf `cat VERSION`.tar.gz
-cd `cat VERSION`
 if test "$(uname -o)" = "Msys"
 then 
     cmake -G "MSYS Makefiles" -Denable_java=ON -Denable_smpi=ON -Denable_smpi_MPICH3_testsuite=ON -Denable_tracing=ON $WORKSPACE
+    make
+    make dist
     make nsis
-
+    
     if [ "$build_mode" = "Debug" ]
     then
     cmake -G "MSYS Makefiles" -Denable_coverage=ON -Denable_java=ON -Denable_model-checking=OFF -Denable_lua=OFF -Denable_compile_optimizations=ON  -Denable_smpi=ON -Denable_smpi_MPICH3_testsuite=ON -Denable_compile_warnings=ON .
@@ -34,11 +33,14 @@ then
     then
     cmake -G "MSYS Makefiles" -Denable_lua=OFF -Denable_java=ON -Denable_tracing=ON -Denable_smpi=ON -Denable_compile_optimizations=OFF -Denable_compile_warnings=ON -Denable_lib_static=OFF -Denable_model-checking=OFF -Denable_latency_bound_tracking=OFF -Denable_gtnets=OFF -Denable_jedule=OFF -Denable_mallocators=OFF -Denable_memcheck=ON .
     fi
+
     make
 else    
-    
     cmake $WORKSPACE
+    rm Simgrid*.tar.gz
     make dist
+    tar xzf `cat VERSION`.tar.gz
+    cd `cat VERSION`
 
     if [ "$build_mode" = "Debug" ]
     then