Merge branch 'mc++'

[simgrid.git] / buildtools / pipol / rc.ubuntu

diff --git a/buildtools/pipol/rc.ubuntu b/buildtools/pipol/rc.ubuntu
index 3b54a11..19658e8 100644 (file)
--- a/buildtools/pipol/rc.ubuntu
+++ b/buildtools/pipol/rc.ubuntu
@@ -2,27 +2,39 @@
 
 sudo apt-get update
 
-sudo apt-get -y -qq install gcc
-sudo apt-get -y -qq install g++
-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 unzip
 sudo apt-get -y -qq install cmake
-sudo apt-get -y -qq install wget
-sudo apt-get -y -qq install perl
-sudo apt-get -y -qq install graphviz-dev graphviz
-sudo apt-get -y -qq install libpcre3-dev
+sudo apt-get -y -qq install default-jdk
+sudo apt-get -y -qq install swig
 sudo apt-get -y -qq install f2c
-sudo apt-get -y -qq install valgrind
+sudo apt-get -y -qq install g++
+sudo apt-get -y -qq install gcc
 sudo apt-get -y -qq install git-core
+sudo apt-get -y -qq install graphviz-dev graphviz
+sudo apt-get -y -qq install libboost-dev
+sudo apt-get -y -qq install liblua5.1-dev lua5.1
 sudo apt-get -y -qq install libunwind7-dev
+sudo apt-get -y -qq install make
+sudo apt-get -y -qq install perl
+sudo apt-get -y -qq install unzip
+sudo apt-get -y -qq install valgrind
+sudo apt-get -y -qq install wget
+
+if [ $PIPOL_IMAGE == "i386-linux-ubuntu-lucid.dd.gz" ]; then
+  wget http://mirror.ovh.net/ubuntu//pool/universe/libu/libunwind/libunwind7_0.99-0.3ubuntu1_i386.deb
+  sudo dpkg -i libunwind7_0.99-0.3ubuntu1_i386.deb
+fi
+
+if [ $PIPOL_IMAGE == "amd64-linux-ubuntu-lucid.dd.gz" ]; then
+  wget http://mirror.ovh.net/ubuntu//pool/universe/libu/libunwind/libunwind7_0.99-0.3ubuntu1_amd64.deb
+  sudo dpkg -i libunwind7_0.99-0.3ubuntu1_amd64.deb
+fi
 
 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_java=`which java`                #java optional
+which_swig=`which swig`                #swig optional
 which_lua=`which lua`          #lua
 which_cmake=`which cmake`      #cmake necessary
 which_unzip=`which unzip`      #unzip for gtnets
@@ -37,6 +49,7 @@ echo $which_cmake
 echo $which_unzip
 echo $which_lua
 echo $which_java
+echo $which_swig
 echo $which_make
 echo $which_gcc
 echo $which_gpp
@@ -47,4 +60,4 @@ echo $which_perl
 echo $which_f2c
 echo $which_gcov
 echo $which_git
-echo "FIN------------------------------------"
\ No newline at end of file
+echo "FIN------------------------------------"