From 8ddc785c2e24ffc57572207d9d838db542ed5860 Mon Sep 17 00:00:00 2001 From: Navarrop Date: Fri, 22 Apr 2011 11:34:44 +0200 Subject: [PATCH 1/1] Add missing cmake path for windows. Install git in mac. --- buildtools/pipol/Experimental.sh | 6 +++--- buildtools/pipol/Nightly_simgrid.sh | 3 +-- buildtools/pipol/rc.mac | 17 ++--------------- 3 files changed, 6 insertions(+), 20 deletions(-) diff --git a/buildtools/pipol/Experimental.sh b/buildtools/pipol/Experimental.sh index 25b44daf42..88dc29b132 100644 --- a/buildtools/pipol/Experimental.sh +++ b/buildtools/pipol/Experimental.sh @@ -16,7 +16,7 @@ cd simgrid if [ x$PIPOL_IMAGE == "xamd64-windows-server-2008-64bits.dd.gz" ] ; then export PATH=/cygdrive/c/:/cygdrive/c/GnuWin32/bin/:/cygdrive/c/Windows/system32:/cygdrive/c/Windows - export PATH=$PATH:/cygdrive/c/strawberry/c/bin:/cygdrive/c/strawberry/perl/site/bin:/cygdrive/c/strawberry/perl/bin + export PATH=$PATH:/cygdrive/c/CMake\ 2.8/bin/:/cygdrive/c/strawberry/c/bin:/cygdrive/c/strawberry/perl/site/bin:/cygdrive/c/strawberry/perl/bin cmake \ -G"Unix Makefiles" \ @@ -35,10 +35,10 @@ if [ x$PIPOL_IMAGE == "xamd64-windows-server-2008-64bits.dd.gz" ] ; then ctest -D ExperimentalBuild ctest -D ExperimentalSubmit else + perl ./buildtools/pipol/cmake.pl perl ./buildtools/pipol/ruby.pl - - + if [ x$PIPOL_IMAGE == "xamd64_2010-linux-ubuntu-maverick.dd.gz" ] ; then #mem-check cmake \ diff --git a/buildtools/pipol/Nightly_simgrid.sh b/buildtools/pipol/Nightly_simgrid.sh index e5b1bc6dd5..69b2e3998d 100644 --- a/buildtools/pipol/Nightly_simgrid.sh +++ b/buildtools/pipol/Nightly_simgrid.sh @@ -36,11 +36,10 @@ cd ./pipol/$PIPOL_HOST git clone git://scm.gforge.inria.fr/simgrid/simgrid.git simgrid --quiet cd simgrid - if [ x$PIPOL_IMAGE == "xamd64-windows-server-2008-64bits.dd.gz" ] ; then export PATH=/cygdrive/c/:/cygdrive/c/GnuWin32/bin/:/cygdrive/c/Windows/system32:/cygdrive/c/Windows - export PATH=$PATH:/cygdrive/c/strawberry/c/bin:/cygdrive/c/strawberry/perl/site/bin:/cygdrive/c/strawberry/perl/bin + export PATH=$PATH:/cygdrive/c/CMake\ 2.8/bin/:/cygdrive/c/strawberry/c/bin:/cygdrive/c/strawberry/perl/site/bin:/cygdrive/c/strawberry/perl/bin cmake \ -G"Unix Makefiles" \ diff --git a/buildtools/pipol/rc.mac b/buildtools/pipol/rc.mac index 71cab633ed..35e122291a 100644 --- a/buildtools/pipol/rc.mac +++ b/buildtools/pipol/rc.mac @@ -3,8 +3,6 @@ sudo fink -y -q -b selfupdate sudo fink -y -q -b selfupdate-rsync -sudo fink -y -q -b install svn -sudo fink -y -q -b install gcc45 sudo fink -y -q -b install make sudo fink -y -q -b install lua51-dev lua51 sudo fink -y -q -b install unzip @@ -14,19 +12,9 @@ sudo fink -y -q -b install perl sudo fink -y -q -b install gd2 graphviz graphviz-dev sudo fink -y -q -b install pcre sudo fink -y -q -b install f2c +sudo fink -y -q -b install git +sudo fink -y -q -b install gcc45 -wget http://kernel.org/pub/software/scm/git/git-1.7.4.tar.gz -tar xzf git-1.7.4.tar.gz -cd git-1.7.4 -./configure --prefix=/usr -make -chmod 777 * -sudo make install -cd ../ -rm git-1.7.4.tar.gz -rm -rf git-1.7.4 - -which_svn=`which svn` #svn necessary which_gcc=`which gcc` #gcc gcc necessary which_gpp=`which g++` #gcc g++ necessary which_make=`which make` #make necessary @@ -48,7 +36,6 @@ echo $which_java echo $which_make echo $which_gcc echo $which_gpp -echo $which_svn echo $which_dot echo $which_wget echo $which_perl -- 2.20.1