From 76b0255fd0d576fa033731ee9c9a2ddcbefb68a1 Mon Sep 17 00:00:00 2001 From: Augustin Degomme Date: Mon, 14 Oct 2013 16:03:32 +0200 Subject: [PATCH] fix run script --- buildtools/jenkins/run.sh | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/buildtools/jenkins/run.sh b/buildtools/jenkins/run.sh index 06b3f2b1a3..910530769e 100755 --- 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,13 @@ 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 make dist + tar xzf `cat $WORKSPACE/VERSION`.tar.gz + cd `cat VERSION` if [ "$build_mode" = "Debug" ] then -- 2.20.1