Update script for build default conf into build-def directory

diff --git a/buildtools/pipol/Experimental.sh b/buildtools/pipol/Experimental.sh
deleted file mode 100755 (executable)
index 3252fd9..0000000
--- a/buildtools/pipol/Experimental.sh
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/bin/bash
-
-if [ -e ./pipol ] ; then
-       rm -rf ./pipol/$PIPOL_HOST
-       mkdir ./pipol/$PIPOL_HOST
-else
-       mkdir ./pipol
-       rm -rf ./pipol/$PIPOL_HOST
-       mkdir ./pipol/$PIPOL_HOST
-fi
-cd ./pipol/$PIPOL_HOST
-
-export GIT_SSL_NO_VERIFY=1
-git clone https://gforge.inria.fr/git/simgrid/simgrid.git
-cd simgrid
-
-perl ./buildtools/pipol/cmake.pl
-perl ./buildtools/pipol/ruby.pl
-
-if [ -e /usr/bin/gcc-4.6 ] ; then
-export CC=gcc-4.6
-export CXX=g++-4.6
-else
-export CC=gcc
-export CXX=g++
-fi
-
-#Those 3 lines is for GTNetS
-#sh ./buildtools/pipol/install_gtnets.sh ./gtnets_install
-#SIMGRID_ROOT=`pwd`
-#export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$SIMGRID_ROOT/gtnets_install/lib
-
-#MC
-cmake \
--Denable_latency_bound_tracking=on \
--Denable_gtnets=on \
--Dgtnets_path=./gtnets_install \
--Denable_coverage=on \
--Denable_model-checking=on \
--Denable_compile_optimizations=off \
--Denable_auto_install=on \
--DCMAKE_INSTALL_PREFIX=./simgrid_install \
--Drelease=on .
-ctest -D ExperimentalStart
-ctest -D ExperimentalConfigure
-ctest -D ExperimentalBuild
-ctest -D ExperimentalTest
-ctest -D ExperimentalCoverage
-ctest -D ExperimentalSubmit
-make clean

diff --git a/buildtools/pipol/Experimental_bindings.sh b/buildtools/pipol/Experimental_bindings.sh
index 33f9256..7bbd9e2 100755 (executable)
--- a/buildtools/pipol/Experimental_bindings.sh
+++ b/buildtools/pipol/Experimental_bindings.sh
@@ -13,6 +13,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
@@ -25,12 +26,34 @@ export CC=gcc
 export CXX=g++
 fi
 
+mkdir build-def
+cd build-def
+
 #DEFAULT CONF
-cmake .
+cmake ..
+ctest -D ExperimentalStart
+ctest -D ExperimentalConfigure
+ctest -D ExperimentalBuild
+ctest -D ExperimentalTest
+ctest -D ExperimentalSubmit
+cd ../
+rm -rf ./build-def
+
+# really clean the working directory
+git reset --hard master
+git clean -dfx
+
+#MC
+cmake \
+-Denable_coverage=on \
+-Denable_model-checking=on \
+-Denable_lua=on \
+-Denable_compile_optimizations=off .
 ctest -D ExperimentalStart
 ctest -D ExperimentalConfigure
 ctest -D ExperimentalBuild
 ctest -D ExperimentalTest
+ctest -D ExperimentalCoverage
 ctest -D ExperimentalSubmit
 
 export SIMGRID_ROOT=`pwd`

diff --git a/buildtools/pipol/Nightly_simgrid.sh b/buildtools/pipol/Nightly_simgrid.sh
index 9b000ab..d118feb 100755 (executable)
--- a/buildtools/pipol/Nightly_simgrid.sh
+++ b/buildtools/pipol/Nightly_simgrid.sh
@@ -70,14 +70,18 @@ export CC=gcc
 export CXX=g++
 fi
 
+mkdir build-def
+cd build-def
+
 #DEFAULT CONF
-cmake .
+cmake ..
 ctest -D NightlyStart
 ctest -D NightlyConfigure
 ctest -D NightlyBuild
 ctest -D NightlyTest
 ctest -D NightlySubmit
-rm -rf ./
+cd ../
+rm -rf ./build-def
 
 # really clean the working directory
 git reset --hard master
@@ -98,13 +102,13 @@ ctest -D NightlySubmit
 
 export SIMGRID_ROOT=`pwd`
 export LD_LIBRARY_PATH=`pwd`/lib
-export DYLD_LIBRARY_PATH=`pwd`/lib              
+export DYLD_LIBRARY_PATH=`pwd`/lib #for mac
 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
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:`pwd`/lib
+export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:`pwd`/lib #for mac
 
 cmake .
 ctest -D NightlyStart