From 8f695a21df0785cb68d5c123d0869adf33915ad4 Mon Sep 17 00:00:00 2001 From: Navarrop Date: Fri, 8 Apr 2011 10:09:26 +0200 Subject: [PATCH] Update pipol scripts --- buildtools/pipol/Experimental.sh | 4 ++ buildtools/pipol/Nightly_simgrid.sh | 6 +++ buildtools/pipol/deploy.sh | 12 ++---- buildtools/pipol/pre-simgrid.sh | 58 +++++++++++++++-------------- buildtools/pipol/rc.debian | 3 ++ buildtools/pipol/rc.fedora | 5 ++- buildtools/pipol/rc.mac | 16 +++++++- buildtools/pipol/rc.ubuntu | 3 ++ buildtools/pipol/rc.windows | 7 ++-- 9 files changed, 72 insertions(+), 42 deletions(-) diff --git a/buildtools/pipol/Experimental.sh b/buildtools/pipol/Experimental.sh index 1ec059bf2f..ced8dddd7c 100644 --- a/buildtools/pipol/Experimental.sh +++ b/buildtools/pipol/Experimental.sh @@ -14,6 +14,10 @@ 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 + cmake \ -G"Unix Makefiles" \ -Denable_lua=off \ diff --git a/buildtools/pipol/Nightly_simgrid.sh b/buildtools/pipol/Nightly_simgrid.sh index 7e7c75b667..ab54c6442c 100644 --- a/buildtools/pipol/Nightly_simgrid.sh +++ b/buildtools/pipol/Nightly_simgrid.sh @@ -1,5 +1,7 @@ #!/bin/bash +#PRE-PIPOL /home/mescal/navarro/pre-simgrid.sh + #PIPOL esn i386-linux-ubuntu-karmic.dd.gz none 02:00 --user --silent #PIPOL esn amd64-linux-ubuntu-karmic.dd.gz none 02:00 --user --silent #PIPOL esn i386-linux-ubuntu-lucid.dd.gz none 02:00 --user --silent @@ -33,6 +35,10 @@ 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 + cmake \ -G"Unix Makefiles" \ -Denable_lua=off \ diff --git a/buildtools/pipol/deploy.sh b/buildtools/pipol/deploy.sh index 21ef610c14..ab7080b9c7 100644 --- a/buildtools/pipol/deploy.sh +++ b/buildtools/pipol/deploy.sh @@ -13,11 +13,7 @@ ssh pipol pipol-sub esn amd64-linux-ubuntu-lucid.dd.gz none 02:00 "~/Experimenta ssh pipol pipol-sub esn amd64_2010-linux-ubuntu-maverick.dd.gz none 02:00 "~/Experimental.sh" #___________________________________________________________________________________________________ -#Fedora 11__________________________________________________________________________________________ -ssh pipol pipol-sub esn i386-linux-fedora-core11.dd.gz none 02:00 "~/Experimental.sh" -ssh pipol pipol-sub esn amd64-linux-fedora-core11.dd.gz none 02:00 "~/Experimental.sh" - -#Fedora 12 +#Fedora 12__________________________________________________________________________________________ ssh pipol pipol-sub esn i386-linux-fedora-core12.dd.gz none 02:00 "~/Experimental.sh" ssh pipol pipol-sub esn amd64-linux-fedora-core12.dd.gz none 02:00 "~/Experimental.sh" @@ -36,9 +32,9 @@ ssh pipol pipol-sub esn amd64_kvm-linux-debian-testing none 02:00 "~/Experimenta #___________________________________________________________________________________________________ #MacOS Snow Leopard 10.6____________________________________________________________________________ -ssh pipol pipol-sub esn x86_64_mac-mac-osx-server-snow-leopard.dd.gz none 02:00 "~/Experimental.sh" -ssh pipol pipol-sub esn x86_mac-mac-osx-server-snow-leopard.dd.gz none 02:00 "~/Experimental.sh" +#ssh pipol pipol-sub esn x86_64_mac-mac-osx-server-snow-leopard.dd.gz none 02:00 "~/Experimental.sh" +#ssh pipol pipol-sub esn x86_mac-mac-osx-server-snow-leopard.dd.gz none 02:00 "~/Experimental.sh" #___________________________________________________________________________________________________ #windows-server-2008-64bits_________________________________________________________________________ -ssh pipol pipol-sub esn amd64-windows-server-2008-64bits-navarro-2011-03-15-122256.dd.gz none 02:00 "~/Experimental.sh" \ No newline at end of file +#ssh pipol pipol-sub esn amd64-windows-server-2008-64bits-navarro-2011-03-15-122256.dd.gz none 02:00 "~/Experimental.sh" \ No newline at end of file diff --git a/buildtools/pipol/pre-simgrid.sh b/buildtools/pipol/pre-simgrid.sh index 55267282da..cdf538638a 100644 --- a/buildtools/pipol/pre-simgrid.sh +++ b/buildtools/pipol/pre-simgrid.sh @@ -2,38 +2,40 @@ set -e -if [ -e /home/mescal/navarro/version/bckup_version ] ; then - svn cleanup version/ - cd /home/mescal/navarro/version - svn up README --quiet -else - if [ -e /home/mescal/navarro/version ] ; then - svn cleanup version/ - echo "0000P" > /home/mescal/navarro/version/bckup_version - else - mkdir /home/mescal/navarro/version - echo "0000P" > /home/mescal/navarro/version/bckup_version - fi - cd /home/mescal/navarro - svn checkout svn://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk /home/mescal/navarro/version --depth empty --quiet +rm -rf /home/mescal/navarro/.pipol/log/* - cd /home/mescal/navarro/version - svn up README --quiet -fi +#if [ -e /home/mescal/navarro/version/bckup_version ] ; then +# svn cleanup version/ +# cd /home/mescal/navarro/version +# svn up README --quiet +#else +# if [ -e /home/mescal/navarro/version ] ; then +# svn cleanup version/ +# echo "0000P" > /home/mescal/navarro/version/bckup_version +# else +# mkdir /home/mescal/navarro/version +# echo "0000P" > /home/mescal/navarro/version/bckup_version +# fi +# cd /home/mescal/navarro +# svn checkout svn://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk /home/mescal/navarro/version --depth empty --quiet +# +# cd /home/mescal/navarro/version +# svn up README --quiet +#fi -old_version=`cat bckup_version` -new_version=`svnversion` +#old_version=`cat bckup_version` +#new_version=`svnversion` Date=`date` echo date : $date -echo version old : $old_version -echo version svn : $new_version -echo `svnversion` > bckup_version +#echo version old : $old_version +#echo version svn : $new_version +#echo `svnversion` > bckup_version -if [ "$old_version" = "$new_version" ] ; then - echo "matches" - exit 1 -else - echo "not matches" +#if [ "$old_version" = "$new_version" ] ; then +# echo "matches" +# exit 1 +#else +# echo "not matches" exit 0 -fi +#fi diff --git a/buildtools/pipol/rc.debian b/buildtools/pipol/rc.debian index 25bd452d15..9065a177a2 100644 --- a/buildtools/pipol/rc.debian +++ b/buildtools/pipol/rc.debian @@ -16,6 +16,7 @@ sudo apt-get -y -qq install graphviz-dev graphviz sudo apt-get -y -qq install libpcre3-dev sudo apt-get -y -qq install f2c sudo apt-get -y -qq install valgrind +sudo apt-get -y -qq install git-core which_svn=`which svn` #svn necessary which_gcc=`which gcc` #gcc gcc necessary @@ -30,6 +31,7 @@ which_dot=`which dot` #dot for cgraph which_perl=`which perl` #perl which_f2c=`which f2c` #f2c which_gcov=`which gcov` #gcov +which_git=`which git` echo "DEBUT----------------------------------" echo $which_cmake echo $which_unzip @@ -44,4 +46,5 @@ echo $which_wget echo $which_perl echo $which_f2c echo $which_gcov +echo $which_git echo "FIN------------------------------------" \ No newline at end of file diff --git a/buildtools/pipol/rc.fedora b/buildtools/pipol/rc.fedora index 942a72b04b..292b93dbdc 100644 --- a/buildtools/pipol/rc.fedora +++ b/buildtools/pipol/rc.fedora @@ -12,8 +12,9 @@ sudo yum -y -q install cmake sudo yum -y -q install wget sudo yum -y -q install perl sudo yum -y -q install graphviz-dev graphviz -sudo yum -y -q install pcre-devel pcre-static sudo yum -y -q install f2c +sudo yum -y -q install pcre-devel pcre-static +sudo yum -y -q install git-core which_svn=`which svn` #svn necessary which_gcc=`which gcc` #gcc gcc necessary @@ -28,6 +29,7 @@ which_dot=`which dot` #dot for cgraph which_perl=`which perl` #perl which_f2c=`which f2c` #f2c which_gcov=`which gcov` #gcov +which_git=`which git` echo "DEBUT----------------------------------" echo $which_cmake echo $which_unzip @@ -42,6 +44,7 @@ echo $which_wget echo $which_perl echo $which_f2c echo $which_gcov +echo $which_git echo "FIN------------------------------------" wget ftp://ftp.ruby-lang.org//pub/ruby/1.9/ruby-1.9.1-p378.tar.gz diff --git a/buildtools/pipol/rc.mac b/buildtools/pipol/rc.mac index c17b99cda8..71cab633ed 100644 --- a/buildtools/pipol/rc.mac +++ b/buildtools/pipol/rc.mac @@ -1,9 +1,10 @@ #!/bin/bash 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 gcc42 +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,6 +15,17 @@ sudo fink -y -q -b install gd2 graphviz graphviz-dev sudo fink -y -q -b install pcre sudo fink -y -q -b install f2c +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 @@ -27,6 +39,7 @@ which_dot=`which dot` #dot for cgraph which_perl=`which perl` #perl which_f2c=`which f2c` #f2c which_gcov=`which gcov` #gcov +which_git=`which git` echo "DEBUT----------------------------------" echo $which_cmake echo $which_unzip @@ -41,4 +54,5 @@ echo $which_wget echo $which_perl echo $which_f2c echo $which_gcov +echo $which_git echo "FIN------------------------------------" \ No newline at end of file diff --git a/buildtools/pipol/rc.ubuntu b/buildtools/pipol/rc.ubuntu index 25bd452d15..9065a177a2 100644 --- a/buildtools/pipol/rc.ubuntu +++ b/buildtools/pipol/rc.ubuntu @@ -16,6 +16,7 @@ sudo apt-get -y -qq install graphviz-dev graphviz sudo apt-get -y -qq install libpcre3-dev sudo apt-get -y -qq install f2c sudo apt-get -y -qq install valgrind +sudo apt-get -y -qq install git-core which_svn=`which svn` #svn necessary which_gcc=`which gcc` #gcc gcc necessary @@ -30,6 +31,7 @@ which_dot=`which dot` #dot for cgraph which_perl=`which perl` #perl which_f2c=`which f2c` #f2c which_gcov=`which gcov` #gcov +which_git=`which git` echo "DEBUT----------------------------------" echo $which_cmake echo $which_unzip @@ -44,4 +46,5 @@ echo $which_wget echo $which_perl echo $which_f2c echo $which_gcov +echo $which_git echo "FIN------------------------------------" \ No newline at end of file diff --git a/buildtools/pipol/rc.windows b/buildtools/pipol/rc.windows index 860687426b..a25ecea7d2 100644 --- a/buildtools/pipol/rc.windows +++ b/buildtools/pipol/rc.windows @@ -1,15 +1,13 @@ #!/bin/bash -sudo echo " " >> /etc/profile -sudo echo "export PATH=/cygdrive/c/strawberry/c/bin:/cygdrive/c/strawberry/perl/site/bin:/cygdrive/c/strawberry/perl/bin:/cygdrive/c/CMake\ 2.8/bin:/cygdrive/c/Subversion/bin:/bin" >> /etc/profile -sudo echo "export PATH=$PATH:/cygdrive/c/:/cygdrive/c/GnuWin32/bin/" >> /etc/profile which_svn=`which svn` #svn necessary which_gcc=`which gcc` #gcc gcc necessary which_gpp=`which g++` #gcc g++ necessary which_make=`which gmake` #make necessary which_cmake=`which cmake` #cmake necessary which_perl=`which perl` #perl -export PATH=$PATH:/cygdrive/c/:/cygdrive/c/GnuWin32/bin/ +which_git=`which git` + echo "DEBUT----------------------------------" echo $which_cmake echo $which_make @@ -17,5 +15,6 @@ echo $which_gcc echo $which_gpp echo $which_svn echo $which_perl +echo $which_git echo $PATH echo "FIN------------------------------------" \ No newline at end of file -- 2.20.1