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/03/03 19:17:34 UTC
svn commit: r1076713 - in /uima/uimacpp/trunk: Makefile.am
m4/find_activemq.m4 m4/find_apr.m4 m4/find_icu.m4 m4/find_xerces.m4
Author: bhavani
Date: Thu Mar 3 18:17:34 2011
New Revision: 1076713
URL: http://svn.apache.org/viewvc?rev=1076713&view=rev
Log:
UIMA-2053 added support for make sdk and make docs targets
Modified:
uima/uimacpp/trunk/Makefile.am
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/Makefile.am
URL: http://svn.apache.org/viewvc/uima/uimacpp/trunk/Makefile.am?rev=1076713&r1=1076712&r2=1076713&view=diff
==============================================================================
--- uima/uimacpp/trunk/Makefile.am (original)
+++ uima/uimacpp/trunk/Makefile.am Thu Mar 3 18:17:34 2011
@@ -31,3 +31,12 @@ dist-hook:
install-data-local:
$(INSTALL) src/base.mak $(DESTDIR)$(prefix)/lib/base.mak
+
+docs: docs/html/index.html
+
+docs/html/index.html:
+ cd docs && ./builddocs.sh
+
+sdk: install/bin/runAECpp docs/html/index.html $(icu_install) $(apr_install) $(xerces_install) $(activemq_install)
+ echo "Building SDK with $(icu_install) $(apr_install) $(xerces_install) $(activemq_install)"
+ export APR_HOME=$(apr_install) ICU_HOME=$(icu_install) XERCES_HOME=$(xerces_install) $ACTIVEMQ_HOME=$(activemq_install) && ./buildsdk.sh $(ARGS)
Modified: uima/uimacpp/trunk/m4/find_activemq.m4
URL: http://svn.apache.org/viewvc/uima/uimacpp/trunk/m4/find_activemq.m4?rev=1076713&r1=1076712&r2=1076713&view=diff
==============================================================================
--- uima/uimacpp/trunk/m4/find_activemq.m4 (original)
+++ uima/uimacpp/trunk/m4/find_activemq.m4 Thu Mar 3 18:17:34 2011
@@ -37,7 +37,9 @@ AC_DEFUN([AMQ_FIND_AMQ],
[ --with-activemq=PATH prefix for install ACTIVEMQ or leave out to use standard path ],
[
if test -d "$withval"; then
- activemq_prefix="$withval"
+ activemq_prefix="$withval"
+ activemq_install="$withval"
+ AC_SUBST(activemq_install)
else
AC_MSG_ERROR([Invalid ACTIVEMQ path $withval])
fi
Modified: uima/uimacpp/trunk/m4/find_apr.m4
URL: http://svn.apache.org/viewvc/uima/uimacpp/trunk/m4/find_apr.m4?rev=1076713&r1=1076712&r2=1076713&view=diff
==============================================================================
--- uima/uimacpp/trunk/m4/find_apr.m4 (original)
+++ uima/uimacpp/trunk/m4/find_apr.m4 Thu Mar 3 18:17:34 2011
@@ -104,7 +104,8 @@ AC_DEFUN([APR_FIND_APR], [
if test "$withval" = "no" || test "$withval" = "yes"; then
AC_MSG_ERROR([--with-apr requires a directory or file to be provided])
fi
-
+ apr_install="$withval"
+ AC_SUBST(apr_install)
for apr_temp_apr_config_file in $apr_temp_acceptable_apr_config
do
for lookdir in "$withval/bin" "$withval"
Modified: uima/uimacpp/trunk/m4/find_icu.m4
URL: http://svn.apache.org/viewvc/uima/uimacpp/trunk/m4/find_icu.m4?rev=1076713&r1=1076712&r2=1076713&view=diff
==============================================================================
--- uima/uimacpp/trunk/m4/find_icu.m4 (original)
+++ uima/uimacpp/trunk/m4/find_icu.m4 Thu Mar 3 18:17:34 2011
@@ -37,7 +37,9 @@ AC_DEFUN([ICU_FIND_ICU],
[ --with-icu=PATH prefix for install ICU or will try standar path ],
[
if test -d "$withval"; then
- icu_prefix="$withval"
+ icu_prefix="$withval"
+ icu_install="$withval"
+ AC_SUBST(icu_install)
else
AC_MSG_ERROR([Invalid ICU path $withval])
fi
Modified: uima/uimacpp/trunk/m4/find_xerces.m4
URL: http://svn.apache.org/viewvc/uima/uimacpp/trunk/m4/find_xerces.m4?rev=1076713&r1=1076712&r2=1076713&view=diff
==============================================================================
--- uima/uimacpp/trunk/m4/find_xerces.m4 (original)
+++ uima/uimacpp/trunk/m4/find_xerces.m4 Thu Mar 3 18:17:34 2011
@@ -66,6 +66,8 @@ AC_DEFUN([AX_LIB_XERCES],
elif test -d "$withval"; then
xerces_prefix="$withval"
xerces_requested="yes"
+ xerces_install="$withval"
+ AC_SUBST(xerces_install)
else
xerces_prefix=""
xerces_requested="no"