From: Augustin Degomme <degomme@idpann.imag.fr>
Date: Mon, 14 Oct 2013 13:18:12 +0000 (+0200)
Subject: Let's try to unify build rules for jenkins
X-Git-Tag: v3_9_90~13
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/1b53839825f8be3107c4156dd0e50793716082a6

Let's try to unify build rules for jenkins
---

diff --git a/buildtools/jenkins/run.sh b/buildtools/jenkins/run.sh
index fe5a509b1e..06b3f2b1a3 100755
--- a/buildtools/jenkins/run.sh
+++ b/buildtools/jenkins/run.sh
@@ -10,53 +10,58 @@ mkdir $WORKSPACE/build
 mkdir $WORKSPACE/install
 cd $WORKSPACE/build
 
-cmake $WORKSPACE
-make dist
+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 nsis
 
-if [ "$build_mode" = "Debug" ]
-then
-cmake -Denable_coverage=ON -Denable_java=ON -Denable_model-checking=OFF -Denable_lua=ON -Denable_compile_optimizations=ON -Denable_compile_warnings=ON .
-fi
-
-if [ "$build_mode" = "ModelChecker" ]
-then
-cmake -Denable_coverage=ON -Denable_java=ON -Denable_model-checking=ON -Denable_lua=ON -Denable_compile_optimizations=OFF -Denable_compile_warnings=ON .
-fi
+    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 .
+    fi
 
-if [ "$build_mode" = "DynamicAnalysis" ]
-then
-cmake -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
+    if [ "$build_mode" = "ModelChecker" ]
+    then
+    cmake -G "MSYS Makefiles" -Denable_coverage=ON -Denable_java=ON -Denable_smpi=ON -Denable_model-checking=ON -Denable_lua=OFF -Denable_compile_optimizations=OFF -Denable_compile_warnings=ON .
+    fi
 
-make
+    if [ "$build_mode" = "DynamicAnalysis" ]
+    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
+    make dist
 
-TRES=0
+    if [ "$build_mode" = "Debug" ]
+    then
+    cmake -Denable_coverage=ON -Denable_java=ON -Denable_model-checking=OFF -Denable_lua=ON -Denable_compile_optimizations=ON  -Denable_smpi=ON -Denable_smpi_MPICH3_testsuite=ON -Denable_compile_warnings=ON .
+    fi
 
-ctest -T test --no-compress-output || true
-if [ -f Testing/TAG ] ; then
-   /usr/bin/xsltproc $WORKSPACE/buildtools/jenkins/ctest2junit.xsl Testing/`head -n 1 < Testing/TAG`/Test.xml > CTestResults.xml
-   mv CTestResults.xml $WORKSPACE
-fi
+    if [ "$build_mode" = "ModelChecker" ]
+    then
+    cmake -Denable_coverage=ON -Denable_java=ON -Denable_smpi=ON -Denable_model-checking=ON -Denable_lua=ON -Denable_compile_optimizations=OFF -Denable_compile_warnings=ON .
+    fi
 
-if [ "$build_mode" = "Debug" ]
-then
-cmake -Denable_coverage=ON -Denable_java=ON -Denable_model-checking=OFF -Denable_lua=ON -Denable_compile_optimizations=ON -Denable_compile_warnings=ON .
-fi
+    if [ "$build_mode" = "DynamicAnalysis" ]
+    then
+    cmake -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
 
-if [ "$build_mode" = "ModelChecker" ]
-then
-cmake -Denable_coverage=ON -Denable_java=ON -Denable_model-checking=ON -Denable_lua=ON -Denable_compile_optimizations=OFF -Denable_compile_warnings=ON .
+    make
+    make dist
 fi
 
-if [ "$build_mode" = "DynamicAnalysis" ]
-then
-  ctest -D ContinuousStart
-  ctest -D ContinuousConfigure
-  ctest -D ContinuousBuild
-  ctest -D ContinuousMemCheck
-  ctest -D ContinuousSubmit
+ctest -T test --no-compress-output  --timeout 100 || true
+if [ -f Testing/TAG ] ; then
+   xsltproc $WORKSPACE/buildtools/jenkins/ctest2junit.xsl -o "$WORKSPACE/CTestResults.xml" Testing/`head -n 1 < Testing/TAG`/Test.xml
 fi
 
 ctest -D ContinuousStart