You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by bu...@apache.org on 2020/02/25 19:42:50 UTC

[uima-uimacpp] branch bll/uimacpp-3.0.0 updated (c8e3880 -> d12003e)

This is an automated email from the ASF dual-hosted git repository.

burn pushed a change to branch bll/uimacpp-3.0.0
in repository https://gitbox.apache.org/repos/asf/uima-uimacpp.git.


    from c8e3880  UIMA-6172 warnings found with newer tool chain
     new 9844473  UIMA-6190 Update build script
     new d12003e  UIMA-6190 Update build script to also work for Mac OSX

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 | 72 ++++++++++++++++++++++++++++++++++++-----------------
 1 file changed, 49 insertions(+), 23 deletions(-)


[uima-uimacpp] 01/02: UIMA-6190 Update build script

Posted by bu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

burn pushed a commit to branch bll/uimacpp-3.0.0
in repository https://gitbox.apache.org/repos/asf/uima-uimacpp.git

commit 9844473853e22767d8a526b61cf7509c5c163e23
Author: Burn Lewis <bu...@mac-burn.watson.ibm.com>
AuthorDate: Fri Feb 21 17:30:23 2020 -0500

    UIMA-6190 Update build script
---
 uimacpp-make-sdk.sh | 62 ++++++++++++++++++++++++++++++++++++-----------------
 1 file changed, 42 insertions(+), 20 deletions(-)

diff --git a/uimacpp-make-sdk.sh b/uimacpp-make-sdk.sh
index b885b1c..369722f 100755
--- a/uimacpp-make-sdk.sh
+++ b/uimacpp-make-sdk.sh
@@ -32,15 +32,27 @@ TARGET=`pwd`/target
 mkdir -p "$PREFIX"
 mkdir -p "$TARGET"
 
+UNAME=`uname -s`
+if [ "$UNAME" = "Darwin" ]; then
+	LIBEXT=dylib
+	INCDIR=darwin
+	ICUARG=MacOSX
+else
+	LIBEXT=so
+	INCDIR=linux
+	ICUARG=Linux
+fi
+
 #guess JAVA_HOME if not set
 if [ -z $JAVA_HOME ]; then
-    JAVA_HOME=$(dirname $(dirname $(readlink -f $(which java))))
-    if [ ! -f "$JAVA_HOME/include/jni.h" ]; then
-	JAVA_HOME=$(dirname $(dirname $(dirname $(readlink -f $(which java)))))
-	if [ ! -f "$JAVA_HOME/include/jni.h" ]; then
-	    echo Cannot guess JAVA_HOME. JAVA SDK installed?
-	    exit
+	if [ "$UNAME" = "Darwin" ]; then
+		JAVA_HOME=$(/usr/libexec/java_home)
+	else
+		JAVA_HOME=$(dirname $(dirname $(dirname $(readlink -f $(which java)))))
 	fi
+    if [ ! -f "$JAVA_HOME/include/jni.h" ]; then
+	echo Cannot guess JAVA_HOME. JAVA SDK installed?
+	exit
     fi
     echo guessing JAVA_HOME=$JAVA_HOME
 else
@@ -55,21 +67,26 @@ export ICU_HOME=$PREFIX
 export AMQ_HOME=$PREFIX
 
 # 3rd party component versons to use
-XERCES=xerces-c-3.1.4
-ICU=icu4c-50_2-src.tgz
-APR=apr-1.4.8
+XERCESMAJOR=3
+XERCES=xerces-c-3.2.2
+ICURELEASE=release-65-1
+ICU=icu4c-65_1-src.tgz
+APR=apr-1.7.0
 APRUTIL=apr-util-1.6.1
-AMQCPP=activemq-cpp-library-3.9.3
+AMQVERSION=3.9.5
+AMQCPP=activemq-cpp-library-$AMQVERSION
+
 # Additional modifications may be needed below for changes to Xerces, ICU, or ActiveMQ-C++
 
 # Build xerces
 if [ ! -f "${XERCES}.tar.gz" ]; then
-    wget http://archive.apache.org/dist/xerces/c/3/sources/${XERCES}.tar.gz
+    wget http://archive.apache.org/dist/xerces/c/$XERCESMAJOR/sources/${XERCES}.tar.gz
     tar -xf ${XERCES}.tar.gz
 fi
-#Modify next line if not version 3.1.x
-if [ ! -f "$XERCES/src/.libs/libxerces-c-3.1.so" ]; then
+#Check if already built
+if [ ! -f "$XERCES/src/.libs/libxerces-c.$LIBEXT" ]; then
     cd $XERCES
+	echo Building Xerces
     ./configure --prefix="$PREFIX"
     make install
     cd ..
@@ -80,14 +97,15 @@ fi
 # Build ICU
 if [ ! -f $ICU ]; then
 #Modify next line if not version 50.2
-    wget https://github.com/unicode-org/icu/releases/download/release-50-2/$ICU
+    wget https://github.com/unicode-org/icu/releases/download/$ICURELEASE/$ICU
     tar -xzf $ICU
 fi
 if [ ! -f icu/source/bin/uconv ]; then
     cd icu/source
-    ./runConfigureICU Linux --prefix="$PREFIX"
+	echo Building ICU
+    ./runConfigureICU $ICUARG --prefix="$PREFIX"
     make install
-    cd ../..
+	cd ../..
 else
     echo ICU previously built
 fi
@@ -99,6 +117,7 @@ if [ ! -f "${APR}.tar.gz" ]; then
 fi
 if [ ! -f "$APR/build/apr_rules.out" ]; then
     cd $APR
+	echo Building APR
     ./configure --prefix="$PREFIX"
     make install
     cd ..
@@ -113,6 +132,7 @@ if [ ! -f "${APRUTIL}.tar.gz" ]; then
 fi
 if [ ! -f ${APRUTIL}/apu-config.out ]; then
     cd $APRUTIL
+	echo Building APR-UTIL
     ./configure --prefix=$PREFIX --with-apr=$PREFIX/bin/apr-1-config
     make install
     cd ..
@@ -123,12 +143,13 @@ fi
 # Build ActiveMQ-C++
 if [ ! -f ${AMQCPP}-src.tar.gz ]; then
 #Modify next line if not v3.9.3
-    wget http://archive.apache.org/dist/activemq/activemq-cpp/3.9.3/${AMQCPP}-src.tar.gz
+    wget http://archive.apache.org/dist/activemq/activemq-cpp/${AMQVERSION}/${AMQCPP}-src.tar.gz
     tar -xf ${AMQCPP}-src.tar.gz
 fi
-if [ ! -f ${AMQCPP}/src/main/.libs/libactivemq-cpp.so ]; then
+if [ ! -f ${AMQCPP}/src/main/.libs/libactivemq-cpp.${LIBEXT} ]; then
     cd $AMQCPP
-    ./configure --prefix=$PREFIX --with-apr=$PREFIX/bin/apr-1-config
+	echo Building ActiveMQ
+    ./configure --with-openssl=/usr/local/opt/openssl --prefix=$PREFIX --with-apr=$PREFIX/bin/apr-1-config
     make install
     cd ..
 else
@@ -137,8 +158,9 @@ fi
 
 # Now build UIMA
 
+echo Building UIMA
 ./autogen.sh
-./configure --prefix=$TARGET --with-xerces=$PREFIX --with-apr=$PREFIX --with-apr-util=$PREFIX --with-icu=$PREFIX --with-activemq=$PREFIX --with-jdk=$JAVA_HOME/include' -I'${JAVA_HOME}/include/linux CXXFLAGS=-std=c++11
+./configure --prefix=$TARGET --with-xerces=$PREFIX --with-apr=$PREFIX --with-apr-util=$PREFIX --with-icu=$PREFIX --with-activemq=$PREFIX --with-jdk=$JAVA_HOME/include' -I'${JAVA_HOME}/include/${INCDIR} CXXFLAGS=-std=c++11
 make check
 make install
 make docs


[uima-uimacpp] 02/02: UIMA-6190 Update build script to also work for Mac OSX

Posted by bu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

burn pushed a commit to branch bll/uimacpp-3.0.0
in repository https://gitbox.apache.org/repos/asf/uima-uimacpp.git

commit d12003ef11c982cf71403f70f195c8790d6a8cf0
Author: burn2l <bu...@gmail.com>
AuthorDate: Mon Feb 24 16:22:10 2020 -0500

    UIMA-6190 Update build script to also work for Mac OSX
---
 uimacpp-make-sdk.sh | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/uimacpp-make-sdk.sh b/uimacpp-make-sdk.sh
index 369722f..d73a5be 100755
--- a/uimacpp-make-sdk.sh
+++ b/uimacpp-make-sdk.sh
@@ -32,15 +32,21 @@ TARGET=`pwd`/target
 mkdir -p "$PREFIX"
 mkdir -p "$TARGET"
 
+# Linux / Mac OSX customizations
+# 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
+
 UNAME=`uname -s`
 if [ "$UNAME" = "Darwin" ]; then
 	LIBEXT=dylib
 	INCDIR=darwin
 	ICUARG=MacOSX
+	AMQARG=
 else
 	LIBEXT=so
 	INCDIR=linux
 	ICUARG=Linux
+	AMQARG=
 fi
 
 #guess JAVA_HOME if not set
@@ -76,7 +82,7 @@ APRUTIL=apr-util-1.6.1
 AMQVERSION=3.9.5
 AMQCPP=activemq-cpp-library-$AMQVERSION
 
-# Additional modifications may be needed below for changes to Xerces, ICU, or ActiveMQ-C++
+# Additional modifications may be needed below after any version changes
 
 # Build xerces
 if [ ! -f "${XERCES}.tar.gz" ]; then
@@ -96,7 +102,6 @@ fi
 
 # Build ICU
 if [ ! -f $ICU ]; then
-#Modify next line if not version 50.2
     wget https://github.com/unicode-org/icu/releases/download/$ICURELEASE/$ICU
     tar -xzf $ICU
 fi
@@ -142,14 +147,13 @@ fi
 
 # Build ActiveMQ-C++
 if [ ! -f ${AMQCPP}-src.tar.gz ]; then
-#Modify next line if not v3.9.3
     wget http://archive.apache.org/dist/activemq/activemq-cpp/${AMQVERSION}/${AMQCPP}-src.tar.gz
     tar -xf ${AMQCPP}-src.tar.gz
 fi
 if [ ! -f ${AMQCPP}/src/main/.libs/libactivemq-cpp.${LIBEXT} ]; then
     cd $AMQCPP
 	echo Building ActiveMQ
-    ./configure --with-openssl=/usr/local/opt/openssl --prefix=$PREFIX --with-apr=$PREFIX/bin/apr-1-config
+    ./configure $AMQARG --prefix=$PREFIX --with-apr=$PREFIX/bin/apr-1-config
     make install
     cd ..
 else