Author: jsdelfino
Date: Sun Jul 4 18:53:25 2010
New Revision: 960382
URL: http://svn.apache.org/viewvc?rev=960382&view=rev
Log:
Minor fixes to the Ubuntu build scripts.
Modified:
tuscany/sca-cpp/trunk/modules/server/Makefile.am
tuscany/sca-cpp/trunk/samples/store-gae/server-test
tuscany/sca-cpp/trunk/ubuntu/ubuntu-bin-all-image
tuscany/sca-cpp/trunk/ubuntu/ubuntu-bin-image
tuscany/sca-cpp/trunk/ubuntu/ubuntu-dev-all-image
tuscany/sca-cpp/trunk/ubuntu/ubuntu-dev-image
tuscany/sca-cpp/trunk/ubuntu/ubuntu-install-all
Modified: tuscany/sca-cpp/trunk/modules/server/Makefile.am
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/server/Makefile.am?rev=960382&r1=960381&r2=960382&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/server/Makefile.am (original)
+++ tuscany/sca-cpp/trunk/modules/server/Makefile.am Sun Jul 4 18:53:25 2010
@@ -23,6 +23,8 @@ incldir = $(prefix)/include/modules/serv
dist_mod_SCRIPTS = cpp-conf scheme-conf server-conf
moddir = $(prefix)/modules/server
+nobase_dist_mod_DATA = htdocs/js/*.js
+
EXTRA_DIST = domain-test.composite client-test.scm server-test.scm
htdocs/*.xml htdocs/*.txt htdocs/*.html htdocs/js/*.js
mod_LTLIBRARIES = libmod_tuscany_eval.la libmod_tuscany_wiring.la
Modified: tuscany/sca-cpp/trunk/samples/store-gae/server-test
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-gae/server-test?rev=960382&r1=960381&r2=960382&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/samples/store-gae/server-test (original)
+++ tuscany/sca-cpp/trunk/samples/store-gae/server-test Sun Jul 4 18:53:25 2010
@@ -27,8 +27,8 @@ sleep 2
# Test HTTP GET
mkdir -p tmp
-$curl_prefix/bin/curl http://localhost:8090/store.html 2>/dev/null
>tmp/store.html
-diff tmp/store.html htdocs/store.html
+$curl_prefix/bin/curl -L http://localhost:8090/store.html 2>/dev/null
>tmp/login.html
+grep "Login" tmp/login.html >/dev/null
rc=$?
# Cleanup
Modified: tuscany/sca-cpp/trunk/ubuntu/ubuntu-bin-all-image
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/ubuntu/ubuntu-bin-all-image?rev=960382&r1=960381&r2=960382&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/ubuntu/ubuntu-bin-all-image (original)
+++ tuscany/sca-cpp/trunk/ubuntu/ubuntu-bin-all-image Sun Jul 4 18:53:25 2010
@@ -26,9 +26,11 @@ set -x
sudo apt-get update
# Create install directory
+u=`id -un`
+g=`id -gn`
sudo mkdir -p /mnt/tuscany
-sudo chown ubuntu /mnt/tuscany
-sudo chgrp ubuntu /mnt/tuscany
+sudo chown $u /mnt/tuscany
+sudo chgrp $g /mnt/tuscany
cd /mnt/tuscany
# Install system tools and libraries
@@ -51,6 +53,10 @@ sudo apt-get -y install python-dev
if [ "$?" != "0" ]; then
exit $?
fi
+sudo apt-get -y install libpcre3-dev libsqlite3-dev
+if [ "$?" != "0" ]; then
+ exit $?
+fi
sudo apt-get -y install libevent-dev
if [ "$?" != "0" ]; then
exit $?
Modified: tuscany/sca-cpp/trunk/ubuntu/ubuntu-bin-image
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/ubuntu/ubuntu-bin-image?rev=960382&r1=960381&r2=960382&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/ubuntu/ubuntu-bin-image (original)
+++ tuscany/sca-cpp/trunk/ubuntu/ubuntu-bin-image Sun Jul 4 18:53:25 2010
@@ -26,9 +26,11 @@ set -x
sudo apt-get update
# Create install directory
+u=`id -un`
+g=`id -gn`
sudo mkdir -p /mnt/tuscany
-sudo chown ubuntu /mnt/tuscany
-sudo chgrp ubuntu /mnt/tuscany
+sudo chown $u /mnt/tuscany
+sudo chgrp $g /mnt/tuscany
cd /mnt/tuscany
# Install system tools and libraries
Modified: tuscany/sca-cpp/trunk/ubuntu/ubuntu-dev-all-image
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/ubuntu/ubuntu-dev-all-image?rev=960382&r1=960381&r2=960382&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/ubuntu/ubuntu-dev-all-image (original)
+++ tuscany/sca-cpp/trunk/ubuntu/ubuntu-dev-all-image Sun Jul 4 18:53:25 2010
@@ -26,9 +26,11 @@ set -x
sudo apt-get update
# Create install directory
+u=`id -un`
+g=`id -gn`
sudo mkdir -p /mnt/tuscany
-sudo chown ubuntu /mnt/tuscany
-sudo chgrp ubuntu /mnt/tuscany
+sudo chown $u /mnt/tuscany
+sudo chgrp $g /mnt/tuscany
cd /mnt/tuscany
# Download and run install script
Modified: tuscany/sca-cpp/trunk/ubuntu/ubuntu-dev-image
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/ubuntu/ubuntu-dev-image?rev=960382&r1=960381&r2=960382&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/ubuntu/ubuntu-dev-image (original)
+++ tuscany/sca-cpp/trunk/ubuntu/ubuntu-dev-image Sun Jul 4 18:53:25 2010
@@ -26,9 +26,11 @@ set -x
sudo apt-get update
# Create install directory
+u=`id -un`
+g=`id -gn`
sudo mkdir -p /mnt/tuscany
-sudo chown ubuntu /mnt/tuscany
-sudo chgrp ubuntu /mnt/tuscany
+sudo chown $u /mnt/tuscany
+sudo chgrp $g /mnt/tuscany
cd /mnt/tuscany
# Download and run install script
Modified: tuscany/sca-cpp/trunk/ubuntu/ubuntu-install-all
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/ubuntu/ubuntu-install-all?rev=960382&r1=960381&r2=960382&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/ubuntu/ubuntu-install-all (original)
+++ tuscany/sca-cpp/trunk/ubuntu/ubuntu-install-all Sun Jul 4 18:53:25 2010
@@ -233,6 +233,7 @@ fi
cd $build
# Build Mod_auth_openid
+sudo apt-get -y install libpcre3-dev libsqlite3-dev
git clone git://github.com/jsdelfino/mod_auth_openid.git
cd mod_auth_openid
./autogen.sh
