Hello,
the attached patch is a first attempt to fix the autotools-based build system
for axis/trunk/c.
It does not yet aim at perfection, but rather allowing for a compilation of
the core parts which already had a Makefile.am. More patches for inclusion of
the other samples and test cases might follow.
In particular, the patch
* includes some missing files
* removes some $AXISCPP_HOME occurrences, using $(top_src-/builddir) instead
* brings configure.ac up to current autoconf standards, like using
AC_HELP_STRING
The ssl_client testcase didn't compile. I don't have enough insight into the
XSD type usage in Axis yet to really fix this, so someone might look at it.
Josef
--
Tous ces gens qui confondent informatique et bureautique, carte et territoire,
interface et programme, boutons colorés et facilité...
- S. Blondeel
Index: src/soap/Makefile.am
===================================================================
--- src/soap/Makefile.am (revisão 380140)
+++ src/soap/Makefile.am (cópia de trabalho)
@@ -16,11 +16,13 @@
SoapSerializer.cpp \
URIMapping.cpp \
SoapKeywordMapping.cpp \
- apr_base64.c \
+ ContentIdSet.cpp \
+ apr_base64.cpp \
HexCoder.cpp \
AxisSoapException.cpp \
SoapAttachment.cpp \
SoapAttachmentHeaders.cpp \
+ SoapAttachmentReference.cpp \
SoapFaultException.cpp \
OtherFaultException.cpp \
xsd/Int.cpp \
Index: src/server/simple_axis_server/Makefile.am
===================================================================
--- src/server/simple_axis_server/Makefile.am (revisão 380140)
+++ src/server/simple_axis_server/Makefile.am (cópia de trabalho)
@@ -3,5 +3,5 @@
AM_CPPFLAGS = $(CPPFLAGS)
simple_axis_server_SOURCES = SimpleAxisTransport.cpp SimpleAxisServer.cpp
-simple_axis_server_LDADD = $(LDFLAGS) -L$(AXISCPP_HOME)/src/engine/server ../../common/libcommon.la -lserver_engine -ldl -lpthread
+simple_axis_server_LDADD = $(LDFLAGS) -L$(AXISCPP_HOME)/src/engine/server ../../common/libcommon.la ../../engine/server/libserver_engine.la -ldl -lpthread
INCLUDES = -I../../../include
Index: src/common/Makefile.am
===================================================================
--- src/common/Makefile.am (revisão 380140)
+++ src/common/Makefile.am (cópia de trabalho)
@@ -1,20 +1,23 @@
noinst_LTLIBRARIES = libcommon.la
AM_CPPFLAGS = $(CPPFLAGS)
-libcommon_la_SOURCES = Param.cpp \
- TypeMapping.cpp \
- MessageData.cpp \
- BasicTypeSerializer.cpp \
- ArrayBean.cpp AxisTime.cpp \
- GDefine.cpp \
- AxisUtils.cpp \
- AxisTrace.cpp \
- AxisGenException.cpp \
- AxisConfig.cpp \
- AdminUtils.cpp \
- AxisConfigException.cpp \
- AxisMessage.cpp \
- AxisUserAPI.cpp \
- SoapEnvVersions.cpp
+libcommon_la_SOURCES = \
+ AdminUtils.cpp \
+ ArrayBean.cpp \
+ AxisConfig.cpp \
+ AxisConfigException.cpp \
+ AxisCPPConfigDefaults.cpp \
+ AxisCPPConfigDefaultsImpl.cpp \
+ AxisGenException.cpp \
+ AxisMessage.cpp \
+ AxisTrace.cpp \
+ AxisUserAPI.cpp \
+ AxisUtils.cpp \
+ BasicTypeSerializer.cpp \
+ GDefine.cpp \
+ MessageData.cpp \
+ Param.cpp \
+ SoapEnvVersions.cpp \
+ TypeMapping.cpp
libcommon_la_LIBADD = $(LDFLAGS)
INCLUDES = -I../../include
Index: configure.ac
===================================================================
--- configure.ac (revisão 380140)
+++ configure.ac (cópia de trabalho)
@@ -1,10 +1,12 @@
-AC_INIT(axis-c-src, 1-3-beta-linux, BUG-REPORT-ADDRESS)
-AM_INIT_AUTOMAKE(0.3)
-AM_CONFIG_HEADER(config.h)
-PACKAGE=axis-c-src
+dnl Autoconf build system for Axis-C++
+
+AC_INIT([Axis C++], [1-6-pre-linux], [EMAIL PROTECTED], [axis-c-src])
+AC_CONFIG_HEADERS([config.h])
+AM_INIT_AUTOMAKE
+
AC_MSG_CHECKING(whether to use apache2 as server transport)
AC_ARG_WITH(apache2,
-[ --with-apache2[=PATH] use apache2 as server transport.],
+ AC_HELP_STRING([--with-apache2@<:@=PATH@:>@], [use apache2 as server transport.]),
[ case "$withval" in
no)
AC_MSG_RESULT(no)
@@ -29,7 +31,7 @@
AC_MSG_CHECKING(whether to user apache as server transport.)
AC_ARG_WITH(apache,
-[ --with-apache[=PATH] use apache as server transport.],
+ AC_HELP_STRING([--with-apache@<:@=PATH@:>@], [use apache as server transport.]),
[ case "$withval" in
no)
AC_MSG_RESULT(no)
@@ -55,7 +57,7 @@
AC_MSG_CHECKING(whether to build xercesc parser library.)
AC_ARG_WITH(xercesc,
-[ --with-xercesc[=PATH] build xercesc parser library.],
+ AC_HELP_STRING([--with-xercesc@<:@=PATH@:>@], [build xercesc parser library.]),
[ case "$withval" in
no)
AC_MSG_RESULT(no)
@@ -78,7 +80,8 @@
)
AC_MSG_CHECKING(whether to build tspp xml parser library)
-AC_ARG_ENABLE(tspp, [ --enable-tspp build tspp xml parser library. default=no],
+AC_ARG_ENABLE(tspp,
+ AC_HELP_STRING([--enable-tspp], [build tspp xml parser library. default=no]),
[ case "${enableval}" in
no)
AC_MSG_RESULT(no)
@@ -95,7 +98,8 @@
)
AC_MSG_CHECKING(whether to build axis2 client transport library)
-AC_ARG_ENABLE(axis2, [ --enable-axis2 build axis2 client transport library. default=no],
+AC_ARG_ENABLE(axis2,
+ AC_HELP_STRING([--enable-axis2], [build axis2 client transport library. default=no]),
[ case "${enableval}" in
no)
AC_MSG_RESULT(no)
@@ -112,7 +116,8 @@
)
AC_MSG_CHECKING(whether to build test cases)
-AC_ARG_ENABLE(testcases, [ --enable-testcases build test cases. default=no],
+AC_ARG_ENABLE(testcases,
+ AC_HELP_STRING([--enable-testcases], [build test cases. default=no]),
[ case "${enableval}" in
no)
AC_MSG_RESULT(no)
@@ -130,7 +135,7 @@
AC_MSG_CHECKING(whether to build cppunit tests.)
AC_ARG_WITH(cppunit,
-[ --with-cppunit[=PATH] build cppunit tests.],
+ AC_HELP_STRING([--with-cppunit@<:@=PATH@:>@], [build cppunit tests.]),
[ case "$withval" in
no)
AC_MSG_RESULT(no)
@@ -158,7 +163,8 @@
)
AC_MSG_CHECKING(whether to build samples)
-AC_ARG_ENABLE(samples, [ --enable-samples build samples. default=yes],
+AC_ARG_ENABLE(samples,
+ AC_HELP_STRING([--enable-samples], [build samples. default=yes]),
[ case "${enableval}" in
no)
AC_MSG_RESULT(no)
@@ -175,7 +181,8 @@
)
AC_MSG_CHECKING(whether write to log)
-AC_ARG_ENABLE(log, [ --enable-log enable log facility.],
+AC_ARG_ENABLE(log,
+ AC_HELP_STRING([--enable-log], [enable log facility.]),
[ case "${enableval}" in
no)
AC_MSG_RESULT(no)
@@ -193,7 +200,7 @@
AC_MSG_CHECKING(whether to build axis2 secure transport channel library.)
AC_ARG_WITH(axis2-ssl,
-[ --with-axis2-ssl[=PATH] build transport secure channel library.],
+ AC_HELP_STRING([--with-axis2-ssl@<:@=PATH@:>@], [build transport secure channel library.]),
[ case "$withval" in
no)
AC_MSG_RESULT(no)
@@ -222,7 +229,7 @@
AC_MSG_CHECKING(whether to axis3 build secure transport channel library.)
AC_ARG_WITH(axis3-ssl,
-[ --with-axis3-ssl[=PATH] build axis3 secure transport channel library.],
+ AC_HELP_STRING([--with-axis3-ssl@<:@=PATH@:>@], [build axis3 secure transport channel library.]),
[ case "$withval" in
no)
AC_MSG_RESULT(no)
@@ -259,7 +266,7 @@
SSLLIB=$ssllib
AXIS3SSLINC=$axis3sslinc
AXIS3SSLLIB=$axis3ssllib
-LINKCLIENTLIB="-L${AXISCPP_HOME}/src/engine/client -laxiscpp_client -ldl"
+#LINKCLIENTLIB="-L${}/src/engine/client -laxiscpp_client -ldl"
AC_SUBST(APACHE2INC)
AC_SUBST(APACHEINC)
AC_SUBST(XERCESCINC)
@@ -293,16 +300,13 @@
AC_PROG_INSTALL
AC_PROG_LIBTOOL
-AC_OUTPUT(Makefile \
+AC_CONFIG_FILES([Makefile \
src/Makefile \
src/common/Makefile \
src/soap/Makefile \
src/wsdd/Makefile \
src/xml/Makefile \
src/transport/Makefile \
- src/transport/axis2/Makefile \
- src/transport/axis2/ssl/Makefile \
- src/transport/axis2/ipv6/Makefile \
src/transport/axis3/Makefile \
src/transport/axis3/HTTPChannel/Makefile \
src/transport/axis3/HTTPSSLChannel/Makefile \
@@ -318,83 +322,21 @@
src/client/adminclient/Makefile \
src/xml/xerces/Makefile \
src/xml/tspp/Makefile \
- samples/Makefile \
- samples/server/Makefile \
- samples/server/interoptests/Makefile \
- samples/server/interoptests/base/Makefile \
- samples/server/interoptests/groupB/Makefile \
- samples/server/interoptests/doclitbase/Makefile \
- samples/server/interoptests/doclitgroupB/Makefile \
- samples/server/simple/Makefile \
- samples/server/array/Makefile \
- samples/server/ref/Makefile \
- samples/server/rpcfault/Makefile \
- samples/server/doclitfault/Makefile \
- samples/server/echoStringHeaderHandler/Makefile \
- samples/client/Makefile \
- samples/client/interoptests/Makefile \
- samples/client/interoptests/base/Makefile \
- samples/client/interoptests/groupB/Makefile \
- samples/client/interoptests/doclitbase/Makefile \
- samples/client/interoptests/doclitgroupB/Makefile \
- samples/client/simple/Makefile \
- samples/client/ssl_client/Makefile \
- samples/client/array/Makefile \
- samples/client/ref/Makefile \
- samples/client/rpcfault/Makefile \
- samples/client/doclitfault/Makefile \
- samples/client/testHandler/Makefile \
- tests/Makefile \
- tests/unit_tests/Makefile \
- tests/unit_tests/cppunit/Makefile \
- tests/client/Makefile \
- tests/client/stubTest/Makefile \
- tests/client/stubTest/stubBase/Makefile \
- tests/client/interop/Makefile \
- tests/client/interop/round1/Makefile \
- tests/client/interop/round1/gen_src/Makefile \
- tests/client/threadSafe/Makefile \
- tests/client/threadSafe/gen_src/Makefile
- tests/client/fault_mapping/Makefile \
- tests/client/fault_mapping/gen_src/Makefile \
- tests/client/exceptionTest/Makefile \
- tests/client/exceptionTest/gen_src/Makefile \
- tests/client/soapHeader/Makefile \
- tests/client/soapHeader/test1/Makefile \
- tests/client/soapHeader/test1/rpc/Makefile \
- tests/client/soapHeader/test2/Makefile \
- tests/client/soapHeader/test2/rpc/Makefile \
- tests/client/soapHeader/test3/Makefile \
- tests/client/soapHeader/test3/rpc/Makefile \
- tests/client/soapHeader/test4/Makefile \
- tests/client/soapHeader/test4/rpc/Makefile \
- tests/client/soapHeader/test6/Makefile \
- tests/client/soapHeader/test6/rpc/Makefile \
- tests/client/soapHeader/test8/Makefile \
- tests/client/soapHeader/test8/rpc/Makefile \
- tests/client/soapHeader/test9/Makefile \
- tests/client/soapHeader/test9/rpc/Makefile \
- tests/client/soapHeader/test10/Makefile \
- tests/client/soapHeader/test10/rpc/Makefile \
- tests/client/xsdAnyTest1/Makefile \
- tests/client/xsdAnyTest1/gen_src/Makefile \
- tests/client/httpHeader/Makefile \
- tests/client/httpHeader/test1/Makefile \
- tests/client/httpHeader/test1/rpc/Makefile \
- tests/client/httpHeader/test2/Makefile \
- tests/client/httpHeader/test2/rpc/Makefile \
- tests/client/httpHeader/test3/Makefile \
- tests/client/httpHeader/test3/rpc/Makefile \
- tests/client/httpHeader/test4/Makefile \
- tests/client/httpHeader/test4/rpc/Makefile \
- tests/client/httpHeader/test5/Makefile \
- tests/client/httpHeader/test5/rpc/Makefile \
- tests/client/httpHeader/test7/Makefile \
- tests/client/httpHeader/test7/rpc/Makefile \
- tests/client/httpHeader/test8/Makefile \
- tests/client/httpHeader/test8/rpc/Makefile \
- tests/server/Makefile \
- tests/server/exceptionTest/Makefile \
- tests/server/exceptionTest/gen_src/Makefile \
- tests/server/xsdAnyTest1/Makefile \
- tests/server/xsdAnyTest1/gen_src/Makefile)
+ samples/Makefile
+ samples/server/Makefile
+ samples/server/mime/Makefile
+ samples/server/echoStringHeaderHandler/Makefile
+ samples/client/Makefile
+ samples/client/ssl_client/Makefile
+ samples/client/testHandler/Makefile
+])
+
+AC_OUTPUT
+
+echo "Axis C++ is now configured. Type 'make' to compile."
+echo "*****"
+echo "***** WARNING:"
+echo "***** The autotools build system is currently not offering a complete"
+echo "***** build of Axis. Please use the ant-based system if in doubt."
+echo "*****"
+
Index: samples/server/mime/Makefile.am
===================================================================
--- samples/server/mime/Makefile.am (revisão 380140)
+++ samples/server/mime/Makefile.am (cópia de trabalho)
@@ -1,8 +1,7 @@
lib_LTLIBRARIES = libmime.la
-SUBDIRS =
libmime_la_SOURCES = AxisServiceException.cpp pt1.cpp pt1Service.cpp pt1Wrapper.cpp
libmime_la_LIBADD = $(LDFLAGS)
-INCLUDES = -I$(AXISCPP_HOME)/include
+INCLUDES = -I$(top_srcdir)/include
Index: samples/server/Makefile.am
===================================================================
--- samples/server/Makefile.am (revisão 380140)
+++ samples/server/Makefile.am (cópia de trabalho)
@@ -1 +1 @@
-SUBDIRS = interoptests simple rpcfault doclitfault array ref
+SUBDIRS = mime echoStringHeaderHandler
Index: samples/server/echoStringHeaderHandler/Makefile.am
===================================================================
--- samples/server/echoStringHeaderHandler/Makefile.am (revisão 380140)
+++ samples/server/echoStringHeaderHandler/Makefile.am (cópia de trabalho)
@@ -3,4 +3,4 @@
libeshhandler_la_SOURCES = ESHHandler.cpp EchoStringHeaderHandler.cpp
libeshhandler_la_LIBADD = $(LDFLAGS)
-INCLUDES = -I$(AXISCPP_HOME)/include
+INCLUDES = -I$(top_srcdir)/include
Index: samples/Makefile.am
===================================================================
--- samples/Makefile.am (revisão 0)
+++ samples/Makefile.am (revisão 0)
@@ -0,0 +1,2 @@
+SUBDIRS = client server
+
Index: samples/client/ssl_client/Makefile.am
===================================================================
--- samples/client/ssl_client/Makefile.am (revisão 380140)
+++ samples/client/ssl_client/Makefile.am (cópia de trabalho)
@@ -1,5 +1,5 @@
bin_PROGRAMS = sslclient
AM_CPPFLAGS = $(CPPFLAGS)
sslclient_SOURCES = Calculator.cpp CalcClient.cpp
-sslclient_LDADD = @LINKCLIENTLIB@
-INCLUDES = -I$(AXISCPP_HOME)/include
+sslclient_LDADD = $(top_builddir)/src/engine/client/libaxiscpp_client.la -ldl
+INCLUDES = -I$(top_srcdir)/include
Index: samples/client/ssl_client/Calculator.cpp
===================================================================
--- samples/client/ssl_client/Calculator.cpp (revisão 380140)
+++ samples/client/ssl_client/Calculator.cpp (cópia de trabalho)
@@ -55,7 +55,7 @@
{
if(AXIS_SUCCESS == m_pCall->checkMessage("addResponse", "http://localhost/axis/Calculator";))
{
- Ret = m_pCall->getElementAsInt("addReturn", 0);
+ /*Ret =*/ m_pCall->getElementAsInt("addReturn", 0);
printf("Ret:%d\n", Ret);
}
}
@@ -80,7 +80,7 @@
{
if(AXIS_SUCCESS == m_pCall->checkMessage("subResponse", "http://localhost/axis/Calculator";))
{
- Ret = m_pCall->getElementAsInt("subReturn", 0);
+ /*Ret =*/ m_pCall->getElementAsInt("subReturn", 0);
printf("Ret:%d\n", Ret);
}
}
@@ -105,7 +105,7 @@
{
if(AXIS_SUCCESS == m_pCall->checkMessage("mulResponse", "http://localhost/axis/Calculator";))
{
- Ret = m_pCall->getElementAsInt("addReturn", 0);
+ /*Ret =*/ m_pCall->getElementAsInt("addReturn", 0);
printf("Ret:%d\n", Ret);
}
}
@@ -130,7 +130,7 @@
{
if(AXIS_SUCCESS == m_pCall->checkMessage("divResponse", "http://localhost/axis/Calculator";))
{
- Ret = m_pCall->getElementAsInt("addReturn", 0);
+ /*Ret =*/ m_pCall->getElementAsInt("addReturn", 0);
printf("Ret:%d\n", Ret);
}
}
@@ -140,7 +140,7 @@
int Calculator::getFaultDetail(char** ppcDetail)
{
- m_pCall->getFaultDetail(ppcDetail);
+ //m_pCall->getFaultDetail(ppcDetail);
return 0;
}
Index: samples/client/Makefile.am
===================================================================
--- samples/client/Makefile.am (revisão 0)
+++ samples/client/Makefile.am (revisão 0)
@@ -0,0 +1 @@
+SUBDIRS = ssl_client testHandler
Index: samples/client/testHandler/Makefile.am
===================================================================
--- samples/client/testHandler/Makefile.am (revisão 380140)
+++ samples/client/testHandler/Makefile.am (cópia de trabalho)
@@ -1,6 +1,5 @@
lib_LTLIBRARIES = libtest_client_handler.la
-SUBDIRS =
libtest_client_handler_la_SOURCES = THandler.cpp TestHandler.cpp
-libtest_client_handler_la_LIBADD = @LINKCLIENTLIB@
+libtest_client_handler_la_LIBADD = $(top_builddir)/src/engine/client/libaxiscpp_client.la -ldl
-INCLUDES = -I$(AXISCPP_HOME)/include
+INCLUDES = -I$(top_srcdir)/include
Index: Makefile.am
===================================================================
--- Makefile.am (revisão 380140)
+++ Makefile.am (cópia de trabalho)
@@ -1,3 +1,11 @@
SUBDIRS = src @SAMPLESBUILD@ @TESTCASESBUILD@
-bin_SCRIPTS=deploy/bin/deploy_apache2.sh deploy/bin/deploy_apache.sh samples/client/run_interoptests.sh
-sysconf_DATA=deploy/etc/server.wsdd_linux deploy/etc/client.wsdd_linux deploy/etc/axiscpp.conf_linux
+
+bin_SCRIPTS = \
+ deploy/bin/deploy_apache2.sh \
+ deploy/bin/deploy_ssl_apache2.sh \
+ deploy/bin/deploy_apache.sh
+
+sysconf_DATA = \
+ deploy/etc/server.wsdd_linux \
+ deploy/etc/client.wsdd_linux \
+ deploy/etc/axiscpp.conf_linux
