summaryrefslogtreecommitdiffstats
path: root/sca-cpp
diff options
context:
space:
mode:
authorjsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68>2010-04-17 22:59:43 +0000
committerjsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68>2010-04-17 22:59:43 +0000
commit3d79be04a42d86838a110d679de4004d5b98b789 (patch)
treeed583de0bd299df70b3bd51fad12a5e1500adff1 /sca-cpp
parentb174f527dc75f0d0bd4480acda7e2995fb30cbec (diff)
Install gcc-4.5 in ubuntu automated install script.
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@935273 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'sca-cpp')
-rw-r--r--sca-cpp/trunk/components/store/Makefile.am20
-rw-r--r--sca-cpp/trunk/components/store/store.composite32
-rwxr-xr-xsca-cpp/trunk/ubuntu/ubuntu-install29
3 files changed, 25 insertions, 56 deletions
diff --git a/sca-cpp/trunk/components/store/Makefile.am b/sca-cpp/trunk/components/store/Makefile.am
deleted file mode 100644
index f372faf8a2..0000000000
--- a/sca-cpp/trunk/components/store/Makefile.am
+++ /dev/null
@@ -1,20 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-if WANT_NOSQLDB
-
-endif
diff --git a/sca-cpp/trunk/components/store/store.composite b/sca-cpp/trunk/components/store/store.composite
deleted file mode 100644
index ccfd61fc4d..0000000000
--- a/sca-cpp/trunk/components/store/store.composite
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
- xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1"
- targetNamespace="http://tuscany.apache.org/xmlns/sca/components"
- name="store">
-
- <component name="store">
- <implementation.cpp path=".libs" library="libstore"/>
- <service name="store">
- <t:binding.http uri="store"/>
- </service>
- </component>
-
-</composite>
diff --git a/sca-cpp/trunk/ubuntu/ubuntu-install b/sca-cpp/trunk/ubuntu/ubuntu-install
index 4c80c47a5f..7eb86ade02 100755
--- a/sca-cpp/trunk/ubuntu/ubuntu-install
+++ b/sca-cpp/trunk/ubuntu/ubuntu-install
@@ -25,10 +25,31 @@ set -x
build=`pwd`
# Install core dev tools
-sudo apt-get -y install wget git-core autoconf automake g++ libtool
-if [ "$?" != "0" ]; then
- exit $?
-fi
+sudo apt-get -y install wget git-core autoconf automake libtool
+if [ "$?" != "0" ]; then
+ exit $?
+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-1_i386.deb
+wget http://ftp.debian.org/debian/pool/main/g/gcc-4.5/fixincludes_4.5.0-1_i386.deb
+wget http://ftp.debian.org/debian/pool/main/g/gcc-4.5/g++-4.5_4.5.0-1_i386.deb
+wget http://ftp.debian.org/debian/pool/main/g/gcc-4.5/gcc-4.5_4.5.0-1_i386.deb
+wget http://ftp.debian.org/debian/pool/main/g/gcc-4.5/gcc-4.5-base_4.5.0-1_i386.deb
+wget http://ftp.debian.org/debian/pool/main/g/gcc-4.5/lib64gcc1_4.5.0-1_i386.deb
+wget http://ftp.debian.org/debian/pool/main/g/gcc-4.5/lib64gomp1_4.5.0-1_i386.deb
+wget http://ftp.debian.org/debian/pool/main/g/gcc-4.5/lib64mudflap0_4.5.0-1_i386.deb
+wget http://ftp.debian.org/debian/pool/main/g/gcc-4.5/lib64stdc++6_4.5.0-1_i386.deb
+wget http://ftp.debian.org/debian/pool/main/g/gcc-4.5/libgcc1_4.5.0-1_i386.deb
+wget http://ftp.debian.org/debian/pool/main/g/gcc-4.5/libgomp1_4.5.0-1_i386.deb
+wget http://ftp.debian.org/debian/pool/main/g/gcc-4.5/libmudflap0-4.5-dev_4.5.0-1_i386.deb
+wget http://ftp.debian.org/debian/pool/main/g/gcc-4.5/libmudflap0_4.5.0-1_i386.deb
+wget http://ftp.debian.org/debian/pool/main/g/gcc-4.5/libstdc++6_4.5.0-1_i386.deb
+wget http://ftp.debian.org/debian/pool/main/g/gcc-4.5/libstdc++6-4.5-dev_4.5.0-1_i386.deb
+sudo dpkg -i cpp-4.5_4.5.0-1_i386.deb fixincludes_4.5.0-1_i386.deb g++-4.5_4.5.0-1_i386.deb gcc-4.5_4.5.0-1_i386.deb gcc-4.5-base_4.5.0-1_i386.deb lib64gcc1_4.5.0-1_i386.deb lib64gomp1_4.5.0-1_i386.deb lib64mudflap0_4.5.0-1_i386.deb lib64stdc++6_4.5.0-1_i386.deb libgcc1_4.5.0-1_i386.deb libgomp1_4.5.0-1_i386.deb libmudflap0-4.5-dev_4.5.0-1_i386.deb libmudflap0_4.5.0-1_i386.deb libstdc++6_4.5.0-1_i386.deb libstdc++6-4.5-dev_4.5.0-1_i386.deb
+cd $build
# Build Apache HTTP server
sudo apt-get -y install libssl-dev