Upgrade build scripts to on Ubuntu 10.04.

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@997186 13f79535-47bb-0310-9956-ffa450edef68

4 files changed, 44 insertions, 9 deletions

diff --git a/sca-cpp/trunk/ubuntu/ubuntu-bin-image b/sca-cpp/trunk/ubuntu/ubuntu-bin-image
index 303cd940d4..175d860087 100755
--- a/sca-cpp/trunk/ubuntu/ubuntu-bin-image
+++ b/sca-cpp/trunk/ubuntu/ubuntu-bin-image
@@ -25,6 +25,9 @@ set -x
 # First update the system
 sudo apt-get update
 
+# Get the Ubuntu version
+osver=`cat /etc/issue | awk '{ print $2 }'`
+
 # Create install directory
 u=`id -un`
 g=`id -gn`
@@ -57,9 +60,16 @@ sudo apt-get -y install libxml2 libxml2-dev
 if [ "$?" != "0" ]; then
     exit $?
 fi
-sudo apt-get -y install xulrunner-1.9.1 xulrunner-1.9.1-dev
-if [ "$?" != "0" ]; then
-    exit $?
+if [ "$osver" = "9.10" ]; then
+    sudo apt-get -y install xulrunner-1.9.1 xulrunner-1.9.1-dev
+    if [ "$?" != "0" ]; then
+        exit $?
+    fi
+else
+    sudo apt-get -y install xulrunner-1.9.2 xulrunner-1.9.2-dev
+    if [ "$?" != "0" ]; then
+        exit $?
+    fi
 fi
 sudo apt-get -y install python-dev
 if [ "$?" != "0" ]; then
diff --git a/sca-cpp/trunk/ubuntu/ubuntu-install b/sca-cpp/trunk/ubuntu/ubuntu-install
index 0cb688ea39..26088745e2 100755
--- a/sca-cpp/trunk/ubuntu/ubuntu-install
+++ b/sca-cpp/trunk/ubuntu/ubuntu-install
@@ -22,6 +22,9 @@
 # Display commands as they are executed
 set -x
 
+# Get the Ubuntu version
+osver=`cat /etc/issue | awk '{ print $2 }'`
+
 # Build and install in the current directory
 build=`pwd`
 
@@ -58,9 +61,16 @@ if [ "$?" != "0" ]; then
 fi
 
 # Install TraceMonkey
-sudo apt-get -y install xulrunner-1.9.1 xulrunner-1.9.1-dev
-if [ "$?" != "0" ]; then
-    exit $?
+if [ "$osver" = "9.10" ]; then
+    sudo apt-get -y install xulrunner-1.9.1 xulrunner-1.9.1-dev
+    if [ "$?" != "0" ]; then
+        exit $?
+    fi
+else
+    sudo apt-get -y install xulrunner-1.9.2 xulrunner-1.9.2-dev
+    if [ "$?" != "0" ]; then
+        exit $?
+    fi
 fi
 
 # Install Python
diff --git a/sca-cpp/trunk/ubuntu/ubuntu-install-all b/sca-cpp/trunk/ubuntu/ubuntu-install-all
index 9a717781e7..cfeed713a2 100755
--- a/sca-cpp/trunk/ubuntu/ubuntu-install-all
+++ b/sca-cpp/trunk/ubuntu/ubuntu-install-all
@@ -171,6 +171,7 @@ cd $build
 
 # Build Libexpat
 wget http://sourceforge.net/projects/expat/files/expat/2.0.1/expat-2.0.1.tar.gz/download
+mv download expat-2.0.1.tar.gz
 tar xzf expat-2.0.1.tar.gz
 cd expat-2.0.1
 ./configure --prefix=$build/expat-2.0.1-bin
@@ -262,7 +263,7 @@ fi
 cd $build
 
 # Build Apache Thrift
-sudo apt-get -y install bison flex
+sudo apt-get -y install bison flex python-dev
 if [ "$?" != "0" ]; then
     exit $?
 fi
@@ -315,7 +316,7 @@ fi
 cd $build
 
 # Build Tuscany SCA
-sudo apt-get -y install python-dev
+sudo apt-get -y install
 if [ "$?" != "0" ]; then
     exit $?
 fi
diff --git a/sca-cpp/trunk/ubuntu/uec2-start b/sca-cpp/trunk/ubuntu/uec2-start
index 86c47a3c36..a0c1b8b2e2 100755
--- a/sca-cpp/trunk/ubuntu/uec2-start
+++ b/sca-cpp/trunk/ubuntu/uec2-start
@@ -21,9 +21,23 @@ here=`readlink -f $0`; here=`dirname $here`
 $here/uec2-setenv
 
 # Here are the AMIs you can use in the different EC2 regions:
+# Ubuntu 9.10 (instance storage)
 # US east 1 - ami-bb709dd2
 # US west 1 - ami-c32e7f86
 # EU west 1 - ami-2fc2e95b
+#
+# Ubuntu 10.04 (elastic block storage)
+# US east 1 - ami-1234de7b
+# US west 1 - ami-10f3a255
+# EU west 1 - ami-38bf954c
+# AP s.east - ami-2c354b7e
 
-ec2-run-instances "ami-c32e7f86" -k ec2-tuscany-keypair --region us-west-1
+# Here are some of the instance types you can use:
+# t1.micro (elastic block storage only)
+# m1.small (default)
+# m1.large
+
+#ec2-run-instances "ami-c32e7f86" -k ec2-tuscany-keypair --region us-west-1
+#ec2-run-instances "ami-10f3a255" -t t1.micro -k ec2-tuscany-keypair --region us-west-1
+ec2-run-instances "ami-10f3a255" -k ec2-tuscany-keypair --region us-west-1