From: Arnaud Giersch <arnaud.giersch@iut-bm.univ-fcomte.fr>
Date: Tue, 5 Feb 2013 15:18:34 +0000 (+0100)
Subject: [pipol] Install default version for compilers.
X-Git-Tag: v3_9_90~510^2~33
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/64e5895c01be890f4feaf75e1c46e9aa410505f9?ds=sidebyside

[pipol] Install default version for compilers.

Particularly, default-jdk should fix the search paths for cmake.
---

diff --git a/buildtools/pipol/rc.debian b/buildtools/pipol/rc.debian
index 25d870bfb3..7cdb9c5064 100644
--- a/buildtools/pipol/rc.debian
+++ b/buildtools/pipol/rc.debian
@@ -3,9 +3,10 @@
 sudo aptitude update
 
 sudo aptitude -y install cmake
+sudo aptitude -y install default-jdk
 sudo aptitude -y install f2c
-sudo aptitude -y install g++-4.6
-sudo aptitude -y install gcc-4.6
+sudo aptitude -y install g++
+sudo aptitude -y install gcc
 sudo aptitude -y install git
 sudo aptitude -y install git-core
 sudo aptitude -y install graphviz-dev graphviz
@@ -13,7 +14,6 @@ sudo aptitude -y install liblua5.1-dev lua5.1
 sudo aptitude -y install libpcre3-dev
 sudo aptitude -y install libunwind7-dev
 sudo aptitude -y install make
-sudo aptitude -y install openjdk-6-jdk
 sudo aptitude -y install valgrind
 
 which_svn=`which svn`		#svn necessary
diff --git a/buildtools/pipol/rc.ubuntu b/buildtools/pipol/rc.ubuntu
index a04f4599ed..534e321e38 100644
--- a/buildtools/pipol/rc.ubuntu
+++ b/buildtools/pipol/rc.ubuntu
@@ -3,6 +3,7 @@
 sudo apt-get update
 
 sudo apt-get -y -qq install cmake
+sudo apt-get -y -qq install default-jdk
 sudo apt-get -y -qq install f2c
 sudo apt-get -y -qq install g++
 sudo apt-get -y -qq install gcc
@@ -12,7 +13,6 @@ sudo apt-get -y -qq install liblua5.1-dev lua5.1
 sudo apt-get -y -qq install libpcre3-dev
 sudo apt-get -y -qq install libunwind7-dev
 sudo apt-get -y -qq install make
-sudo apt-get -y -qq install openjdk-6-jdk
 sudo apt-get -y -qq install perl
 sudo apt-get -y -qq install unzip
 sudo apt-get -y -qq install valgrind