Hi Damitha,
Attached patch do the following.
Damitha Kumarage wrote:
Hi all,
I need some help on gnu build utilities to do the following tasks with
axis2c project
1) make it work for all platforms
Need some more work to achive this.
2) when make dist is issuded create a folder structure as it is in svn
folder structure. Currently when I do make dist
the created folder structure does not have many required folders
like docs, test, deploy etc
ex: bin include lib modules services xdocs bindings test deploy
ides conftools
Done.
3)when make install is issued on source distribution it should install
the same folder structure except
the modules folder. In addition it should create two folders called
services and modules to keep installed
services and modules respectively.
ex: axis2.xml bin include lib services xdocs bindings test
Done.
4)when make install is done on a test service(eg: test/server/echo)
then that service library should be installed
in a folder creates as install_prefix/services/echo. For example if
I give
configure --prefix=$AXIS2C_HOME/deploy
make install
then service library should be installed at
$AXIS2C_HOME/deploy/services/echo. In echo folder we need
to have the services.xml copied as well
Some work to be done.
thanks
damitha
Please apply.
Thanks
~sanjaya
--
http://sanjaya.8k.com
Index: test/unit/xml/om/Makefile.am
===================================================================
--- test/unit/xml/om/Makefile.am (revision 374032)
+++ test/unit/xml/om/Makefile.am (working copy)
@@ -1,5 +1,6 @@
prgbindir=$(prefix)/bin/unit_test
prglibdir=$(prefix)/lib/unit_test
+noinst_HEADERS = om_node_test.h
prglib_LTLIBRARIES = libtest_om.la
AM_CPPFLAGS = $(CPPFLAGS)
libtest_om_la_SOURCES = om_test.c om_node_test.c
Index: test/unit/core/phaseresolver/Makefile.am
===================================================================
--- test/unit/core/phaseresolver/Makefile.am (revision 374032)
+++ test/unit/core/phaseresolver/Makefile.am (working copy)
@@ -31,8 +31,8 @@
-laxis2_wsdl \
-laxis2_phaseresolver \
-laxis2_om \
- -laxis2_parser \
-laxis2_addr \
+ -laxis2_parser \
-L$(GUTHTHILA_LIB) $(GUTHTHILA_LIBNAME) \
-L$(LIBXML2_LIB) $(LIBXML2_LIBNAME)
Index: test/xml/soap/test_soap.c
===================================================================
--- test/xml/soap/test_soap.c (revision 374032)
+++ test/xml/soap/test_soap.c (working copy)
@@ -247,6 +247,7 @@
}
allocator = axis2_allocator_init (NULL);
log = axis2_log_create(allocator, NULL);
+ log->level = AXIS2_LOG_LEVEL_DEBUG;
error = axis2_error_create(allocator);
env = axis2_env_create_with_error_log(allocator, error, log);
Index: test/xml/soap/Makefile.am
===================================================================
--- test/xml/soap/Makefile.am (revision 374032)
+++ test/xml/soap/Makefile.am (working copy)
@@ -9,8 +9,8 @@
-laxis2_om \
-laxis2_soap \
-laxis2_util \
+ -laxis2_parser \
-laxis2_unix \
- -laxis2_libxml2 \
-laxis2_unix \
-L$(LIBXML2_LIB) $(LIBXML2_LIBNAME) \
-L$(GUTHTHILA_LIB) $(GUTHTHILA_LIBNAME)
Index: test/xml/om/Makefile.am
===================================================================
--- test/xml/om/Makefile.am (revision 374032)
+++ test/xml/om/Makefile.am (working copy)
@@ -8,12 +8,12 @@
-L$(AXIS2C_HOME)/lib \
-laxis2_om \
-laxis2_util \
+ -laxis2_parser \
-laxis2_unix \
- -laxis2_parser \
-L$(LIBXML2_LIB) $(LIBXML2_LIBNAME) \
-L$(GUTHTHILA_LIB) $(GUTHTHILA_LIBNAME)
INCLUDES = -I$(top_builddir)/include \
-I$(top_builddir)/modules/xml/parser \
-I$(top_builddir)/modules/util \
- -I$(top_builddir)/modules/platforms
+ -I$(top_builddir)/modules/platforms
Index: test/core/clientapi/Makefile.am
===================================================================
--- test/core/clientapi/Makefile.am (revision 374032)
+++ test/core/clientapi/Makefile.am (working copy)
@@ -1,11 +1,10 @@
prgbindir=$(prefix)/bin/system_test
-prgbin_PROGRAMS = test_clientapi test_client
+prgbin_PROGRAMS = test_client test_clientapi
SUBDIRS =
AM_CPPFLAGS = $(CPPFLAGS) -g -pthread
-test_clientapi_SOURCES = test_clientapi.c
test_client_SOURCES = test_client.c
+test_clientapi_SOURCES = test_clientapi.c
-
test_clientapi_LDADD = -L$(AXIS2C_HOME)/lib \
-laxis2_description \
-laxis2_context \
Index: test/core/Makefile.am
===================================================================
--- test/core/Makefile.am (revision 374032)
+++ test/core/Makefile.am (working copy)
@@ -1 +1 @@
-SUBDIRS = description context engine clientapi transport deployment addr
+SUBDIRS = description context engine deployment addr clientapi transport
Index: test/util/Makefile.am
===================================================================
--- test/util/Makefile.am (revision 374032)
+++ test/util/Makefile.am (working copy)
@@ -1,10 +1,12 @@
prgbindir=$(prefix)/bin/system_test
+noinst_HEADERS = test_log.h
prgbin_PROGRAMS = test_util
SUBDIRS =
AM_CPPFLAGS = $(CPPFLAGS)
test_util_SOURCES = test_util.c test_log.c
-test_util_LDADD = -L$(AXIS2C_HOME)/lib -laxis2_util -laxis2_unix
+test_util_LDADD = -L$(AXIS2C_HOME)/lib -laxis2_util \
+ -laxis2_unix
INCLUDES = -I$(top_builddir)/include \
-I$(top_builddir)/modules/util \
Index: configure.ac
===================================================================
--- configure.ac (revision 374032)
+++ configure.ac (working copy)
@@ -78,10 +78,49 @@
LIBXML2_LIBNAME="-lxml2"
)
+AC_MSG_CHECKING(whether to build tests)
+AC_ARG_ENABLE(tests, [ --enable-tests build tests. default=no],
+[ case "${enableval}" in
+ no)
+ AC_MSG_RESULT(no)
+ TESTS=""
+ ;;
+ *)
+ AC_MSG_RESULT(yes)
+ TESTS="test"
+
+ ;;
+ esac ],
+ AC_MSG_RESULT(no)
+ TESTS=""
+)
+
+AC_MSG_CHECKING(whether to build samples)
+AC_ARG_ENABLE(tests, [ --enable-samples build samples. default=no],
+[ case "${enableval}" in
+ no)
+ AC_MSG_RESULT(no)
+ SAMPLES=""
+ ;;
+ *)
+ AC_MSG_RESULT(yes)
+ SAMPLES="samples"
+
+ ;;
+ esac ],
+ AC_MSG_RESULT(no)
+ SAMPLES=""
+)
+
+PKG_CHECK_MODULES(XML2, libxml-2.0)
+AC_SUBST(XML2_CFLAGS)
+AC_SUBST(XML2_LIBS)
AC_SUBST(LIBXML2)
AC_SUBST(GUTHTHILA)
AC_SUBST(LIBXML2_LIBNAME)
AC_SUBST(GUTHTHILA_LIBNAME)
+AC_SUBST(TESTS)
+AC_SUBST(SAMPLES)
AC_CONFIG_FILES([Makefile \
modules/Makefile \
@@ -102,9 +141,6 @@
modules/core/util/Makefile \
modules/xml/Makefile \
modules/xml/parser/Makefile \
- modules/xml/parser/guththila/Makefile \
- modules/xml/parser/guththila/impl/Makefile \
- modules/xml/parser/guththila/impl/src/Makefile \
modules/xml/parser/libxml2/Makefile \
modules/xml/soap/Makefile \
modules/xml/om/Makefile \
@@ -142,7 +178,9 @@
test/unit/xml/Makefile \
test/unit/xml/om/Makefile\
test/core/transport/Makefile\
- test/core/transport/http/Makefile
+ test/core/transport/http/Makefile \
+ ides/Makefile \
+ ides/anjuta/Makefile
])
AC_OUTPUT
Index: samples/server/math/Makefile.am
===================================================================
--- samples/server/math/Makefile.am (revision 374032)
+++ samples/server/math/Makefile.am (working copy)
@@ -1,4 +1,5 @@
lib_LTLIBRARIES = libmath.la
+noinst_HEADERS = math.h
SUBDIRS =
libmath_la_SOURCES = math.c math_skeleton.c
libmath_la_LIBADD =
Index: samples/server/echo/Makefile.am
===================================================================
--- samples/server/echo/Makefile.am (revision 374032)
+++ samples/server/echo/Makefile.am (working copy)
@@ -1,4 +1,5 @@
lib_LTLIBRARIES = libecho.la
+noinst_HEADERS = echo.h
SUBDIRS =
libecho_la_SOURCES = echo.c echo_skeleton.c
libecho_la_LIBADD =
Index: samples/client/math/Makefile.am
===================================================================
--- samples/client/math/Makefile.am (revision 374032)
+++ samples/client/math/Makefile.am (working copy)
@@ -1,4 +1,5 @@
bin_PROGRAMS = math
+noinst_HEADERS = axis2_math_stub.h
math_SOURCES = axis2_math_stub.c \
math_client.c
Index: samples/client/echo/Makefile.am
===================================================================
--- samples/client/echo/Makefile.am (revision 374032)
+++ samples/client/echo/Makefile.am (working copy)
@@ -1,4 +1,5 @@
bin_PROGRAMS = echo
+noinst_HEADERS = axis2_echo_stub.h
echo_SOURCES = axis2_echo_stub.c \
echo_client.c
Index: modules/xml/parser/Makefile.am
===================================================================
--- modules/xml/parser/Makefile.am (revision 374032)
+++ modules/xml/parser/Makefile.am (working copy)
@@ -1 +1,2 @@
SUBDIRS = $(LIBXML2) $(GUTHTHILA)
+noinst_HEADERS = axis2_xml_writer.h axis2_xml_reader.h
Index: modules/platforms/unix/Makefile.am
===================================================================
--- modules/platforms/unix/Makefile.am (revision 374032)
+++ modules/platforms/unix/Makefile.am (working copy)
@@ -1,4 +1,5 @@
lib_LTLIBRARIES = libaxis2_unix.la
+noinst_HEADERS = axis2_unix.h axis2_uuid_gen_unix.h
AM_CPPFLAGS = $(CPPFLAGS)
libaxis2_unix_la_SOURCES = uuid_gen_unix.c
Index: modules/core/deployment/Makefile.am
===================================================================
--- modules/core/deployment/Makefile.am (revision 374032)
+++ modules/core/deployment/Makefile.am (working copy)
@@ -23,3 +23,5 @@
-I$(top_builddir)/modules/core/deployment \
-I$(top_builddir)/modules/xml/parser \
-I$(top_builddir)/modules/platforms
+
+noinst_HEADERS = axis2_deployment.h
Index: modules/core/description/Makefile.am
===================================================================
--- modules/core/description/Makefile.am (revision 374032)
+++ modules/core/description/Makefile.am (working copy)
@@ -1,4 +1,6 @@
lib_LTLIBRARIES = libaxis2_description.la
+noinst_HEADERS = axis2_description.h
+
AM_CPPFLAGS = $(CPPFLAGS)
libaxis2_description_la_SOURCES = param_container.c \
op.c \
@@ -26,3 +28,4 @@
-I$(top_builddir)/modules/core/description \
-I$(top_builddir)/modules/core/addr \
-I$(top_builddir)/modules/platforms
+
Index: modules/core/clientapi/Makefile.am
===================================================================
--- modules/core/clientapi/Makefile.am (revision 374032)
+++ modules/core/clientapi/Makefile.am (working copy)
@@ -1,4 +1,6 @@
lib_LTLIBRARIES = libaxis2_clientapi.la
+noinst_HEADERS = callback_recv.h listener_manager.h
+
AM_CPPFLAGS = $(CPPFLAGS)
libaxis2_clientapi_la_SOURCES = async_result.c \
Index: modules/core/transport/Makefile.am
===================================================================
--- modules/core/transport/Makefile.am (revision 374032)
+++ modules/core/transport/Makefile.am (working copy)
@@ -1 +1,2 @@
SUBDIRS = http http/sender http/receiver http/server
+noinst_HEADERS = axis2_transport_receiver.h axis2_transport_sender.h
Index: modules/wsdl/Makefile.am
===================================================================
--- modules/wsdl/Makefile.am (revision 374032)
+++ modules/wsdl/Makefile.am (working copy)
@@ -1,4 +1,5 @@
lib_LTLIBRARIES = libaxis2_wsdl.la
+noinst_HEADERS = axis2_wsdl.h
AM_CPPFLAGS = $(CPPFLAGS)
libaxis2_wsdl_la_SOURCES = wsdl_op.c \
wsdl_svc.c \
Index: modules/Makefile.am
===================================================================
--- modules/Makefile.am (revision 374032)
+++ modules/Makefile.am (working copy)
@@ -1 +1,2 @@
SUBDIRS = platforms/unix util xml wsdl core
+EXTRA_DIST = platforms/axis2_platform_auto_sense.h
Index: modules/util/Makefile.am
===================================================================
--- modules/util/Makefile.am (revision 374032)
+++ modules/util/Makefile.am (working copy)
@@ -1,4 +1,14 @@
lib_LTLIBRARIES = libaxis2_util.la
+noinst_HEADERS = axis2_hash.h \
+ axis2_string.h \
+ axis2_array_list.h \
+ axis2_log_default.h \
+ axis2_error_default.h \
+ axis2_stream_default.h \
+ axis2_file_diff.h \
+ axis2_utils.h \
+ axis2_linked_list.h
+
AM_CPPFLAGS = $(CPPFLAGS)
libaxis2_util_la_SOURCES = hash.c \
allocator.c \
Index: build.sh
===================================================================
--- build.sh (revision 374032)
+++ build.sh (working copy)
@@ -1,6 +1,6 @@
#!/bin/bash
./autogen.sh
-AXIS2C_HOME=`pwd`/deploy
-./configure --prefix=${AXIS2C_HOME}
+AXIS2C_HOME=/home/sanjaya/tmp
+./configure --prefix=${AXIS2C_HOME} --enable-tests=yes --enable-samples=yes
make
make install
Index: Makefile.am
===================================================================
--- Makefile.am (revision 374032)
+++ Makefile.am (working copy)
@@ -1,2 +1,3 @@
-SUBDIRS = modules
+SUBDIRS = modules $(TESTS) $(SAMPLES) ides
include_HEADERS=$(top_builddir)/include/*.h
+EXTRA_DIST = build.sh autogen.sh
