Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid

[simgrid.git] / buildtools / pipol / Experimental.sh

diff --git a/buildtools/pipol/Experimental.sh b/buildtools/pipol/Experimental.sh
old mode 100644 (file)
new mode 100755 (executable)
index 9f7ae94..3252fd9
--- a/buildtools/pipol/Experimental.sh
+++ b/buildtools/pipol/Experimental.sh
@@ -10,38 +10,25 @@ else
 fi
 cd ./pipol/$PIPOL_HOST
 
-svn checkout svn://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk simgrid-trunk --quiet
-cd simgrid-trunk
+export GIT_SSL_NO_VERIFY=1
+git clone https://gforge.inria.fr/git/simgrid/simgrid.git
+cd simgrid
 
-sh ./buildtools/pipol/liste_install.sh
-sh ./buildtools/pipol/install_gtnets.sh ./gtnets_install
-SIMGRID_ROOT=`pwd`
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$SIMGRID_ROOT/gtnets_install/lib
 perl ./buildtools/pipol/cmake.pl
 perl ./buildtools/pipol/ruby.pl
 
-rm CMakeCache.txt
+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
 
-#supernovae
-cmake \
--Denable_lua=on \
--Denable_ruby=on \
--Denable_java=on \
--Denable_tracing=on \
--Denable_smpi=on \
--Denable_supernovae=on \
--Denable_compile_optimizations=on \
--Denable_compile_warnings=on \
--Denable_lib_static=off \
--Denable_model-checking=off \
--Denable_latency_bound_tracking=off \
--Denable_gtnets=off .
-ctest -D ExperimentalStart
-ctest -D ExperimentalConfigure
-ctest -D ExperimentalBuild
-ctest -D ExperimentalTest
-ctest -D ExperimentalSubmit
-make clean
+#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 \
@@ -53,7 +40,7 @@ cmake \
 -Denable_compile_optimizations=off \
 -Denable_auto_install=on \
 -DCMAKE_INSTALL_PREFIX=./simgrid_install \
--Denable_supernovae=off .
+-Drelease=on .
 ctest -D ExperimentalStart
 ctest -D ExperimentalConfigure
 ctest -D ExperimentalBuild