diff options
| author | jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68> | 2010-03-13 18:40:42 +0000 |
|---|---|---|
| committer | jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68> | 2010-03-13 18:40:42 +0000 |
| commit | 014971ccb5b2041147cf9d84d498cce64ea0493e (patch) | |
| tree | 0f93393d6a58e6bcd7a1e68bbe8a9c4af3626001 /sca-cpp/trunk/components | |
| parent | 7fc75cdf0b19e8f748505931164d1756e796b833 (diff) | |
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
Diffstat (limited to 'sca-cpp/trunk/components')
| -rw-r--r-- | sca-cpp/trunk/components/chat/Makefile.am | 2 | ||||
| -rwxr-xr-x | sca-cpp/trunk/components/chat/vysper-classpath | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/sca-cpp/trunk/components/chat/Makefile.am b/sca-cpp/trunk/components/chat/Makefile.am index 9ab64c388c..00fdcfea74 100644 --- a/sca-cpp/trunk/components/chat/Makefile.am +++ b/sca-cpp/trunk/components/chat/Makefile.am @@ -42,7 +42,7 @@ noinst_PROGRAMS = xmpp-test client-test if WANT_VYSPER -AM_JAVACFLAGS = -cp `${top_builddir}/components/chat/vysper-classpath`${JAVAROOT} +AM_JAVACFLAGS = -cp `${top_builddir}/components/chat/vysper-classpath ${VYSPER_PREFIX}`${JAVAROOT} noinst_JAVA = test/*.java diff --git a/sca-cpp/trunk/components/chat/vysper-classpath b/sca-cpp/trunk/components/chat/vysper-classpath index eb234fb285..7cf16a5ae8 100755 --- a/sca-cpp/trunk/components/chat/vysper-classpath +++ b/sca-cpp/trunk/components/chat/vysper-classpath @@ -20,6 +20,10 @@ # Compute a classpath for running a Vysper server here=`readlink -f $0`; here=`dirname $here` -vysper_prefix=`cat $here/vysper.prefix` +if [ "$1" = "" ]; then + vysper_prefix=`cat $here/vysper.prefix` +else + vysper_prefix=$1 +fi jars=`find $vysper_prefix/lib -name "*.jar" | awk '{ printf "%s:", $1 }'` echo "$vysper_prefix/config:$jars" |