diff options
| author | jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68> | 2010-03-27 16:57:21 +0000 |
|---|---|---|
| committer | jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68> | 2010-03-27 16:57:21 +0000 |
| commit | 68fcd3094fc78203a814725bc5542820c0f0f9b0 (patch) | |
| tree | 9f3b6eeb4eac398ed30a90d019349634994e7724 /sca-cpp/trunk/ubuntu | |
| parent | d64a280c20229e374684e9b5e392fdf878ed5514 (diff) | |
Change automated build to build curl from source instead of using the deb libcurl package as it's back-level on Ubuntu 9.04. Adjust INSTALL instructions as well.
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@928231 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'sca-cpp/trunk/ubuntu')
| -rwxr-xr-x | sca-cpp/trunk/ubuntu/ubuntu-bin-image | 2 | ||||
| -rwxr-xr-x | sca-cpp/trunk/ubuntu/ubuntu-install | 16 |
2 files changed, 15 insertions, 3 deletions
diff --git a/sca-cpp/trunk/ubuntu/ubuntu-bin-image b/sca-cpp/trunk/ubuntu/ubuntu-bin-image index 3e8546a275..7159817c61 100755 --- a/sca-cpp/trunk/ubuntu/ubuntu-bin-image +++ b/sca-cpp/trunk/ubuntu/ubuntu-bin-image @@ -59,7 +59,7 @@ sudo apt-get -y install openjdk-6-jdk if [ "$?" != "0" ]; then exit $? fi -sudo apt-get -y install libcurl4-openssl-dev xulrunner-dev +sudo apt-get -y install xulrunner-dev if [ "$?" != "0" ]; then exit $? fi diff --git a/sca-cpp/trunk/ubuntu/ubuntu-install b/sca-cpp/trunk/ubuntu/ubuntu-install index 64712959f9..fea93e1a9e 100755 --- a/sca-cpp/trunk/ubuntu/ubuntu-install +++ b/sca-cpp/trunk/ubuntu/ubuntu-install @@ -125,8 +125,20 @@ if [ "$?" != "0" ]; then exit $? fi +# Build Libcurl +curl -o curl-7.19.5.tar.gz http://curl.haxx.se/download/curl-7.19.5.tar.gz +tar xzf curl-7.19.5.tar.gz +cd curl-7.19.5 +./configure --prefix=$build/curl-7.19.5-bin +make +make install +if [ "$?" != "0" ]; then + exit $? +fi +cd $build + # Build Tuscany SCA -sudo apt-get -y install libcurl4-openssl-dev xulrunner-dev +sudo apt-get -y install xulrunner-dev if [ "$?" != "0" ]; then exit $? fi @@ -134,7 +146,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-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-0.5 +./configure --prefix=$build/tuscany-sca-cpp-bin --with-libcurl=$build/curl-7.19.5-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-0.5 make make install if [ "$?" != "0" ]; then |