You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by as...@apache.org on 2013/07/25 22:25:15 UTC

svn commit: r1507112 - in /qpid/trunk/qpid/cpp: ./ bindings/qmf/ bindings/qmf/python/ bindings/qmf/ruby/ bindings/qmf/tests/ bindings/qmf2/ bindings/qmf2/examples/cpp/ bindings/qmf2/python/ bindings/qmf2/ruby/ bindings/qpid/ bindings/qpid/dotnet/ bindi...

Author: astitcher
Date: Thu Jul 25 20:25:14 2013
New Revision: 1507112

URL: http://svn.apache.org/r1507112
Log:
QPID-4640: QPID-3633: Remove autotools build from qpid C++ source tree

Removed:
    qpid/trunk/qpid/cpp/INSTALL-AUTOTOOLS
    qpid/trunk/qpid/cpp/Makefile.am
    qpid/trunk/qpid/cpp/bindings/qmf/Makefile.am
    qpid/trunk/qpid/cpp/bindings/qmf/python/Makefile.am
    qpid/trunk/qpid/cpp/bindings/qmf/ruby/Makefile.am
    qpid/trunk/qpid/cpp/bindings/qmf/tests/Makefile.am
    qpid/trunk/qpid/cpp/bindings/qmf2/Makefile.am
    qpid/trunk/qpid/cpp/bindings/qmf2/examples/cpp/Makefile.am
    qpid/trunk/qpid/cpp/bindings/qmf2/python/Makefile.am
    qpid/trunk/qpid/cpp/bindings/qmf2/ruby/Makefile.am
    qpid/trunk/qpid/cpp/bindings/qpid/Makefile.am
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/Makefile.am
    qpid/trunk/qpid/cpp/bindings/qpid/python/Makefile.am
    qpid/trunk/qpid/cpp/bindings/qpid/ruby/Makefile.am
    qpid/trunk/qpid/cpp/bootstrap
    qpid/trunk/qpid/cpp/build-aux/.gitignore
    qpid/trunk/qpid/cpp/build-aux/compile
    qpid/trunk/qpid/cpp/build-aux/config.guess
    qpid/trunk/qpid/cpp/build-aux/config.rpath
    qpid/trunk/qpid/cpp/build-aux/config.sub
    qpid/trunk/qpid/cpp/build-aux/depcomp
    qpid/trunk/qpid/cpp/build-aux/install-sh
    qpid/trunk/qpid/cpp/build-aux/mdate-sh
    qpid/trunk/qpid/cpp/build-aux/missing
    qpid/trunk/qpid/cpp/configure.ac
    qpid/trunk/qpid/cpp/docs/api/Makefile.am
    qpid/trunk/qpid/cpp/docs/man/Makefile.am
    qpid/trunk/qpid/cpp/etc/Makefile.am
    qpid/trunk/qpid/cpp/etc/selinux/Makefile
    qpid/trunk/qpid/cpp/examples/Makefile.am
    qpid/trunk/qpid/cpp/examples/makedist.mk
    qpid/trunk/qpid/cpp/examples/messaging/Makefile.am
    qpid/trunk/qpid/cpp/examples/old_api/Makefile.am
    qpid/trunk/qpid/cpp/examples/old_api/direct/Makefile.am
    qpid/trunk/qpid/cpp/examples/old_api/failover/Makefile.am
    qpid/trunk/qpid/cpp/examples/old_api/fanout/Makefile.am
    qpid/trunk/qpid/cpp/examples/old_api/pub-sub/Makefile.am
    qpid/trunk/qpid/cpp/examples/old_api/request-response/Makefile.am
    qpid/trunk/qpid/cpp/examples/old_api/tradedemo/Makefile.am
    qpid/trunk/qpid/cpp/examples/old_api/xml-exchange/Makefile.am
    qpid/trunk/qpid/cpp/examples/qmf-agent/Makefile
    qpid/trunk/qpid/cpp/examples/qmf-console/Makefile.am
    qpid/trunk/qpid/cpp/m4/ac_pkg_swig.m4
    qpid/trunk/qpid/cpp/m4/clock_time.m4
    qpid/trunk/qpid/cpp/m4/compiler-flags.m4
    qpid/trunk/qpid/cpp/m4/cppunit.m4
    qpid/trunk/qpid/cpp/m4/extensions.m4
    qpid/trunk/qpid/cpp/m4/python.m4
    qpid/trunk/qpid/cpp/make-dist
    qpid/trunk/qpid/cpp/managementgen/Makefile.am
    qpid/trunk/qpid/cpp/managementgen/qmfgen/templates/Makefile.mk
    qpid/trunk/qpid/cpp/packaging/NSIS/Makefile.am
    qpid/trunk/qpid/cpp/qpid-autotools-install
    qpid/trunk/qpid/cpp/src/Makefile.am
    qpid/trunk/qpid/cpp/src/ha.mk
    qpid/trunk/qpid/cpp/src/legacystore.mk
    qpid/trunk/qpid/cpp/src/qmf.mk
    qpid/trunk/qpid/cpp/src/qmfc.mk
    qpid/trunk/qpid/cpp/src/ssl.mk
    qpid/trunk/qpid/cpp/src/tests/Makefile.am
    qpid/trunk/qpid/cpp/src/tests/brokermgmt.mk
    qpid/trunk/qpid/cpp/src/tests/run-unit-tests
    qpid/trunk/qpid/cpp/src/tests/sasl.mk
    qpid/trunk/qpid/cpp/src/tests/ssl.mk
    qpid/trunk/qpid/cpp/src/tests/testagent.mk
    qpid/trunk/qpid/cpp/src/xml.mk
Modified:
    qpid/trunk/qpid/cpp/SSL
    qpid/trunk/qpid/cpp/src/prof
    qpid/trunk/qpid/cpp/src/tests/Shlib.cpp
    qpid/trunk/qpid/cpp/src/tests/run_cli_tests
    qpid/trunk/qpid/cpp/src/tests/run_federation_tests

Modified: qpid/trunk/qpid/cpp/SSL
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/SSL?rev=1507112&r1=1507111&r2=1507112&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/SSL (original)
+++ qpid/trunk/qpid/cpp/SSL Thu Jul 25 20:25:14 2013
@@ -7,15 +7,11 @@ on Windows.
 Linux
 =====
 
-SSL support for Qpid-C++, based on Mozilla's Network Security Services
-library, is provided as two loadable modules: one for the client
-(sslconnector.so), one for the broker (ssl.so). Either these libraries
-should be present in the relevant module directory or the
-'load-module' option (or QPID_LOAD_MODULE environment variable) is
-used to ensure they are loaded.
+SSL support for Qpid-C++ is based on Mozilla's Network Security Services
+library. SSL support will be built automatically providing this library
+and include files are found at build time.
 
-Broker side SSL Settings (note you can get these by qpidd --help
-providing the ssl.so module is loaded):
+Broker side SSL Settings (note you can get these by qpidd --help)
 
 SSL Settings:
   --ssl-use-export-policy              Use NSS export policy
@@ -57,14 +53,13 @@ for accessing the created db.
 
 The daemon can then be started with something like the following:
 
-./src/qpidd --auth no --load-module src/.libs/ssl.so \
+./src/qpidd --auth no \
             --ssl-cert-db ./test_cert_db \
             --ssl-cert-password-file ./cert.password \
             --ssl-cert-name myhost.mydomain
 
 then for client set:
 
-QPID_LOAD_MODULE=./src/.libs/sslconnector.so
 QPID_SSL_CERT_DB=./test_cert_db
 
 and run e.g.

Modified: qpid/trunk/qpid/cpp/src/prof
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/prof?rev=1507112&r1=1507111&r2=1507112&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/prof (original)
+++ qpid/trunk/qpid/cpp/src/prof Thu Jul 25 20:25:14 2013
@@ -32,8 +32,8 @@ opcontrol --start
 opcontrol --stop
 opcontrol --dump
 opcontrol --shutdown
-opreport -l ./.libs/lt-qpidd > stats.txt
-opannotate --source --output-dir=qpidd-prof ./.libs/lt-qpidd
+opreport -l ./qpidd > stats.txt
+opannotate --source --output-dir=qpidd-prof ./qpidd
 
 # clear the relusts
 #opcontrol --reset

Modified: qpid/trunk/qpid/cpp/src/tests/Shlib.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/Shlib.cpp?rev=1507112&r1=1507111&r2=1507112&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/Shlib.cpp (original)
+++ qpid/trunk/qpid/cpp/src/tests/Shlib.cpp Thu Jul 25 20:25:14 2013
@@ -35,13 +35,7 @@ typedef void (*CallMe)(int*);
 
 
 QPID_AUTO_TEST_CASE(testShlib) {
-    // The CMake-based build passes in the shared lib suffix; if it's not
-    // there, this is a Linux/UNIX libtool-based build.
-#if defined (QPID_SHLIB_PREFIX) && defined (QPID_SHLIB_SUFFIX)
     Shlib sh("./" QPID_SHLIB_PREFIX "shlibtest" QPID_SHLIB_POSTFIX QPID_SHLIB_SUFFIX);
-#else
-    Shlib sh(".libs/libshlibtest.so");
-#endif
     // Double cast to avoid ISO warning.
     CallMe callMe=sh.getSymbol<CallMe>("callMe");
     BOOST_REQUIRE(callMe != 0);
@@ -59,11 +53,7 @@ QPID_AUTO_TEST_CASE(testShlib) {
 QPID_AUTO_TEST_CASE(testAutoShlib) {
     int unloaded = 0;
     {
-#if defined (QPID_SHLIB_PREFIX) && defined (QPID_SHLIB_SUFFIX)
         AutoShlib sh("./" QPID_SHLIB_PREFIX "shlibtest" QPID_SHLIB_POSTFIX QPID_SHLIB_SUFFIX);
-#else
-        AutoShlib sh(".libs/libshlibtest.so");
-#endif
         CallMe callMe=sh.getSymbol<CallMe>("callMe");
         BOOST_REQUIRE(callMe != 0);
         callMe(&unloaded);

Modified: qpid/trunk/qpid/cpp/src/tests/run_cli_tests
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/run_cli_tests?rev=1507112&r1=1507111&r2=1507112&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/run_cli_tests (original)
+++ qpid/trunk/qpid/cpp/src/tests/run_cli_tests Thu Jul 25 20:25:14 2013
@@ -44,8 +44,8 @@ start_brokers() {
     # look like they're xml related.
     # if we start supporting xml on windows, it will need something similar 
     # here
-    if [ -f ../.libs/xml.so ] ; then
-	xargs="--load-module ../.libs/xml.so"
+    if [ -f ../xml.so ] ; then
+	xargs="--load-module ../xml.so"
 	if [ ! -f test.xquery ] ; then 
 	    create_test_xquery
 	fi

Modified: qpid/trunk/qpid/cpp/src/tests/run_federation_tests
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/run_federation_tests?rev=1507112&r1=1507111&r2=1507112&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/run_federation_tests (original)
+++ qpid/trunk/qpid/cpp/src/tests/run_federation_tests Thu Jul 25 20:25:14 2013
@@ -25,7 +25,7 @@ source ./test_env.sh
 #set -x
 trap stop_brokers INT TERM QUIT
 
-if [ -f ../.libs/xml.so ] ; then
+if [ -f ../xml.so ] ; then
     MODULES="--load-module xml" # Load the XML exchange and run XML exchange federation tests
     SKIPTESTS=
 else



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org