Fixes to the automated Ubuntu install script, and automatic detection of xulrunner level (as it changes often) in configure.ac.

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

4 files changed, 90 insertions, 28 deletions

diff --git a/sca-cpp/trunk/INSTALL b/sca-cpp/trunk/INSTALL
index 2f18f67f89..329854c534 100644
--- a/sca-cpp/trunk/INSTALL
+++ b/sca-cpp/trunk/INSTALL
@@ -1,12 +1,12 @@
 Apache Tuscany SCA Runtime
 ==========================
 
-Automated installation from scratch on Ubuntu Server 9.10
-=========================================================
+Automated installation from scratch on Ubuntu 9.10
+==================================================
 
-Tuscany provides an automated install script for Ubuntu Server 9.10. You can
-even start with a fresh Ubuntu Server 9.10 system, the ubuntu-install script
-takes care of all the download, build and installation steps for you.
+Tuscany provides an automated install script for Ubuntu 9.10. You can start
+with a fresh Ubuntu Server 9.10 system, the ubuntu-install script takes care
+of all the download, build and installation steps for you.
 
 The required system tools and libraries are downloaded and installed using
 apt-get. The Tuscany project and its dependencies (Apache HTTPD server, Apache
@@ -16,10 +16,12 @@ To run the automated installation:
 mkdir tuscany
 cd tuscany
 wget http://svn.apache.org/repos/asf/tuscany/sca-cpp/trunk/ubuntu-install
-sudo ./ubuntu-install
+./ubuntu-install
+
+The script will display each command as it's executed.
 
 That's all you need to do to build and install the Tuscany SCA runtime on
-Ubuntu Server 9.10.
+Ubuntu 9.10.
 
 
 For manual build and install steps on other systems or if you need to customize
diff --git a/sca-cpp/trunk/configure.ac b/sca-cpp/trunk/configure.ac
index 16a5f49bd4..baf9bf9003 100644
--- a/sca-cpp/trunk/configure.ac
+++ b/sca-cpp/trunk/configure.ac
@@ -84,21 +84,25 @@ AC_SUBST(LIBXML2_LIB)
 
 # Configure path to libmozjs includes and lib.
 AC_MSG_CHECKING([for js-include])
+xulrunner=`ls /usr/include | grep "xulrunner" | tail -1`
+if test "$xulrunner" = ""; then
+  xulrunner="xulrunner-1.9.1.8"
+fi
 AC_ARG_WITH([js-include], [AC_HELP_STRING([--with-js-include=PATH], [path to installed SpiderMonkey include dir
-             [default=/usr/include/xulrunner-1.9.1.8/unstable]])], [
+             [default=/usr/include/$xulrunner/unstable]])], [
   JS_INCLUDE="${withval}"
   AC_MSG_RESULT("${withval}")
 ], [
-  JS_INCLUDE="/usr/include/xulrunner-1.9.1.8/unstable"
-  AC_MSG_RESULT(/usr/include/xulrunner-1.9.1.8/unstable)
+  JS_INCLUDE="/usr/include/$xulrunner/unstable"
+  AC_MSG_RESULT(/usr/include/$xulrunner/unstable)
 ])
 AC_MSG_CHECKING([for js-lib])
-AC_ARG_WITH([js-lib], [AC_HELP_STRING([--with-js-lib=PATH], [path to installed SpiderMonkey lib dir [default=/usr/lib/xulrunner-1.9.1.8]])], [
+AC_ARG_WITH([js-lib], [AC_HELP_STRING([--with-js-lib=PATH], [path to installed SpiderMonkey lib dir [default=/usr/lib/$xulrunner]])], [
   JS_LIB="${withval}"
   AC_MSG_RESULT("${withval}")
 ], [
-  JS_LIB="/usr/lib/xulrunner-1.9.1.8"
-  AC_MSG_RESULT(/usr/lib/xulrunner-1.9.1.8)
+  JS_LIB="/usr/lib/$xulrunner"
+  AC_MSG_RESULT(/usr/lib/$xulrunner)
 ])
 AC_SUBST(JS_INCLUDE)
 AC_SUBST(JS_LIB)
diff --git a/sca-cpp/trunk/etc/git-exclude b/sca-cpp/trunk/etc/git-exclude
index dc92823c14..de984d102b 100644
--- a/sca-cpp/trunk/etc/git-exclude
+++ b/sca-cpp/trunk/etc/git-exclude
@@ -67,22 +67,25 @@ doxygen
 *.jar
 *.prefix
 index.yaml
+core
 
 # Specific ignores
 kernel-test
 string-test
 mem-test
+parallel-test
 xml-test
 xsd-test
 atom-test
 eval-test
 eval-shell
 json-test
-cache-test
 client-test
 memcache-test
 curl-test
 scdl-test
+python-test
+python-shell
 jni-test
 java-test
 java-shell
diff --git a/sca-cpp/trunk/ubuntu-install b/sca-cpp/trunk/ubuntu-install
index 5a63495e80..659932be4c 100755
--- a/sca-cpp/trunk/ubuntu-install
+++ b/sca-cpp/trunk/ubuntu-install
@@ -17,48 +17,88 @@
 
 # Install the required system tools and libraries, the runtime dependencies and
 # the Tuscany SCA runtime on a fresh Ubuntu Server 9.10 system
-pwd=`pwd`
+
+# Display commands as they are executed
+set -x
+
+# Build and install in the current directory
+build=`pwd`
 
 # Install GIT and core dev tools
-sudo apt-get -y install git-core
-sudo apt-get -y install autoconf automake g++ libtool
+sudo apt-get -y install git-core autoconf automake g++ libtool
+if [ "$?" != "0" ]; then
+    exit $?
+fi
 
 # Install the required binaries
 sudo apt-get -y install curl memcached
+if [ "$?" != "0" ]; then
+    exit $?
+fi
 
 # Build Apache HTTP server
 sudo apt-get -y install libssl-dev
+if [ "$?" != "0" ]; then
+    exit $?
+fi
 curl -o httpd-2.2.15.tar.gz http://www.apache.org/dist/httpd/httpd-2.2.15.tar.gz
 tar xzf httpd-2.2.15.tar.gz
 cd httpd-2.2.15
-./configure --enable-ssl --enable-proxy --enable-rewrite --with-included-apr --with-mpm=prefork --prefix=$pwd/httpd-2.2.15-bin
+./configure --enable-ssl --enable-proxy --enable-rewrite --with-included-apr --with-mpm=prefork --prefix=$build/httpd-2.2.15-bin
 make
 make install
-cd ..
+if [ "$?" != "0" ]; then
+    exit $?
+fi
+cd $build
 
 # Build Apache Axis2/C
-sudo apt-get -y libxml2-dev
+sudo apt-get -y install libxml2-dev
+if [ "$?" != "0" ]; then
+    exit $?
+fi
 curl -o axis2c-src-1.6.0.tar.gz http://www.apache.org/dist/ws/axis2-c/1_6_0/axis2c-src-1.6.0.tar.gz
 tar xzf axis2c-src-1.6.0.tar.gz
 cd axis2c-src-1.6.0
-./configure --enable-libxml2 --enable-openssl --with-apache2=$pwd/httpd-2.2.15-bin/include --prefix=$pwd/axis2c-1.6.0-bin
+./configure --enable-libxml2 --enable-openssl --with-apache2=$build/httpd-2.2.15-bin/include --prefix=$build/axis2c-1.6.0-bin
+make
+make install
+if [ "$?" != "0" ]; then
+    exit $?
+fi
+export AXIS2C_HOME=$build/axis2c-1.6.0-bin
+cd samples
+./configure --prefix=$build/axis2c-1.6.0-bin --with-axis2=$build/axis2c-1.6.0-bin/include/axis2-1.6.0
 make
 make install
-cd ..
+if [ "$?" != "0" ]; then
+    exit $?
+fi
+cd $build
 
 # Build Apache Qpid/C++
-sudo apt-get -y libboost-dev libboost-program-options-dev libboost-filesystem-dev uuid-dev
+sudo apt-get -y install libboost-dev libboost-program-options-dev libboost-filesystem-dev uuid-dev
+if [ "$?" != "0" ]; then
+    exit $?
+fi
 sudo -s ln -s /usr/lib/libboost_program_options-mt.so /usr/lib/libboost_program_options.so
 sudo -s ln -s /usr/lib/libboost_filesystem-mt.so /usr/lib/libboost_filesystem.so
 curl -o qpid-cpp-0.6.tar.gz http://qpid.apache.org/dist/qpid-0.6rc7/qpid-cpp-0.6rc7.tar.gz
+tar xzf qpid-cpp-0.6.tar.gz
 cd qpidc-0.6
-./configure --prefix=$pwd/qpidc-0.6-bin
+./configure --prefix=$build/qpidc-0.6-bin
 make
 make install
-cd ..
+if [ "$?" != "0" ]; then
+    exit $?
+fi
+cd $build
 
 # Build Libstrophe
 sudo apt-get -y install check
+if [ "$?" != "0" ]; then
+    exit $?
+fi
 git clone git://code.stanziq.com/libstrophe
 cd libstrophe
 git submodule init
@@ -66,23 +106,36 @@ git submodule update
 aclocal
 automake --add-missing --foreign --copy
 autoconf
-./configure --prefix=$pwd/libstrophe-bin
+./configure --prefix=$build/libstrophe-bin
 make
 make install
-cd ..
+if [ "$?" != "0" ]; then
+    exit $?
+fi
+cd $build
 
 # Install Apache Vysper
 sudo apt-get -y install openjdk-6-jdk
 curl -o vysper-1.0.0-bin.tar.gz 'http://hudson.zones.apache.org/hudson/view/Vysper/job/vysper-trunk-jdk1.6-ubuntu/org.apache.vysper$vysper/lastSuccessfulBuild/artifact/org.apache.vysper/vysper/1.0.0-SNAPSHOT/vysper-1.0.0-SNAPSHOT-bin.tar.gz'
 tar xzf vysper-1.0.0-bin.tar.gz
+if [ "$?" != "0" ]; then
+    exit $?
+fi
 
 # Build Tuscany SCA
 sudo apt-get -y install libcurl4-openssl-dev xulrunner-dev
+if [ "$?" != "0" ]; then
+    exit $?
+fi
 git clone git://git.apache.org/tuscany-sca-cpp
 cd tuscany-sca-cpp
 cp etc/git-exclude .git/info/exclude
 ./bootstrap
-./configure --prefix=$pwd/tuscany-sca-cpp-bin --with-apr=$pwd/httpd-2.2.15-bin --with-httpd=$pwd/httpd-2.2.15-bin --enable-threads --enable-python --enable-java --with-java=/usr/lib/jvm/java-6-openjdk --enable-webservice --with-axis2c=$pwd/axis2c-1.6.0-bin --enable-queue --with-qpidc=$pwd/qpidc-0.6-bin --enable-chat --with-libstrophe=$pwd/libstrophe --with-vysper=$pwd/vysper-1.0.0
+./configure --prefix=$build/tuscany-sca-cpp-bin --with-apr=$build/httpd-2.2.15-bin --with-httpd=$build/httpd-2.2.15-bin --enable-threads --enable-python --enable-java --with-java=/usr/lib/jvm/java-6-openjdk --enable-webservice --with-axis2c=$build/axis2c-1.6.0-bin --enable-queue --with-qpidc=$build/qpidc-0.6-bin --enable-chat --with-libstrophe=$build/libstrophe --with-vysper=$build/vysper-1.0.0
 make
 make install
+if [ "$?" != "0" ]; then
+    exit $?
+fi
+cd $build