Author: jsdelfino
Date: Wed Dec 21 02:26:01 2011
New Revision: 1221567
URL: http://svn.apache.org/viewvc?rev=1221567&view=rev
Log:
Fix PostgreSQL download URL and add it to the default build scripts on Ubuntu
and Mac OS X.
Modified:
tuscany/sca-cpp/trunk/macos/macos-install
tuscany/sca-cpp/trunk/ubuntu/ubuntu-install
tuscany/sca-cpp/trunk/ubuntu/ubuntu-install-all
Modified: tuscany/sca-cpp/trunk/macos/macos-install
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/macos/macos-install?rev=1221567&r1=1221566&r2=1221567&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/macos/macos-install (original)
+++ tuscany/sca-cpp/trunk/macos/macos-install Wed Dec 21 02:26:01 2011
@@ -274,6 +274,18 @@ if [ "$?" != "0" ]; then
fi
cd $build
+# Build PostgreSQL
+curl -OL http://ftp.postgresql.org/pub/source/v9.1.2/postgresql-9.1.2.tar.gz
+tar xzf postgresql-9.1.2.tar.gz
+cd postgresql-9.1.2
+./configure --prefix=$build/postgresql-9.1.2-bin --enable-thread-safety
+make
+make install
+if [ "$?" != "0" ]; then
+ exit $?
+fi
+cd $build
+
# Build Apache Libcloud
curl -OL
http://archive.apache.org/dist/incubator/libcloud/apache-libcloud-incubating-0.4.2.tar.bz2
tar xjf apache-libcloud-incubating-0.4.2.tar.bz2
@@ -296,7 +308,7 @@ cd $build
git clone git://git.apache.org/tuscany-sca-cpp.git
cd tuscany-sca-cpp
./bootstrap
-./configure --prefix=$build/tuscany-sca-cpp-bin
--with-curl=$build/curl-7.19.5-bin --with-apr=$build/apr-1.4.x-bin
--with-httpd=$build/httpd-2.3.15-bin
--with-memcached=$build/memcached-1.4.7-bin --with-tinycdb=$build/tinycdb-bin
--with-leveldb=$build/leveldb --with-js-include=$build/js-1.8.5-bin/include/js
--with-js-lib=$build/js-1.8.5-bin/lib --enable-libcloud
--with-libcloud=$build/libcloud-0.4.2-bin --enable-threads --enable-python
--enable-opencl --with-libxml2=$build/libxml2-2.7.7-bin --enable-chat
--with-libstrophe=$build/libstrophe-bin --enable-openid
--with-mod-auth-openid=$build/mod-auth-openid-bin --enable-oauth
--with-liboauth=$build/liboauth-0.9.1-bin --enable-mod-security
--with-mod-security=$build/modsecurity-apache-2.6.1-bin
+./configure --prefix=$build/tuscany-sca-cpp-bin
--with-curl=$build/curl-7.19.5-bin --with-apr=$build/apr-1.4.x-bin
--with-httpd=$build/httpd-2.3.15-bin
--with-memcached=$build/memcached-1.4.7-bin --with-tinycdb=$build/tinycdb-bin
--with-leveldb=$build/leveldb --with-js-include=$build/js-1.8.5-bin/include/js
--with-js-lib=$build/js-1.8.5-bin/lib --enable-libcloud
--with-libcloud=$build/libcloud-0.4.2-bin --enable-threads --enable-python
--enable-opencl --with-libxml2=$build/libxml2-2.7.7-bin --enable-chat
--with-libstrophe=$build/libstrophe-bin --enable-sqldb
--with-pgsql=$build/postgresql-9.1.2-bin --enable-openid
--with-mod-auth-openid=$build/mod-auth-openid-bin --enable-oauth
--with-liboauth=$build/liboauth-0.9.1-bin --enable-mod-security
--with-mod-security=$build/modsecurity-apache-2.6.1-bin
make
make install
if [ "$?" != "0" ]; then
@@ -305,8 +317,8 @@ fi
cd $build
# Create src archive
-tar czf tuscany-sca-cpp-1.0-src.tar.gz apache-libcloud-incubating-0.4.2
apache-libcloud-incubating-0.4.2.tar.bz2 apr-1.4.x apr-1.4.x-bin autoconf-2.13
autoconf-2.13-bin autoconf-2.13.tar.gz curl-7.19.5 curl-7.19.5-bin
curl-7.19.5.tar.gz expat-2.0.1 expat-2.0.1-bin expat-2.0.1.tar.gz htmltidy-bin
httpd-2.3.15-beta httpd-2.3.15-beta.tar.gz httpd-2.3.15-bin js-1.8.5-bin
js-1.8.5 js185-1.0.0.tar.gz libcloud-0.4.2-bin libevent-2.0.13-stable
libevent-2.0.13-stable-bin libevent-2.0.13-stable.tar.gz liboauth-0.9.1
liboauth-0.9.1-bin liboauth-0.9.1.tar.gz libopkele libopkele-bin libstrophe
libstrophe-bin libxml2-2.7.7 libxml2-2.7.7-bin libxml2-sources-2.7.7.tar.gz
memcached-1.4.7 memcached-1.4.7-bin memcached-1.4.7.tar.gz mod_auth_openid
mod-auth-openid-bin modsecurity-apache_2.6.1 modsecurity-apache-2.6.0-bin
modsecurity-apache_2.6.0.tar.gz modsecurity-crs_2.2.2
modsecurity-crs_2.2.2.tar.gz nspr-4.8.8-bin nspr-4.8.8 nspr-4.8.8.tar.gz nuvem
pcre-8.12 pcre-8.12-bin pcre-8.12.zip pkg-c
onfig-0.25 pkg-config-0.25-bin pkg-config-0.25.tar.gz tidy tinycdb tinycdb-bin
leveldb tuscany-sca-cpp tuscany-sca-cpp-bin
+tar czf tuscany-sca-cpp-1.0-src.tar.gz apache-libcloud-incubating-0.4.2
apache-libcloud-incubating-0.4.2.tar.bz2 apr-1.4.x apr-1.4.x-bin autoconf-2.13
autoconf-2.13-bin autoconf-2.13.tar.gz curl-7.19.5 curl-7.19.5-bin
curl-7.19.5.tar.gz expat-2.0.1 expat-2.0.1-bin expat-2.0.1.tar.gz htmltidy-bin
httpd-2.3.15-beta httpd-2.3.15-beta.tar.gz httpd-2.3.15-bin js-1.8.5-bin
js-1.8.5 js185-1.0.0.tar.gz libcloud-0.4.2-bin libevent-2.0.13-stable
libevent-2.0.13-stable-bin libevent-2.0.13-stable.tar.gz liboauth-0.9.1
liboauth-0.9.1-bin liboauth-0.9.1.tar.gz libopkele libopkele-bin libstrophe
libstrophe-bin libxml2-2.7.7 libxml2-2.7.7-bin libxml2-sources-2.7.7.tar.gz
memcached-1.4.7 memcached-1.4.7-bin memcached-1.4.7.tar.gz mod_auth_openid
mod-auth-openid-bin modsecurity-apache_2.6.1 modsecurity-apache-2.6.0-bin
modsecurity-apache_2.6.0.tar.gz modsecurity-crs_2.2.2
modsecurity-crs_2.2.2.tar.gz nspr-4.8.8-bin nspr-4.8.8 nspr-4.8.8.tar.gz nuvem
pcre-8.12 pcre-8.12-bin pcre-8.12.zip pkg-c
onfig-0.25 pkg-config-0.25-bin pkg-config-0.25.tar.gz postgresql-9.1.2
postgresql-9.1.2-bin postgresql-9.1.2.tar.gz tidy tinycdb tinycdb-bin leveldb
tuscany-sca-cpp tuscany-sca-cpp-bin
# Create bin archive
-tar czf tuscany-sca-cpp-1.0.tar.gz apr-1.4.x-bin curl-7.19.5-bin
expat-2.0.1-bin htmltidy-bin httpd-2.3.15-bin js-1.8.5-bin libcloud-0.4.2-bin
libevent-2.0.13-stable-bin liboauth-0.9.1-bin libopkele-bin libstrophe-bin
libxml2-2.7.7-bin memcached-1.4.7-bin mod-auth-openid-bin
modsecurity-apache-2.6.1-bin nspr-4.8.8-bin nuvem/nuvem-parallel pcre-8.12-bin
tinycdb-bin leveldb tuscany-sca-cpp tuscany-sca-cpp-bin
+tar czf tuscany-sca-cpp-1.0.tar.gz apr-1.4.x-bin curl-7.19.5-bin
expat-2.0.1-bin htmltidy-bin httpd-2.3.15-bin js-1.8.5-bin libcloud-0.4.2-bin
libevent-2.0.13-stable-bin liboauth-0.9.1-bin libopkele-bin libstrophe-bin
libxml2-2.7.7-bin memcached-1.4.7-bin mod-auth-openid-bin
modsecurity-apache-2.6.1-bin nspr-4.8.8-bin nuvem/nuvem-parallel pcre-8.12-bin
postgresql-9.1.2-bin tinycdb-bin leveldb tuscany-sca-cpp tuscany-sca-cpp-bin
Modified: tuscany/sca-cpp/trunk/ubuntu/ubuntu-install
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/ubuntu/ubuntu-install?rev=1221567&r1=1221566&r2=1221567&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/ubuntu/ubuntu-install (original)
+++ tuscany/sca-cpp/trunk/ubuntu/ubuntu-install Wed Dec 21 02:26:01 2011
@@ -247,6 +247,22 @@ if [ "$?" != "0" ]; then
fi
cd $build
+# Build PostgreSQL
+sudo apt-get -y install libreadline-dev
+if [ "$?" != "0" ]; then
+ exit $?
+fi
+curl -OL http://ftp.postgresql.org/pub/source/v9.1.2/postgresql-9.1.2.tar.gz
+tar xzf postgresql-9.1.2.tar.gz
+cd postgresql-9.1.2
+./configure --prefix=$build/postgresql-9.1.2-bin --enable-thread-safety
+make
+make install
+if [ "$?" != "0" ]; then
+ exit $?
+fi
+cd $build
+
# Build Apache Thrift
sudo apt-get -y install bison flex python-dev libboost-dev
libboost-filesystem-dev
if [ "$?" != "0" ]; then
@@ -325,7 +341,7 @@ cd $build
git clone git://git.apache.org/tuscany-sca-cpp.git
cd tuscany-sca-cpp
./bootstrap
-./configure --prefix=$build/tuscany-sca-cpp-bin
--with-curl=$build/curl-7.19.5-bin --with-apr=$build/apr-1.4.x-bin
--with-httpd=$build/httpd-2.3.15-bin
--with-memcached=$build/memcached-1.4.7-bin
--with-tinycdb=$build/tinycdb-0.77-bin
--with-js-include=$build/js-1.8.5-bin/include/js
--with-js-lib=$build/js-1.8.5-bin/lib --enable-pagespeed
--with-pagespeed=$build/page-speed-1.9-bin --enable-libcloud
--with-libcloud=$build/libcloud-0.4.2-bin --enable-threads --enable-python
--with-libxml2=$build/libxml2-2.7.7-bin --enable-chat
--with-libstrophe=$build/libstrophe-bin --enable-log
--with-thrift=$build/thrift-0.2.0-bin --with-scribe=$build/scribe-2.2-bin
--enable-openid --with-mod-auth-openid=$build/mod-auth-openid-bin
--enable-oauth --with-liboauth=$build/liboauth-0.9.1-bin --enable-mod-security
--with-mod-security=$build/modsecurity-apache-2.6.1-bin
+./configure --prefix=$build/tuscany-sca-cpp-bin
--with-curl=$build/curl-7.19.5-bin --with-apr=$build/apr-1.4.x-bin
--with-httpd=$build/httpd-2.3.15-bin
--with-memcached=$build/memcached-1.4.7-bin
--with-tinycdb=$build/tinycdb-0.77-bin
--with-js-include=$build/js-1.8.5-bin/include/js
--with-js-lib=$build/js-1.8.5-bin/lib --enable-pagespeed
--with-pagespeed=$build/page-speed-1.9-bin --enable-libcloud
--with-libcloud=$build/libcloud-0.4.2-bin --enable-threads --enable-python
--with-libxml2=$build/libxml2-2.7.7-bin --enable-chat
--with-libstrophe=$build/libstrophe-bin --enable-sqldb
--with-pgsql=$build/postgresql-9.1.2-bin --enable-log
--with-thrift=$build/thrift-0.2.0-bin --with-scribe=$build/scribe-2.2-bin
--enable-openid --with-mod-auth-openid=$build/mod-auth-openid-bin
--enable-oauth --with-liboauth=$build/liboauth-0.9.1-bin --enable-mod-security
--with-mod-security=$build/modsecurity-apache-2.6.1-bin
make
make install
if [ "$?" != "0" ]; then
@@ -334,8 +350,8 @@ fi
cd $build
# Create src archive
-tar czf tuscany-sca-cpp-1.0-src.tar.gz apache-libcloud-incubating-0.4.2
apache-libcloud-incubating-0.4.2.tar.bz2 apr-1.4.x apr-1.4.x-bin curl-7.19.5
curl-7.19.5-bin curl-7.19.5.tar.gz expat-2.0.1 expat-2.0.1-bin
expat-2.0.1.tar.gz htmltidy-bin httpd-2.3.15-beta httpd-2.3.15-beta.tar.gz
httpd-2.3.15-bin js-1.8.5-bin js-1.8.5 js185-1.0.0.tar.gz libcloud-0.4.2-bin
liboauth-0.9.1 liboauth-0.9.1-bin liboauth-0.9.1.tar.gz libopkele libopkele-bin
libstrophe libstrophe-bin libxml2-2.7.7 libxml2-2.7.7-bin
libxml2-sources-2.7.7.tar.gz memcached-1.4.7 memcached-1.4.7-bin
memcached-1.4.7.tar.gz mod_auth_openid mod-auth-openid-bin
modsecurity-apache_2.6.1 modsecurity-apache-2.6.1-bin
modsecurity-apache_2.6.1.tar.gz modsecurity-crs_2.2.2
modsecurity-crs_2.2.2.tar.gz nspr-4.8.8-bin nspr-4.8.8 nspr-4.8.8.tar.gz nuvem
page-speed-1.9 page-speed-1.9-bin page-speed-sdk.zip scribe scribe-2.2-bin
scribe-2.2.tar.gz thrift-0.2.0 thrift-0.2.0-bin thrift-0.2.0-incubating.tar.gz
tidy tinycdb-0.77 tiny
cdb-0.77-bin tinycdb_0.77.tar.gz tuscany-sca-cpp tuscany-sca-cpp-bin
+tar czf tuscany-sca-cpp-1.0-src.tar.gz apache-libcloud-incubating-0.4.2
apache-libcloud-incubating-0.4.2.tar.bz2 apr-1.4.x apr-1.4.x-bin curl-7.19.5
curl-7.19.5-bin curl-7.19.5.tar.gz expat-2.0.1 expat-2.0.1-bin
expat-2.0.1.tar.gz htmltidy-bin httpd-2.3.15-beta httpd-2.3.15-beta.tar.gz
httpd-2.3.15-bin js-1.8.5-bin js-1.8.5 js185-1.0.0.tar.gz libcloud-0.4.2-bin
liboauth-0.9.1 liboauth-0.9.1-bin liboauth-0.9.1.tar.gz libopkele libopkele-bin
libstrophe libstrophe-bin libxml2-2.7.7 libxml2-2.7.7-bin
libxml2-sources-2.7.7.tar.gz memcached-1.4.7 memcached-1.4.7-bin
memcached-1.4.7.tar.gz mod_auth_openid mod-auth-openid-bin
modsecurity-apache_2.6.1 modsecurity-apache-2.6.1-bin
modsecurity-apache_2.6.1.tar.gz modsecurity-crs_2.2.2
modsecurity-crs_2.2.2.tar.gz nspr-4.8.8-bin nspr-4.8.8 nspr-4.8.8.tar.gz nuvem
page-speed-1.9 page-speed-1.9-bin page-speed-sdk.zip postgresql-9.1.2
postgresql-9.1.2-bin postgresql-9.1.2.tar.gz scribe scribe-2.2-bin
scribe-2.2.tar.gz thrift-0.2.0 thrift-0
.2.0-bin thrift-0.2.0-incubating.tar.gz tidy tinycdb-0.77 tinycdb-0.77-bin
tinycdb_0.77.tar.gz tuscany-sca-cpp tuscany-sca-cpp-bin
# Create bin archive
-tar czf tuscany-sca-cpp-1.0.tar.gz apr-1.4.x-bin curl-7.19.5-bin
expat-2.0.1-bin htmltidy-bin httpd-2.3.15-bin js-1.8.5-bin libcloud-0.4.2-bin
liboauth-0.9.1-bin libopkele-bin libstrophe-bin libxml2-2.7.7-bin
memcached-1.4.7-bin mod-auth-openid-bin modsecurity-apache-2.6.1-bin
nspr-4.8.8-bin nuvem/nuvem-parallel page-speed-1.9-bin scribe-2.2-bin
thrift-0.2.0-bin tinycdb-0.77-bin tuscany-sca-cpp tuscany-sca-cpp-bin
+tar czf tuscany-sca-cpp-1.0.tar.gz apr-1.4.x-bin curl-7.19.5-bin
expat-2.0.1-bin htmltidy-bin httpd-2.3.15-bin js-1.8.5-bin libcloud-0.4.2-bin
liboauth-0.9.1-bin libopkele-bin libstrophe-bin libxml2-2.7.7-bin
memcached-1.4.7-bin mod-auth-openid-bin modsecurity-apache-2.6.1-bin
nspr-4.8.8-bin nuvem/nuvem-parallel page-speed-1.9-bin postgresql-9.1.2-bin
scribe-2.2-bin thrift-0.2.0-bin tinycdb-0.77-bin tuscany-sca-cpp
tuscany-sca-cpp-bin
Modified: tuscany/sca-cpp/trunk/ubuntu/ubuntu-install-all
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/ubuntu/ubuntu-install-all?rev=1221567&r1=1221566&r2=1221567&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/ubuntu/ubuntu-install-all (original)
+++ tuscany/sca-cpp/trunk/ubuntu/ubuntu-install-all Wed Dec 21 02:26:01 2011
@@ -306,7 +306,7 @@ sudo apt-get -y install libreadline-dev
if [ "$?" != "0" ]; then
exit $?
fi
-curl -OL
ftp://ftp9.us.postgresql.org/pub/mirrors/postgresql/source/v9.1.2/postgresql-9.1.2.tar.gz
+curl -OL http://ftp.postgresql.org/pub/source/v9.1.2/postgresql-9.1.2.tar.gz
tar xzf postgresql-9.1.2.tar.gz
cd postgresql-9.1.2
./configure --prefix=$build/postgresql-9.1.2-bin --enable-thread-safety
