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

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

diff --git a/buildtools/pipol/Nightly_simgrid.sh b/buildtools/pipol/Nightly_simgrid.sh
index d300cf9..b9ead54 100755 (executable)
--- a/buildtools/pipol/Nightly_simgrid.sh
+++ b/buildtools/pipol/Nightly_simgrid.sh
@@ -29,16 +29,16 @@
 
 #__________________________________________________________________________________________________
 #Debian Lenny 5.0___________________________________________________________________________________
-#PIPOL esn i386_kvm-linux-debian-lenny none 02:00 --user --silent
-#PIPOL esn amd64_kvm-linux-debian-lenny none 02:00 --user --silent
+#PIPOL esn i386-linux-debian-lenny.dd.gz none 02:00 --user --silent
+#PIPOL esn amd64-linux-debian-lenny.dd.gz none 02:00 --user --silent
 
 #Debian Lenny 6.0
 #PIPOL esn amd64_2010-linux-debian-squeeze.dd.gz none 02:00 --user --silent
-#PIPOL esn i386_2010-linux-debian-squeeze.dd.gz none 02:00 --user --silent
+#PIPOL esn i386_2010-linux-debian-squeeze-navarro-2011-10-03-171100.dd.gz none 02:00 --user --silent
 
 #Debian Testing
-#PIPOL esn i386_kvm-linux-debian-testing none 02:00 --user --silent
-#PIPOL esn amd64_kvm-linux-debian-testing none 02:00 --user --silent
+#PIPOL esn i386-linux-debian-testing none 02:00 --user --silent
+#PIPOL esn amd64-linux-debian-testing none 02:00 --user --silent
 
 #___________________________________________________________________________________________________
 #MacOS Snow Leopard 10.6____________________________________________________________________________
@@ -64,19 +64,16 @@ cd simgrid
 perl ./buildtools/pipol/cmake.pl
 perl ./buildtools/pipol/ruby.pl
 
-#supernovae
-cmake \
--Denable_lua=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 \
--Drelease=on \
--Denable_gtnets=off .
+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
+
+#DEFAULT CONF
+cmake -Drelease=on .
 ctest -D NightlyStart
 ctest -D NightlyConfigure
 ctest -D NightlyBuild
@@ -86,13 +83,10 @@ make clean
 
 #MC
 cmake \
--Denable_latency_bound_tracking=on \
--Denable_gtnets=off \
 -Denable_coverage=on \
 -Denable_model-checking=on \
 -Denable_compile_optimizations=off \
--Drelease=on \
--Denable_supernovae=off .
+-Drelease=on .
 ctest -D NightlyStart
 ctest -D NightlyConfigure
 ctest -D NightlyBuild
@@ -108,6 +102,7 @@ git clone git://scm.gforge.inria.fr/simgrid/simgrid-java.git simgrid-java --quie
 cd simgrid-java
 export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:`pwd`/lib
 export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:`pwd`/lib
+
 cmake .
 ctest -D NightlyStart
 ctest -D NightlyConfigure
@@ -116,8 +111,9 @@ ctest -D NightlyTest
 ctest -D NightlySubmit
 
 cd ../
-svn checkout svn://scm.gforge.inria.fr/svn/simgrid/contrib/trunk/simgrid-ruby simgrid-ruby --quiet
+git clone git://scm.gforge.inria.fr/simgrid/simgrid-ruby.git simgrid-ruby --quiet
 cd simgrid-ruby
+
 cmake .
 ctest -D NightlyStart
 ctest -D NightlyConfigure