Add missing cmake path for windows.

Install git in mac.

diff --git a/buildtools/pipol/Experimental.sh b/buildtools/pipol/Experimental.sh
index 25b44da..88dc29b 100644 (file)
--- 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
 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" \
        
        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
        ctest -D ExperimentalBuild
        ctest -D ExperimentalSubmit
 else

+

        perl ./buildtools/pipol/cmake.pl
        perl ./buildtools/pipol/ruby.pl
        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 \
        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 e5b1bc6..69b2e39 100644 (file)
--- 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
 
 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
 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" \
 
        cmake \
        -G"Unix Makefiles" \

diff --git a/buildtools/pipol/rc.mac b/buildtools/pipol/rc.mac
index 71cab63..35e1222 100644 (file)
--- 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 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
 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 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
 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_make
 echo $which_gcc
 echo $which_gpp

-echo $which_svn

 echo $which_dot
 echo $which_wget
 echo $which_perl
 echo $which_dot
 echo $which_wget
 echo $which_perl