Minor fixes to the Ubuntu build scripts.

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

7 files changed, 25 insertions, 10 deletions

diff --git a/sca-cpp/trunk/modules/server/Makefile.am b/sca-cpp/trunk/modules/server/Makefile.am
index 4c3e5531f0..349e372a74 100644
--- a/sca-cpp/trunk/modules/server/Makefile.am
+++ b/sca-cpp/trunk/modules/server/Makefile.am
@@ -23,6 +23,8 @@ incldir = $(prefix)/include/modules/server
 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
diff --git a/sca-cpp/trunk/samples/store-gae/server-test b/sca-cpp/trunk/samples/store-gae/server-test
index c656cb33c2..02b103ed2d 100755
--- a/sca-cpp/trunk/samples/store-gae/server-test
+++ b/sca-cpp/trunk/samples/store-gae/server-test
@@ -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
diff --git a/sca-cpp/trunk/ubuntu/ubuntu-bin-all-image b/sca-cpp/trunk/ubuntu/ubuntu-bin-all-image
index 92bb2b1525..aba33e79d3 100755
--- a/sca-cpp/trunk/ubuntu/ubuntu-bin-all-image
+++ b/sca-cpp/trunk/ubuntu/ubuntu-bin-all-image
@@ -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 $?
diff --git a/sca-cpp/trunk/ubuntu/ubuntu-bin-image b/sca-cpp/trunk/ubuntu/ubuntu-bin-image
index 7a8e6e166c..303cd940d4 100755
--- a/sca-cpp/trunk/ubuntu/ubuntu-bin-image
+++ b/sca-cpp/trunk/ubuntu/ubuntu-bin-image
@@ -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
diff --git a/sca-cpp/trunk/ubuntu/ubuntu-dev-all-image b/sca-cpp/trunk/ubuntu/ubuntu-dev-all-image
index aed2ec8efe..6fa4656c29 100755
--- a/sca-cpp/trunk/ubuntu/ubuntu-dev-all-image
+++ b/sca-cpp/trunk/ubuntu/ubuntu-dev-all-image
@@ -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
diff --git a/sca-cpp/trunk/ubuntu/ubuntu-dev-image b/sca-cpp/trunk/ubuntu/ubuntu-dev-image
index 183941aae6..ed40aa6b9c 100755
--- a/sca-cpp/trunk/ubuntu/ubuntu-dev-image
+++ b/sca-cpp/trunk/ubuntu/ubuntu-dev-image
@@ -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
diff --git a/sca-cpp/trunk/ubuntu/ubuntu-install-all b/sca-cpp/trunk/ubuntu/ubuntu-install-all
index 04b72bf942..5e18be5025 100755
--- a/sca-cpp/trunk/ubuntu/ubuntu-install-all
+++ b/sca-cpp/trunk/ubuntu/ubuntu-install-all
@@ -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