From b6ddc42e0d629ae17521b816588856584ecd1196 Mon Sep 17 00:00:00 2001 From: navarro Date: Wed, 24 Oct 2012 11:37:16 +0200 Subject: [PATCH] Update pipol script --- buildtools/pipol/Experimental_bindings.sh | 3 ++- buildtools/pipol/Nightly_simgrid.sh | 15 +++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/buildtools/pipol/Experimental_bindings.sh b/buildtools/pipol/Experimental_bindings.sh index 54cc0f22da..33f92565f3 100755 --- a/buildtools/pipol/Experimental_bindings.sh +++ b/buildtools/pipol/Experimental_bindings.sh @@ -25,7 +25,8 @@ export CC=gcc export CXX=g++ fi -cmake -Drelease=on . +#DEFAULT CONF +cmake . ctest -D ExperimentalStart ctest -D ExperimentalConfigure ctest -D ExperimentalBuild diff --git a/buildtools/pipol/Nightly_simgrid.sh b/buildtools/pipol/Nightly_simgrid.sh index 52a5fbe060..9b000ab3a9 100755 --- a/buildtools/pipol/Nightly_simgrid.sh +++ b/buildtools/pipol/Nightly_simgrid.sh @@ -57,6 +57,7 @@ cd ./pipol/$PIPOL_HOST export GIT_SSL_NO_VERIFY=1 git clone https://gforge.inria.fr/git/simgrid/simgrid.git cd simgrid +#git checkout v3_7_x perl ./buildtools/pipol/cmake.pl perl ./buildtools/pipol/ruby.pl @@ -70,15 +71,13 @@ export CXX=g++ fi #DEFAULT CONF -cmake \ --Drelease=on \ --Denable_lua=on . +cmake . ctest -D NightlyStart ctest -D NightlyConfigure ctest -D NightlyBuild ctest -D NightlyTest ctest -D NightlySubmit -make clean +rm -rf ./ # really clean the working directory git reset --hard master @@ -88,9 +87,8 @@ git clean -dfx cmake \ -Denable_coverage=on \ -Denable_model-checking=on \ --Denable_lua=off \ --Drelease=on \ --Denable_supernovae=off . +-Denable_lua=on \ +-Denable_compile_optimizations=off . ctest -D NightlyStart ctest -D NightlyConfigure ctest -D NightlyBuild @@ -101,7 +99,8 @@ ctest -D NightlySubmit export SIMGRID_ROOT=`pwd` export LD_LIBRARY_PATH=`pwd`/lib export DYLD_LIBRARY_PATH=`pwd`/lib -cd ../ +cd .. + git clone git://scm.gforge.inria.fr/simgrid/simgrid-java.git simgrid-java --quiet cd simgrid-java export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:`pwd`/lib -- 2.20.1