Add Apache Libcloud support to the build.

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

4 files changed, 46 insertions, 13 deletions

diff --git a/sca-cpp/trunk/INSTALL b/sca-cpp/trunk/INSTALL
index a1fc55c5ce..39dd8a2710 100644
--- a/sca-cpp/trunk/INSTALL
+++ b/sca-cpp/trunk/INSTALL
@@ -41,11 +41,11 @@ libtool-2.2.6
 doxygen-1.6.1
 gcc-g++-4.5
 
-As of April 2010, the GCC 4.5 compiler is not yet included in all Linux
-distributions. GCC 4.5 Ubuntu / Debian packages can be downloaded from:
+The GCC 4.5 compiler may not yet be included in your Linux distribution.
+GCC 4.5 Ubuntu / Debian packages can be downloaded from:
 http://ftp.debian.org/debian/pool/main/g/gcc-4.5/
 
-To download and setup GCC 4.5 on Ubuntu, run this script:
+To download and setup GCC 4.5 on Ubuntu 9.10, run this script:
 http://svn.apache.org/repos/asf/tuscany/sca-cpp/trunk/ubuntu/ubuntu-gcc-4.5
 
 
@@ -102,8 +102,12 @@ SQL Database:
 postgresql-9.0 (http://www.postgresql.org/)
 
 Logging:
-Apache Thrift-0.2.0 (http://incubator.apache.org/thrift/)
-Facebook Scribe-2.2 (http://github.com/facebook/scribe/downloads)
+Apache Thrift 0.2.0 (http://incubator.apache.org/thrift/)
+Facebook Scribe 2.2 (http://github.com/facebook/scribe/downloads)
+
+Cloud deployment:
+Apache Libcloud 0.3.1 (http://incubator.apache.org/libcloud/)
+
 
 To configure the Tuscany SCA build do this:
 ./bootstrap
@@ -157,6 +161,7 @@ dependencies installed under $HOME:
 --with-curl=$HOME/curl-7.19.5-bin --with-libxml2=/usr \
 --with-js-include=/usr/include/xulrunner-1.9.1.8/unstable \
 --with-js-lib=/usr/lib/xulrunner-1.9.1.8 \
+--with-libcloud=$HOME/libcloud-0.3.1-bin \
 --enable-threads \
 --enable-python --with-python=/usr \
 --enable-gae --with-gae=$HOME/google_appengine \
@@ -322,3 +327,10 @@ make
 make install
 cp src/lib/libscribe.so $HOME/scribe-2.2-bin/lib
 
+Apache Libcloud:
+wget http://www.apache.org/dist/incubator/libcloud/apache-libcloud-incubating-0.3.1.tar.bz2
+tar xjf apache-libcloud-incubating-0.3.1.tar.bz2
+cd apache-libcloud-0.3.1
+python setup.py build
+python setup.py install --home $HOME/libcloud-0.3.1-bin
+
diff --git a/sca-cpp/trunk/README b/sca-cpp/trunk/README
index a826d6d26e..b5d45890c5 100644
--- a/sca-cpp/trunk/README
+++ b/sca-cpp/trunk/README
@@ -4,6 +4,11 @@ Apache Tuscany SCA Runtime
 Getting the source code
 =======================
 
+To checkout the source code, do this:
+git clone git://git.apache.org/tuscany-sca-cpp
+or
+svn checkout http://svn.apache.org/repos/asf/tuscany/sca-cpp tuscany-sca-cpp
+
 To checkout the source code with commit access, do this:
 git clone git://git.apache.org/tuscany-sca-cpp
 cd tuscany-sca-cpp
@@ -14,11 +19,6 @@ git config svn.rmdir true
 git svn init --prefix=origin/ -s https://svn.apache.org/repos/asf/tuscany/sca-cpp
 git svn rebase
 
-To checkout the source without commit access, do this:
-git clone git://git.apache.org/tuscany-sca-cpp
-or
-svn checkout http://svn.apache.org/repos/asf/tuscany/sca-cpp tuscany-sca-cpp
-
 
 Layout
 ======
diff --git a/sca-cpp/trunk/configure.ac b/sca-cpp/trunk/configure.ac
index 58c516c3ee..5791dd5e19 100644
--- a/sca-cpp/trunk/configure.ac
+++ b/sca-cpp/trunk/configure.ac
@@ -478,7 +478,17 @@ else
   AM_CONDITIONAL([WANT_GAE], false)
 fi
 
-# Configure path to Java includes and lib.
+# Configure path to Apache Libcloud.
+AC_MSG_CHECKING([for libcloud])
+AC_ARG_WITH([libcloud], [AC_HELP_STRING([--with-libcloud=PATH], [path to installed Apache Libcloud [default=/usr/local]])], [
+  LIBCLOUD_LIB="${withval}/lib/python"
+  AC_MSG_RESULT("${withval}")
+], [
+  LIBCLOUD_LIB="/usr/local/lib/python2.6/site-packages"
+  AC_MSG_RESULT(/usr/local)
+])
+AC_SUBST(LIBCLOUD_LIB)
+
 # Configure path to Apache Axis2C includes and lib.
 AC_MSG_CHECKING([for axis2c])
 AC_ARG_WITH([axis2c], [AC_HELP_STRING([--with-axis2c=PATH], [path to installed Apache Axis2C [default=/usr/local/axis2c]])], [
diff --git a/sca-cpp/trunk/ubuntu/ubuntu-install b/sca-cpp/trunk/ubuntu/ubuntu-install
index 3a06e6befa..39bf5fa904 100755
--- a/sca-cpp/trunk/ubuntu/ubuntu-install
+++ b/sca-cpp/trunk/ubuntu/ubuntu-install
@@ -266,7 +266,18 @@ make install
 if [ "$?" != "0" ]; then
     exit $?
 fi
-cp src/lib/libscribe.so $HOME/scribe-2.2-bin/lib
+cp src/lib/libscribe.so $build/scribe-2.2-bin/lib
+cd $build
+
+# Build Apache Libcloud
+wget http://www.apache.org/dist/incubator/libcloud/apache-libcloud-incubating-0.3.1.tar.bz2
+tar xjf apache-libcloud-incubating-0.3.1.tar.bz2
+cd apache-libcloud-0.3.1
+python setup.py build
+python setup.py install --home $build/libcloud-0.3.1-bin
+if [ "$?" != "0" ]; then
+    exit $?
+fi
 cd $build
 
 # Build Tuscany SCA
@@ -274,7 +285,7 @@ git clone git://git.apache.org/tuscany-sca-cpp
 cd tuscany-sca-cpp
 cp etc/git-exclude .git/info/exclude
 ./bootstrap
-./configure --prefix=$build/tuscany-sca-cpp-bin --with-curl=$build/curl-7.19.5-bin --with-apr=$build/httpd-2.2.15-bin --with-httpd=$build/httpd-2.2.15-bin --with-memcached=$build/memcached-1.4.4-bin --with-tinycdb=$build/tinycdb-0.77-bin --with-js-include=$build/tracemonkey-bin/include/js --with-js-lib=$build/tracemonkey-bin/lib --enable-threads --enable-python --enable-gae --with-gae=$build/google_appengine --enable-java --with-java=/usr/lib/jvm/java-6-openjdk --enable-webservice --with-libxml2=$build/libxml2-2.7.7-bin --with-axis2c=$build/axis2c-1.6.0-bin --enable-queue --with-qpidc=$build/qpidc-0.6-bin --enable-chat --with-libstrophe=$build/libstrophe-bin --with-vysper=$build/vysper-0.5 --enable-sqldb --with-pgsql=$build/postgresql-9.0-bin --enable-log --with-thrift=$build/thrift-0.2.0-bin --with-scribe=$build/scribe-2.2-bin
+./configure --prefix=$build/tuscany-sca-cpp-bin --with-curl=$build/curl-7.19.5-bin --with-apr=$build/httpd-2.2.15-bin --with-httpd=$build/httpd-2.2.15-bin --with-memcached=$build/memcached-1.4.4-bin --with-tinycdb=$build/tinycdb-0.77-bin --with-js-include=$build/tracemonkey-bin/include/js --with-js-lib=$build/tracemonkey-bin/lib --with-libcloud=$build/libcloud-0.3.1-bin --enable-threads --enable-python --enable-gae --with-gae=$build/google_appengine --enable-java --with-java=/usr/lib/jvm/java-6-openjdk --enable-webservice --with-libxml2=$build/libxml2-2.7.7-bin --with-axis2c=$build/axis2c-1.6.0-bin --enable-queue --with-qpidc=$build/qpidc-0.6-bin --enable-chat --with-libstrophe=$build/libstrophe-bin --with-vysper=$build/vysper-0.5 --enable-sqldb --with-pgsql=$build/postgresql-9.0-bin --enable-log --with-thrift=$build/thrift-0.2.0-bin --with-scribe=$build/scribe-2.2-bin
 make
 make install
 if [ "$?" != "0" ]; then