diff options
| author | jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68> | 2010-05-31 17:42:16 +0000 |
|---|---|---|
| committer | jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68> | 2010-05-31 17:42:16 +0000 |
| commit | 76cf55f98aad01d77a19330855b1b7712ad7a031 (patch) | |
| tree | 20f8300221b496764ad2452436d17f12435d0e29 /sca-cpp/trunk/ubuntu | |
| parent | b85f56b7c32f101ad41255bde647bbdcd12dd796 (diff) | |
Build the expat XML parser separately instead of building it as part of libstrophe.
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@949816 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'sca-cpp/trunk/ubuntu')
| -rwxr-xr-x | sca-cpp/trunk/ubuntu/ubuntu-bin-image | 4 | ||||
| -rwxr-xr-x | sca-cpp/trunk/ubuntu/ubuntu-install | 26 |
2 files changed, 13 insertions, 17 deletions
diff --git a/sca-cpp/trunk/ubuntu/ubuntu-bin-image b/sca-cpp/trunk/ubuntu/ubuntu-bin-image index c3ef606ed0..4ba1a2fec4 100755 --- a/sca-cpp/trunk/ubuntu/ubuntu-bin-image +++ b/sca-cpp/trunk/ubuntu/ubuntu-bin-image @@ -58,10 +58,6 @@ sudo apt-get -y install libboost-dev libboost-program-options-dev libboost-files 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 $? diff --git a/sca-cpp/trunk/ubuntu/ubuntu-install b/sca-cpp/trunk/ubuntu/ubuntu-install index fa4d7e598b..1b71610367 100755 --- a/sca-cpp/trunk/ubuntu/ubuntu-install +++ b/sca-cpp/trunk/ubuntu/ubuntu-install @@ -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 |