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:39 UTC
[uima-uimacpp] 02/02: Merge branch 'rc/uimacpp-3.0.0' of
https://github.com/apache/uima-uimacpp into rc/uimacpp-3.0.0
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