From 410c75dad3dce643e6c4ee670ff465dee432687a Mon Sep 17 00:00:00 2001 From: jsdelfino Date: Mon, 17 May 2010 02:29:54 +0000 Subject: Add missing GCC-4.5 dependencies to automated Ubuntu build. Centralize GCC-4.5 installation in ubuntu-gcc-4.5. git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@944955 13f79535-47bb-0310-9956-ffa450edef68 --- sca-cpp/trunk/ubuntu/ubuntu-bin-image | 24 ++++-------------------- sca-cpp/trunk/ubuntu/ubuntu-gcc-4.5 | 5 +++++ sca-cpp/trunk/ubuntu/ubuntu-install | 24 ++++-------------------- 3 files changed, 13 insertions(+), 40 deletions(-) diff --git a/sca-cpp/trunk/ubuntu/ubuntu-bin-image b/sca-cpp/trunk/ubuntu/ubuntu-bin-image index ef1345b856..43c2686665 100755 --- a/sca-cpp/trunk/ubuntu/ubuntu-bin-image +++ b/sca-cpp/trunk/ubuntu/ubuntu-bin-image @@ -35,28 +35,12 @@ sudo apt-get -y install wget git-core autoconf automake libtool if [ "$?" != "0" ]; then exit $? fi -mkdir -p gcc-4.5 -cd gcc-4.5 -wget http://ftp.debian.org/debian/pool/main/g/gcc-4.5/cpp-4.5_4.5.0-2_i386.deb -wget http://ftp.debian.org/debian/pool/main/g/gcc-4.5/fixincludes_4.5.0-2_i386.deb -wget http://ftp.debian.org/debian/pool/main/g/gcc-4.5/g++-4.5_4.5.0-2_i386.deb -wget http://ftp.debian.org/debian/pool/main/g/gcc-4.5/gcc-4.5_4.5.0-2_i386.deb -wget http://ftp.debian.org/debian/pool/main/g/gcc-4.5/gcc-4.5-base_4.5.0-2_i386.deb -wget http://ftp.debian.org/debian/pool/main/g/gcc-4.5/lib64gcc1_4.5.0-2_i386.deb -wget http://ftp.debian.org/debian/pool/main/g/gcc-4.5/lib64gomp1_4.5.0-2_i386.deb -wget http://ftp.debian.org/debian/pool/main/g/gcc-4.5/lib64mudflap0_4.5.0-2_i386.deb -wget http://ftp.debian.org/debian/pool/main/g/gcc-4.5/lib64stdc++6_4.5.0-2_i386.deb -wget http://ftp.debian.org/debian/pool/main/g/gcc-4.5/libgcc1_4.5.0-2_i386.deb -wget http://ftp.debian.org/debian/pool/main/g/gcc-4.5/libgomp1_4.5.0-2_i386.deb -wget http://ftp.debian.org/debian/pool/main/g/gcc-4.5/libmudflap0-4.5-dev_4.5.0-2_i386.deb -wget http://ftp.debian.org/debian/pool/main/g/gcc-4.5/libmudflap0_4.5.0-2_i386.deb -wget http://ftp.debian.org/debian/pool/main/g/gcc-4.5/libstdc++6_4.5.0-2_i386.deb -wget http://ftp.debian.org/debian/pool/main/g/gcc-4.5/libstdc++6-4.5-dev_4.5.0-2_i386.deb -sudo dpkg -i *.deb +wget http://svn.apache.org/repos/asf/tuscany/sca-cpp/trunk/ubuntu/ubuntu-gcc-4.5 +chmod +x ubuntu-gcc-4.5 +./ubuntu-gcc-4.5 if [ "$?" != "0" ]; then exit $? fi -cd .. sudo apt-get -y install libssl-dev if [ "$?" != "0" ]; then exit $? @@ -82,7 +66,7 @@ if [ "$?" != "0" ]; then exit $? fi -# Download and install the runtime +# Download and install the Tuscany runtime wget http://people.apache.org/~jsdelfino/tuscany/test/tuscany-sca-cpp-1.0.0-SNAPSHOT.tar.gz tar xzf tuscany-sca-cpp-1.0.0-SNAPSHOT.tar.gz diff --git a/sca-cpp/trunk/ubuntu/ubuntu-gcc-4.5 b/sca-cpp/trunk/ubuntu/ubuntu-gcc-4.5 index 04d93cc95f..0488672c1b 100755 --- a/sca-cpp/trunk/ubuntu/ubuntu-gcc-4.5 +++ b/sca-cpp/trunk/ubuntu/ubuntu-gcc-4.5 @@ -23,6 +23,10 @@ set -x # Install GCC 4.5 binaries mkdir -p gcc-4.5 cd gcc-4.5 +sudo apt-get -y install libcloog-ppl0 libelfg0 libgmpxx4ldbl libmpc2 libppl-c2 libppl7 +if [ "$?" != "0" ]; then + exit $? +fi wget http://ftp.debian.org/debian/pool/main/g/gcc-4.5/cpp-4.5_4.5.0-2_i386.deb wget http://ftp.debian.org/debian/pool/main/g/gcc-4.5/fixincludes_4.5.0-2_i386.deb wget http://ftp.debian.org/debian/pool/main/g/gcc-4.5/g++-4.5_4.5.0-2_i386.deb @@ -38,6 +42,7 @@ wget http://ftp.debian.org/debian/pool/main/g/gcc-4.5/libmudflap0-4.5-dev_4.5.0- wget http://ftp.debian.org/debian/pool/main/g/gcc-4.5/libmudflap0_4.5.0-2_i386.deb wget http://ftp.debian.org/debian/pool/main/g/gcc-4.5/libstdc++6_4.5.0-2_i386.deb wget http://ftp.debian.org/debian/pool/main/g/gcc-4.5/libstdc++6-4.5-dev_4.5.0-2_i386.deb +wget http://ftp.debian.org/debian/pool/main/b/binutils/binutils_2.20.51.20100418-1_i386.deb sudo dpkg -i *.deb if [ "$?" != "0" ]; then exit $? diff --git a/sca-cpp/trunk/ubuntu/ubuntu-install b/sca-cpp/trunk/ubuntu/ubuntu-install index 45d9ce276e..2f419e8e7d 100755 --- a/sca-cpp/trunk/ubuntu/ubuntu-install +++ b/sca-cpp/trunk/ubuntu/ubuntu-install @@ -31,28 +31,12 @@ if [ "$?" != "0" ]; then fi # Install GCC 4.5 -mkdir -p gcc-4.5 -cd gcc-4.5 -wget http://ftp.debian.org/debian/pool/main/g/gcc-4.5/cpp-4.5_4.5.0-2_i386.deb -wget http://ftp.debian.org/debian/pool/main/g/gcc-4.5/fixincludes_4.5.0-2_i386.deb -wget http://ftp.debian.org/debian/pool/main/g/gcc-4.5/g++-4.5_4.5.0-2_i386.deb -wget http://ftp.debian.org/debian/pool/main/g/gcc-4.5/gcc-4.5_4.5.0-2_i386.deb -wget http://ftp.debian.org/debian/pool/main/g/gcc-4.5/gcc-4.5-base_4.5.0-2_i386.deb -wget http://ftp.debian.org/debian/pool/main/g/gcc-4.5/lib64gcc1_4.5.0-2_i386.deb -wget http://ftp.debian.org/debian/pool/main/g/gcc-4.5/lib64gomp1_4.5.0-2_i386.deb -wget http://ftp.debian.org/debian/pool/main/g/gcc-4.5/lib64mudflap0_4.5.0-2_i386.deb -wget http://ftp.debian.org/debian/pool/main/g/gcc-4.5/lib64stdc++6_4.5.0-2_i386.deb -wget http://ftp.debian.org/debian/pool/main/g/gcc-4.5/libgcc1_4.5.0-2_i386.deb -wget http://ftp.debian.org/debian/pool/main/g/gcc-4.5/libgomp1_4.5.0-2_i386.deb -wget http://ftp.debian.org/debian/pool/main/g/gcc-4.5/libmudflap0-4.5-dev_4.5.0-2_i386.deb -wget http://ftp.debian.org/debian/pool/main/g/gcc-4.5/libmudflap0_4.5.0-2_i386.deb -wget http://ftp.debian.org/debian/pool/main/g/gcc-4.5/libstdc++6_4.5.0-2_i386.deb -wget http://ftp.debian.org/debian/pool/main/g/gcc-4.5/libstdc++6-4.5-dev_4.5.0-2_i386.deb -sudo dpkg -i *.deb +wget http://svn.apache.org/repos/asf/tuscany/sca-cpp/trunk/ubuntu/ubuntu-gcc-4.5 +chmod +x ubuntu-gcc-4.5 +./ubuntu-gcc-4.5 if [ "$?" != "0" ]; then exit $? fi -cd $build # Build Apache HTTP server sudo apt-get -y install libssl-dev @@ -71,7 +55,7 @@ fi cd $build # Build Memcached -sudo apt-get install libevent-dev +sudo apt-get -y install libevent-dev if [ "$?" != "0" ]; then exit $? fi -- cgit v1.2.3