Updated the INSTALL instructions, fixed a few incremental build issues, and added a script that builds everything from scratch, tested on Ubuntu 9.10.

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

2 files changed, 11 insertions, 30 deletions

diff --git a/sca-cpp/trunk/modules/wsgi/Makefile.am b/sca-cpp/trunk/modules/wsgi/Makefile.am
index 9df8135ab2..ed5c868f6b 100644
--- a/sca-cpp/trunk/modules/wsgi/Makefile.am
+++ b/sca-cpp/trunk/modules/wsgi/Makefile.am
@@ -22,6 +22,17 @@ INCLUDES = -I${PYTHON_INCLUDE}
 mod_SCRIPTS = composite.py scdl.py util.py elemutil.py xmlutil.py atomutil.py jsonutil.py wsgi-start wsgi-stop
 moddir = $(prefix)/modules/wsgi
 
+noinst_DATA = target.stamp
+
+target.stamp: app.yaml *.py *.composite htdocs/*
+	mkdir -p target
+	cp app.yaml *.py *.composite target
+	cp -R htdocs target/htdocs
+	touch target.stamp
+
+clean-local:
+	rm -rf target.stamp target
+
 client_test_SOURCES = client-test.cpp
 client_test_LDFLAGS = -lxml2 -lcurl -lmozjs
 
diff --git a/sca-cpp/trunk/modules/wsgi/wsgi-package b/sca-cpp/trunk/modules/wsgi/wsgi-package
deleted file mode 100755
index 28756f9494..0000000000
--- a/sca-cpp/trunk/modules/wsgi/wsgi-package
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh
-
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#  
-#    http://www.apache.org/licenses/LICENSE-2.0
-#    
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-
-# Package a WSGI app for upload
-here=`readlink -f $0`; here=`dirname $here`
-pwd=`pwd`
-root=`readlink -f $pwd`
-
-rm -rf target
-mkdir -p target
-cd target
-ls $here/*.py | grep -v "\-test.py" | xargs -i -t ln -s -f {}
-ls $root | grep -v "target" | xargs -i -t ln -s -f $root/{}
-