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 2007/02/03 21:31:01 UTC

svn commit: r503299 - in /incubator/uima/uimacpp/trunk: buildsdk.sh src/Makefile.unix src/base.mak src/configure.in src/framework/Makefile.am src/test/fvt.sh

Author: eae
Date: Sat Feb  3 12:31:00 2007
New Revision: 503299

URL: http://svn.apache.org/viewvc?view=rev&rev=503299
Log:
fixes for MacOSX

Modified:
    incubator/uima/uimacpp/trunk/buildsdk.sh
    incubator/uima/uimacpp/trunk/src/Makefile.unix
    incubator/uima/uimacpp/trunk/src/base.mak
    incubator/uima/uimacpp/trunk/src/configure.in
    incubator/uima/uimacpp/trunk/src/framework/Makefile.am
    incubator/uima/uimacpp/trunk/src/test/fvt.sh

Modified: incubator/uima/uimacpp/trunk/buildsdk.sh
URL: http://svn.apache.org/viewvc/incubator/uima/uimacpp/trunk/buildsdk.sh?view=diff&rev=503299&r1=503298&r2=503299
==============================================================================
--- incubator/uima/uimacpp/trunk/buildsdk.sh (original)
+++ incubator/uima/uimacpp/trunk/buildsdk.sh Sat Feb  3 12:31:00 2007
@@ -142,6 +142,7 @@
 mkdir "$UIMA_DIR"/include/uima
 mkdir "$UIMA_DIR"/lib
 mkdir "$UIMA_DIR"/licenses
+mkdir "$UIMA_DIR"/examples
 
 UNAME=`uname -s`
 if [ "$UNAME" = "Darwin" ]; then
@@ -161,7 +162,9 @@
 cp -p "$UIMA_INSTALLDIR"/include/uima/* "$UIMA_DIR"/include/uima/
 eval cp $CPLR "$UIMA_INSTALLDIR"/lib/libuima*.$LIBEXT"*"  "$UIMA_DIR"/lib/
 if [ "$UNAME" = "Darwin" ]; then
+  thisDir=`pwd`
   cd "$UIMA_DIR"/lib && ln -s libuima-2.1.dylib  libuima.jnilib
+  cd $thisDir
 fi
 	
 echo copying from "$UIMACPP_HOME/docs"...
@@ -169,7 +172,6 @@
 cp -p "$UIMACPP_HOME"/docs/uimadoxytags.tag  "$UIMA_DIR"/docs/
 cp $CPLR "$UIMACPP_HOME"/docs/html "$UIMA_DIR"/docs/
 
-mkdir "$UIMA_DIR"/examples
 cp $CPLR "$UIMACPP_HOME"/examples/* "$UIMA_DIR"/examples/
 
 # copy following file from fvt suite

Modified: incubator/uima/uimacpp/trunk/src/Makefile.unix
URL: http://svn.apache.org/viewvc/incubator/uima/uimacpp/trunk/src/Makefile.unix?view=diff&rev=503299&r1=503298&r2=503299
==============================================================================
--- incubator/uima/uimacpp/trunk/src/Makefile.unix (original)
+++ incubator/uima/uimacpp/trunk/src/Makefile.unix Sat Feb  3 12:31:00 2007
@@ -27,10 +27,12 @@
 CONFIGURE_ARGS := $(CONFIGURE_ARGS)  --with-xerces=$(XERCES_HOME)
 endif
 
-ifeq ($(JAVA_HOME),)
-	JAVA_HOME := /opt/IBMJava2-142
+ifeq ($(JAVA_INLCUDE),)
+	JAVA_INCLUDE := /opt/IBMJava2-142/include
+else
+	JAVA_INCLUDE := $(JAVA_HOME)/include
 endif
-CONFIGURE_ARGS := $(CONFIGURE_ARGS)  --with-jdk=$(JAVA_HOME)
+CONFIGURE_ARGS := $(CONFIGURE_ARGS)  --with-jdk=$(JAVA_INCLUDE)
 
 AC_FLAGS=CFLAGS="$(CFLAGS)" CXXFLAGS="$(CFLAGS)"
 

Modified: incubator/uima/uimacpp/trunk/src/base.mak
URL: http://svn.apache.org/viewvc/incubator/uima/uimacpp/trunk/src/base.mak?view=diff&rev=503299&r1=503298&r2=503299
==============================================================================
--- incubator/uima/uimacpp/trunk/src/base.mak (original)
+++ incubator/uima/uimacpp/trunk/src/base.mak Sat Feb  3 12:31:00 2007
@@ -56,9 +56,12 @@
 
 # the suffix for shared libraries
 DLL_SUFFIX=so
+SHARED_FLAG=-shared
 UNAME = $(shell uname -s)
 ifeq ($(UNAME), Darwin)
   DLL_SUFFIX=dylib
+  SHARED_FLAG=-dynamiclib
+  EXTRA_LINK_LIBS=-lxerces-c -lapr-1.0 -licui18n -licuuc -licuio -licudata 
 endif
 
 ifeq ($(DEBUG),1)
@@ -80,7 +83,7 @@
 	 -Wno-deprecated
 
 ifeq ($(DLL_BUILD),1)
-DLL_LINKFLAGS=-shared
+DLL_LINKFLAGS=$(SHARED_FLAG)
 TARGET_FILE_NAME=$(TARGET_FILE).$(DLL_SUFFIX)
 BIN_LINKFLAGS=
 else
@@ -90,7 +93,7 @@
 
 LINKFLAGS= $(DLL_LINKFLAGS) $(BIN_LINKFLAGS) \
 	 $(USER_LINKFLAGS) $(BUILD_LFLAGS) \
-	 -L$(UIMACPP_HOME)/lib -luima
+	 -L$(UIMACPP_HOME)/lib -luima $(EXTRA_LINK_LIBS)
 
 # compiler to use
 CC=g++

Modified: incubator/uima/uimacpp/trunk/src/configure.in
URL: http://svn.apache.org/viewvc/incubator/uima/uimacpp/trunk/src/configure.in?view=diff&rev=503299&r1=503298&r2=503299
==============================================================================
--- incubator/uima/uimacpp/trunk/src/configure.in (original)
+++ incubator/uima/uimacpp/trunk/src/configure.in Sat Feb  3 12:31:00 2007
@@ -151,7 +151,7 @@
 
 AC_ARG_WITH([jdk], AC_HELP_STRING([--with-jdk],
                                       [use local JDK (uses /opt/IBMJava2-142 by default)]),
-               [UIMA_JDK_INCLUDE="-I$withval/include"
+               [UIMA_JDK_INCLUDE="-I$withval"
                 JDK_TEST_INCLUDE="$UIMA_JDK_INCLUDE"],
                     [UIMA_JDK_INCLUDE="-I/opt/IBMJava2-142/include"
                      JDK_TEST_INCLUDE="-I/opt/IBMJava2-142/include"])

Modified: incubator/uima/uimacpp/trunk/src/framework/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/uima/uimacpp/trunk/src/framework/Makefile.am?view=diff&rev=503299&r1=503298&r2=503299
==============================================================================
--- incubator/uima/uimacpp/trunk/src/framework/Makefile.am (original)
+++ incubator/uima/uimacpp/trunk/src/framework/Makefile.am Sat Feb  3 12:31:00 2007
@@ -15,6 +15,7 @@
 
 install-data-local:
 if APPLE
+	$(INSTALL) -d $(DESTDIR)$(prefix)/data
 	$(INSTALL) ../../data/resourceSpecifierSchema.xsd $(DESTDIR)$(prefix)/data/resourceSpecifierSchema.xsd
 else
 	$(INSTALL) -D ../../data/resourceSpecifierSchema.xsd $(DESTDIR)$(prefix)/data/resourceSpecifierSchema.xsd

Modified: incubator/uima/uimacpp/trunk/src/test/fvt.sh
URL: http://svn.apache.org/viewvc/incubator/uima/uimacpp/trunk/src/test/fvt.sh?view=diff&rev=503299&r1=503298&r2=503299
==============================================================================
--- incubator/uima/uimacpp/trunk/src/test/fvt.sh (original)
+++ incubator/uima/uimacpp/trunk/src/test/fvt.sh Sat Feb  3 12:31:00 2007
@@ -17,6 +17,7 @@
 fi
 
 export LD_LIBRARY_PATH=$Testlib:$APR_HOME/lib:$ICU_HOME/lib:$XERCES_HOME/lib
+export DYLD_LIBRARY_PATH=$Testlib:$APR_HOME/lib:$ICU_HOME/lib:$XERCES_HOME/lib
 export PATH=$Testbin:$PATH
 
 export UIMACPP_DATAPATH=./data