From: navarro <navarro@caraja.(none)>
Date: Wed, 24 Oct 2012 11:12:36 +0000 (+0200)
Subject: Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid
X-Git-Tag: v3_8~18
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/bf2c5d4d8474e3d5d414f1b722716128f43ad4d2?hp=cf7b535f589a0328782c870cfc7436da8b2b6d7a

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

diff --git a/buildtools/pipol/Experimental_bindings.sh b/buildtools/pipol/Experimental_bindings.sh
index 54cc0f22da..33f92565f3 100755
--- a/buildtools/pipol/Experimental_bindings.sh
+++ b/buildtools/pipol/Experimental_bindings.sh
@@ -25,7 +25,8 @@ export CC=gcc
 export CXX=g++
 fi
 
-cmake -Drelease=on .
+#DEFAULT CONF
+cmake .
 ctest -D ExperimentalStart
 ctest -D ExperimentalConfigure
 ctest -D ExperimentalBuild
diff --git a/buildtools/pipol/Nightly_simgrid.sh b/buildtools/pipol/Nightly_simgrid.sh
index 52a5fbe060..9b000ab3a9 100755
--- a/buildtools/pipol/Nightly_simgrid.sh
+++ b/buildtools/pipol/Nightly_simgrid.sh
@@ -57,6 +57,7 @@ cd ./pipol/$PIPOL_HOST
 export GIT_SSL_NO_VERIFY=1
 git clone https://gforge.inria.fr/git/simgrid/simgrid.git
 cd simgrid
+#git checkout v3_7_x
 
 perl ./buildtools/pipol/cmake.pl
 perl ./buildtools/pipol/ruby.pl
@@ -70,15 +71,13 @@ export CXX=g++
 fi
 
 #DEFAULT CONF
-cmake \
--Drelease=on \
--Denable_lua=on .
+cmake .
 ctest -D NightlyStart
 ctest -D NightlyConfigure
 ctest -D NightlyBuild
 ctest -D NightlyTest
 ctest -D NightlySubmit
-make clean
+rm -rf ./
 
 # really clean the working directory
 git reset --hard master
@@ -88,9 +87,8 @@ git clean -dfx
 cmake \
 -Denable_coverage=on \
 -Denable_model-checking=on \
--Denable_lua=off \
--Drelease=on \
--Denable_supernovae=off .
+-Denable_lua=on \
+-Denable_compile_optimizations=off .
 ctest -D NightlyStart
 ctest -D NightlyConfigure
 ctest -D NightlyBuild
@@ -101,7 +99,8 @@ ctest -D NightlySubmit
 export SIMGRID_ROOT=`pwd`
 export LD_LIBRARY_PATH=`pwd`/lib
 export DYLD_LIBRARY_PATH=`pwd`/lib              
-cd ../
+cd ..
+
 git clone git://scm.gforge.inria.fr/simgrid/simgrid-java.git simgrid-java --quiet
 cd simgrid-java
 export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:`pwd`/lib
diff --git a/buildtools/pipol/rc.ubuntu b/buildtools/pipol/rc.ubuntu
index 3b54a1187b..8462e769f1 100644
--- a/buildtools/pipol/rc.ubuntu
+++ b/buildtools/pipol/rc.ubuntu
@@ -18,6 +18,16 @@ sudo apt-get -y -qq install valgrind
 sudo apt-get -y -qq install git-core
 sudo apt-get -y -qq install libunwind7-dev
 
+if [ $PIPOL_IMAGE == "i386-linux-ubuntu-lucid.dd.gz" ]; then
+  wget http://mirror.ovh.net/ubuntu//pool/universe/libu/libunwind/libunwind7_0.99-0.3ubuntu1_i386.deb
+  sudo dpkg -i libunwind7_0.99-0.3ubuntu1_i386.deb
+fi
+
+if [ $PIPOL_IMAGE == "amd64-linux-ubuntu-lucid.dd.gz" ]; then
+  wget http://mirror.ovh.net/ubuntu//pool/universe/libu/libunwind/libunwind7_0.99-0.3ubuntu1_amd64.deb
+  sudo dpkg -i libunwind7_0.99-0.3ubuntu1_amd64.deb
+fi
+
 which_svn=`which svn`		#svn necessary
 which_gcc=`which gcc`		#gcc gcc necessary
 which_gpp=`which g++`		#gcc g++ necessary