Author: jsdelfino
Date: Sat Jun 5 06:18:02 2010
New Revision: 951659
URL: http://svn.apache.org/viewvc?rev=951659&view=rev
Log:
Minor fixes to ubuntu image creation scripts.
Added:
tuscany/sca-cpp/trunk/ubuntu/ubuntu-bin-all-image
- copied, changed from r951656,
tuscany/sca-cpp/trunk/ubuntu/ubuntu-bin-image
tuscany/sca-cpp/trunk/ubuntu/ubuntu-dev-all-image
- copied, changed from r951656,
tuscany/sca-cpp/trunk/ubuntu/ubuntu-dev-image
Modified:
tuscany/sca-cpp/trunk/ubuntu/ubuntu-bin-image
tuscany/sca-cpp/trunk/ubuntu/ubuntu-dev-image
tuscany/sca-cpp/trunk/ubuntu/ubuntu-install
tuscany/sca-cpp/trunk/ubuntu/ubuntu-install-all
Copied: tuscany/sca-cpp/trunk/ubuntu/ubuntu-bin-all-image (from r951656,
tuscany/sca-cpp/trunk/ubuntu/ubuntu-bin-image)
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/ubuntu/ubuntu-bin-all-image?p2=tuscany/sca-cpp/trunk/ubuntu/ubuntu-bin-all-image&p1=tuscany/sca-cpp/trunk/ubuntu/ubuntu-bin-image&r1=951656&r2=951659&rev=951659&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/ubuntu/ubuntu-bin-image (original)
+++ tuscany/sca-cpp/trunk/ubuntu/ubuntu-bin-all-image Sat Jun 5 06:18:02 2010
@@ -15,8 +15,9 @@
# specific language governing permissions and limitations
# under the License.
-# Install the required system tools and libraries, the runtime dependencies and
-# the Tuscany SCA runtime on a fresh Ubuntu Server 9.10 image.
+# Install a complete distribution, the required system tools and libraries,
+# the runtime dependencies and the Tuscany SCA runtime on a fresh Ubuntu Server
+# 9.10 image.
# Display commands as they are executed
set -x
@@ -46,6 +47,10 @@ sudo apt-get -y install libssl-dev
if [ "$?" != "0" ]; then
exit $?
fi
+sudo apt-get -y install python-dev
+if [ "$?" != "0" ]; then
+ exit $?
+fi
sudo apt-get -y install libevent-dev
if [ "$?" != "0" ]; then
exit $?
@@ -68,6 +73,6 @@ if [ "$?" != "0" ]; then
fi
# Download and install the Tuscany runtime
-wget
http://people.apache.org/~jsdelfino/tuscany/test/tuscany-sca-cpp-1.0.tar.gz
+wget
http://people.apache.org/~jsdelfino/tuscany/test/tuscany-sca-cpp-all-1.0.tar.gz
tar xzf tuscany-sca-cpp-1.0.tar.gz
Modified: tuscany/sca-cpp/trunk/ubuntu/ubuntu-bin-image
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/ubuntu/ubuntu-bin-image?rev=951659&r1=951658&r2=951659&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/ubuntu/ubuntu-bin-image (original)
+++ tuscany/sca-cpp/trunk/ubuntu/ubuntu-bin-image Sat Jun 5 06:18:02 2010
@@ -15,8 +15,9 @@
# specific language governing permissions and limitations
# under the License.
-# Install the required system tools and libraries, the runtime dependencies and
-# the Tuscany SCA runtime on a fresh Ubuntu Server 9.10 image.
+# Install a minimal distribution including only the core runtime, support for
+# Python and C++ components, memcached and tinycdb on a fresh Ubuntu Server
+# 9.10 image.
# Display commands as they are executed
set -x
@@ -42,27 +43,31 @@ fi
#if [ "$?" != "0" ]; then
# exit $?
#fi
-sudo apt-get -y install libssl-dev
+sudo apt-get -y install libssl-dev apache2 apache2-utils apache2-prefork-dev
libaprutil1-dev libapr1-dev
if [ "$?" != "0" ]; then
exit $?
fi
-sudo apt-get -y install libevent-dev
+sudo apt-get -y install curl libcurl4-openssl-dev
if [ "$?" != "0" ]; then
exit $?
fi
-sudo apt-get -y install pkg-config
+sudo apt-get -y install libxml2 libxml2-dev
if [ "$?" != "0" ]; then
exit $?
fi
-sudo apt-get -y install libboost-dev libboost-program-options-dev
libboost-filesystem-dev uuid-dev
+sudo apt-get -y install xulrunner-1.9.1 xulrunner-1.9.1-dev
if [ "$?" != "0" ]; then
exit $?
fi
-sudo apt-get -y install openjdk-6-jdk
+sudo apt-get -y install python-dev
if [ "$?" != "0" ]; then
exit $?
fi
-sudo apt-get -y install bison flex
+sudo apt-get -y install memcached
+if [ "$?" != "0" ]; then
+ exit $?
+fi
+sudo apt-get -y install tinycdb libcdb-dev
if [ "$?" != "0" ]; then
exit $?
fi
Copied: tuscany/sca-cpp/trunk/ubuntu/ubuntu-dev-all-image (from r951656,
tuscany/sca-cpp/trunk/ubuntu/ubuntu-dev-image)
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/ubuntu/ubuntu-dev-all-image?p2=tuscany/sca-cpp/trunk/ubuntu/ubuntu-dev-all-image&p1=tuscany/sca-cpp/trunk/ubuntu/ubuntu-dev-image&r1=951656&r2=951659&rev=951659&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/ubuntu/ubuntu-dev-image (original)
+++ tuscany/sca-cpp/trunk/ubuntu/ubuntu-dev-all-image Sat Jun 5 06:18:02 2010
@@ -15,8 +15,9 @@
# specific language governing permissions and limitations
# under the License.
-# Install the required system tools and libraries, the runtime dependencies and
-# the Tuscany SCA runtime on a fresh Ubuntu Server 9.10 image.
+# Install a complete distribution, the required system tools and libraries,
+# the runtime dependencies and the Tuscany SCA runtime on a fresh Ubuntu
+# Server 9.10 image.
# Display commands as they are executed
set -x
Modified: tuscany/sca-cpp/trunk/ubuntu/ubuntu-dev-image
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/ubuntu/ubuntu-dev-image?rev=951659&r1=951658&r2=951659&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/ubuntu/ubuntu-dev-image (original)
+++ tuscany/sca-cpp/trunk/ubuntu/ubuntu-dev-image Sat Jun 5 06:18:02 2010
@@ -15,8 +15,9 @@
# specific language governing permissions and limitations
# under the License.
-# Install the required system tools and libraries, the runtime dependencies and
-# the Tuscany SCA runtime on a fresh Ubuntu Server 9.10 image.
+# Install a complete distribution, the required system tools and libraries,
+# the runtime dependencies and the Tuscany SCA runtime on a fresh Ubuntu
+# Server 9.10 image.
# Display commands as they are executed
set -x
@@ -32,7 +33,7 @@ cd /mnt/tuscany
# Download and run install script
sudo apt-get -y install wget
-wget
http://svn.apache.org/repos/asf/tuscany/sca-cpp/trunk/ubuntu/ubuntu-install-all
-chmod +x ./ubuntu-install-all
-./ubuntu-install-all
+wget
http://svn.apache.org/repos/asf/tuscany/sca-cpp/trunk/ubuntu/ubuntu-install
+chmod +x ./ubuntu-install
+./ubuntu-install
Modified: tuscany/sca-cpp/trunk/ubuntu/ubuntu-install
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/ubuntu/ubuntu-install?rev=951659&r1=951658&r2=951659&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/ubuntu/ubuntu-install (original)
+++ tuscany/sca-cpp/trunk/ubuntu/ubuntu-install Sat Jun 5 06:18:02 2010
@@ -15,11 +15,9 @@
# specific language governing permissions and limitations
# under the License.
-# Install the required system tools and libraries, the runtime dependencies and
-# the Tuscany SCA runtime on a fresh Ubuntu Server 9.10 system.
-
# Build a minimal distribution including only the core runtime, support for
-# Python and C++ components, memcached and tinycdb.
+# Python and C++ components, memcached and tinycdb on a fresh Ubuntu Server
+# 9.10 system.
# Display commands as they are executed
set -x
@@ -47,32 +45,38 @@ if [ "$?" != "0" ]; then
exit $?
fi
-# Install Memcached
-sudo apt-get -y install memcached
+# Install Libcurl
+sudo apt-get -y install curl libcurl4-openssl-dev
if [ "$?" != "0" ]; then
exit $?
fi
-# Install Tinycdb
-sudo apt-get -y install tinycdb libcdb-dev
+# Build Libxml2
+sudo apt-get -y install libxml2 libxml2-dev
if [ "$?" != "0" ]; then
exit $?
fi
-# Install Libcurl
-sudo apt-get -y install curl libcurl4-openssl-dev
+# Install TraceMonkey
+sudo apt-get -y install xulrunner-1.9.1 xulrunner-1.9.1-dev
if [ "$?" != "0" ]; then
exit $?
fi
-# Build Libxml2
-sudo apt-get -y install libxml2 libxml2-dev
+# Install Python
+sudo apt-get -y install python-dev
if [ "$?" != "0" ]; then
exit $?
fi
-# Install TraceMonkey
-sudo apt-get -y install xulrunner-1.9.1 xulrunner-1.9.1-dev
+# Install Memcached
+sudo apt-get -y install memcached
+if [ "$?" != "0" ]; then
+ exit $?
+fi
+
+# Install Tinycdb
+sudo apt-get -y install tinycdb libcdb-dev
if [ "$?" != "0" ]; then
exit $?
fi
Modified: tuscany/sca-cpp/trunk/ubuntu/ubuntu-install-all
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/ubuntu/ubuntu-install-all?rev=951659&r1=951658&r2=951659&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/ubuntu/ubuntu-install-all (original)
+++ tuscany/sca-cpp/trunk/ubuntu/ubuntu-install-all Sat Jun 5 06:18:02 2010
@@ -15,11 +15,9 @@
# specific language governing permissions and limitations
# under the License.
-# Install the required system tools and libraries, the runtime dependencies and
-# the Tuscany SCA runtime on a fresh Ubuntu Server 9.10 system.
-
-# Build a complete distribution including the core runtime, all modules and
-# components and dependencies from source.
+# Install a complete distribution, the required system tools and libraries, the
+# runtime dependencies and the Tuscany SCA runtime on a fresh Ubuntu Server
+# 9.10 system.
# Display commands as they are executed
set -x
@@ -275,6 +273,10 @@ fi
cd $build
# Build Tuscany SCA
+sudo apt-get -y install python-dev
+if [ "$?" != "0" ]; then
+ exit $?
+fi
git clone git://git.apache.org/tuscany-sca-cpp.git
cd tuscany-sca-cpp
cp etc/git-exclude .git/info/exclude
