From: Navarrop <Pierre.Navarro@imag.fr>
Date: Mon, 3 Oct 2011 15:53:09 +0000 (+0200)
Subject: Set cc and cxx for pipol scripts.
X-Git-Tag: v3_6_2~28
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/6f3373052dcfd12bf1fd9282c8b1ed12eedf1919

Set cc and cxx for pipol scripts.
---

diff --git a/buildtools/pipol/Experimental.sh b/buildtools/pipol/Experimental.sh
index bcdd981233..afa30ee5ee 100755
--- a/buildtools/pipol/Experimental.sh
+++ b/buildtools/pipol/Experimental.sh
@@ -16,26 +16,20 @@ 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
 
 #supernovae
-if 	[ "x$PIPOL_IMAGE" = "xi386-linux-debian-testing.dd.gz"  ] || [ "x$PIPOL_IMAGE" = "xamd64-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 \
@@ -48,7 +42,6 @@ cmake \
 -Denable_latency_bound_tracking=off \
 -Drelease=on \
 -Denable_gtnets=off .
-fi
 
 ctest -D ExperimentalStart
 ctest -D ExperimentalConfigure
diff --git a/buildtools/pipol/Experimental_bindings.sh b/buildtools/pipol/Experimental_bindings.sh
index 705450678f..6f689e877e 100755
--- a/buildtools/pipol/Experimental_bindings.sh
+++ b/buildtools/pipol/Experimental_bindings.sh
@@ -16,12 +16,16 @@ cd simgrid
 perl ./buildtools/pipol/cmake.pl
 perl ./buildtools/pipol/ruby.pl
 
-#supernovae
-if 	[ "x$PIPOL_IMAGE" = "xi386-linux-debian-testing.dd.gz"  ] || [ "x$PIPOL_IMAGE" = "xamd64-linux-debian-testing.dd.gz" ] ; then
-	cmake -DCMAKE_C_COMPILER=gcc-4.6 -DCMAKE_CXX_COMPILER=g++-4.6 -Drelease=on .
+if [ -e /usr/bin/gcc-4.6 ] ; then
+export CC=gcc-4.6
+export CXX=g++-4.6
 else
-	cmake -Drelease=on .
+export CC=gcc
+export CXX=g++
 fi
+
+#supernovae
+cmake -Drelease=on .
 ctest -D ExperimentalStart
 ctest -D ExperimentalConfigure
 ctest -D ExperimentalBuild
@@ -38,11 +42,7 @@ cd simgrid-java
 export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:`pwd`/lib
 export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:`pwd`/lib #for mac
 
-if 	[ "x$PIPOL_IMAGE" = "xi386-linux-debian-testing.dd.gz"  ] || [ "x$PIPOL_IMAGE" = "xamd64-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 ExperimentalStart
 ctest -D ExperimentalConfigure
 ctest -D ExperimentalBuild
@@ -53,11 +53,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"  ] || [ "x$PIPOL_IMAGE" = "xamd64-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 ExperimentalStart
 ctest -D ExperimentalConfigure
 ctest -D ExperimentalBuild
diff --git a/buildtools/pipol/MemCheck.sh b/buildtools/pipol/MemCheck.sh
index 47877d81b5..6bc51d898c 100755
--- a/buildtools/pipol/MemCheck.sh
+++ b/buildtools/pipol/MemCheck.sh
@@ -16,6 +16,14 @@ 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
+
 #mem-check
 cmake \
 -Denable_lua=off \
diff --git a/buildtools/pipol/Nightly_memCheck.sh b/buildtools/pipol/Nightly_memCheck.sh
index 5152683bfa..67e1784373 100755
--- a/buildtools/pipol/Nightly_memCheck.sh
+++ b/buildtools/pipol/Nightly_memCheck.sh
@@ -18,6 +18,14 @@ 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
+
 #mem-check
 cmake \
 -Denable_lua=off \
diff --git a/buildtools/pipol/Nightly_simgrid.sh b/buildtools/pipol/Nightly_simgrid.sh
index f99528e310..d3eb1e11c9 100755
--- a/buildtools/pipol/Nightly_simgrid.sh
+++ b/buildtools/pipol/Nightly_simgrid.sh
@@ -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"  ] || [ "x$PIPOL_IMAGE" = "xamd64-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"  ] || [ "x$PIPOL_IMAGE" = "xamd64-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"  ] || [ "x$PIPOL_IMAGE" = "xamd64-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