From 8f231f04b3a46aed69f3e992c27f8c64f7b2866c Mon Sep 17 00:00:00 2001 From: Navarrop Date: Wed, 28 Sep 2011 15:17:11 +0200 Subject: [PATCH] Update some pipol scripts. --- buildtools/pipol/Experimental.sh | 2 +- buildtools/pipol/Experimental_bindings.sh | 6 +++--- buildtools/pipol/Nightly_simgrid.sh | 10 +++++----- buildtools/pipol/deploy.sh | 4 ++-- buildtools/pipol/rc.debian | 1 + 5 files changed, 12 insertions(+), 11 deletions(-) diff --git a/buildtools/pipol/Experimental.sh b/buildtools/pipol/Experimental.sh index 8bf0676802..bcdd981233 100755 --- a/buildtools/pipol/Experimental.sh +++ b/buildtools/pipol/Experimental.sh @@ -22,7 +22,7 @@ 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 +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 \ diff --git a/buildtools/pipol/Experimental_bindings.sh b/buildtools/pipol/Experimental_bindings.sh index 7c0af93764..705450678f 100755 --- a/buildtools/pipol/Experimental_bindings.sh +++ b/buildtools/pipol/Experimental_bindings.sh @@ -17,7 +17,7 @@ perl ./buildtools/pipol/cmake.pl perl ./buildtools/pipol/ruby.pl #supernovae -if [ "x$PIPOL_IMAGE" = "xi386-linux-debian-testing.dd.gz" ] ; then +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 . else cmake -Drelease=on . @@ -38,7 +38,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" ] ; then +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 . @@ -53,7 +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" ] ; then +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 . diff --git a/buildtools/pipol/Nightly_simgrid.sh b/buildtools/pipol/Nightly_simgrid.sh index 6312b5c873..f99528e310 100755 --- a/buildtools/pipol/Nightly_simgrid.sh +++ b/buildtools/pipol/Nightly_simgrid.sh @@ -29,8 +29,8 @@ #__________________________________________________________________________________________________ #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 @@ -65,7 +65,7 @@ perl ./buildtools/pipol/cmake.pl perl ./buildtools/pipol/ruby.pl #supernovae -if [ "x$PIPOL_IMAGE" = "xi386-linux-debian-testing.dd.gz" ] ; then +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 \ @@ -125,7 +125,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 +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 . @@ -140,7 +140,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 +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 . diff --git a/buildtools/pipol/deploy.sh b/buildtools/pipol/deploy.sh index 09fcdd9b1f..911588875a 100755 --- a/buildtools/pipol/deploy.sh +++ b/buildtools/pipol/deploy.sh @@ -27,8 +27,8 @@ 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-linux-debian-lenny none 02:00 "~/Experimental_bindings.sh" -ssh pipol pipol-sub esn amd64-linux-debian-lenny none 02:00 "~/Experimental_bindings.sh" +ssh pipol pipol-sub esn i386-linux-debian-lenny.dd.gz none 02:00 "~/Experimental_bindings.sh" +ssh pipol pipol-sub esn amd64-linux-debian-lenny.dd.gz 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" diff --git a/buildtools/pipol/rc.debian b/buildtools/pipol/rc.debian index 9d13301d9f..0acaf7acbc 100644 --- a/buildtools/pipol/rc.debian +++ b/buildtools/pipol/rc.debian @@ -9,6 +9,7 @@ sudo apt-get -y install openjdk-6-jdk sudo apt-get -y install gcc-4.6 sudo apt-get -y install g++-4.6 sudo apt-get -y install valgrind +sudo apt-get -y install f2c which_svn=`which svn` #svn necessary which_gcc=`which gcc` #gcc gcc necessary -- 2.30.2