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/04/17 06:57:23 UTC
svn commit: r935126 - in /tuscany/sca-cpp/trunk:
components/queue/Makefile.am components/store/Makefile.am
components/webservice/Makefile.am configure.ac ubuntu/ubuntu-gcc-4.5
Author: jsdelfino
Date: Sat Apr 17 04:57:23 2010
New Revision: 935126
URL: http://svn.apache.org/viewvc?rev=935126&view=rev
Log:
Change build scripts to make them work with GCC 4.5. Add a script to help install GCC 4.5 on Ubuntu.
Added:
tuscany/sca-cpp/trunk/ubuntu/ubuntu-gcc-4.5 (with props)
Modified:
tuscany/sca-cpp/trunk/components/queue/Makefile.am
tuscany/sca-cpp/trunk/components/store/Makefile.am
tuscany/sca-cpp/trunk/components/webservice/Makefile.am
tuscany/sca-cpp/trunk/configure.ac
Modified: tuscany/sca-cpp/trunk/components/queue/Makefile.am
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/components/queue/Makefile.am?rev=935126&r1=935125&r2=935126&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/components/queue/Makefile.am (original)
+++ tuscany/sca-cpp/trunk/components/queue/Makefile.am Sat Apr 17 04:57:23 2010
@@ -29,16 +29,16 @@ qpidc.prefix: $(top_builddir)/config.sta
comp_LTLIBRARIES = libqueue-sender.la libqueue-listener.la
libqueue_sender_la_SOURCES = queue-sender.cpp
-libqueue_sender_la_LDFLAGS = -L${QPIDC_LIB} -R${QPIDC_LIB} -lqpidclient
+libqueue_sender_la_LDFLAGS = -L${QPIDC_LIB} -R${QPIDC_LIB} -lqpidclient -lqpidcommon
libqueue_listener_la_SOURCES = queue-listener.cpp
-libqueue_listener_la_LDFLAGS = -L${QPIDC_LIB} -R${QPIDC_LIB} -lqpidclient
+libqueue_listener_la_LDFLAGS = -L${QPIDC_LIB} -R${QPIDC_LIB} -lqpidclient -lqpidcommon
qpid_test_SOURCES = qpid-test.cpp
-qpid_test_LDFLAGS = -L${QPIDC_LIB} -R${QPIDC_LIB} -lqpidclient
+qpid_test_LDFLAGS = -L${QPIDC_LIB} -R${QPIDC_LIB} -lqpidclient -lqpidcommon
client_test_SOURCES = client-test.cpp
-client_test_LDFLAGS = -lxml2 -lcurl -lmozjs -L${QPIDC_LIB} -R${QPIDC_LIB} -lqpidclient
+client_test_LDFLAGS = -lxml2 -lcurl -lmozjs -L${QPIDC_LIB} -R${QPIDC_LIB} -lqpidclient -lqpidcommon
noinst_PROGRAMS = qpid-test client-test
TESTS = send-test server-test
Modified: tuscany/sca-cpp/trunk/components/store/Makefile.am
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/components/store/Makefile.am?rev=935126&r1=935125&r2=935126&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/components/store/Makefile.am (original)
+++ tuscany/sca-cpp/trunk/components/store/Makefile.am Sat Apr 17 04:57:23 2010
@@ -15,6 +15,6 @@
# specific language governing permissions and limitations
# under the License.
-if WANT_STORE
+if WANT_NOSQLDB
endif
Modified: tuscany/sca-cpp/trunk/components/webservice/Makefile.am
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/components/webservice/Makefile.am?rev=935126&r1=935125&r2=935126&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/components/webservice/Makefile.am (original)
+++ tuscany/sca-cpp/trunk/components/webservice/Makefile.am Sat Apr 17 04:57:23 2010
@@ -27,25 +27,25 @@ axis2c.prefix: $(top_builddir)/config.st
comp_LTLIBRARIES = libwebservice-client.la libwebservice-listener.la libaxis2-dispatcher.la libaxis2-service.la
libwebservice_client_la_SOURCES = webservice-client.cpp
-libwebservice_client_la_LDFLAGS = -lxml2 -L${AXIS2C_LIB} -R${AXIS2C_LIB} -laxis2_engine
+libwebservice_client_la_LDFLAGS = -lxml2 -L${AXIS2C_LIB} -R${AXIS2C_LIB} -laxis2_engine -laxis2_axiom -laxutil
libwebservice_listener_la_SOURCES = webservice-listener.cpp
-libwebservice_listener_la_LDFLAGS = -lxml2 -L${AXIS2C_LIB} -R${AXIS2C_LIB} -laxis2_engine
+libwebservice_listener_la_LDFLAGS = -lxml2 -L${AXIS2C_LIB} -R${AXIS2C_LIB} -laxis2_engine -laxis2_axiom -laxutil
libaxis2_dispatcher_la_SOURCES = axis2-dispatcher.cpp
-libaxis2_dispatcher_la_LDFLAGS = -lxml2 -L${AXIS2C_LIB} -R${AXIS2C_LIB} -laxis2_engine
+libaxis2_dispatcher_la_LDFLAGS = -lxml2 -L${AXIS2C_LIB} -R${AXIS2C_LIB} -laxis2_engine -laxis2_axiom -laxutil
libaxis2_service_la_SOURCES = axis2-service.cpp
-libaxis2_service_la_LDFLAGS = -lxml2 -L${AXIS2C_LIB} -R${AXIS2C_LIB} -laxis2_engine
+libaxis2_service_la_LDFLAGS = -lxml2 -L${AXIS2C_LIB} -R${AXIS2C_LIB} -laxis2_engine -laxis2_axiom -laxutil
axiom_test_SOURCES = axiom-test.cpp
-axiom_test_LDFLAGS = -lxml2 -L${AXIS2C_LIB} -R${AXIS2C_LIB} -laxis2_engine
+axiom_test_LDFLAGS = -lxml2 -L${AXIS2C_LIB} -R${AXIS2C_LIB} -laxis2_engine -laxis2_axiom -laxutil
axis2_test_SOURCES = axis2-test.cpp
-axis2_test_LDFLAGS = -lxml2 -L${AXIS2C_LIB} -R${AXIS2C_LIB} -laxis2_engine
+axis2_test_LDFLAGS = -lxml2 -L${AXIS2C_LIB} -R${AXIS2C_LIB} -laxis2_engine -laxis2_axiom -laxutil
client_test_SOURCES = client-test.cpp
-client_test_LDFLAGS = -lxml2 -lcurl -lmozjs -L${AXIS2C_LIB} -R${AXIS2C_LIB} -laxis2_engine
+client_test_LDFLAGS = -lxml2 -lcurl -lmozjs -L${AXIS2C_LIB} -R${AXIS2C_LIB} -laxis2_engine -laxis2_axiom -laxutil
noinst_PROGRAMS = axiom-test axis2-test client-test
TESTS = axiom-test echo-test server-test
Modified: tuscany/sca-cpp/trunk/configure.ac
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/configure.ac?rev=935126&r1=935125&r2=935126&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/configure.ac (original)
+++ tuscany/sca-cpp/trunk/configure.ac Sat Apr 17 04:57:23 2010
@@ -25,6 +25,13 @@ AM_CONFIG_HEADER(config.h)
AM_INIT_AUTOMAKE([tar-ustar])
AC_PREFIX_DEFAULT(/usr/local/tuscany/sca)
+# Use GCC 4.5 if available
+if test -x "/usr/bin/gcc-4.5"; then
+ CXX=/usr/bin/g++-4.5
+ CPP=/usr/bin/cpp-4.5
+ CC=/usr/bin/gcc-4.5
+fi
+
# Check for required programs.
AC_MSG_NOTICE([checking for programs])
AC_PROG_CXX
@@ -180,7 +187,7 @@ cxxflags="${cxxflags} ${INCLUDES} -I. -I
AC_MSG_NOTICE([checking for required libraries])
LIBS="-L${APR_LIB} ${defaultlibs}"
AC_CHECK_LIB([apr-1], [apr_pool_initialize], [AC_MSG_NOTICE([found])], [AC_MSG_ERROR([couldn't find a suitable libapr-1, use --with-apr=PATH])])
-ldflags="${ldflags} -L${APR_LIB} -R${APR_LIB} -lapr-1 -laprutil-1"
+ldflags="${ldflags} -ldl -L${APR_LIB} -R${APR_LIB} -lapr-1 -laprutil-1"
# Check for libraries only required by some modules and add their search path to LD options.
LIBS="-L${LIBCURL_LIB} ${defaultlibs}"
@@ -385,7 +392,7 @@ if test "${want_java}" = "true"; then
AC_MSG_NOTICE([checking for server Java VM])
JAVA_CHECK_LIB="-L${JAVA_PREFIX}/jre/lib/i386 -R${JAVA_PREFIX}/jre/lib/i386 -L${JAVA_PREFIX}/jre/lib/i386/server -R${JAVA_PREFIX}/jre/lib/i386/server"
LIBS="${JAVA_CHECK_LIB} ${default_LIBS}"
- AC_CHECK_LIB([java], [JNI_CreateJavaVM], [JAVA_LDFLAGS="${JAVA_CHECK_LIB} -ljava"], [], [-ljvm -lverify])
+ AC_CHECK_LIB([java], [JNI_CreateJavaVM], [JAVA_LDFLAGS="${JAVA_CHECK_LIB} -ljava -ljvm -lverify"], [], [-ljvm -lverify])
if test "${JAVA_LDFLAGS}" != ""; then
AC_DEFINE([JAVA_SERVER_VM], 1, [Server Java VM])
fi
@@ -395,7 +402,7 @@ if test "${want_java}" = "true"; then
AC_MSG_NOTICE([checking for J9 Java VM])
JAVA_CHECK_LIB="-L${JAVA_PREFIX}/jre/lib/i386 -R${JAVA_PREFIX}/jre/lib/i386 -L${JAVA_PREFIX}/jre/lib/i386/j9vm -R${JAVA_PREFIX}/jre/lib/i386/j9vm"
LIBS="${JAVA_CHECK_LIB} ${default_LIBS}"
- AC_CHECK_LIB([java], [JNI_CreateJavaVM], [JAVA_LDFLAGS="${JAVA_CHECK_LIB} -ljava"], [], [-ljvm -ljsig])
+ AC_CHECK_LIB([java], [JNI_CreateJavaVM], [JAVA_LDFLAGS="${JAVA_CHECK_LIB} -ljava -ljvm -ljsig"], [], [-ljvm -ljsig])
if test "${JAVA_LDFLAGS}" != ""; then
AC_DEFINE([JAVA_J9_VM], 1, [J9 Java VM])
fi
@@ -407,7 +414,7 @@ if test "${want_java}" = "true"; then
AC_MSG_NOTICE([checking for Apache Harmony Java VM])
JAVA_CHECK_LIB="-L${JAVA_PREFIX}/jre/bin -R${JAVA_PREFIX}/jre/bin -L${JAVA_PREFIX}/jre/bin/default -R${JAVA_PREFIX}/jre/bin/default"
LIBS="${JAVA_CHECK_LIB} ${default_LIBS}"
- AC_CHECK_LIB([harmonyvm], [JNI_CreateJavaVM], [JAVA_LDFLAGS="${JAVA_CHECK_LIB} -lharmonyvm"], [], [-lhythr -licuuc -lch ${JAVA_PREFIX}/jre/bin/default/libicudata.so.34])
+ AC_CHECK_LIB([harmonyvm], [JNI_CreateJavaVM], [JAVA_LDFLAGS="${JAVA_CHECK_LIB} -lharmonyvm -lhythr -licuuc -lch ${JAVA_PREFIX}/jre/bin/default/libicudata.so.34"], [], [-lhythr -licuuc -lch ${JAVA_PREFIX}/jre/bin/default/libicudata.so.34])
if test "${JAVA_LDFLAGS}" != ""; then
AC_DEFINE([JAVA_HARMONY_VM], 1, [Apache Harmony Java VM])
fi
@@ -432,7 +439,7 @@ if test "${want_java}" = "true"; then
AC_DEFINE([WANT_JAVA], 1, [enable Java support])
else
AM_CONDITIONAL([WANT_JAVA], false)
- JAVA_LDFLAGS="-L${JAVA_PREFIX}/jre/lib -R${JAVA_PREFIX}/jre/lib -ljava"
+ JAVA_LDFLAGS=""
fi
AC_SUBST(JAVA_LDFLAGS)
@@ -507,24 +514,24 @@ else
AM_CONDITIONAL([WANT_WEBSERVICE], false)
fi
-# Enable Store component.
-AC_MSG_CHECKING([whether to enable the Store component])
-AC_ARG_ENABLE(store, [AS_HELP_STRING([--enable-store], [enable Store component [default=no]])],
+# Enable NoSQL database component.
+AC_MSG_CHECKING([whether to enable the NoSQL database component])
+AC_ARG_ENABLE(nosqldb, [AS_HELP_STRING([--enable-nosqldb], [enable NoSQL database component [default=no]])],
[ case "${enableval}" in
no)
AC_MSG_RESULT(no)
;;
*)
AC_MSG_RESULT(yes)
- want_store=true
+ want_nosqldb=true
;;
esac ],
[ AC_MSG_RESULT(no)])
-if test "${want_store}" = "true"; then
- AM_CONDITIONAL([WANT_STORE], true)
- AC_DEFINE([WANT_STORE], 1, [enable Store component])
+if test "${want_nosqldb}" = "true"; then
+ AM_CONDITIONAL([WANT_NOSQLDB], true)
+ AC_DEFINE([WANT_NOSQLDB], 1, [enable NoSQL database component])
else
- AM_CONDITIONAL([WANT_STORE], false)
+ AM_CONDITIONAL([WANT_NOSQLDB], false)
fi
# Configure path to PostgreSQL.
Added: tuscany/sca-cpp/trunk/ubuntu/ubuntu-gcc-4.5
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/ubuntu/ubuntu-gcc-4.5?rev=935126&view=auto
==============================================================================
--- tuscany/sca-cpp/trunk/ubuntu/ubuntu-gcc-4.5 (added)
+++ tuscany/sca-cpp/trunk/ubuntu/ubuntu-gcc-4.5 Sat Apr 17 04:57:23 2010
@@ -0,0 +1,52 @@
+# 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.
+
+# Install GCC 4.5
+
+# Display commands as they are executed
+set -x
+
+# First update the system
+sudo apt-get update
+
+# Create install directory
+sudo mkdir -p /mnt/tuscany
+sudo chown ubuntu /mnt/tuscany
+sudo chgrp ubuntu /mnt/tuscany
+cd /mnt/tuscany
+
+# Install GCC 4.5 binaries
+mkdir -p gcc-4.5
+cd gcc-4.5
+wget http://ftp.debian.org/debian/pool/main/g/gcc-4.5/cpp-4.5_4.5.0-1_i386.deb
+wget http://ftp.debian.org/debian/pool/main/g/gcc-4.5/fixincludes_4.5.0-1_i386.deb
+wget http://ftp.debian.org/debian/pool/main/g/gcc-4.5/g++-4.5_4.5.0-1_i386.deb
+wget http://ftp.debian.org/debian/pool/main/g/gcc-4.5/gcc-4.5_4.5.0-1_i386.deb
+wget http://ftp.debian.org/debian/pool/main/g/gcc-4.5/gcc-4.5-base_4.5.0-1_i386.deb
+wget http://ftp.debian.org/debian/pool/main/g/gcc-4.5/lib64gcc1_4.5.0-1_i386.deb
+wget http://ftp.debian.org/debian/pool/main/g/gcc-4.5/lib64gomp1_4.5.0-1_i386.deb
+wget http://ftp.debian.org/debian/pool/main/g/gcc-4.5/lib64mudflap0_4.5.0-1_i386.deb
+wget http://ftp.debian.org/debian/pool/main/g/gcc-4.5/lib64stdc++6_4.5.0-1_i386.deb
+wget http://ftp.debian.org/debian/pool/main/g/gcc-4.5/libgcc1_4.5.0-1_i386.deb
+wget http://ftp.debian.org/debian/pool/main/g/gcc-4.5/libgomp1_4.5.0-1_i386.deb
+wget http://ftp.debian.org/debian/pool/main/g/gcc-4.5/libmudflap0-4.5-dev_4.5.0-1_i386.deb
+wget http://ftp.debian.org/debian/pool/main/g/gcc-4.5/libmudflap0_4.5.0-1_i386.deb
+wget http://ftp.debian.org/debian/pool/main/g/gcc-4.5/libstdc++6_4.5.0-1_i386.deb
+wget http://ftp.debian.org/debian/pool/main/g/gcc-4.5/libstdc++6-4.5-dev_4.5.0-1_i386.deb
+
+sudo dpkg -i cpp-4.5_4.5.0-1_i386.deb fixincludes_4.5.0-1_i386.deb g++-4.5_4.5.0-1_i386.deb gcc-4.5_4.5.0-1_i386.deb gcc-4.5-base_4.5.0-1_i386.deb lib64gcc1_4.5.0-1_i386.deb lib64gomp1_4.5.0-1_i386.deb lib64mudflap0_4.5.0-1_i386.deb lib64stdc++6_4.5.0-1_i386.deb libgcc1_4.5.0-1_i386.deb libgomp1_4.5.0-1_i386.deb libmudflap0-4.5-dev_4.5.0-1_i386.deb libmudflap0_4.5.0-1_i386.deb libstdc++6_4.5.0-1_i386.deb libstdc++6-4.5-dev_4.5.0-1_i386.deb
+
Propchange: tuscany/sca-cpp/trunk/ubuntu/ubuntu-gcc-4.5
------------------------------------------------------------------------------
svn:executable = *