You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by bh...@apache.org on 2011/02/11 22:17:24 UTC
svn commit: r1069956 - in /uima/uimacpp/trunk: ./ m4/ src/ src/framework/
src/test/ src/test/src/ src/utils/
Author: bhavani
Date: Fri Feb 11 21:17:01 2011
New Revision: 1069956
URL: http://svn.apache.org/viewvc?rev=1069956&view=rev
Log:
UIMA-2053 standardize build process and library naming on linux
Added:
uima/uimacpp/trunk/Makefile.am
uima/uimacpp/trunk/autogen.sh (with props)
uima/uimacpp/trunk/configure.ac
uima/uimacpp/trunk/m4/
uima/uimacpp/trunk/m4/find_activemq.m4
uima/uimacpp/trunk/m4/find_apr.m4
uima/uimacpp/trunk/m4/find_icu.m4
uima/uimacpp/trunk/m4/find_xerces.m4
Modified:
uima/uimacpp/trunk/buildsdk.sh
uima/uimacpp/trunk/src/Makefile.am
uima/uimacpp/trunk/src/framework/Makefile.am
uima/uimacpp/trunk/src/test/Makefile.am
uima/uimacpp/trunk/src/test/src/annotator_dump.cpp
uima/uimacpp/trunk/src/test/src/annotator_tok.cpp
uima/uimacpp/trunk/src/utils/Makefile.am
Added: uima/uimacpp/trunk/Makefile.am
URL: http://svn.apache.org/viewvc/uima/uimacpp/trunk/Makefile.am?rev=1069956&view=auto
==============================================================================
--- uima/uimacpp/trunk/Makefile.am (added)
+++ uima/uimacpp/trunk/Makefile.am Fri Feb 11 21:17:01 2011
@@ -0,0 +1,33 @@
+# ---------------------------------------------------------------------------
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ---------------------------------------------------------------------------
+
+#SUBDIRS = framework utils test
+SUBDIRS = src
+ACLOCAL_AMFLAGS = -I m4
+EXTRA_DIST = docs data examples scriptators LICENSE buildsdk.sh README.4sdk NOTICE.4sdk RELEASE_NOTES.html
+
+
+dist-hook:
+ rm -rf `find $(distdir)/docs -name .svn`
+ rm -rf `find $(distdir)/data -name .svn`
+ rm -rf `find $(distdir)/examples -name .svn`
+ rm -rf `find $(distdir)/scriptators -name .svn`
+ rm -rf `find $(distdir) -name .svn`
+
+install-data-local:
+ $(INSTALL) src/base.mak $(DESTDIR)$(prefix)/lib/base.mak
+
Added: uima/uimacpp/trunk/autogen.sh
URL: http://svn.apache.org/viewvc/uima/uimacpp/trunk/autogen.sh?rev=1069956&view=auto
==============================================================================
--- uima/uimacpp/trunk/autogen.sh (added)
+++ uima/uimacpp/trunk/autogen.sh Fri Feb 11 21:17:01 2011
@@ -0,0 +1,3 @@
+touch NEWS README AUTHORS ChangeLog
+autoreconf -I m4 --force --install
+rm -rf autom4te.cache
Propchange: uima/uimacpp/trunk/autogen.sh
------------------------------------------------------------------------------
svn:executable = *
Modified: uima/uimacpp/trunk/buildsdk.sh
URL: http://svn.apache.org/viewvc/uima/uimacpp/trunk/buildsdk.sh?rev=1069956&r1=1069955&r2=1069956&view=diff
==============================================================================
--- uima/uimacpp/trunk/buildsdk.sh (original)
+++ uima/uimacpp/trunk/buildsdk.sh Fri Feb 11 21:17:01 2011
@@ -26,7 +26,7 @@ usage() {
echo " The doxygen documentation must be built by running buildocs.sh"
echo " in the docs directory of the uimacpp source tree."
echo " Requires the following environment variables:"
- echo " UIMA_INSTALL - 'install' location of uimacpp build."
+ echo " UIMA_INSTALLDIR - 'install' location of uimacpp build."
echo " Defaults to ./install"
echo " APR_HOME - root of the APR install."
echo " ICU_HOME - root of the ICU install."
Added: uima/uimacpp/trunk/configure.ac
URL: http://svn.apache.org/viewvc/uima/uimacpp/trunk/configure.ac?rev=1069956&view=auto
==============================================================================
--- uima/uimacpp/trunk/configure.ac (added)
+++ uima/uimacpp/trunk/configure.ac Fri Feb 11 21:17:01 2011
@@ -0,0 +1,374 @@
+
+ # Licensed to the Apache Software Foundation (ASF) under one
+ # or more contributor license agreements. See the NOTICE file
+ # distributed with this work for additional information
+ # regarding copyright ownership. The ASF licenses this file
+ # to you under the Apache License, Version 2.0 (the
+ # "License"); you may not use this file except in compliance
+ # with the License. You may obtain a copy of the License at
+ #
+ # http://www.apache.org/licenses/LICENSE-2.0
+ #
+ # Unless required by applicable law or agreed to in writing,
+ # software distributed under the License is distributed on an
+ # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ # KIND, either express or implied. See the License for the
+ # specific language governing permissions and limitations
+ # under the License.
+
+AC_INIT(libuima, 2.3.1)
+AC_CONFIG_SRCDIR(src/framework/engine.cpp)
+AM_INIT_AUTOMAKE
+
+AC_CONFIG_MACRO_DIR([m4])
+AC_DISABLE_STATIC
+AC_PREFIX_DEFAULT(/install)
+
+#[LIB_VERSION=`echo $VERSION | sed -e 's/\.//' -e 's/^\([^.]*\)$/\1.0/'`]
+#LIB_VERSION_MAJOR=`echo $LIB_VERSION | sed 's/\..*//'`
+
+AC_ARG_ENABLE(debuguima,
+[ --enable-debuguima Turn on debugging],
+[case "${enableval}" in
+ yes) debuguima=true ;;
+ no) debuguima=false ;;
+ *) AC_MSG_ERROR(bad value ${enableval} for --enable-debuguima) ;;
+esac],[debuguima=false])
+AM_CONDITIONAL([DEBUG_UIMA], [test x$debuguima = xtrue])
+
+
+AC_ARG_ENABLE(debugtest,
+[ --enable-debugtest Turn on debugging],
+[case "${enableval}" in
+ yes) debugtest=true ;;
+ no) debugtest=false ;;
+ *) AC_MSG_ERROR(bad value ${enableval} for --enable-debugtest) ;;
+esac],[debugtest=false])
+AM_CONDITIONAL([DEBUG_TEST], [test x$debugtest = xtrue])
+
+LIB_VERSION_MAJOR="2"
+LIB_VERSION_MINOR="3"
+LIB_VERSION_REV="1"
+LIB_VERSION=${LIB_VERSION_MAJOR}.${LIB_VERSION_MINOR}.${LIB_VERSION_REV}
+LT_RELEASE_NUMBER=${LIB_VERSION_MAJOR}.${LIB_VERSION_MINOR}
+#LT_VERSION_NUMBER=${LIB_VERSION_MAJOR}:${LIB_VERSION_MINOR}:${LIB_VERSION_REV}
+LT_VERSION_NUMBER=0:0:0
+
+AC_SUBST(LT_RELEASE_NUMBER)
+AC_SUBST(LT_VERSION_NUMBER)
+AC_SUBST(VERSION)
+AC_SUBST(LIB_VERSION)
+AC_SUBST(LIB_VERSION_MAJOR)
+AC_SUBST(LIB_VERSION_MINOR)
+AC_MSG_RESULT([release $VERSION, library $LIB_VERSION])
+
+AC_PROG_LIBTOOL
+AC_PROG_CXX
+
+AC_C_BIGENDIAN
+
+######################################
+# setup for using default dependencies
+UIMACPP_HOME_INCLUDE="-I$UIMACPP_HOME/include"
+UIMACPP_HOME_LIB="-L$UIMACPP_HOME/lib"
+
+#########################################################################
+#
+# new check for XercesC
+#
+
+AC_MSG_NOTICE([Xerces C++ library configuration])
+AX_LIB_XERCES([2.8])
+
+if test $HAVE_XERCES = "no"; then
+ AC_MSG_WARN([XERCES not found])
+ echo "The Xerces C++ library cannot be found."
+ echo "Please install XERCES on this system and supply the appropriate"
+ echo "--with-xerces option to 'configure'"
+
+ AC_MSG_ERROR([no suitable XERCES found])
+fi
+
+echo "Found $XERCES_VERSION $XERCES_CPPFLAGS $XERCES_LDFLAGS $XERCES_LIBS"
+# Get build information from XERCES
+UIMA_XERCES_INCLUDE="$XERCES_CPPFLAGS"
+UIMA_XERCES_LIB="$XERCES_LDFLAGS $XERCES_LIBS"
+
+AC_SUBST(UIMA_XERCES_INCLUDE)
+AC_SUBST(UIMA_XERCES_LIB)
+
+#########################################################################
+#
+# check for XercesC
+#
+
+#AC_ARG_WITH([xerces], AC_HELP_STRING([--with-xerces],
+# [use Xerces C++ Library (uses $UIMACPP_HOME by default)]),
+# [UIMA_XERCES_INCLUDE="-I$withval/include"
+# UIMA_XERCES_LIB="-L$withval/lib -lxerces-c"
+# XERCES_TEST_INCLUDE="$UIMA_XERCES_INCLUDE"
+# AC_SUBST(UIMA_XERCES_INCLUDE)
+# AC_SUBST(UIMA_XERCES_LIB)
+# ],
+# [XERCES_TEST_INCLUDE="-I$UIMACPP_HOME/include"
+# UIMACPP_HOME_LIB="$UIMACPP_HOME_LIB -lxerces-c"])
+
+CPPFLAGS_save="$CPPFLAGS"
+#CPPFLAGS="$CPPFLAGS $XERCES_TEST_INCLUDE"
+CPPFLAGS="$CPPFLAGS $UIMA_XERCES_INCLUDE"
+AC_CHECK_HEADER([xercesc/util/XercesVersion.hpp],
+ [:],
+ [AC_MSG_ERROR([Unable to find Xerces C++ headers])])
+CPPFLAGS="$CPPFLAGS_save"
+
+
+#########################################################################
+#
+# new check for APR
+#
+
+AC_MSG_NOTICE([Apache Portable Runtime (APR) library configuration])
+APR_FIND_APR([], [], 1, [1])
+
+if test $apr_found = "no"; then
+ AC_MSG_WARN([APR not found])
+ echo "The Apache Portable Runtime (APR) library cannot be found."
+ echo "Please install APR on this system and supply the appropriate"
+ echo "--with-apr option to 'configure'"
+
+ AC_MSG_ERROR([no suitable APR found])
+fi
+
+# check APR version number agains regex
+APR_VER_REGEXES=["1\.3\.[0-9] 1\.3\.1[0-9] "]
+
+AC_MSG_CHECKING([APR version])
+apr_version="`$apr_config --version`"
+if test $? -ne 0; then
+ AC_MSG_ERROR([apr-config --version failed])
+fi
+AC_MSG_RESULT([$apr_version])
+
+APR_WANTED_REGEX_MATCH=0
+for apr_wanted_regex in $APR_VER_REGEXES; do
+ if test `expr $apr_version : $apr_wanted_regex` -ne 0; then
+ APR_WANTED_REGEX_MATCH=1
+ break
+ fi
+done
+
+if test $APR_WANTED_REGEX_MATCH -eq 0; then
+ echo "wanted regexes are $APR_VER_REGEXES"
+ AC_MSG_ERROR([invalid apr version found, check the README for supported versions.])
+fi
+
+# Get build information from APR
+
+
+APR_CPPFLAGS="`$apr_config --cppflags`"
+if test $? -ne 0; then
+ AC_MSG_ERROR([apr-config --cppflags failed])
+fi
+
+APR_INCLUDES="`$apr_config --includes`"
+if test $? -ne 0; then
+ AC_MSG_ERROR([apr-config --includes failed])
+fi
+
+APR_LDFLAGS="`$apr_config --ldflags`"
+if test $? -ne 0; then
+ AC_MSG_ERROR([apr-config --ldflags failed])
+fi
+
+APR_LIBS="`$apr_config --link-libtool --libs`"
+if test $? -ne 0; then
+ AC_MSG_ERROR([apr-config --link-libtool --libs failed])
+fi
+
+UIMA_APR_INCLUDE="$APR_CPPFLAGS $APR_INCLUDES"
+UIMA_APR_LIB="$APR_LDFLAGS $APR_LIBS"
+
+#AC_SUBST([APR_LIBS])
+#AC_SUBST([APR_LDFLAGS])
+#AC_SUBST([APR_CPPFLAGS])
+#AC_SUBST([APR_INCLUDES])
+
+AC_SUBST(UIMA_APR_INCLUDE)
+AC_SUBST(UIMA_APR_LIB)
+
+#########################################################################
+#
+# check for APR
+#
+
+#AC_ARG_WITH([apr], AC_HELP_STRING([--with-apr],
+# [use APR Library (uses $UIMACPP_HOME by default)]),
+# [APR_VER=`echo $withval/include/apr-* | sed -e 's/.*apr-//'`
+# UIMA_APR_INCLUDE="-I$withval/include/apr-$APR_VER"
+# UIMA_APR_LIB="-L$withval/lib -lapr-$APR_VER"
+# APR_TEST_INCLUDE="$UIMA_APR_INCLUDE"
+# AC_SUBST(UIMA_APR_INCLUDE)
+# AC_SUBST(UIMA_APR_LIB)
+# ],
+# [APR_VER=`echo $UIMACPP_HOME/include/apr-* | sed -e 's/.*apr-//'`
+# APR_TEST_INCLUDE="-I$UIMACPP_HOME/include/apr-$APR_VER"
+# UIMACPP_HOME_INCLUDE="$UIMACPP_HOME_INCLUDE $APR_TEST_INCLUDE"
+# UIMACPP_HOME_LIB="$UIMACPP_HOME_LIB -lapr-$APR_VER"])
+
+CPPFLAGS_save="$CPPFLAGS"
+#CPPFLAGS="$CPPFLAGS $APR_TEST_INCLUDE -D_GNU_SOURCE"
+CPPFLAGS="$CPPFLAGS $UIMA_APR_INCLUDE -D_GNU_SOURCE"
+AC_CHECK_HEADER([apr.h],
+ [:],
+ [AC_MSG_ERROR([Unable to find APR Headers])])
+CPPFLAGS="$CPPFLAGS_save"
+#########################################################################
+#
+# check for ICU
+#
+AC_MSG_NOTICE([ICU C++ library configuration])
+ICU_FIND_ICU([3.2])
+
+if test $icu_found = "no"; then
+ AC_MSG_WARN([ICU not found])
+ echo "The ICU C++ library cannot be found."
+ echo "Please install ICU on this system and supply the appropriate"
+ echo "--with-icu option to 'configure'"
+
+ AC_MSG_ERROR([no suitable ICU found])
+fi
+
+# Get build information from XERCES
+UIMA_ICU_INCLUDE="$ICU_CPPFLAGS"
+UIMA_ICU_LIB="$ICU_LDFLAGS $XERCES_LIBS"
+
+AC_SUBST(UIMA_ICU_INCLUDE)
+AC_SUBST(UIMA_ICU_LIB)
+
+
+
+#########################################################################
+#
+# check for ICU
+#
+
+#AC_ARG_WITH([icu], AC_HELP_STRING([--with-icu],
+# [use ICU Library (uses $UIMACPP_HOME by default)]),
+# [UIMA_ICU_INCLUDE="-I$withval/include"
+# UIMA_ICU_LIB="-L$withval/lib -licui18n -licuuc -licuio -licudata"
+# ICU_TEST_INCLUDE="$UIMA_ICU_INCLUDE"
+# AC_SUBST(UIMA_ICU_INCLUDE)
+# AC_SUBST(UIMA_ICU_LIB)
+# ],
+# [ICU_TEST_INCLUDE="-I$UIMACPP_HOME/include"
+# UIMACPP_HOME_LIB="$UIMACPP_HOME_LIB -licui18n -licuuc -licuio -licudata"])
+
+CPPFLAGS_save="$CPPFLAGS"
+#CPPFLAGS="$CPPFLAGS $ICU_TEST_INCLUDE"
+CPPFLAGS="$CPPFLAGS $UIMA_ICU_INCLUDE"
+AC_CHECK_HEADER([unicode/uversion.h],
+ [:],
+ [AC_MSG_ERROR([Unable to find ICU Headers])])
+CPPFLAGS="$CPPFLAGS_save"
+
+
+########################################################################
+# check for ActiveMQ new
+#
+AC_MSG_NOTICE([ActiveMQ C++ library configuration])
+AMQ_FIND_AMQ([3.2])
+
+if test $amq_found = "no"; then
+ AC_MSG_WARN([ACTIVEMQ not found])
+ echo "The ACTIVEMQ C++ library cannot be found."
+ echo "Please install ACTIVEMQ 3.2 or higher on this system and supply the appropriate"
+ echo "--with-activemq option to 'configure'"
+
+ AC_MSG_ERROR([no suitable ACTIVEMQ found])
+fi
+
+# Get build information from XERCES
+UIMA_ACTIVEMQ_INCLUDE="$ACTIVEMQ_CXXFLAGS"
+UIMA_ACTIVEMQ_LIB="$ACTIVEMQ_LDFLAGS"
+
+AC_SUBST(UIMA_ACTIVEMQ_INCLUDE)
+AC_SUBST(UIMA_ACTIVEMQ_LIB)
+
+
+#########################################################################
+#
+# check for ACTIVEMQ
+#
+#ACTIVEMQ_INC="$withval/include"
+#for lookdir in "$withval/include" "withval"
+# do
+# ACTIVEMQ_INC="$ACTIVEMQ_INC/$lookdir"
+# done
+
+#AC_ARG_WITH([activemq], AC_HELP_STRING([--with-activemq],
+# [use ACTIVEMQ Library (no deployment wrapper by default)]),
+# [ACTIVEMQ_VER=`echo $withval/include/activemq-cpp-* | sed -e 's/.*activemq-cpp-//'`
+# UIMA_ACTIVEMQ_INCLUDE="-I$withval/include/activemq-cpp-$ACTIVEMQ_VER"
+# UIMA_ACTIVEMQ_LIB="-L$withval/lib -lactivemq-cpp"
+# ACTIVEMQ_TEST_INCLUDE="$UIMA_ACTIVEMQ_INCLUDE"
+# AC_SUBST(UIMA_ACTIVEMQ_INCLUDE)
+# AC_SUBST(UIMA_ACTIVEMQ_LIB)
+# ])
+
+CPPFLAGS_save="$CPPFLAGS"
+#CPPFLAGS="$CPPFLAGS $ACTIVEMQ_TEST_INCLUDE"
+CPPFLAGS="$CPPFLAGS $UIMA_ACTIVEMQ_INCLUDE"
+activemq=true
+AC_CHECK_HEADER([activemq/exceptions/ExceptionDefines.h],
+ [:],
+ [activemq=false])
+
+CPPFLAGS="$CPPFLAGS_save"
+AM_CONDITIONAL([ACTIVEMQ_FOUND], [test x$activemq = xtrue])
+if test "x$activemq" = "xfalse"; then
+AC_MSG_RESULT(***ACTIVEMQ dependency not found)
+AC_MSG_RESULT(***Not building deployCppService)
+AC_MSG_RESULT(***To try again ... touch configure before running make)
+fi
+
+
+
+####################################
+#Substitute default paths, if needed
+AC_SUBST(UIMACPP_HOME_INCLUDE)
+AC_SUBST(UIMACPP_HOME_LIB)
+
+
+#########################################################################
+#
+# check for Java JDK
+#
+
+AC_ARG_WITH([jdk], AC_HELP_STRING([--with-jdk],
+ [use local JDK (uses /opt/IBMJava2-142 by default)]),
+ [UIMA_JDK_INCLUDE="-I$withval"
+ JDK_TEST_INCLUDE="$UIMA_JDK_INCLUDE"],
+ [UIMA_JDK_INCLUDE="-I/opt/IBMJava2-142/include"
+ JDK_TEST_INCLUDE="-I/opt/IBMJava2-142/include"])
+
+CPPFLAGS_save="$CPPFLAGS"
+CPPFLAGS="$CPPFLAGS $JDK_TEST_INCLUDE"
+AC_CHECK_HEADER([jni.h],
+ [:],
+ [AC_MSG_ERROR([Unable to find JDK Headers])])
+CPPFLAGS="$CPPFLAGS_save"
+
+AC_SUBST(UIMA_JDK_INCLUDE)
+
+
+#########################################################################
+#
+# setup for link with UIMA lib
+#
+
+UIMA_LIB="-L\$(top_srcdir)/src/framework -luima"
+AC_SUBST(UIMA_LIB)
+
+AM_CONDITIONAL(APPLE, test x$build_vendor = xapple)
+
+AC_OUTPUT(Makefile src/Makefile src/framework/Makefile src/utils/Makefile src/test/Makefile)
Added: uima/uimacpp/trunk/m4/find_activemq.m4
URL: http://svn.apache.org/viewvc/uima/uimacpp/trunk/m4/find_activemq.m4?rev=1069956&view=auto
==============================================================================
--- uima/uimacpp/trunk/m4/find_activemq.m4 (added)
+++ uima/uimacpp/trunk/m4/find_activemq.m4 Fri Feb 11 21:17:01 2011
@@ -0,0 +1,77 @@
+# ===========================================================================
+# http://www.gnu.org/software/autoconf-archive/ax_lib_xerces.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+# AX_LIB_ICUC([MINIMUM-VERSION])
+#
+# DESCRIPTION
+#
+# This macro provides tests of availability of ICU
+# particular version or newer. This macros checks for ICU
+# Parser headers and libraries and defines compilation flags
+#
+# Macro supports following options and their values:
+#
+# --with-activemq - path to ACTIVEMQ installation prefix
+#
+#
+# This macro calls:
+#
+# AC_SUBST(ACTIVEMQ_CXXFLAGS)
+# AC_SUBST(ACTIVEMQ_LDFLAGS)
+# AC_SUBST(ACTIVEMQ_VERSION) - only if version requirement is used
+#
+# And sets:
+#
+# icu_found
+#
+
+AC_DEFUN([AMQ_FIND_AMQ],
+[
+ amq_found="no"
+
+ AC_MSG_CHECKING(for ActiveMQ 3.2 or later)
+ AC_ARG_WITH(activemq,
+ [ --with-activemq=PATH prefix for install ACTIVEMQ or leave out to use standard path ],
+ [
+ if test -d "$withval"; then
+ activemq_prefix="$withval"
+ else
+ AC_MSG_ERROR([Invalid ACTIVEMQ path $withval])
+ fi
+ ],
+ [
+ dnl Default behavior is implicit yes
+ if test -x /usr/local/bin/activemqcpp-config ; then
+ activemq_prefix=/usr/local
+ elif test -x /usr/bin/activemqcpp-config ; then
+ activemq_prefix=/usr
+ else
+ AC_MSG_ERROR([ACTIVEMQ not found. Please use --with-activemq= to the path])
+ fi
+ ])
+
+ if test -x "$activemq_prefix/bin/activemqcpp-config"; then
+ ACTIVEMQ_VERSION=`$activemq_prefix/bin/activemqcpp-config --version`
+ VERSION_CHECK=`expr $ACTIVEMQ_VERSION \>\= $1`
+ if test "$VERSION_CHECK" = "1"; then
+ amq_found="yes"
+ ACTIVEMQ_VER=`echo $activemq_prefix/include/activemq-cpp-* | sed -e 's/.*activemq-cpp-//'`
+ ACTIVEMQ_CXXFLAGS="-I$activemq_prefix/include/activemq-cpp-$ACTIVEMQ_VER"
+# ACTIVEMQ_CXXFLAGS=`$activemq_prefix/bin/activemqcpp-config --exec-prefix=$activemq_prefix --include`
+ ACTIVEMQ_LDFLAGS=`$activemq_prefix/bin/activemqcpp-config --exec-prefix=$activemq_prefix --libs`
+ AC_SUBST(ACTIVEMQ_VERSION)
+ AC_SUBST(ACTIVEMQ_CXXFLAGS)
+ AC_SUBST(ACTIVEMQ_LDFLAGS)
+ else
+ AC_MSG_ERROR([Invalid activemq version $ACTIVEMQ_VERSION found. activemq version $1 or higher is required])
+ fi
+ else
+ AC_MSG_ERROR([activemqcpp-config script not found in $activemq_prefix/bin])
+ fi
+
+ AC_MSG_RESULT($amq_found)
+
+])
Added: uima/uimacpp/trunk/m4/find_apr.m4
URL: http://svn.apache.org/viewvc/uima/uimacpp/trunk/m4/find_apr.m4?rev=1069956&view=auto
==============================================================================
--- uima/uimacpp/trunk/m4/find_apr.m4 (added)
+++ uima/uimacpp/trunk/m4/find_apr.m4 Fri Feb 11 21:17:01 2011
@@ -0,0 +1,202 @@
+dnl -------------------------------------------------------- -*- autoconf -*-
+dnl Licensed to the Apache Software Foundation (ASF) under one or more
+dnl contributor license agreements. See the NOTICE file distributed with
+dnl this work for additional information regarding copyright ownership.
+dnl The ASF licenses this file to You under the Apache License, Version 2.0
+dnl (the "License"); you may not use this file except in compliance with
+dnl the License. You may obtain a copy of the License at
+dnl
+dnl http://www.apache.org/licenses/LICENSE-2.0
+dnl
+dnl Unless required by applicable law or agreed to in writing, software
+dnl distributed under the License is distributed on an "AS IS" BASIS,
+dnl WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+dnl See the License for the specific language governing permissions and
+dnl limitations under the License.
+
+dnl
+dnl find_apr.m4 : locate the APR include files and libraries
+dnl
+dnl This macro file can be used by applications to find and use the APR
+dnl library. It provides a standardized mechanism for using APR. It supports
+dnl embedding APR into the application source, or locating an installed
+dnl copy of APR.
+dnl
+dnl APR_FIND_APR(srcdir, builddir, implicit-install-check, acceptable-majors,
+dnl detailed-check)
+dnl
+dnl where srcdir is the location of the bundled APR source directory, or
+dnl empty if source is not bundled.
+dnl
+dnl where builddir is the location where the bundled APR will will be built,
+dnl or empty if the build will occur in the srcdir.
+dnl
+dnl where implicit-install-check set to 1 indicates if there is no
+dnl --with-apr option specified, we will look for installed copies.
+dnl
+dnl where acceptable-majors is a space separated list of acceptable major
+dnl version numbers. Often only a single major version will be acceptable.
+dnl If multiple versions are specified, and --with-apr=PREFIX or the
+dnl implicit installed search are used, then the first (leftmost) version
+dnl in the list that is found will be used. Currently defaults to [0 1].
+dnl
+dnl where detailed-check is an M4 macro which sets the apr_acceptable to
+dnl either "yes" or "no". The macro will be invoked for each installed
+dnl copy of APR found, with the apr_config variable set appropriately.
+dnl Only installed copies of APR which are considered acceptable by
+dnl this macro will be considered found. If no installed copies are
+dnl considered acceptable by this macro, apr_found will be set to either
+dnl either "no" or "reconfig".
+dnl
+dnl Sets the following variables on exit:
+dnl
+dnl apr_found : "yes", "no", "reconfig"
+dnl
+dnl apr_config : If the apr-config tool exists, this refers to it. If
+dnl apr_found is "reconfig", then the bundled directory
+dnl should be reconfigured *before* using apr_config.
+dnl
+dnl Note: this macro file assumes that apr-config has been installed; it
+dnl is normally considered a required part of an APR installation.
+dnl
+dnl If a bundled source directory is available and needs to be (re)configured,
+dnl then apr_found is set to "reconfig". The caller should reconfigure the
+dnl (passed-in) source directory, placing the result in the build directory,
+dnl as appropriate.
+dnl
+dnl If apr_found is "yes" or "reconfig", then the caller should use the
+dnl value of apr_config to fetch any necessary build/link information.
+dnl
+
+AC_DEFUN([APR_FIND_APR], [
+ apr_found="no"
+
+ if test "$target_os" = "os2-emx"; then
+ # Scripts don't pass test -x on OS/2
+ TEST_X="test -f"
+ else
+ TEST_X="test -x"
+ fi
+
+ ifelse([$4], [], [
+ ifdef(AC_WARNING,AC_WARNING([$0: missing argument 4 (acceptable-majors): Defaulting to APR 0.x then APR 1.x]))
+ acceptable_majors="0 1"],
+ [acceptable_majors="$4"])
+
+ apr_temp_acceptable_apr_config=""
+ for apr_temp_major in $acceptable_majors
+ do
+ case $apr_temp_major in
+ 0)
+ apr_temp_acceptable_apr_config="$apr_temp_acceptable_apr_config apr-config"
+ ;;
+ *)
+ apr_temp_acceptable_apr_config="$apr_temp_acceptable_apr_config apr-$apr_temp_major-config"
+ ;;
+ esac
+ done
+
+ AC_MSG_CHECKING(for APR)
+ AC_ARG_WITH(apr,
+ [ --with-apr=PATH prefix for installed APR or the full path to
+ apr-config],
+ [
+ if test "$withval" = "no" || test "$withval" = "yes"; then
+ AC_MSG_ERROR([--with-apr requires a directory or file to be provided])
+ fi
+
+ for apr_temp_apr_config_file in $apr_temp_acceptable_apr_config
+ do
+ for lookdir in "$withval/bin" "$withval"
+ do
+ if $TEST_X "$lookdir/$apr_temp_apr_config_file"; then
+ apr_config="$lookdir/$apr_temp_apr_config_file"
+ ifelse([$5], [], [], [
+ apr_acceptable="yes"
+ $5
+ if test "$apr_acceptable" != "yes"; then
+ AC_MSG_WARN([Found APR in $apr_config, but we think it is considered unacceptable])
+ continue
+ fi])
+ apr_found="yes"
+ break 2
+ fi
+ done
+ done
+
+ if test "$apr_found" != "yes" && $TEST_X "$withval" && $withval --help > /dev/null 2>&1 ; then
+ apr_config="$withval"
+ ifelse([$5], [], [apr_found="yes"], [
+ apr_acceptable="yes"
+ $5
+ if test "$apr_acceptable" = "yes"; then
+ apr_found="yes"
+ fi])
+ fi
+
+ dnl if --with-apr is used, it is a fatal error for its argument
+ dnl to be invalid
+ if test "$apr_found" != "yes"; then
+ AC_MSG_ERROR([the --with-apr parameter is incorrect. It must specify an install prefix, a build directory, or an apr-config file.])
+ fi
+ ],[
+ dnl If we allow installed copies, check those before using bundled copy.
+ if test -n "$3" && test "$3" = "1"; then
+ for apr_temp_apr_config_file in $apr_temp_acceptable_apr_config
+ do
+ if $apr_temp_apr_config_file --help > /dev/null 2>&1 ; then
+ apr_config="$apr_temp_apr_config_file"
+ ifelse([$5], [], [], [
+ apr_acceptable="yes"
+ $5
+ if test "$apr_acceptable" != "yes"; then
+ AC_MSG_WARN([skipped APR at $apr_config, version not acceptable])
+ continue
+ fi])
+ apr_found="yes"
+ break
+ else
+ dnl look in some standard places
+ for lookdir in /usr /usr/local /usr/local/apr /opt/apr; do
+ if $TEST_X "$lookdir/bin/$apr_temp_apr_config_file"; then
+ apr_config="$lookdir/bin/$apr_temp_apr_config_file"
+ ifelse([$5], [], [], [
+ apr_acceptable="yes"
+ $5
+ if test "$apr_acceptable" != "yes"; then
+ AC_MSG_WARN([skipped APR at $apr_config, version not acceptable])
+ continue
+ fi])
+ apr_found="yes"
+ break 2
+ fi
+ done
+ fi
+ done
+ fi
+ dnl if we have not found anything yet and have bundled source, use that
+ if test "$apr_found" = "no" && test -d "$1"; then
+ apr_temp_abs_srcdir="`cd $1 && pwd`"
+ apr_found="reconfig"
+ apr_bundled_major="`sed -n '/#define.*APR_MAJOR_VERSION/s/^[^0-9]*\([0-9]*\).*$/\1/p' \"$1/include/apr_version.h\"`"
+ case $apr_bundled_major in
+ "")
+ AC_MSG_ERROR([failed to find major version of bundled APR])
+ ;;
+ 0)
+ apr_temp_apr_config_file="apr-config"
+ ;;
+ *)
+ apr_temp_apr_config_file="apr-$apr_bundled_major-config"
+ ;;
+ esac
+ if test -n "$2"; then
+ apr_config="$2/$apr_temp_apr_config_file"
+ else
+ apr_config="$1/$apr_temp_apr_config_file"
+ fi
+ fi
+ ])
+
+ AC_MSG_RESULT($apr_found)
+])
Added: uima/uimacpp/trunk/m4/find_icu.m4
URL: http://svn.apache.org/viewvc/uima/uimacpp/trunk/m4/find_icu.m4?rev=1069956&view=auto
==============================================================================
--- uima/uimacpp/trunk/m4/find_icu.m4 (added)
+++ uima/uimacpp/trunk/m4/find_icu.m4 Fri Feb 11 21:17:01 2011
@@ -0,0 +1,76 @@
+# ===========================================================================
+# http://www.gnu.org/software/autoconf-archive/ax_lib_xerces.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+# AX_LIB_ICUC([MINIMUM-VERSION])
+#
+# DESCRIPTION
+#
+# This macro provides tests of availability of ICU
+# particular version or newer. This macros checks for ICU
+# Parser headers and libraries and defines compilation flags
+#
+# Macro supports following options and their values:
+#
+# --with-icu - path to ICU installation prefix
+#
+#
+# This macro calls:
+#
+# AC_SUBST(ICU_CPPFLAGS)
+# AC_SUBST(ICU_LDFLAGS)
+# AC_SUBST(ICU_VERSION) - only if version requirement is used
+#
+# And sets:
+#
+# icu_found
+#
+
+AC_DEFUN([ICU_FIND_ICU],
+[
+ icu_found="no"
+
+ AC_MSG_CHECKING(for ICU)
+ AC_ARG_WITH(icu,
+ [ --with-icu=PATH prefix for install ICU or will try standar path ],
+ [
+ if test -d "$withval"; then
+ icu_prefix="$withval"
+ else
+ AC_MSG_ERROR([Invalid ICU path $withval])
+ fi
+ ],
+ [
+ dnl Default behavior is implicit yes
+ if test -d /usr/local/include/unicode ; then
+ icu_prefix=/usr/local
+ elif test -d /usr/include/unicode ; then
+ icu_prefix=/usr
+ else
+ AC_MSG_ERROR([ICU not found. Please use --with-icu= to the path])
+ fi
+ ])
+
+ icu_found="yes"
+
+ if test -x "$icu_prefix/bin/icu-config"; then
+ ICU_VERSION=`$icu_prefix/bin/icu-config --prefix=$icu_prefix --version`
+ VERSION_CHECK=`expr $ICU_VERSION \>\= $1`
+ if test "$VERSION_CHECK" = "1"; then
+ ICU_CPPFLAGS="-I$icu_prefix/include"
+ ICU_LDFLAGS="-L$icu_prefix/lib -licui18n -licuuc -licuio -licudata"
+ AC_SUBST(ICU_CPPFLAGS)
+ AC_SUBST(ICU_LDFLAGS)
+ AC_MSG_RESULT($icu_found)
+ else
+ icu_found="no"
+ AC_MSG_ERROR([Invalid ICU version $ICU_VERSION found. ICU version $1 or higher is required])
+ fi
+ else
+ icu_found="no"
+ AC_MSG_ERROR([icu_config script not found.])
+ fi
+
+])
Added: uima/uimacpp/trunk/m4/find_xerces.m4
URL: http://svn.apache.org/viewvc/uima/uimacpp/trunk/m4/find_xerces.m4?rev=1069956&view=auto
==============================================================================
--- uima/uimacpp/trunk/m4/find_xerces.m4 (added)
+++ uima/uimacpp/trunk/m4/find_xerces.m4 Fri Feb 11 21:17:01 2011
@@ -0,0 +1,291 @@
+# ===========================================================================
+# http://www.gnu.org/software/autoconf-archive/ax_lib_xerces.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+# AX_LIB_XERCES([MINIMUM-VERSION])
+#
+# DESCRIPTION
+#
+# This macro provides tests of availability of Apache Xerces C++ Parser of
+# particular version or newer. This macros checks for Apache Xerces C++
+# Parser headers and libraries and defines compilation flags
+#
+# Macro supports following options and their values:
+#
+# 1) Single-option usage:
+#
+# --with-xerces - yes, no or path to Xerces installation prefix
+#
+# 2) Three-options usage (all options are required):
+#
+# --with-xerces=yes
+# --with-xerces-inc - path to base directory with Xerces headers
+# --with-xerces-lib - linker flags for Xerces
+#
+# This macro calls:
+#
+# AC_SUBST(XERCES_CFLAGS)
+# AC_SUBST(XERCES_LDFLAGS)
+# AC_SUBST(XERCES_VERSION) - only if version requirement is used
+#
+# And sets:
+#
+# HAVE_XERCES
+#
+# LICENSE
+#
+# Copyright (c) 2008 Mateusz Loskot <ma...@loskot.net>
+#
+# Copying and distribution of this file, with or without modification, are
+# permitted in any medium without royalty provided the copyright notice
+# and this notice are preserved. This file is offered as-is, without any
+# warranty.
+
+#serial 10
+
+AC_DEFUN([AX_LIB_XERCES],
+[
+# AC_REQUIRE([AX_PTHREAD])
+
+ AC_ARG_WITH([xerces],
+ AS_HELP_STRING([--with-xerces=@<:@ARG@:>@],
+ [use Xerces C++ Parser from given prefix (ARG=path); check standard prefixes (ARG=yes); disable (ARG=no)]
+ ),
+ [
+ if test "$withval" = "yes"; then
+ if test -d /usr/local/include/xercesc ; then
+ xerces_prefix=/usr/local
+ elif test -d /usr/include/xercesc ; then
+ xerces_prefix=/usr
+ else
+ xerces_prefix=""
+ fi
+ xerces_requested="yes"
+ elif test -d "$withval"; then
+ xerces_prefix="$withval"
+ xerces_requested="yes"
+ else
+ xerces_prefix=""
+ xerces_requested="no"
+ fi
+ ],
+ [
+ dnl Default behavior is implicit yes
+ if test -d /usr/local/include/xercesc ; then
+ xerces_prefix=/usr/local
+ elif test -d /usr/include/xercesc ; then
+ xerces_prefix=/usr
+ else
+ xerces_prefix=""
+ fi
+ ]
+ )
+
+ AC_ARG_WITH([xerces-inc],
+ AS_HELP_STRING([--with-xerces-inc=@<:@DIR@:>@],
+ [path to Xerces C++ Parser headers]
+ ),
+ [xerces_include_dir="$withval"],
+ [xerces_include_dir=""]
+ )
+ AC_ARG_WITH([xerces-lib],
+ AS_HELP_STRING([--with-xerces-lib=@<:@ARG@:>@],
+ [link options for Xerces C++ Parser libraries]
+ ),
+ [xerces_ldflags="$withval"],
+ [xerces_ldflags=""]
+ )
+
+ XERCES_CPPFLAGS=""
+ XERCES_LDFLAGS=""
+ XERCES_VERSION=""
+
+ dnl
+ dnl Collect include/lib paths and flags
+ dnl
+ run_xerces_test="no"
+
+ if test -n "$xerces_prefix"; then
+ xerces_include_dir="$xerces_prefix/include"
+ xerces_include_dir2="$xerces_prefix/include/xercesc"
+ xerces_ldflags="-L$xerces_prefix/lib"
+ run_xerces_test="yes"
+ elif test "$xerces_requested" = "yes"; then
+ if test -n "$xerces_include_dir" -a -n "$xerces_lib_flags"; then
+ xerces_include_dir2="$xerces_include_dir/xercesc"
+ run_xerces_test="yes"
+ fi
+ else
+ run_xerces_test="no"
+ fi
+
+ xerces_libs="-lxerces-c"
+
+ dnl
+ dnl Check Xerces C++ Parser files
+ dnl
+ if test "$run_xerces_test" = "yes"; then
+
+ saved_CPPFLAGS="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS -I$xerces_include_dir -I$xerces_include_dir2"
+
+ saved_LDFLAGS="$LDFLAGS"
+ LDFLAGS="$LDFLAGS $xerces_ldflags $PTHREAD_LDFLAGS"
+
+ saved_LIBS="$LIBS"
+ LIBS="$xerces_libs $PTHREAD_LIBS $LIBS"
+
+ dnl
+ dnl Check Xerces headers
+ dnl
+ AC_MSG_CHECKING([for Xerces C++ Parser headers in $xerces_include_dir and $xerces_include_dir2])
+
+ AC_LANG_PUSH([C++])
+ AC_COMPILE_IFELSE([
+ AC_LANG_PROGRAM(
+ [[
+@%:@include <xercesc/util/XercesDefs.hpp>
+@%:@include <xercesc/util/PlatformUtils.hpp>
+ ]],
+ [[]]
+ )],
+ [
+ XERCES_CPPFLAGS="-I$xerces_include_dir -I$xerces_include_dir2"
+ xerces_header_found="yes"
+ AC_MSG_RESULT([found])
+ ],
+ [
+ xerces_header_found="no"
+ AC_MSG_RESULT([not found])
+ ]
+ )
+ AC_LANG_POP([C++])
+
+ dnl
+ dnl Check Xerces libraries
+ dnl
+ if test "$xerces_header_found" = "yes"; then
+
+ AC_MSG_CHECKING([for Xerces C++ Parser libraries])
+
+ AC_LANG_PUSH([C++])
+ AC_LINK_IFELSE([
+ AC_LANG_PROGRAM(
+ [[
+@%:@include <xercesc/util/XercesDefs.hpp>
+@%:@include <xercesc/util/PlatformUtils.hpp>
+#if (_XERCES_VERSION >= 20200)
+XERCES_CPP_NAMESPACE_USE
+#endif
+ ]],
+ [[
+XMLPlatformUtils::Initialize();
+ ]]
+ )],
+ [
+ XERCES_LDFLAGS="$xerces_ldflags $PTHREAD_LDFLAGS"
+ XERCES_LIBS="$xerces_libs $PTHREAD_LIBS"
+ xerces_lib_found="yes"
+ AC_MSG_RESULT([found])
+ ],
+ [
+ xerces_lib_found="no"
+ AC_MSG_RESULT([not found])
+ ]
+ )
+ AC_LANG_POP([C++])
+ fi
+
+ CPPFLAGS="$saved_CPPFLAGS"
+ LDFLAGS="$saved_LDFLAGS"
+ LIBS="$saved_LIBS"
+ fi
+
+ AC_MSG_CHECKING([for Xerces C++ Parser])
+
+ if test "$run_xerces_test" = "yes"; then
+ if test "$xerces_header_found" = "yes" -a "$xerces_lib_found" = "yes"; then
+
+ AC_SUBST([XERCES_CPPFLAGS])
+ AC_SUBST([XERCES_LDFLAGS])
+ AC_SUBST([XERCES_LIBS])
+
+ HAVE_XERCES="yes"
+ else
+ HAVE_XERCES="no"
+ fi
+
+ AC_MSG_RESULT([$HAVE_XERCES])
+
+ dnl
+ dnl Check Xerces version
+ dnl
+ if test "$HAVE_XERCES" = "yes"; then
+
+ xerces_version_req=ifelse([$1], [], [], [$1])
+
+ if test -n "$xerces_version_req"; then
+
+ AC_MSG_CHECKING([if Xerces C++ Parser version is >= $xerces_version_req])
+
+ if test -f "$xerces_include_dir2/util/XercesVersion.hpp"; then
+
+ xerces_major=`cat $xerces_include_dir2/util/XercesVersion.hpp | \
+ grep '^#define.*XERCES_VERSION_MAJOR.*[0-9]$' | \
+ sed -e 's/#define XERCES_VERSION_MAJOR.//'`
+
+ xerces_minor=`cat $xerces_include_dir2/util/XercesVersion.hpp | \
+ grep '^#define.*XERCES_VERSION_MINOR.*[0-9]$' | \
+ sed -e 's/#define XERCES_VERSION_MINOR.//'`
+
+ xerces_revision=`cat $xerces_include_dir2/util/XercesVersion.hpp | \
+ grep '^#define.*XERCES_VERSION_REVISION.*[0-9]$' | \
+ sed -e 's/#define XERCES_VERSION_REVISION.//'`
+
+ XERCES_VERSION="$xerces_major.$xerces_minor.$xerces_revision"
+ AC_SUBST([XERCES_VERSION])
+
+ dnl Decompose required version string and calculate numerical representation
+ xerces_version_req_major=`expr $xerces_version_req : '\([[0-9]]*\)'`
+ xerces_version_req_minor=`expr $xerces_version_req : '[[0-9]]*\.\([[0-9]]*\)'`
+ xerces_version_req_revision=`expr $xerces_version_req : '[[0-9]]*\.[[0-9]]*\.\([[0-9]]*\)'`
+ if test "x$xerces_version_req_revision" = "x"; then
+ xerces_version_req_revision="0"
+ fi
+
+ xerces_version_req_number=`expr $xerces_version_req_major \* 10000 \
+ \+ $xerces_version_req_minor \* 100 \
+ \+ $xerces_version_req_revision`
+
+ dnl Calculate numerical representation of detected version
+ xerces_version_number=`expr $xerces_major \* 10000 \
+ \+ $xerces_minor \* 100 \
+ \+ $xerces_revision`
+
+ xerces_version_check=`expr $xerces_version_number \>\= $xerces_version_req_number`
+ if test "$xerces_version_check" = "1"; then
+ AC_MSG_RESULT([yes])
+ else
+ HAVE_XERCES="no"
+ AC_MSG_RESULT([no])
+ AC_MSG_ERROR([Found Xerces C++ Parser $XERCES_VERSION, which is older than required. Possible compilation failure.])
+ fi
+ else
+ HAVE_XERCES="no"
+ AC_MSG_RESULT([no])
+ AC_MSG_ERROR([Missing header XercesVersion.hpp. Unable to determine Xerces version.])
+ fi
+ fi
+ fi
+
+ else
+ HAVE_XERCES="no"
+ AC_MSG_RESULT([$HAVE_XERCES])
+
+ if test "$xerces_requested" = "yes"; then
+ AC_MSG_ERROR([Xerces C++ Parser support requested but headers or library not found. Specify valid prefix of Xerces C++ using --with-xerces=@<:@DIR@:>@ or provide include directory and linker flags using --with-xerces-inc and --with-xerces-lib])
+ fi
+ fi
+])
Modified: uima/uimacpp/trunk/src/Makefile.am
URL: http://svn.apache.org/viewvc/uima/uimacpp/trunk/src/Makefile.am?rev=1069956&r1=1069955&r2=1069956&view=diff
==============================================================================
--- uima/uimacpp/trunk/src/Makefile.am (original)
+++ uima/uimacpp/trunk/src/Makefile.am Fri Feb 11 21:17:01 2011
@@ -16,3 +16,7 @@
# ---------------------------------------------------------------------------
SUBDIRS = framework utils test
+EXTRA_DIST = base.mak
+install-data-local:
+ $(INSTALL) base.mak $(DESTDIR)$(prefix)/lib/base.mak
+
Modified: uima/uimacpp/trunk/src/framework/Makefile.am
URL: http://svn.apache.org/viewvc/uima/uimacpp/trunk/src/framework/Makefile.am?rev=1069956&r1=1069955&r2=1069956&view=diff
==============================================================================
--- uima/uimacpp/trunk/src/framework/Makefile.am (original)
+++ uima/uimacpp/trunk/src/framework/Makefile.am Fri Feb 11 21:17:01 2011
@@ -17,10 +17,14 @@
lib_LTLIBRARIES = libuima.la
-include_HEADERS =
-include_HEADERS += uima/*.h
-include_HEADERS += uima/*.hpp
-include_HEADERS += ../cas/uima/*.hpp
+nobase_include_HEADERS =
+nobase_include_HEADERS += uima/*.h
+nobase_include_HEADERS += uima/*.hpp
+cas_includedir = $(includedir)/uima
+cas_include_HEADERS = ../cas/uima/*.hpp
+jni_includedir = $(includedir)/uima
+jni_include_HEADERS = ../jni/uima/*.hpp
+jni_include_HEADERS += ../jni/uima/*.h
uima_tgt: libuima.la
@@ -46,7 +50,8 @@ INCLUDES += $(UIMA_JDK_INCLUDE)
INCLUDES += $(UIMA_JDK_INCLUDE)/genunix
INCLUDES += $(UIMA_JDK_INCLUDE)/linux
-AM_LDFLAGS = -release $(LIB_VERSION)
+libuima_la_LDFLAGS = -version-info $(LT_VERSION_NUMBER) -release $(LT_RELEASE_NUMBER)
+#AM_LDFLAGS = -release $(LIB_VERSION)
if DEBUG_UIMA
AM_CPPFLAGS = -g -DDEBUG
@@ -133,4 +138,5 @@ libuima_la_SOURCES += ../cas/xmideserial
libuima_la_SOURCES += ../cas/xmideserializer_handler.cpp
libuima_la_SOURCES += ../cas/xmiwriter.cpp
+#libuima_la_LDFLAGS = -avoid-version -release 2.3.1 -soname libuima.2.3
libuima_la_LIBADD = $(UIMA_XERCES_LIB) $(UIMA_APR_LIB) $(UIMA_ICU_LIB) $(UIMACPP_HOME_LIB)
Modified: uima/uimacpp/trunk/src/test/Makefile.am
URL: http://svn.apache.org/viewvc/uima/uimacpp/trunk/src/test/Makefile.am?rev=1069956&r1=1069955&r2=1069956&view=diff
==============================================================================
--- uima/uimacpp/trunk/src/test/Makefile.am (original)
+++ uima/uimacpp/trunk/src/test/Makefile.am Fri Feb 11 21:17:01 2011
@@ -15,8 +15,16 @@
# limitations under the License.
# ---------------------------------------------------------------------------
-bin_PROGRAMS = $(TST_BIN)
-lib_LTLIBRARIES = $(TST_LIB)
+TESTS = fvt.sh
+check_PROGRAMS = $(TST_BIN)
+#noinst_libdir = $(libdir)
+check_LTLIBRARIES = $(TST_LIB)
+
+EXTRA_DIST = data fvtTestfile fvt.sh
+dist-hook:
+ rm -rf `find $(distdir)/src/test/data -name .svn`
+
+
TST_LIB=libtoknz.la libdump.la libSofaStreamHandlerFile.la libSimpleTextSegmenter.la libTextSegmentConsumer.la libMeetingAnnotator.la
@@ -52,7 +60,7 @@ LIBADD = $(UIMA_LIB) $(UIMA_XERCES_LIB)
# Common routines formerly in library
# src/cmdline_driver.cpp src/doc_buffer.cpp src/htmlparser.cpp src/htmlparser_tools.cpp src/parse_handlers.cpp src/parser_config.cpp src/tt_types.cpp src/xmlparse_handlers.cpp
-
+include_HEADERS = src/uima/*.hpp
test_casserializer_SOURCES = src/test_casserializer.cpp
test_engine_SOURCES = src/test_engine.cpp
@@ -85,23 +93,32 @@ test_xmideserialization_SOURCES = src/te
# that use it have diffeerent compile flags so thy'll get different obj names.
# Otherwise we get: object `tt_types.$(OBJEXT)' created both with libtool and without
#
+
+LT_FLAGS = -avoid-version -module -rpath /somewhere
+
libtoknz_la_SOURCES = src/annotator_tok.cpp
libtoknz_la_SOURCES += src/ss_tokenizer.cpp
libtoknz_la_SOURCES += src/tt_types.cpp
libtoknz_la_LIBADD = $(LIBADD)
-libtoknz_la_CXXFLAGS = $(AM_CXXFLAGS)
+libtoknz_la_CXXFLAGS = $(AM_CXXFLAGSi)
+libtoknz_la_LDFLAGS = $(LT_FLAGS)
libdump_la_SOURCES = src/annotator_dump.cpp
libdump_la_LIBADD = $(LIBADD)
+libdump_la_LDFLAGS = $(LT_FLAGS)
libSofaStreamHandlerFile_la_SOURCES = src/SofaStreamHandlerFile.cpp
libSofaStreamHandlerFile_la_LIBADD = $(LIBADD)
+libSofaStreamHandlerFile_la_LDFLAGS = $(LT_FLAGS)
libSimpleTextSegmenter_la_SOURCES = src/SimpleTextSegmenter.cpp
libSimpleTextSegmenter_la_LIBADD = $(LIBADD)
+libSimpleTextSegmenter_la_LDFLAGS = $(LT_FLAGS)
libTextSegmentConsumer_la_SOURCES = src/TextSegmentConsumer.cpp
libTextSegmentConsumer_la_LIBADD = $(LIBADD)
+libTextSegmentConsumer_la_LDFLAGS = $(LT_FLAGS)
libMeetingAnnotator_la_SOURCES = src/MeetingAnnotator.cpp
libMeetingAnnotator_la_LIBADD = $(LIBADD)
+libMeetingAnnotator_la_LDFLAGS = $(LT_FLAGS)
Modified: uima/uimacpp/trunk/src/test/src/annotator_dump.cpp
URL: http://svn.apache.org/viewvc/uima/uimacpp/trunk/src/test/src/annotator_dump.cpp?rev=1069956&r1=1069955&r2=1069956&view=diff
==============================================================================
--- uima/uimacpp/trunk/src/test/src/annotator_dump.cpp (original)
+++ uima/uimacpp/trunk/src/test/src/annotator_dump.cpp Fri Feb 11 21:17:01 2011
@@ -344,7 +344,7 @@ typedef AnnotatorDump UserDefinedAnnotat
/* Include generic C API wrapper */
/* ----------------------------------------------------------------------- */
-#include "uima/annotator_generic.inl"
-
+///#include "uima/annotator_generic.inl"
+MAKE_AE(AnnotatorDump);
/* <EOF> */
Modified: uima/uimacpp/trunk/src/test/src/annotator_tok.cpp
URL: http://svn.apache.org/viewvc/uima/uimacpp/trunk/src/test/src/annotator_tok.cpp?rev=1069956&r1=1069955&r2=1069956&view=diff
==============================================================================
--- uima/uimacpp/trunk/src/test/src/annotator_tok.cpp (original)
+++ uima/uimacpp/trunk/src/test/src/annotator_tok.cpp Fri Feb 11 21:17:01 2011
@@ -459,7 +459,7 @@ typedef AnnotatorTokenizer UserDefinedAn
/* Include generic C API wrapper */
/* ----------------------------------------------------------------------- */
-#include "uima/annotator_generic.inl"
-
+//#include "uima/annotator_generic.inl"
+MAKE_AE(AnnotatorTokenizer);
/* <EOF> */
Modified: uima/uimacpp/trunk/src/utils/Makefile.am
URL: http://svn.apache.org/viewvc/uima/uimacpp/trunk/src/utils/Makefile.am?rev=1069956&r1=1069955&r2=1069956&view=diff
==============================================================================
--- uima/uimacpp/trunk/src/utils/Makefile.am (original)
+++ uima/uimacpp/trunk/src/utils/Makefile.am Fri Feb 11 21:17:01 2011
@@ -19,11 +19,11 @@
bin_PROGRAMS = $(UTILS_BIN)
-if ACTIVEMQ_FOUND
+#if ACTIVEMQ_FOUND
UTILS_BIN= runAECpp deployCppService
-else
-UTILS_BIN= runAECpp
-endif
+#else
+#UTILS_BIN= runAECpp
+#endif
test_tgt: $(UTILS_BIN)
@@ -38,13 +38,16 @@ endif
AM_CPPFLAGS += -D_GNU_SOURCE
# Set default for all target_LDADD values
-LDADD = $(UIMA_LIB) $(UIMA_XERCES_LIB) $(UIMA_ICU_LIB) $(UIMA_ACTIVEMQ_LIB) -ldl $(UIMACPP_HOME_LIB)
+LDADD = $(UIMA_LIB) $(UIMA_APR_LIB) $(UIMA_XERCES_LIB) $(UIMA_ICU_LIB) $(UIMA_ACTIVEMQ_LIB) -ldl $(UIMACPP_HOME_LIB)
runAECpp_SOURCES = runAECpp.cpp
runAECpp_CPPFLAGS = -g -DDEBUG
runAECpp_CPPFLAGS += -D_GNU_SOURCE
-deployCppService_SOURCES = deployCppService.cpp ActiveMQAnalysisEngineService.cpp
+deployCppService_SOURCES = deployCppService.cpp ActiveMQAnalysisEngineService.cpp deployCppService.hpp ActiveMQAnalysisEngineService.hpp
+
+
+
deployCppService_CPPFLAGS = -g -DDEBUG
deployCppService_CPPFLAGS += -D_GNU_SOURCE