You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by ea...@apache.org on 2020/04/15 16:17:37 UTC
[uima-uimacpp] branch rc/uimacpp-3.0.0 updated (d653031 -> ba6607a)
This is an automated email from the ASF dual-hosted git repository.
eae pushed a change to branch rc/uimacpp-3.0.0
in repository https://gitbox.apache.org/repos/asf/uima-uimacpp.git.
from d653031 [UIMA-6190] Run the JNI test on OSX
new e401245 UIMA-6189 small changes for macOS, try updating xerces-c version for Jenkins
new ba6607a Merge branch 'rc/uimacpp-3.0.0' of https://github.com/apache/uima-uimacpp into rc/uimacpp-3.0.0
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
uimacpp-make-sdk.sh | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
[uima-uimacpp] 01/02: UIMA-6189 small changes for macOS,
try updating xerces-c version for Jenkins
Posted by ea...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
eae pushed a commit to branch rc/uimacpp-3.0.0
in repository https://gitbox.apache.org/repos/asf/uima-uimacpp.git
commit e401245af7680f975c83e72dd90a5e4aff65eaa1
Author: Eddie Epstein <ea...@us.ibm.com>
AuthorDate: Wed Apr 15 11:53:00 2020 -0400
UIMA-6189 small changes for macOS, try updating xerces-c version for Jenkins
---
uimacpp-make-sdk.sh | 15 ++++++---------
1 file changed, 6 insertions(+), 9 deletions(-)
diff --git a/uimacpp-make-sdk.sh b/uimacpp-make-sdk.sh
index e2579a4..10d1265 100755
--- a/uimacpp-make-sdk.sh
+++ b/uimacpp-make-sdk.sh
@@ -41,16 +41,16 @@ TARGET=`pwd`/target
mkdir -p "$PREFIX"
mkdir -p "$TARGET"
-# Linux / Mac OSX customizations
+# Linux / Mac OSX configuration customization for AMQ build
# If ActiveMQ falsely believes OpenSSL is installed use: AMQARG=--disable-ssl
-# or if it is installed elsewhere use (e.g. on OSX): AMQARG=--with-openssl=/usr/local/opt/openssl
+# or if OpenSLL is installed elsewhere in OSX, change the specified value
UNAME=`uname -s`
if [ "$UNAME" = "Darwin" ]; then
LIBEXT=dylib
INCDIR=darwin
ICUARG=MacOSX
- AMQARG=
+ AMQARG=--with-openssl=/usr/local/opt/openssl
else
LIBEXT=so
INCDIR=linux
@@ -88,7 +88,7 @@ export UIMA_HOME=$PWD/apache-uima
# 3rd party component versons to use
UIMAJ=uimaj-3.1.0
XERCESMAJOR=3
-XERCES=xerces-c-3.2.2
+XERCES=xerces-c-3.2.3
ICURELEASE=release-65-1
ICU=icu4c-65_1-src.tgz
APR=apr-1.7.0
@@ -175,11 +175,7 @@ if [ -z $TESTONLY ]; then
if [ ! -f ${AMQCPP}/src/main/.libs/libactivemq-cpp.${LIBEXT} ]; then
cd $AMQCPP
echo Building ActiveMQ
- if [ "$UNAME" = "Darwin" ]; then
- LDFLAGS="-L/usr/local/opt/openssl@1.1/lib" CPPFLAGS="-I/usr/local/opt/openssl@1.1/include" ./configure $AMQARG --prefix=$PREFIX --with-apr=$PREFIX/bin/apr-1-config
- else
- ./configure $AMQARG --prefix=$PREFIX --with-apr=$PREFIX/bin/apr-1-config
- fi
+ ./configure $AMQARG --prefix=$PREFIX --with-apr=$PREFIX/bin/apr-1-config
make install
cd ..
else
@@ -196,6 +192,7 @@ if [ -z $TESTONLY ]; then
make check
make install
make docs
+ rm -rf sdk
make sdk TARGETDIR=sdk
else
./configure --prefix=$TARGET --with-xerces=$PREFIX --with-apr=$PREFIX --with-icu=$PREFIX --without-activemq --with-jdk=$JAVA_HOME/include' -I'${JAVA_HOME}/include/${INCDIR} CXXFLAGS=-std=c++11
[uima-uimacpp] 02/02: Merge branch 'rc/uimacpp-3.0.0' of
https://github.com/apache/uima-uimacpp into rc/uimacpp-3.0.0
Posted by ea...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
eae pushed a commit to branch rc/uimacpp-3.0.0
in repository https://gitbox.apache.org/repos/asf/uima-uimacpp.git
commit ba6607a0b5aa83af0a359ea0919e29f3d26cff3a
Merge: e401245 d653031
Author: Eddie Epstein <ea...@us.ibm.com>
AuthorDate: Wed Apr 15 12:15:35 2020 -0400
Merge branch 'rc/uimacpp-3.0.0' of https://github.com/apache/uima-uimacpp into rc/uimacpp-3.0.0
Conflicts:
uimacpp-make-sdk.sh
UIMA-6189 try to deal with merge
src/test/fvt.sh | 9 +++++++--
src/test/fvtTestfile | 2 +-
uimacpp-make-sdk.sh | 34 +++++++++++++++++-----------------
3 files changed, 25 insertions(+), 20 deletions(-)
diff --cc uimacpp-make-sdk.sh
index 10d1265,51538e6..631e43a
--- a/uimacpp-make-sdk.sh
+++ b/uimacpp-make-sdk.sh
@@@ -41,9 -41,9 +41,9 @@@ TARGET=`pwd`/targe
mkdir -p "$PREFIX"
mkdir -p "$TARGET"
-# Linux / Mac OSX customizations
+# Linux / Mac OSX configuration customization for AMQ build
# If ActiveMQ falsely believes OpenSSL is installed use: AMQARG=--disable-ssl
- # or if OpenSLL is installed elsewhere in OSX, change the specified value
+ # On Mac OpenSSL is usually installed in /usr/local/opt/openssl
UNAME=`uname -s`
if [ "$UNAME" = "Darwin" ]; then