Now install ruby v1.9.*

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@9476 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/buildtools/pipol/Experimental.sh b/buildtools/pipol/Experimental.sh
index f8e3523..e425237 100644 (file)
--- a/buildtools/pipol/Experimental.sh
+++ b/buildtools/pipol/Experimental.sh
@@ -16,6 +16,7 @@ svn checkout svn://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk simgrid-trunk -
 
 sh ./simgrid-trunk/buildtools/pipol/liste_install.sh
 perl ./simgrid-trunk/buildtools/pipol/cmake.pl
+perl ./simgrid-trunk/buildtools/pipol/ruby.pl
 
 cd simgrid-trunk
 

diff --git a/buildtools/pipol/Experimental_all_simgrid_gt.sh b/buildtools/pipol/Experimental_all_simgrid_gt.sh
index e85cd6b..5163e18 100644 (file)
--- a/buildtools/pipol/Experimental_all_simgrid_gt.sh
+++ b/buildtools/pipol/Experimental_all_simgrid_gt.sh
@@ -16,6 +16,7 @@ svn checkout svn://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk simgrid-trunk -
 
 sh ./simgrid-trunk/buildtools/pipol/liste_install.sh
 perl ./simgrid-trunk/buildtools/pipol/cmake.pl
+perl ./simgrid-trunk/buildtools/pipol/ruby.pl
 
 cd simgrid-trunk
 

diff --git a/buildtools/pipol/Nightly_simgrid.sh b/buildtools/pipol/Nightly_simgrid.sh
index d7ff52f..e86e9b9 100644 (file)
--- a/buildtools/pipol/Nightly_simgrid.sh
+++ b/buildtools/pipol/Nightly_simgrid.sh
@@ -42,6 +42,7 @@ svn checkout svn://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk simgrid-trunk -
 
 sh ./simgrid-trunk/buildtools/pipol/liste_install.sh
 perl ./simgrid-trunk/buildtools/pipol/cmake.pl
+perl ./simgrid-trunk/buildtools/pipol/ruby.pl
 
 cd simgrid-trunk
 

diff --git a/buildtools/pipol/liste_install.sh b/buildtools/pipol/liste_install.sh
index 2248fcf..0135386 100644 (file)
--- a/buildtools/pipol/liste_install.sh
+++ b/buildtools/pipol/liste_install.sh
@@ -9,7 +9,6 @@ if [ -e /usr/bin/apt-get ] ; then
     sudo apt-get -y -qq install make
     sudo apt-get -y -qq install openjdk-6-jdk
     sudo apt-get -y -qq install liblua5.1-dev lua5.1
-    sudo apt-get -y -qq install ruby1.8-dev ruby
     sudo apt-get -y -qq install unzip
     sudo apt-get -y -qq install cmake
     sudo apt-get -y -qq install wget
@@ -26,7 +25,6 @@ else
            sudo yum -y -q install make
            sudo yum -y -q install java-1.6.0-openjdk
            sudo yum -y -q install lua-devel lua
-           sudo yum -y -q install ruby-devel ruby
            sudo yum -y -q install unzip
            sudo yum -y -q install cmake
            sudo yum -y -q install wget
@@ -41,7 +39,6 @@ else
                    sudo fink -y -q -b install gcc42
                    sudo fink -y -q -b install make
                    sudo fink -y -q -b install lua51-dev lua51
-                   sudo fink -y -q -b install ruby18-dev ruby
                    sudo fink -y -q -b install unzip
                    sudo fink -y -q -b install cmake
                    sudo fink -y -q -b install wget
@@ -59,7 +56,6 @@ which_gpp=`which g++`         #gcc g++ necessary
 which_make=`which make`                #make necessary
 which_java=`which java`                #java optional
 which_lua=`which lua`          #lua
-which_ruby=`which ruby`                #ruby
 which_cmake=`which cmake`      #cmake necessary
 which_unzip=`which unzip`      #unzip for gtnets
 which_wget=`which wget`                #wget for cmake
@@ -70,7 +66,6 @@ which_gcov=`which gcov`     #gcov
 echo "DEBUT----------------------------------"
 echo $which_cmake
 echo $which_unzip
-echo $which_ruby
 echo $which_lua
 echo $which_java
 echo $which_make

diff --git a/buildtools/pipol/ruby.pl b/buildtools/pipol/ruby.pl
new file mode 100644 (file)
index 0000000..fb86749
--- /dev/null
+++ b/buildtools/pipol/ruby.pl
@@ -0,0 +1,23 @@
+#!/usr/bin/perl -w
+use strict;
+
+if( -e "/usr/bin/apt-get")
+{
+       my($ruby_version)=`apt-cache search ruby1.9.*-dev`;
+       
+       $ruby_version =~ s/-dev.*//g;
+       chomp $ruby_version;
+       
+       print "ruby to install $ruby_version $ruby_version-dev\n";
+       `sudo apt-get install -y $ruby_version $ruby_version-dev`;
+       
+       print "ln -sf /usr/bin/$ruby_version /usr/bin/ruby\n";
+       `sudo ln -sf /usr/bin/$ruby_version /usr/bin/ruby`;
+       
+       $ruby_version=`ruby --version`;
+       print "ruby = $ruby_version";
+}
+elsif(-e "/usr/bin/yum")
+{
+       `sudo yum -y -q install ruby-devel ruby`
+}

diff --git a/doc/FAQ.doc b/doc/FAQ.doc
index 3db2cce..518b227 100644 (file)
--- a/doc/FAQ.doc
+++ b/doc/FAQ.doc
@@ -116,7 +116,6 @@ For Windows :
   \li Dev-c++ <a href="http://sourceforge.net/projects/dev-cpp/files/Binaries/Dev-C%2B%2B%204.9.9.2/devcpp-4.9.9.2_nomingw_setup.exe/download">(download page)</a>
   \li perl strawberry <a href="http://www.strawberryperl.com/download/5.12.2.0/strawberry-perl-5.12.2.0.msi">(download page)</a>
   \li pcre-7.0 <a href="http://sourceforge.net/projects/gnuwin32/files/pcre/7.0/pcre-7.0.exe/download">(download page)</a>
-
   \li Set environment variables.
 
 \verbatim