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/07 07:25:13 UTC
svn commit: r354738 - in /webservices/axis2/trunk/c: INSTALL configure.ac
test/unit/xml/om/Makefile.am test/xml/om/Makefile.am
Author: damitha
Date: Tue Dec 6 22:24:58 2005
New Revision: 354738
URL: http://svn.apache.org/viewcvs?rev=354738&view=rev
Log:
Parser selection is made more configuralbe. Now user can build
both parsers or none or one of them
Modified:
webservices/axis2/trunk/c/INSTALL
webservices/axis2/trunk/c/configure.ac
webservices/axis2/trunk/c/test/unit/xml/om/Makefile.am
webservices/axis2/trunk/c/test/xml/om/Makefile.am
Modified: webservices/axis2/trunk/c/INSTALL
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/INSTALL?rev=354738&r1=354737&r2=354738&view=diff
==============================================================================
--- webservices/axis2/trunk/c/INSTALL (original)
+++ webservices/axis2/trunk/c/INSTALL Tue Dec 6 22:24:58 2005
@@ -1,250 +1,39 @@
-Installation Instructions
-*************************
-
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free
-Software Foundation, Inc.
-
-This file is free documentation; the Free Software Foundation gives
-unlimited permission to copy, distribute and modify it.
+Axis2 nstallation instructions
+=======================================
-Basic Installation
-==================
-
-These are generic installation instructions.
-
- The `configure' shell script attempts to guess correct values for
-various system-dependent variables used during compilation. It uses
-those values to create a `Makefile' in each directory of the package.
-It may also create one or more `.h' files containing system-dependent
-definitions. Finally, it creates a shell script `config.status' that
-you can run in the future to recreate the current configuration, and a
-file `config.log' containing compiler output (useful mainly for
-debugging `configure').
-
- It can also use an optional file (typically called `config.cache'
-and enabled with `--cache-file=config.cache' or simply `-C') that saves
-the results of its tests to speed up reconfiguring. (Caching is
-disabled by default to prevent problems with accidental use of stale
-cache files.)
-
- If you need to do unusual things to compile the package, please try
-to figure out how `configure' could check whether to do them, and mail
-diffs or instructions to the address given in the `README' so they can
-be considered for the next release. If you are using the cache, and at
-some point `config.cache' contains results you don't want to keep, you
-may remove or edit it.
-
- The file `configure.ac' (or `configure.in') is used to create
-`configure' by a program called `autoconf'. You only need
-`configure.ac' if you want to change it or regenerate `configure' using
-a newer version of `autoconf'.
-
-The simplest way to compile this package is:
-
- 1. `cd' to the directory containing the package's source code and type
- `./configure' to configure the package for your system. If you're
- using `csh' on an old version of System V, you might need to type
- `sh ./configure' instead to prevent `csh' from trying to execute
- `configure' itself.
-
- Running `configure' takes awhile. While running, it prints some
- messages telling which features it is checking for.
-
- 2. Type `make' to compile the package.
-
- 3. Optionally, type `make check' to run any self-tests that come with
- the package.
-
- 4. Type `make install' to install the programs and any data files and
- documentation.
-
- 5. You can remove the program binaries and object files from the
- source code directory by typing `make clean'. To also remove the
- files that `configure' created (so you can compile the package for
- a different kind of computer), type `make distclean'. There is
- also a `make maintainer-clean' target, but that is intended mainly
- for the package's developers. If you use it, you may have to get
- all sorts of other programs in order to regenerate files that came
- with the distribution.
-
-Compilers and Options
-=====================
-
-Some systems require unusual options for compilation or linking that the
-`configure' script does not know about. Run `./configure --help' for
-details on some of the pertinent environment variables.
-
- You can give `configure' initial values for configuration parameters
-by setting variables in the command line or in the environment. Here
-is an example:
-
- ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
-
- *Note Defining Variables::, for more details.
-
-Compiling For Multiple Architectures
-====================================
-
-You can compile the package for more than one kind of computer at the
-same time, by placing the object files for each architecture in their
-own directory. To do this, you must use a version of `make' that
-supports the `VPATH' variable, such as GNU `make'. `cd' to the
-directory where you want the object files and executables to go and run
-the `configure' script. `configure' automatically checks for the
-source code in the directory that `configure' is in and in `..'.
-
- If you have to use a `make' that does not support the `VPATH'
-variable, you have to compile the package for one architecture at a
-time in the source code directory. After you have installed the
-package for one architecture, use `make distclean' before reconfiguring
-for another architecture.
-
-Installation Names
-==================
-
-By default, `make install' will install the package's files in
-`/usr/local/bin', `/usr/local/man', etc. You can specify an
-installation prefix other than `/usr/local' by giving `configure' the
-option `--prefix=PREFIX'.
-
- You can specify separate installation prefixes for
-architecture-specific files and architecture-independent files. If you
-give `configure' the option `--exec-prefix=PREFIX', the package will
-use PREFIX as the prefix for installing programs and libraries.
-Documentation and other data files will still use the regular prefix.
-
- In addition, if you use an unusual directory layout you can give
-options like `--bindir=DIR' to specify different values for particular
-kinds of files. Run `configure --help' for a list of the directories
-you can set and what kinds of files go in them.
-
- If the package supports it, you can cause programs to be installed
-with an extra prefix or suffix on their names by giving `configure' the
-option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
-
-Optional Features
-=================
-
-Some packages pay attention to `--enable-FEATURE' options to
-`configure', where FEATURE indicates an optional part of the package.
-They may also pay attention to `--with-PACKAGE' options, where PACKAGE
-is something like `gnu-as' or `x' (for the X Window System). The
-`README' should mention any `--enable-' and `--with-' options that the
-package recognizes.
-
- For packages that use the X Window System, `configure' can usually
-find the X include and library files automatically, but if it doesn't,
-you can use the `configure' options `--x-includes=DIR' and
-`--x-libraries=DIR' to specify their locations.
-
-Specifying the System Type
-==========================
-
-There may be some features `configure' cannot figure out automatically,
-but needs to determine by the type of machine the package will run on.
-Usually, assuming the package is built to be run on the _same_
-architectures, `configure' can figure that out, but if it prints a
-message saying it cannot guess the machine type, give it the
-`--build=TYPE' option. TYPE can either be a short name for the system
-type, such as `sun4', or a canonical name which has the form:
-
- CPU-COMPANY-SYSTEM
-
-where SYSTEM can have one of these forms:
-
- OS KERNEL-OS
-
- See the file `config.sub' for the possible values of each field. If
-`config.sub' isn't included in this package, then this package doesn't
-need to know the machine type.
-
- If you are _building_ compiler tools for cross-compiling, you should
-use the `--target=TYPE' option to select the type of system they will
-produce code for.
-
- If you want to _use_ a cross compiler, that generates code for a
-platform different from the build platform, you should specify the
-"host" platform (i.e., that on which the generated programs will
-eventually be run) with `--host=TYPE'.
-
-Sharing Defaults
-================
-
-If you want to set default values for `configure' scripts to share, you
-can create a site shell script called `config.site' that gives default
-values for variables like `CC', `cache_file', and `prefix'.
-`configure' looks for `PREFIX/share/config.site' if it exists, then
-`PREFIX/etc/config.site' if it exists. Or, you can set the
-`CONFIG_SITE' environment variable to the location of the site script.
-A warning: not all `configure' scripts look for a site script.
-
-Defining Variables
-==================
-
-Variables not defined in a site shell script can be set in the
-environment passed to `configure'. However, some packages may run
-configure again during the build, and the customized values of these
-variables may be lost. In order to avoid this problem, you should set
-them in the `configure' command line, using `VAR=value'. For example:
-
- ./configure CC=/usr/local2/bin/gcc
-
-causes the specified `gcc' to be used as the C compiler (unless it is
-overridden in the site shell script). Here is a another example:
-
- /bin/bash ./configure CONFIG_SHELL=/bin/bash
-
-Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent
-configuration-related scripts to be executed by `/bin/bash'.
-
-`configure' Invocation
-======================
-
-`configure' recognizes the following options to control how it operates.
-
-`--help'
-`-h'
- Print a summary of the options to `configure', and exit.
-
-`--version'
-`-V'
- Print the version of Autoconf used to generate the `configure'
- script, and exit.
-
-`--cache-file=FILE'
- Enable the cache: use and save the results of the tests in FILE,
- traditionally `config.cache'. FILE defaults to `/dev/null' to
- disable caching.
-
-`--config-cache'
-`-C'
- Alias for `--cache-file=config.cache'.
-
-`--quiet'
-`--silent'
-`-q'
- Do not print messages saying which checks are being made. To
- suppress all normal output, redirect it to `/dev/null' (any error
- messages will still be shown).
-
-`--srcdir=DIR'
- Look for the package's source code in directory DIR. Usually
- `configure' can determine that directory automatically.
+To build
+Create the environment variable pointing to your root source
-`configure' also accepts some other, not widely useful, options. Run
-`configure --help' for more details.
+eg:
+AXIS2C_HOME="/home/x/projects/c"
+cd ${AXIS2C_HOME}
+
+./autogen.sh
+./configure
+make
+make install
-Axis2 specific installation instructions
-=======================================
+or optionally you can use the build.sh script.
User can select the parser between Guththila and
libxml2. This can be done using a configure option
-configure --with-pull-parser=PARSER build the pull parser wrapper library. PARSER=libxml2/guththila
+configure --enable-guththila=yes build the guththila pull parser wrapper library wrapper
+configure --enable-guththila=no does not build the guththila pull parser library wrapper
+
+By default libxml2 parser wrapper is built.
+
+When running tests remember to rename the parser wrapper you want, to libaxis2_parser.so
+
+So when running tests user can change the parser by just renaming the libaxis2_libxml2.so or
+libaxis2_guththila.so to libaxis2_parser.so
-For example if user want to build the wrapper for libxml2
+Note:
+1) If you use libxml2 make sure to create two environment variables
-configure --with-pull-parser=libxml2
+ LIBXML2_INCLUDE
+ LIBXML2_LIB
-Currently only compile time parser abstraction is supported. ie. User need to decide which parser to
-use at compile time. Dynamic parser change will be supported with the next release
+2) Before you build tests make sure that all the axis2c libraries are installed in (or copied to)
+ AXIS2C_HOME/install/lib
+
Modified: webservices/axis2/trunk/c/configure.ac
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/configure.ac?rev=354738&r1=354737&r2=354738&view=diff
==============================================================================
--- webservices/axis2/trunk/c/configure.ac (original)
+++ webservices/axis2/trunk/c/configure.ac Tue Dec 6 22:24:58 2005
@@ -1,68 +1,78 @@
-# run autogen.sh to generate the configure script.
+dnl run autogen.sh to generate the configure script.
AC_PREREQ(2.59)
+
AC_INIT(axis2, 1.0.0)
-AC_CONFIG_SRCDIR([modules/common/src/axis2.c])
-AC_CONFIG_AUX_DIR(conftools)
AC_CANONICAL_SYSTEM
-AM_INIT_AUTOMAKE
-AC_CONFIG_HEADER(config.h)
-AC_PROG_LIBTOOL
-# Checks for programs.
-AC_PROG_CXX
+AM_CONFIG_HEADER(config.h)
+AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
+
+AC_CONFIG_SRCDIR([modules/common/src/axis2.c])
+
+dnl Checks for programs.
AC_PROG_CC
+AC_PROG_CXX
AC_PROG_CPP
+AM_PROG_LIBTOOL
AC_PROG_INSTALL
AC_PROG_LN_S
AC_PROG_MAKE_SET
-# Checks for libraries.
+dnl Checks for libraries.
AC_CHECK_LIB(dl, dlopen)
-
-#using libtool
-AM_PROG_LIBTOOL
+AC_CHECK_LIB(cutest, CuTestInit)
CFLAGS="$CFLAGS -ansi -Wall -D_LARGEFILE64_SOURCE -g3 -O2"
#CFLAGS="$CFLAGS -Wall -ansi -Wshadow -DLINUX=2 -D_REENTRANT -D_GNU_SOURCE -D_LARGEFILE64_SOURCE -g -O2 -pthread"
-LDFLAGS="$LDFLAGS -L${CUTEST_HOME}/lib/"
-LIBS="-ldl"
-# Checks for header files.
+dnl Checks for header files.
AC_HEADER_STDC
AC_CHECK_HEADERS([stdio.h stdlib.h string.h])
-# Checks for typedefs, structures, and compiler characteristics.
+dnl Checks for typedefs, structures, and compiler characteristics.
AC_C_CONST
-# Checks for library functions.
+dnl Checks for library functions.
AC_FUNC_MALLOC
AC_FUNC_REALLOC
#AC_CHECK_FUNCS([memmove])
-AC_MSG_CHECKING(give the xml pull parser you wish to use. eg:libxml2)
-AC_ARG_WITH(pull-parser,
-[ --with-pull-parser[=PARSER] build the pull parser wrapper library. PARSER=libxml2/guththila],
-[ case "$withval" in
+AC_MSG_CHECKING(whether to build guththila xml parser library)
+AC_ARG_ENABLE(guththila, [ --enable-guththila build guththila xml parser library wrapper. default=no],
+[ case "${enableval}" in
no)
AC_MSG_RESULT(no)
- want_parser=no
+ GUTHTHILA=""
;;
*)
AC_MSG_RESULT(yes)
+ GUTHTHILA="guththila"
- dnl pull parser to use
- want_parser="$withval"
-
- ;;
+ ;;
esac ],
AC_MSG_RESULT(no)
- want_parser="guththila"
+ GUTHTHILA=""
+)
+
+AC_MSG_CHECKING(whether to build libxml2 xml parser library)
+AC_ARG_ENABLE(libxml2, [ --enable-libxml2 build libxml2 xml parser library wrapper. default=yes],
+[ case "${enableval}" in
+ no)
+ AC_MSG_RESULT(no)
+ LIBXML2=""
+ ;;
+ *)
+ AC_MSG_RESULT(yes)
+ LIBXML2="libxml2"
+
+ ;;
+ esac ],
+ AC_MSG_RESULT(yes)
+ LIBXML2="libxml2"
)
-PULL_PARSER=$want_parser
-PULL_PARSER_WRAPPER="axis2_$want_parser"
-AC_SUBST(PULL_PARSER)
-AC_SUBST(PULL_PARSER_WRAPPER)
+AC_SUBST(LIBXML2)
+AC_SUBST(GUTHTHILA)
AC_CONFIG_FILES([Makefile \
modules/Makefile \
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=354738&r1=354737&r2=354738&view=diff
==============================================================================
--- webservices/axis2/trunk/c/test/unit/xml/om/Makefile.am (original)
+++ webservices/axis2/trunk/c/test/unit/xml/om/Makefile.am Tue Dec 6 22:24:58 2005
@@ -18,4 +18,4 @@
-lcutest \
-L$(top_builddir)/install/lib \
-laxis2_util \
- -l$(PULL_PARSER_WRAPPER)
+ -laxis2_parser
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=354738&r1=354737&r2=354738&view=diff
==============================================================================
--- webservices/axis2/trunk/c/test/xml/om/Makefile.am (original)
+++ webservices/axis2/trunk/c/test/xml/om/Makefile.am Tue Dec 6 22:24:58 2005
@@ -5,7 +5,7 @@
test_om_SOURCES = test_om.c
test_om_LDADD = $(LDFLAGS) -L$(top_builddir)/install/lib -laxis2_om \
- -L$(top_builddir)/install/lib -l$(PULL_PARSER_WRAPPER) \
+ -L$(top_builddir)/install/lib -laxis2_parser \
-L$(top_builddir)/install/lib -laxis2_util
INCLUDES = -I${CUTEST_HOME}/include -I$(top_builddir)/include \