Use a new image of squeeze cause the pipol one is broken

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

diff --git a/buildtools/pipol/Nightly_simgrid.sh b/buildtools/pipol/Nightly_simgrid.sh
index 6312b5c..3dadd3c 100755 (executable)
--- a/buildtools/pipol/Nightly_simgrid.sh
+++ b/buildtools/pipol/Nightly_simgrid.sh
@@ -29,12 +29,12 @@
 
 #__________________________________________________________________________________________________
 #Debian Lenny 5.0___________________________________________________________________________________
-#PIPOL esn i386-linux-debian-lenny none 02:00 --user --silent
-#PIPOL esn amd64-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-linux-debian-testing none 02:00 --user --silent
@@ -64,21 +64,15 @@ cd simgrid
 perl ./buildtools/pipol/cmake.pl
 perl ./buildtools/pipol/ruby.pl
 
-#supernovae
-if [ "x$PIPOL_IMAGE" = "xi386-linux-debian-testing.dd.gz" ] ; then
-cmake -DCMAKE_C_COMPILER=gcc-4.6 -DCMAKE_CXX_COMPILER=g++-4.6 \
--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
+
+#supernovae
 cmake \
 -Denable_lua=on \
 -Denable_tracing=on \
@@ -91,7 +85,6 @@ cmake \
 -Denable_latency_bound_tracking=off \
 -Drelease=on \
 -Denable_gtnets=off .
-fi
 
 ctest -D NightlyStart
 ctest -D NightlyConfigure
@@ -125,11 +118,7 @@ cd simgrid-java
 export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:`pwd`/lib
 export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:`pwd`/lib
 
-if [ "x$PIPOL_IMAGE" = "xi386-linux-debian-testing.dd.gz" ] ; then
-       cmake -DCMAKE_C_COMPILER=gcc-4.6 -DCMAKE_CXX_COMPILER=g++-4.6 .
-else
-       cmake .
-fi
+cmake .
 ctest -D NightlyStart
 ctest -D NightlyConfigure
 ctest -D NightlyBuild
@@ -140,11 +129,7 @@ cd ../
 git clone git://scm.gforge.inria.fr/simgrid/simgrid-ruby.git simgrid-ruby --quiet
 cd simgrid-ruby
 
-if [ "x$PIPOL_IMAGE" = "xi386-linux-debian-testing.dd.gz" ] ; then
-       cmake -DCMAKE_C_COMPILER=gcc-4.6 -DCMAKE_CXX_COMPILER=g++-4.6 .
-else
-       cmake .
-fi
+cmake .
 ctest -D NightlyStart
 ctest -D NightlyConfigure
 ctest -D NightlyBuild