Fix Windows Jenkins script

diff --git a/buildtools/jenkins/run.bat b/buildtools/jenkins/run.bat
index 4dad1f7..867f69c 100644 (file)
--- a/buildtools/jenkins/run.bat
+++ b/buildtools/jenkins/run.bat
@@ -1,35 +1 @@
-#!c:\mingw\msys\1.0\bin\sh -login
-
-if [ -d $WORKSPACE/build ]
-then
-  rm -rf $WORKSPACE/build
-fi
-if [ -d $WORKSPACE/install ]
-then
-  rm -rf $WORKSPACE/install
-fi
-mkdir $WORKSPACE/build
-mkdir $WORKSPACE/install
-cd $WORKSPACE/build
-
-cmake -G "MinGW Makefiles" $WORKSPACE
-mingw32-make dist
-tar xzf `cat VERSION`.tar.gz
-cd `cat VERSION`
-
-if [ "$build_mode" = "Debug" ]
-then
-cmake -G "MinGW Makefiles" -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 -G "MinGW Makefiles" -Denable_coverage=ON -Denable_java=ON -Denable_model-checking=ON -Denable_lua=ON -Denable_compile_optimizations=ON -Denable_compile_warnings=ON .
-fi
-
-if [ "$build_mode" = "DynamicAnalysis" ]
-then
-cmake -G "MinGW 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
-
-mingw32-make
+c:\mingw\msys\1.0\bin\sh -login .\buildtools\Jenkins\runmingw.sh %1 %2

diff --git a/buildtools/jenkins/run.sh b/buildtools/jenkins/run.sh
index b457edb..5558ac8 100644 (file)
--- a/buildtools/jenkins/run.sh
+++ b/buildtools/jenkins/run.sh
@@ -1,13 +1,11 @@
 #!/bin/bash
 
-if [ -d $WORKSPACE/build ]
-then
-  rm -rf $WORKSPACE/build
-fi
-if [ -d $WORKSPACE/install ]
-then
-  rm -rf $WORKSPACE/install
-fi
+WORKSPACE=$1
+build_mode=$2
+
+rm -rf $WORKSPACE/build
+rm -rf $WORKSPACE/install
+
 mkdir $WORKSPACE/build
 mkdir $WORKSPACE/install
 cd $WORKSPACE/build

diff --git a/buildtools/jenkins/runmingw.sh b/buildtools/jenkins/runmingw.sh
new file mode 100644 (file)
index 0000000..b813165
--- /dev/null
+++ b/buildtools/jenkins/runmingw.sh
@@ -0,0 +1,22 @@
+#!c:\mingw\msys\1.0\bin\sh -login
+
+WORKSPACE=$1
+build_mode=$2
+
+rm -rf $WORKSPACE/build
+rm -rf $WORKSPACE/install
+mkdir $WORKSPACE/build
+mkdir $WORKSPACE/install
+cd $WORKSPACE/build
+
+if [ "$build_mode" = "Debug" ]
+then
+cmake -G "MSYS Makefiles" ..
+fi
+
+if [ "$build_mode" = "ModelChecker" ]
+then
+cmake -G "MSYS Makefiles" -Denable_model-checking=ON ..
+fi
+
+make