You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by da...@apache.org on 2005/12/08 04:35:25 UTC
svn commit: r354957 - in /webservices/axis2/trunk/c: ./ modules/xml/parser/
modules/xml/parser/guththila/src/ modules/xml/parser/libxml2/src/
test/unit/ test/unit/core/context/ test/unit/core/description/
test/unit/core/engine/ test/unit/core/phasereso...
Author: damitha
Date: Wed Dec 7 19:34:57 2005
New Revision: 354957
URL: http://svn.apache.org/viewcvs?rev=354957&view=rev
Log:
Changes to selecting the parser from tests more flexible
Modified:
webservices/axis2/trunk/c/build.sh
webservices/axis2/trunk/c/configure.ac
webservices/axis2/trunk/c/modules/xml/parser/Makefile.am
webservices/axis2/trunk/c/modules/xml/parser/guththila/src/Makefile.am
webservices/axis2/trunk/c/modules/xml/parser/libxml2/src/Makefile.am
webservices/axis2/trunk/c/test/unit/Makefile.am
webservices/axis2/trunk/c/test/unit/core/context/Makefile.am
webservices/axis2/trunk/c/test/unit/core/description/Makefile.am
webservices/axis2/trunk/c/test/unit/core/engine/Makefile.am
webservices/axis2/trunk/c/test/unit/core/phaseresolver/Makefile.am
webservices/axis2/trunk/c/test/unit/xml/om/Makefile.am
webservices/axis2/trunk/c/test/xml/om/Makefile.am
Modified: webservices/axis2/trunk/c/build.sh
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/build.sh?rev=354957&r1=354956&r2=354957&view=diff
==============================================================================
--- webservices/axis2/trunk/c/build.sh (original)
+++ webservices/axis2/trunk/c/build.sh Wed Dec 7 19:34:57 2005
@@ -1,6 +1,6 @@
#!/bin/bash
./autogen.sh
AXIS2C_HOME=`pwd`
-./configure --prefix=${AXIS2C_HOME}/install --with-pull-parser=libxml2
+./configure --prefix=${AXIS2C_HOME}/install
make
make install
Modified: webservices/axis2/trunk/c/configure.ac
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/configure.ac?rev=354957&r1=354956&r2=354957&view=diff
==============================================================================
--- webservices/axis2/trunk/c/configure.ac (original)
+++ webservices/axis2/trunk/c/configure.ac Wed Dec 7 19:34:57 2005
@@ -43,15 +43,18 @@
no)
AC_MSG_RESULT(no)
GUTHTHILA=""
+ GUTHTHILA_LIBNAME=""
;;
*)
AC_MSG_RESULT(yes)
GUTHTHILA="guththila"
+ GUTHTHILA_LIBNAME="-lguththila"
;;
esac ],
AC_MSG_RESULT(no)
GUTHTHILA=""
+ GUTHTHILA_LIBNAME=""
)
AC_MSG_CHECKING(whether to build libxml2 xml parser library)
@@ -60,19 +63,24 @@
no)
AC_MSG_RESULT(no)
LIBXML2=""
+ LIBXML2_LIBNAME=""
;;
*)
AC_MSG_RESULT(yes)
LIBXML2="libxml2"
+ LIBXML2_LIBNAME="-lxml2"
;;
esac ],
AC_MSG_RESULT(yes)
LIBXML2="libxml2"
+ LIBXML2_LIBNAME="-lxml2"
)
AC_SUBST(LIBXML2)
AC_SUBST(GUTHTHILA)
+AC_SUBST(LIBXML2_LIBNAME)
+AC_SUBST(GUTHTHILA_LIBNAME)
AC_CONFIG_FILES([Makefile \
modules/Makefile \
Modified: webservices/axis2/trunk/c/modules/xml/parser/Makefile.am
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/parser/Makefile.am?rev=354957&r1=354956&r2=354957&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/parser/Makefile.am (original)
+++ webservices/axis2/trunk/c/modules/xml/parser/Makefile.am Wed Dec 7 19:34:57 2005
@@ -1 +1 @@
-SUBDIRS = $(PULL_PARSER)
+SUBDIRS = $(LIBXML2) $(GUTHTHILA)
Modified: webservices/axis2/trunk/c/modules/xml/parser/guththila/src/Makefile.am
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/parser/guththila/src/Makefile.am?rev=354957&r1=354956&r2=354957&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/parser/guththila/src/Makefile.am (original)
+++ webservices/axis2/trunk/c/modules/xml/parser/guththila/src/Makefile.am Wed Dec 7 19:34:57 2005
@@ -4,7 +4,9 @@
guththila_xml_reader_wrapper.c
libaxis2_guththila_la_LIBADD = $(LDFLAGS)
-INCLUDES = -I$(top_builddir)/include -I${CUTEST_HOME}/include \
+
+INCLUDES = -I$(top_builddir)/include \
-I$(top_builddir)/modules/util/src \
-I$(top_builddir)/modules/xml/parser \
- -I$(top_builddir)/modules/xml/parser/guththila/impl/src
+ -I${GUTHTHILA_INCLUDE}
+
Modified: webservices/axis2/trunk/c/modules/xml/parser/libxml2/src/Makefile.am
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/parser/libxml2/src/Makefile.am?rev=354957&r1=354956&r2=354957&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/parser/libxml2/src/Makefile.am (original)
+++ webservices/axis2/trunk/c/modules/xml/parser/libxml2/src/Makefile.am Wed Dec 7 19:34:57 2005
@@ -3,8 +3,9 @@
libaxis2_libxml2_la_SOURCES = axis2_libxml2_reader_wrapper.c \
axis2_libxml2_writer_wrapper.c
-libaxis2_libxml2_la_LIBADD = -L${LIBXML2_LIB} -lxml2 $(LDFLAGS)
-INCLUDES = -I$(top_builddir)/include -I${CUTEST_HOME}/include \
+libaxis2_libxml2_la_LIBADD = $(LDFLAGS)
+
+INCLUDES = -I$(top_builddir)/include \
-I$(top_builddir)/modules/util/src \
-I$(top_builddir)/modules/xml/parser \
-I${LIBXML2_INCLUDE}
Modified: webservices/axis2/trunk/c/test/unit/Makefile.am
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/test/unit/Makefile.am?rev=354957&r1=354956&r2=354957&view=diff
==============================================================================
--- webservices/axis2/trunk/c/test/unit/Makefile.am (original)
+++ webservices/axis2/trunk/c/test/unit/Makefile.am Wed Dec 7 19:34:57 2005
@@ -14,15 +14,16 @@
-L$(top_builddir)/test/unit/util/.libs -ltest_util \
-L$(top_builddir)/test/unit/xml/om/.libs -ltest_om \
-L$(top_builddir)/install/lib \
- -laxis2_guththila \
- -lguththila \
-laxis2_util \
-laxis2_om \
-laxis2_description \
-laxis2_engine \
-laxis2_context \
-laxis2_phaseresolver \
- -laxis2_wsdl
+ -laxis2_wsdl \
+ -laxis2_parser \
+ -L$(GUTHTHILA_LIB) $(GUTHTHILA_LIBNAME) \
+ -L$(LIBXML2_LIB) $(LIBXML2_LIBNAME)
INCLUDES = -I${CUTEST_HOME}/include -I$(top_builddir)/include \
Modified: webservices/axis2/trunk/c/test/unit/core/context/Makefile.am
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/test/unit/core/context/Makefile.am?rev=354957&r1=354956&r2=354957&view=diff
==============================================================================
--- webservices/axis2/trunk/c/test/unit/core/context/Makefile.am (original)
+++ webservices/axis2/trunk/c/test/unit/core/context/Makefile.am Wed Dec 7 19:34:57 2005
@@ -23,6 +23,7 @@
-laxis2_wsdl \
-laxis2_phaseresolver \
-laxis2_om \
- -laxis2_guththila \
- -lguththila
+ -laxis2_parser \
+ -L$(GUTHTHILA_LIB) $(GUTHTHILA_LIBNAME) \
+ -L$(LIBXML2_LIB) $(LIBXML2_LIBNAME)
Modified: webservices/axis2/trunk/c/test/unit/core/description/Makefile.am
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/test/unit/core/description/Makefile.am?rev=354957&r1=354956&r2=354957&view=diff
==============================================================================
--- webservices/axis2/trunk/c/test/unit/core/description/Makefile.am (original)
+++ webservices/axis2/trunk/c/test/unit/core/description/Makefile.am Wed Dec 7 19:34:57 2005
@@ -23,6 +23,7 @@
-laxis2_wsdl \
-laxis2_phaseresolver \
-laxis2_om \
- -laxis2_guththila \
- -lguththila
+ -laxis2_parser \
+ -L$(GUTHTHILA_LIB) $(GUTHTHILA_LIBNAME) \
+ -L$(LIBXML2_LIB) $(LIBXML2_LIBNAME)
Modified: webservices/axis2/trunk/c/test/unit/core/engine/Makefile.am
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/test/unit/core/engine/Makefile.am?rev=354957&r1=354956&r2=354957&view=diff
==============================================================================
--- webservices/axis2/trunk/c/test/unit/core/engine/Makefile.am (original)
+++ webservices/axis2/trunk/c/test/unit/core/engine/Makefile.am Wed Dec 7 19:34:57 2005
@@ -22,5 +22,6 @@
-laxis2_wsdl \
-laxis2_phaseresolver \
-laxis2_om \
- -laxis2_guththila \
- -lguththila
+ -laxis2_parser \
+ -L$(GUTHTHILA_LIB) $(GUTHTHILA_LIBNAME) \
+ -L$(LIBXML2_LIB) $(LIBXML2_LIBNAME)
Modified: webservices/axis2/trunk/c/test/unit/core/phaseresolver/Makefile.am
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/test/unit/core/phaseresolver/Makefile.am?rev=354957&r1=354956&r2=354957&view=diff
==============================================================================
--- webservices/axis2/trunk/c/test/unit/core/phaseresolver/Makefile.am (original)
+++ webservices/axis2/trunk/c/test/unit/core/phaseresolver/Makefile.am Wed Dec 7 19:34:57 2005
@@ -22,6 +22,7 @@
-laxis2_wsdl \
-laxis2_phaseresolver \
-laxis2_om \
- -laxis2_guththila \
- -lguththila
+ -laxis2_parser \
+ -L$(GUTHTHILA_LIB) $(GUTHTHILA_LIBNAME) \
+ -L$(LIBXML2_LIB) $(LIBXML2_LIBNAME)
Modified: webservices/axis2/trunk/c/test/unit/xml/om/Makefile.am
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/test/unit/xml/om/Makefile.am?rev=354957&r1=354956&r2=354957&view=diff
==============================================================================
--- webservices/axis2/trunk/c/test/unit/xml/om/Makefile.am (original)
+++ webservices/axis2/trunk/c/test/unit/xml/om/Makefile.am Wed Dec 7 19:34:57 2005
@@ -18,4 +18,8 @@
-lcutest \
-L$(top_builddir)/install/lib \
-laxis2_util \
- -laxis2_parser
+ -laxis2_om \
+ -laxis2_parser \
+ -L$(LIBXML2_LIB) $(LIBXML2_LIBNAME) \
+ -L$(GUTHTHILA_LIB) $(GUTHTHILA_LIBNAME)
+
Modified: webservices/axis2/trunk/c/test/xml/om/Makefile.am
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/test/xml/om/Makefile.am?rev=354957&r1=354956&r2=354957&view=diff
==============================================================================
--- webservices/axis2/trunk/c/test/xml/om/Makefile.am (original)
+++ webservices/axis2/trunk/c/test/xml/om/Makefile.am Wed Dec 7 19:34:57 2005
@@ -4,9 +4,13 @@
AM_CPPFLAGS = $(CPPFLAGS) -g -O2 -pthread
test_om_SOURCES = test_om.c
-test_om_LDADD = $(LDFLAGS) -L$(top_builddir)/install/lib -laxis2_om \
- -L$(top_builddir)/install/lib -laxis2_parser \
- -L$(top_builddir)/install/lib -laxis2_util
+test_om_LDADD = $(LDFLAGS) \
+ -L$(top_builddir)/install/lib \
+ -laxis2_om \
+ -laxis2_util \
+ -laxis2_parser \
+ -L$(LIBXML2_LIB) $(LIBXML2_LIBNAME) \
+ -L$(GUTHTHILA_LIB) $(GUTHTHILA_LIBNAME)
INCLUDES = -I${CUTEST_HOME}/include -I$(top_builddir)/include \
-I$(top_builddir)/modules/xml/parser \