Author: jsdelfino
Date: Mon May 17 02:29:54 2010
New Revision: 944955
URL: http://svn.apache.org/viewvc?rev=944955&view=rev
Log:
Add missing GCC-4.5 dependencies to automated Ubuntu build. Centralize GCC-4.5
installation in ubuntu-gcc-4.5.
Modified:
tuscany/sca-cpp/trunk/ubuntu/ubuntu-bin-image
tuscany/sca-cpp/trunk/ubuntu/ubuntu-gcc-4.5
tuscany/sca-cpp/trunk/ubuntu/ubuntu-install
Modified: tuscany/sca-cpp/trunk/ubuntu/ubuntu-bin-image
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/ubuntu/ubuntu-bin-image?rev=944955&r1=944954&r2=944955&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/ubuntu/ubuntu-bin-image (original)
+++ tuscany/sca-cpp/trunk/ubuntu/ubuntu-bin-image Mon May 17 02:29:54 2010
@@ -35,28 +35,12 @@ sudo apt-get -y install wget git-core au
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
Modified: tuscany/sca-cpp/trunk/ubuntu/ubuntu-gcc-4.5
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/ubuntu/ubuntu-gcc-4.5?rev=944955&r1=944954&r2=944955&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/ubuntu/ubuntu-gcc-4.5 (original)
+++ tuscany/sca-cpp/trunk/ubuntu/ubuntu-gcc-4.5 Mon May 17 02:29:54 2010
@@ -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/m
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 $?
Modified: tuscany/sca-cpp/trunk/ubuntu/ubuntu-install
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/ubuntu/ubuntu-install?rev=944955&r1=944954&r2=944955&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/ubuntu/ubuntu-install (original)
+++ tuscany/sca-cpp/trunk/ubuntu/ubuntu-install Mon May 17 02:29:54 2010
@@ -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
