From: Navarrop <Pierre.Navarro@imag.fr>
Date: Tue, 27 Sep 2011 10:45:00 +0000 (+0200)
Subject: With debian testing on pipol we must set -DCMAKE_C_COMPILER=gcc-4.6 -DCMAKE_CXX_COMPI... 
X-Git-Tag: v3_6_2~49^2~1
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/7e3f3c930a2f9dfc8b56d42a2f7e0b8cd044d3af

With debian testing on pipol we must set -DCMAKE_C_COMPILER=gcc-4.6 -DCMAKE_CXX_COMPILER=g++-4.6 flags.
Don't use kvm image from pipol for now.
Clean rc.debian, some packages are already install.
---

diff --git a/buildtools/pipol/Experimental.sh b/buildtools/pipol/Experimental.sh
index 7fada6d0c2..8bf0676802 100755
--- a/buildtools/pipol/Experimental.sh
+++ b/buildtools/pipol/Experimental.sh
@@ -22,6 +22,20 @@ perl ./buildtools/pipol/ruby.pl
 #export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$SIMGRID_ROOT/gtnets_install/lib
 
 #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 .
+else
 cmake \
 -Denable_lua=on \
 -Denable_tracing=on \
@@ -34,6 +48,8 @@ cmake \
 -Denable_latency_bound_tracking=off \
 -Drelease=on \
 -Denable_gtnets=off .
+fi
+
 ctest -D ExperimentalStart
 ctest -D ExperimentalConfigure
 ctest -D ExperimentalBuild
diff --git a/buildtools/pipol/Experimental_bindings.sh b/buildtools/pipol/Experimental_bindings.sh
index c6a90c9095..5c61314a10 100755
--- a/buildtools/pipol/Experimental_bindings.sh
+++ b/buildtools/pipol/Experimental_bindings.sh
@@ -17,7 +17,11 @@ perl ./buildtools/pipol/cmake.pl
 perl ./buildtools/pipol/ruby.pl
 
 #supernovae
-cmake -Drelease=on .
+if [ "x$PIPOL_IMAGE" = "xi386-linux-debian-testing.dd.gz" ] ; then
+	cmake -DCMAKE_C_COMPILER=gcc-4.6 -DCMAKE_CXX_COMPILER=g++-4.6 -Drelease=on .
+else
+	cmake -Drelease=on .
+fi
 ctest -D ExperimentalStart
 ctest -D ExperimentalConfigure
 ctest -D ExperimentalBuild
@@ -34,7 +38,11 @@ cd simgrid-java
 export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:`pwd`/lib
 export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:`pwd`/lib #for mac
 
-cmake .
+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
 ctest -D ExperimentalStart
 ctest -D ExperimentalConfigure
 ctest -D ExperimentalBuild
@@ -44,7 +52,12 @@ ctest -D ExperimentalSubmit
 cd ../
 svn checkout svn://scm.gforge.inria.fr/svn/simgrid/contrib/trunk/simgrid-ruby simgrid-ruby --quiet
 cd simgrid-ruby
-cmake .
+
+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
 ctest -D ExperimentalStart
 ctest -D ExperimentalConfigure
 ctest -D ExperimentalBuild
diff --git a/buildtools/pipol/Nightly_simgrid.sh b/buildtools/pipol/Nightly_simgrid.sh
index d300cf92cb..5e2b6fbef2 100755
--- 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 none 02:00 --user --silent
+#PIPOL esn amd64-linux-debian-lenny 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
 
 #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____________________________________________________________________________
@@ -65,6 +65,20 @@ 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 .
+else
 cmake \
 -Denable_lua=on \
 -Denable_tracing=on \
@@ -77,6 +91,8 @@ cmake \
 -Denable_latency_bound_tracking=off \
 -Drelease=on \
 -Denable_gtnets=off .
+fi
+
 ctest -D NightlyStart
 ctest -D NightlyConfigure
 ctest -D NightlyBuild
@@ -108,7 +124,12 @@ 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 .
+
+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
 ctest -D NightlyStart
 ctest -D NightlyConfigure
 ctest -D NightlyBuild
@@ -118,7 +139,12 @@ ctest -D NightlySubmit
 cd ../
 svn checkout svn://scm.gforge.inria.fr/svn/simgrid/contrib/trunk/simgrid-ruby simgrid-ruby --quiet
 cd simgrid-ruby
-cmake .
+
+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
 ctest -D NightlyStart
 ctest -D NightlyConfigure
 ctest -D NightlyBuild
diff --git a/buildtools/pipol/deploy.sh b/buildtools/pipol/deploy.sh
index d5849eb89d..09fcdd9b1f 100755
--- a/buildtools/pipol/deploy.sh
+++ b/buildtools/pipol/deploy.sh
@@ -27,16 +27,16 @@ ssh pipol pipol-sub esn i386_2010-linux-fedora-core14.dd.gz none 02:00 "~/Experi
 
 #___________________________________________________________________________________________________
 #Debian Lenny 5.0___________________________________________________________________________________
-ssh pipol pipol-sub esn i386_kvm-linux-debian-lenny none 02:00 "~/Experimental_bindings.sh"
-ssh pipol pipol-sub esn amd64_kvm-linux-debian-lenny none 02:00 "~/Experimental_bindings.sh"
+ssh pipol pipol-sub esn i386-linux-debian-lenny none 02:00 "~/Experimental_bindings.sh"
+ssh pipol pipol-sub esn amd64-linux-debian-lenny none 02:00 "~/Experimental_bindings.sh"
 
 #Debian Lenny 6.0
 ssh pipol pipol-sub esn amd64_2010-linux-debian-squeeze.dd.gz none 02:00 "~/Experimental_bindings.sh"
 ssh pipol pipol-sub esn i386_2010-linux-debian-squeeze.dd.gz none 02:00 "~/Experimental_bindings.sh"
 
 #Debian Testing
-ssh pipol pipol-sub esn i386_kvm-linux-debian-testing none 02:00 "~/Experimental_bindings.sh"
-ssh pipol pipol-sub esn amd64_kvm-linux-debian-testing none 02:00 "~/Experimental_bindings.sh"
+ssh pipol pipol-sub esn i386-linux-debian-testing none 02:00 "~/Experimental_bindings.sh"
+ssh pipol pipol-sub esn amd64-linux-debian-testing none 02:00 "~/Experimental_bindings.sh"
 
 #___________________________________________________________________________________________________
 #MacOS Snow Leopard 10.6____________________________________________________________________________
diff --git a/buildtools/pipol/rc.debian b/buildtools/pipol/rc.debian
index 9065a177a2..0314dd5055 100644
--- a/buildtools/pipol/rc.debian
+++ b/buildtools/pipol/rc.debian
@@ -1,22 +1,13 @@
 #!/bin/bash
 
+export PATH=$PATH:/usr/local/sbin:/usr/sbin:/sbin
 sudo apt-get update
-
-sudo apt-get -y -qq install subversion
-sudo apt-get -y -qq install gcc
-sudo apt-get -y -qq install g++
-sudo apt-get -y -qq install make
-sudo apt-get -y -qq install openjdk-6-jdk
-sudo apt-get -y -qq install liblua5.1-dev lua5.1
-sudo apt-get -y -qq install unzip
-sudo apt-get -y -qq install cmake
-sudo apt-get -y -qq install wget
-sudo apt-get -y -qq install perl
-sudo apt-get -y -qq install graphviz-dev graphviz
-sudo apt-get -y -qq install libpcre3-dev
-sudo apt-get -y -qq install f2c
-sudo apt-get -y -qq install valgrind
-sudo apt-get -y -qq install git-core
+sudo apt-get -y install cmake
+sudo apt-get -y install git
+sudo apt-get -y install libpcre3-dev
+sudo apt-get -y install openjdk-6-jdk
+sudo apt-get -y install gcc-4.6
+sudo apt-get -y install g++-4.6
 
 which_svn=`which svn`		#svn necessary
 which_gcc=`which gcc`		#gcc gcc necessary