You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by js...@apache.org on 2010/05/31 19:42:16 UTC
svn commit: r949816 - in /tuscany/sca-cpp/trunk: INSTALL
components/chat/Makefile.am configure.ac ubuntu/ubuntu-bin-image
ubuntu/ubuntu-install
Author: jsdelfino
Date: Mon May 31 17:42:16 2010
New Revision: 949816
URL: http://svn.apache.org/viewvc?rev=949816&view=rev
Log:
Build the expat XML parser separately instead of building it as part of libstrophe.
Modified:
tuscany/sca-cpp/trunk/INSTALL
tuscany/sca-cpp/trunk/components/chat/Makefile.am
tuscany/sca-cpp/trunk/configure.ac
tuscany/sca-cpp/trunk/ubuntu/ubuntu-bin-image
tuscany/sca-cpp/trunk/ubuntu/ubuntu-install
Modified: tuscany/sca-cpp/trunk/INSTALL
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/INSTALL?rev=949816&r1=949815&r2=949816&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/INSTALL (original)
+++ tuscany/sca-cpp/trunk/INSTALL Mon May 31 17:42:16 2010
@@ -94,16 +94,16 @@ a Java 5+ JDK (http://openjdk.java.net/,
XMPP Chat:
Apache Vysper 0.5 (http://mina.apache.org/)
-Libstrophe (http://code.stanziq.com/cgit/strophe/libstrophe/)
-build it from source at git://code.stanziq.com//libstrophe
-requires libcheck-0.9.6
+Libstrophe (http://code.stanziq.com/strophe/)
+build it from source at git://github.com/jsdelfino/libstrophe.git
+requires Expat 2.0.1 (http://sourceforge.net/projects/expat/)
SQL Database:
postgresql-9.0 (http://www.postgresql.org/)
Logging:
-Apache Thrift 0.2.0 (http://incubator.apache.org/thrift/)
Facebook Scribe 2.2 (http://github.com/facebook/scribe/downloads)
+requires Apache Thrift 0.2.0 (http://incubator.apache.org/thrift/)
Cloud deployment:
Apache Libcloud 0.3.1 (http://incubator.apache.org/libcloud/)
Modified: tuscany/sca-cpp/trunk/components/chat/Makefile.am
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/components/chat/Makefile.am?rev=949816&r1=949815&r2=949816&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/components/chat/Makefile.am (original)
+++ tuscany/sca-cpp/trunk/components/chat/Makefile.am Mon May 31 17:42:16 2010
@@ -32,16 +32,16 @@ EXTRA_DIST = chat.composite *.scm
comp_LTLIBRARIES = libchatter.la
libchatter_la_SOURCES = chatter.cpp
-libchatter_la_LDFLAGS = -L${LIBSTROPHE_LIB} -R${LIBSTROPHE_LIB} -lstrophe -lexpat -lssl -lresolv
+libchatter_la_LDFLAGS = -L${LIBSTROPHE_LIB} -R${LIBSTROPHE_LIB} -lstrophe -lssl -lresolv
noinst_DATA = libchatter.so
libchatter.so:
ln -s .libs/libchatter.so
xmpp_test_SOURCES = xmpp-test.cpp
-xmpp_test_LDFLAGS = -L${LIBSTROPHE_LIB} -R${LIBSTROPHE_LIB} -lstrophe -lexpat -lssl -lresolv
+xmpp_test_LDFLAGS = -L${LIBSTROPHE_LIB} -R${LIBSTROPHE_LIB} -lstrophe -lssl -lresolv
client_test_SOURCES = client-test.cpp
-client_test_LDFLAGS = -lxml2 -lcurl -lmozjs -L${LIBSTROPHE_LIB} -R${LIBSTROPHE_LIB} -lstrophe -lexpat -lssl -lresolv
+client_test_LDFLAGS = -lxml2 -lcurl -lmozjs -L${LIBSTROPHE_LIB} -R${LIBSTROPHE_LIB} -lstrophe -lssl -lresolv
noinst_PROGRAMS = xmpp-test client-test
dist_noinst_SCRIPTS = server-test
Modified: tuscany/sca-cpp/trunk/configure.ac
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/configure.ac?rev=949816&r1=949815&r2=949816&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/configure.ac (original)
+++ tuscany/sca-cpp/trunk/configure.ac Mon May 31 17:42:16 2010
@@ -671,7 +671,7 @@ if test "${want_chat}" = "true"; then
AC_MSG_ERROR([--enable-chat requires multi-threading, use --enable-threads])
fi
LIBS="-L${LIBSTROPHE_LIB} ${default_LIBS}"
- AC_CHECK_LIB([strophe], [xmpp_initialize], [], [AC_MSG_ERROR([couldn't find a suitable libstrophe, use --with-libstrophe=PATH])], [-lexpat -lssl -lresolv])
+ AC_CHECK_LIB([strophe], [xmpp_initialize], [], [AC_MSG_ERROR([couldn't find a suitable libstrophe, use --with-libstrophe=PATH])], [-lssl -lresolv])
AM_CONDITIONAL([WANT_CHAT], true)
AC_DEFINE([WANT_CHAT], 1, [enable Chat component])
Modified: tuscany/sca-cpp/trunk/ubuntu/ubuntu-bin-image
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/ubuntu/ubuntu-bin-image?rev=949816&r1=949815&r2=949816&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/ubuntu/ubuntu-bin-image (original)
+++ tuscany/sca-cpp/trunk/ubuntu/ubuntu-bin-image Mon May 31 17:42:16 2010
@@ -58,10 +58,6 @@ sudo apt-get -y install libboost-dev lib
if [ "$?" != "0" ]; then
exit $?
fi
-sudo apt-get -y install check
-if [ "$?" != "0" ]; then
- exit $?
-fi
sudo apt-get -y install openjdk-6-jdk
if [ "$?" != "0" ]; then
exit $?
Modified: tuscany/sca-cpp/trunk/ubuntu/ubuntu-install
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/ubuntu/ubuntu-install?rev=949816&r1=949815&r2=949816&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/ubuntu/ubuntu-install (original)
+++ tuscany/sca-cpp/trunk/ubuntu/ubuntu-install Mon May 31 17:42:16 2010
@@ -168,28 +168,28 @@ if [ "$?" != "0" ]; then
fi
cd $build
-# Build Libstrophe
-sudo apt-get -y install check
+# Build Libexpat
+wget http://sourceforge.net/projects/expat/files/expat/2.0.1/expat-2.0.1.tar.gz/download
+tar xzf expat-2.0.1.tar.gz
+cd expat-2.0.1
+./configure --prefix=$build/expat-2.0.1-bin
+make
+make install
if [ "$?" != "0" ]; then
exit $?
fi
-git clone git://code.stanziq.com/libstrophe
+cd $build
+
+# Build Libstrophe
+git clone git://github.com/jsdelfino/libstrophe.git
cd libstrophe
-git submodule init
-git submodule update
-aclocal
-automake --add-missing --foreign --copy
-autoconf
-./configure --prefix=$build/libstrophe-bin
+./bootstrap.sh
+./configure --prefix=$build/libstrophe-bin --with-expat=$build/expat-2.0.1-bin
make
make install
if [ "$?" != "0" ]; then
exit $?
fi
-cd $build
-mkdir -p $build/libstrophe-bin/include
-cp $build/libstrophe/*.h $build/libstrophe-bin/include
-cp $build/libstrophe/src/*.h $build/libstrophe-bin/include
# Install Apache Vysper
sudo apt-get -y install openjdk-6-jdk