svn commit: r1221237 - in /uima/uimacpp/trunk/src: cas/arrayfs.cpp cas/uima/lowlevel_fsheap.hpp test/src/test_primitivetypes.cpp
Author: bhavani
Date: Tue Dec 20 13:00:06 2011
New Revision: 1221237
URL: http://svn.apache.org/viewvc?rev=1221237view=rev
Log:
UIMA-2307 implement copyToArray and copyFromArray in class BasicArrayFS
Modified:
uima/uimacpp/trunk/src/cas/arrayfs.cpp
uima/uimacpp/trunk/src/cas/uima/lowlevel_fsheap.hpp
uima/uimacpp/trunk/src/test/src/test_primitivetypes.cpp
Modified: uima/uimacpp/trunk/src/cas/arrayfs.cpp
URL:
http://svn.apache.org/viewvc/uima/uimacpp/trunk/src/cas/arrayfs.cpp?rev=1221237r1=1221236r2=1221237view=diff
==
--- uima/uimacpp/trunk/src/cas/arrayfs.cpp (original)
+++ uima/uimacpp/trunk/src/cas/arrayfs.cpp Tue Dec 20 13:00:06 2011
@@ -169,28 +169,76 @@ namespace uima {
size_t uiEnd,
T* destArray,
size_t uiDestOffset) const {
-assertWithMsg(false, Not yet implemented);
-UIMA_EXC_THROW_NEW(NotYetImplementedException,
- UIMA_ERR_NOT_YET_IMPLEMENTED,
- UIMA_MSG_ID_EXC_NOT_YET_IMPLEMENTED,
- ErrorMessage(UIMA_MSG_ID_EXCON_UNKNOWN_CONTEXT),
- ErrorInfo::unrecoverable
- );
+ checkValidity(UIMA_MSG_ID_EXCON_GETTING_FS_FROM_ARRAY);
+ checkArraySize(iv_tyFS, iv_cas-getHeap(), uiEnd - uiStart ,
UIMA_MSG_ID_EXCON_GETTING_FS_FROM_ARRAY);
+ uima::lowlevel::TyFSType typecode = iv_cas-getHeap()-getType(iv_tyFS);
+ T result;
+ size_t srcOffset = uiStart;
+ size_t numelements = uiEnd-uiStart+1;
+ size_t destOffset = uiDestOffset;
+
+ if (typecode== uima::internal::gs_tyIntArrayType ||
+ typecode== uima::internal::gs_tyFloatArrayType ) {
+ iv_cas-getHeap()-copyToArray(
srcOffset,iv_tyFS,(uima::lowlevel::TyHeapCell*)
destArray,destOffset,numelements);
+ } else if(typecode== uima::internal::gs_tyByteArrayType ||
+ typecode== uima::internal::gs_tyBooleanArrayType) {
+ iv_cas-getHeap()-copyToArray( srcOffset,iv_tyFS,(char*)
destArray,destOffset,numelements);
+ } else if(typecode== uima::internal::gs_tyShortArrayType ) {
+ iv_cas-getHeap()-copyToArray( srcOffset,iv_tyFS,(short*)
destArray,destOffset,numelements);
+ } else if(typecode== uima::internal::gs_tyLongArrayType ||
+ typecode== uima::internal::gs_tyDoubleArrayType) {
+ iv_cas-getHeap()-copyToArray( srcOffset,iv_tyFS,(INT64*)
destArray,destOffset,numelements);
+ } else {
+ assertWithMsg(false, Not yet implemented);
+ UIMA_EXC_THROW_NEW(NotYetImplementedException,
+ UIMA_ERR_NOT_YET_IMPLEMENTED,
+ UIMA_MSG_ID_EXC_NOT_YET_IMPLEMENTED,
+ ErrorMessage(UIMA_MSG_ID_EXCON_UNKNOWN_CONTEXT),
+ ErrorInfo::unrecoverable
+);
+ }
}
-
template class T, const uima::lowlevel::TyFSType ARRAY_TYPE
void BasicArrayFST, ARRAY_TYPE::copyFromArray(
-T const * sourceArray,
+ T const * sourceArray,
size_t uiStart,
size_t uiEnd,
size_t uiOffset) {
-assertWithMsg(false, Not yet implemented);
-UIMA_EXC_THROW_NEW(NotYetImplementedException,
- UIMA_ERR_NOT_YET_IMPLEMENTED,
- UIMA_MSG_ID_EXC_NOT_YET_IMPLEMENTED,
- ErrorMessage(UIMA_MSG_ID_EXCON_UNKNOWN_CONTEXT),
- ErrorInfo::unrecoverable
- );
+ checkValidity(UIMA_MSG_ID_EXCON_GETTING_FS_FROM_ARRAY);
+ checkArraySize(iv_tyFS, iv_cas-getHeap(), uiEnd - uiStart,
UIMA_MSG_ID_EXCON_GETTING_FS_FROM_ARRAY);
+
+ size_t srcOffset = uiStart;
+ size_t numelements = uiEnd-uiStart+1;
+ size_t destOffset = uiOffset;
+ checkArraySize(iv_tyFS, iv_cas-getHeap(), destOffset+numelements-1,
UIMA_MSG_ID_EXCON_GETTING_FS_FROM_ARRAY);
+ uima::lowlevel::TyFSType typecode = iv_cas-getHeap()-getType(iv_tyFS);
+
+ if (typecode== uima::internal::gs_tyIntArrayType ||
+ typecode== uima::internal::gs_tyFloatArrayType ) {
+ iv_cas-getHeap()-copyFromArray( (uima::lowlevel::TyHeapCell *)
sourceArray, srcOffset, iv_tyFS, destOffset, numelements);
+ }
+ else if(typecode== uima::internal::gs_tyByteArrayType ||
+ typecode== uima::internal::gs_tyBooleanArrayType ) {
+ iv_cas-getHeap()-copyFromArray( (char *) sourceArray,
srcOffset, iv_tyFS, destOffset, numelements);
+
+ }
+ else if(typecode== uima::internal::gs_tyShortArrayType) {
+ iv_cas-getHeap()-copyFromArray( (short *) sourceArray,
srcOffset, iv_tyFS, destOffset, numelements);
+ }
+ else if(typecode== uima::internal::gs_tyLongArrayType ||
+ typecode == uima::internal::gs_tyDoubleArrayType ) {
+ iv_cas-getHeap()-copyFromArray( (INT64 *)
svn commit: r1221318 - in /uima/sandbox/trunk/TextMarker/uima-docbook-textmarker: pom.xml src/docbook/images/tools/tools.textmarker/symboltaxo.png src/docbook/proxy-book.xml src/docbook/tools.textmark
Author: pkluegl
Date: Tue Dec 20 15:32:17 2011
New Revision: 1221318
URL: http://svn.apache.org/viewvc?rev=1221318view=rev
Log:
UIMA-2285
converted to maven project
added a proxy book and old (out-dated) introduction for testing the maven build
process
Added:
uima/sandbox/trunk/TextMarker/uima-docbook-textmarker/pom.xml
uima/sandbox/trunk/TextMarker/uima-docbook-textmarker/src/docbook/images/tools/tools.textmarker/symboltaxo.png
(with props)
uima/sandbox/trunk/TextMarker/uima-docbook-textmarker/src/docbook/proxy-book.xml
Modified:
uima/sandbox/trunk/TextMarker/uima-docbook-textmarker/src/docbook/tools.textmarker.xml
Added: uima/sandbox/trunk/TextMarker/uima-docbook-textmarker/pom.xml
URL:
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uima-docbook-textmarker/pom.xml?rev=1221318view=auto
==
--- uima/sandbox/trunk/TextMarker/uima-docbook-textmarker/pom.xml (added)
+++ uima/sandbox/trunk/TextMarker/uima-docbook-textmarker/pom.xml Tue Dec 20
15:32:17 2011
@@ -0,0 +1,23 @@
+project xmlns=http://maven.apache.org/POM/4.0.0;
xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance;
xsi:schemaLocation=http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd;
+ modelVersion4.0.0/modelVersion
+ artifactIduima-docbook-textmarker/artifactId
+ version2.4.1-SNAPSHOT/version
+ packagingpom/packaging
+ parent
+ groupIdorg.apache.uima/groupId
+ artifactIduimaj-parent/artifactId
+ version2.4.1-SNAPSHOT/version
+ relativePath../uimaj-parent/pom.xml/relativePath
+ /parent
+ nameApache UIMA SDK Documentation - TextMarker/name
+ url${uimaWebsiteUrl}/url
+ scm
+
urlhttp://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uima-docbook-textmarker/url
+
connectionscm:svn:http://svn.apache.org/repos/asf/uima/sandbox/trunk/TextMarker/uima-docbook-textmarker/connection
+
developerConnectionscm:svn:https://svn.apache.org/repos/asf/uima/sandbox/trunk/TextMarker/uima-docbook-textmarker/developerConnection
+ /scm
+ properties
+ uimaScmProject${project.artifactId}/uimaScmProject
+ bookNameRootproxy-book/bookNameRoot
+ /properties
+/project
\ No newline at end of file
Added:
uima/sandbox/trunk/TextMarker/uima-docbook-textmarker/src/docbook/images/tools/tools.textmarker/symboltaxo.png
URL:
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uima-docbook-textmarker/src/docbook/images/tools/tools.textmarker/symboltaxo.png?rev=1221318view=auto
==
Binary file - no diff available.
Propchange:
uima/sandbox/trunk/TextMarker/uima-docbook-textmarker/src/docbook/images/tools/tools.textmarker/symboltaxo.png
--
svn:mime-type = application/octet-stream
Added:
uima/sandbox/trunk/TextMarker/uima-docbook-textmarker/src/docbook/proxy-book.xml
URL:
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uima-docbook-textmarker/src/docbook/proxy-book.xml?rev=1221318view=auto
==
---
uima/sandbox/trunk/TextMarker/uima-docbook-textmarker/src/docbook/proxy-book.xml
(added)
+++
uima/sandbox/trunk/TextMarker/uima-docbook-textmarker/src/docbook/proxy-book.xml
Tue Dec 20 15:32:17 2011
@@ -0,0 +1,27 @@
+?xml version=1.0 encoding=UTF-8?
+!DOCTYPE book PUBLIC -//OASIS//DTD DocBook XML V4.4//EN
+http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd;
+!--
+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.
+--
+book lang=en
+ titleTextMarker Guide and Reference/title
+ xi:include xmlns:xi=http://www.w3.org/2001/XInclude;
href=../../target/docbook-shared/common_book_info.xml/
+ toc/
+ xi:include xmlns:xi=http://www.w3.org/2001/XInclude;
href=tools.textmarker.xml/
+/book
Modified:
uima/sandbox/trunk/TextMarker/uima-docbook-textmarker/src/docbook/tools.textmarker.xml
URL:
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uima-docbook-textmarker/src/docbook/tools.textmarker.xml?rev=1221318r1=1221317r2=1221318view=diff
==
---
svn commit: r1221405 - /uima/uimacpp/trunk/src/cas/uima/lowlevel_fsheap.hpp
Author: bhavani
Date: Tue Dec 20 18:20:00 2011
New Revision: 1221405
URL: http://svn.apache.org/viewvc?rev=1221405view=rev
Log:
UIMA-2307 linux build failed due to unnecessary qualifier in copyToArray and
copyFromArray method declaration
Modified:
uima/uimacpp/trunk/src/cas/uima/lowlevel_fsheap.hpp
Modified: uima/uimacpp/trunk/src/cas/uima/lowlevel_fsheap.hpp
URL:
http://svn.apache.org/viewvc/uima/uimacpp/trunk/src/cas/uima/lowlevel_fsheap.hpp?rev=1221405r1=1221404r2=1221405view=diff
==
--- uima/uimacpp/trunk/src/cas/uima/lowlevel_fsheap.hpp (original)
+++ uima/uimacpp/trunk/src/cas/uima/lowlevel_fsheap.hpp Tue Dec 20 18:20:00 2011
@@ -611,56 +611,56 @@ namespace uima {
double getDouble(TyHeapCell offset);
- void FSHeap::copyFromArray(TyHeapCell sourceArray[], size_t
srcOffset, TyHeapCell tyCell, size_t destOffset, size_t numelements) {
+ void copyFromArray(TyHeapCell sourceArray[], size_t srcOffset,
TyHeapCell tyCell, size_t destOffset, size_t numelements) {
TyHeapCell * ptr = getCArrayFromFS(tyCell);
if(ptr!=NULL) {
memcpy(ptr + destOffset, sourceArray + srcOffset,
numelements*sizeof(TyHeapCell));
}
}
- void FSHeap::copyFromArray(char sourceArray[], size_t srcOffset,
TyHeapCell tyCell, size_t destOffset, size_t numelements) {
+ void copyFromArray(char sourceArray[], size_t srcOffset, TyHeapCell
tyCell, size_t destOffset, size_t numelements) {
char * ptr = const_castchar*(get8BitArray(tyCell));
if(ptr!=NULL) {
memcpy(ptr + destOffset, sourceArray + srcOffset, numelements);
}
}
- void FSHeap::copyFromArray(short sourceArray[], size_t srcOffset,
TyHeapCell tyCell, size_t destOffset, size_t numelements) {
+ void copyFromArray(short sourceArray[], size_t srcOffset, TyHeapCell
tyCell, size_t destOffset, size_t numelements) {
short * ptr = const_castshort*(get16BitArray(tyCell));
if(ptr!=NULL) {
memcpy(ptr + destOffset, sourceArray + srcOffset, numelements *
sizeof(short));
}
}
- void FSHeap::copyFromArray(INT64 sourceArray[], size_t srcOffset,
TyHeapCell tyCell, size_t destOffset, size_t numelements) {
+ void copyFromArray(INT64 sourceArray[], size_t srcOffset, TyHeapCell
tyCell, size_t destOffset, size_t numelements) {
INT64 * ptr = const_castINT64*(get64BitArray(tyCell));
if(ptr!=NULL) {
memcpy(ptr + destOffset, sourceArray + srcOffset, numelements *
sizeof(INT64));
}
}
- void FSHeap::copyToArray(size_t srcOffset, TyHeapCell tyCell, char
destArray[], size_t destOffset, size_t numelements) {
+ void copyToArray(size_t srcOffset, TyHeapCell tyCell, char
destArray[], size_t destOffset, size_t numelements) {
char * ptr = const_castchar*(get8BitArray(tyCell));
if(ptr!=NULL) {
memcpy(destArray + destOffset, ptr + srcOffset, numelements);
}
}
- void FSHeap::copyToArray(size_t srcOffset, TyHeapCell tyCell,
TyHeapCell destArray[], size_t destOffset, size_t numelements) {
+ void copyToArray(size_t srcOffset, TyHeapCell tyCell, TyHeapCell
destArray[], size_t destOffset, size_t numelements) {
TyHeapCell * ptr = const_castTyHeapCell*(getCArrayFromFS(tyCell));
if(ptr!=NULL) {
memcpy(destArray + destOffset, ptr + srcOffset,
numelements*sizeof(TyHeapCell) );
}
}
- void FSHeap::copyToArray(size_t srcOffset, TyHeapCell tyCell, short
destArray[], size_t destOffset, size_t numelements) {
+ void copyToArray(size_t srcOffset, TyHeapCell tyCell, short
destArray[], size_t destOffset, size_t numelements) {
short * ptr = const_castshort*(get16BitArray(tyCell));
if(ptr!=NULL) {
memcpy(destArray + destOffset, ptr + srcOffset,
numelements*sizeof(short) );
}
}
- void FSHeap::copyToArray(size_t srcOffset, TyHeapCell tyCell, INT64
destArray[], size_t destOffset, size_t numelements) {
+ void copyToArray(size_t srcOffset, TyHeapCell tyCell, INT64
destArray[], size_t destOffset, size_t numelements) {
INT64 * ptr = const_castINT64*(get64BitArray(tyCell));
if(ptr!=NULL) {
memcpy(destArray + destOffset, ptr + srcOffset,
numelements*sizeof(INT64) );
svn commit: r1221406 - /uima/uimacpp/trunk/configure.ac
Author: bhavani Date: Tue Dec 20 18:22:40 2011 New Revision: 1221406 URL: http://svn.apache.org/viewvc?rev=1221406view=rev Log: UIMA-2053 updated package name and removed old build configuration files Modified: uima/uimacpp/trunk/configure.ac Modified: uima/uimacpp/trunk/configure.ac URL: http://svn.apache.org/viewvc/uima/uimacpp/trunk/configure.ac?rev=1221406r1=1221405r2=1221406view=diff == --- uima/uimacpp/trunk/configure.ac (original) +++ uima/uimacpp/trunk/configure.ac Tue Dec 20 18:22:40 2011 @@ -16,7 +16,7 @@ # specific language governing permissions and limitations # under the License. -AC_INIT(libuima, 2.3.1) +AC_INIT(libuima, 2.4.0) AC_CONFIG_SRCDIR(src/framework/engine.cpp) AM_INIT_AUTOMAKE
svn commit: r1221469 - /uima/uimacpp/trunk/configure.ac
Author: bhavani
Date: Tue Dec 20 20:14:39 2011
New Revision: 1221469
URL: http://svn.apache.org/viewvc?rev=1221469view=rev
Log:
UIMA-2053 cleanup configure.ac
Modified:
uima/uimacpp/trunk/configure.ac
Modified: uima/uimacpp/trunk/configure.ac
URL:
http://svn.apache.org/viewvc/uima/uimacpp/trunk/configure.ac?rev=1221469r1=1221468r2=1221469view=diff
==
--- uima/uimacpp/trunk/configure.ac (original)
+++ uima/uimacpp/trunk/configure.ac Tue Dec 20 20:14:39 2011
@@ -46,20 +46,20 @@ AC_ARG_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}
+#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_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_SUBST(LIB_VERSION)
+#AC_SUBST(LIB_VERSION_MAJOR)
+#AC_SUBST(LIB_VERSION_MINOR)
AC_MSG_RESULT([release $VERSION, library $LIB_VERSION])
AC_PROG_LIBTOOL
svn commit: r1221480 - /uima/uimacpp/trunk/configure.ac
Author: bhavani
Date: Tue Dec 20 20:31:21 2011
New Revision: 1221480
URL: http://svn.apache.org/viewvc?rev=1221480view=rev
Log:
UIMA-2053 more cleanup configure.ac
Modified:
uima/uimacpp/trunk/configure.ac
Modified: uima/uimacpp/trunk/configure.ac
URL:
http://svn.apache.org/viewvc/uima/uimacpp/trunk/configure.ac?rev=1221480r1=1221479r2=1221480view=diff
==
--- uima/uimacpp/trunk/configure.ac (original)
+++ uima/uimacpp/trunk/configure.ac Tue Dec 20 20:31:21 2011
@@ -46,20 +46,10 @@ AC_ARG_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
@@ -101,18 +91,6 @@ 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
@@ -201,20 +179,6 @@ 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
@@ -252,17 +216,6 @@ 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
@@ -320,21 +273,6 @@ fi
#
# 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
svn commit: r1221494 - /uima/uimacpp/trunk/README.4src
Author: bhavani Date: Tue Dec 20 21:17:37 2011 New Revision: 1221494 URL: http://svn.apache.org/viewvc?rev=1221494view=rev Log: UIMA-2053 updated build instructions Modified: uima/uimacpp/trunk/README.4src Modified: uima/uimacpp/trunk/README.4src URL: http://svn.apache.org/viewvc/uima/uimacpp/trunk/README.4src?rev=1221494r1=1221493r2=1221494view=diff == --- uima/uimacpp/trunk/README.4src (original) +++ uima/uimacpp/trunk/README.4src Tue Dec 20 21:17:37 2011 @@ -1,154 +1,164 @@ - -See the NOTICE file for licensing information. - - -Building the Apache UIMA C++ SDK - - -The Apache UIMA C++ SDK has been built and tested in 32-bit mode -on Linux systems with gcc versions from 3.2.4 to 4.1.0, on Windows -using MSVC version 8, and on MacOSX with gcc version 4.0.1. - -64-bit builds have only been tested on Linux with gcc 4.1.0. - - -Setting up the build environment: -- -UIMACPP has dependencies on APR, ICU, Xerces-C and ActiveMQ-cpp -libraries. Dependent libraries must be specified with the -environmental parameters APR_HOME, ICU_HOME, XERCES_HOME and -ACTIVEMQ_HOME. For now, the ActiveMQ dependency is optional; if not -specified the UIMA-AS compatible service wrapper deployCppService will -fail to build. - -There is also a dependency on JNI headers from a Java JDK. The build -looks for these headers in the directory specified by JAVA_INCLUDE. -A typical setting for JAVA_INCLUDE on Linux or Windows would be -$JAVA_HOME/include; on MacOSX jni.h and the other headers will be in a -Headers directory. - -On Unix, dependent headers are expected under $dependent_HOME/include and -dependent libraries under $dependent_HOME/lib. - -The build of dependent libraries on Windows is less consistent. -APR libraries are expected in %APR_HOME%\Release. ActiveMQ libraries -are in %ACTIVEMQ_HOME%\vs2005-build\ReleaseDLL (or DebugDLL) and -ActiveMQ headers are expected in %ACTIVEMQ_HOME%\src\main. - -On Windows, buildsdk command tries to copy the msvc*.dll runtime libs from -C:\Program Files\Microsoft Visual Studio 8\VC\redist\x86\Microsoft.VC80.CRT -To override the location for MSCV redistributable libraries, use MSVCRT_HOME. - - -Building, testing and packaging on Linux: -- -Set up your environment as described above. The following instructions -assume you have unpacked the source into $HOME/uimacpp-2.X.Y-incubating. - -1 Create the GNU automake scripts: - Note: This step is only done when building from an SVN extract; -it should be skipped when building from a source tarball. -The prebuild step requires relatively up-to-date GNU tools -GNU automake v1.9.6, autoconf v2.59 and libtool v1.5.24. - cd $HOME/uimacpp-2.X.Y-incubating/src - make -f Makefile.prebuild - -2 Build the UIMA shared library and test routines: - cd $HOME/uimacpp-2.X.Y-incubating/src - make -f Makefile.unix install - -3 Run the test suite: - cd $HOME/uimacpp-2.X.Y-incubating/src/test - ./fvt.sh - -4 Build the documentation: - Note: The documentation build requires Doxygen 1.3.6 or later. - cd $HOME/uimacpp-2.X.Y-incubating/docs - ./builddocs.sh - -5 Build the SDK tree: - cd $HOME/uimacpp-2.X.Y-incubating - ./buildsdk.sh target_dir - -6 Package the SDK tarball: - cd target_dir - tar czf uimacpp-2.X.Y-incubating-bin.tgz uimacpp - - -Building, testing and packaging on Windows: -- -Set up your environment as described above. The following instructions -assume you have unpacked the source into \uimacpp-2.X.Y-incubating. - -1 Build the UIMA C++ framework in both release and debug: - cd \uimacpp-2.X.Y-incubating\src - winmake /build release - winmake /build debug - -2 Build and run the test suite: - cd \uimacpp-2.X.Y-incubating\src\test - devenv test.sln /build release - fvt - -3 Build the documentation: - Note: The documentation build requires Doxygen 1.3.6 or later. - cd \uimacpp-2.X.Y-incubating\docs - builddocs - -4 Build the SDK tree: - set MSVCRT_HOME to the directory with the msvc*.dll files required. - cd \uimacpp-2.X.Y-incubating - buildsdk target_dir - -5 Package the SDK zipfile by creating a compressed folder of - target_dir\uimacpp into uimacpp-2.X.Y-incubating-bin.zip - - -Building, testing and packaging on Mac OSX: -Except for one problem with APR, building is the same here as on Linux. -For the Intel-based Mac OSX machines we have tested with, the APR function -to dynamically load shared libraries does not respect DYLD_LIBRARY_PATH. - -A fix is to patch dso/unix/dso.c as follows: - -26a27,31 -#if defined(DSO_USE_DYLD) -#define DSO_USE_DLFCN -#undef DSO_USE_DYLD -#endif - - - -Building the dependencies: APR, ICU, Xersec-c and Activemq-cpp --- -
