svn commit: r663652 - in /incubator/uima/uimacpp/trunk: README.4src src/winmake.cmd

[ea...@apache.org]

Author: eae
Date: Thu Jun  5 09:25:27 2008
New Revision: 663652

URL: http://svn.apache.org/viewvc?rev=663652&view=rev
Log:
UIMA-1064

Modified:
    incubator/uima/uimacpp/trunk/README.4src
    incubator/uima/uimacpp/trunk/src/winmake.cmd

Modified: incubator/uima/uimacpp/trunk/README.4src
URL: http://svn.apache.org/viewvc/incubator/uima/uimacpp/trunk/README.4src?rev=663652&r1=663651&r2=663652&view=diff
==============================================================================
--- incubator/uima/uimacpp/trunk/README.4src (original)
+++ incubator/uima/uimacpp/trunk/README.4src Thu Jun  5 09:25:27 2008
@@ -18,8 +18,8 @@
 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 is
-not built.
+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.
@@ -135,7 +135,11 @@
 
   DESTDIR=`pwd` make install
 
-On Windows, the activemq-cpp targets needed by uimacpp are ReleaseDLL and DebugDLL.
+On Windows, the only activemq-cpp targets needed by uimacpp are ReleaseDLL and DebugDLL,
+ e.g. devenv vs2005-build/vs2005-activemq.vcproj /build ReleaseDLL
+
+Also, the APR library can be built by launching libapr.dsp or by following the
+instructions in Makefile.win.
 
 
 Disclaimer

Modified: incubator/uima/uimacpp/trunk/src/winmake.cmd
URL: http://svn.apache.org/viewvc/incubator/uima/uimacpp/trunk/src/winmake.cmd?rev=663652&r1=663651&r2=663652&view=diff
==============================================================================
--- incubator/uima/uimacpp/trunk/src/winmake.cmd (original)
+++ incubator/uima/uimacpp/trunk/src/winmake.cmd Thu Jun  5 09:25:27 2008
@@ -19,25 +19,18 @@
 
 setlocal
 
-REM default behavior is to build against uima-cpp SDK image, specified by UIMACPP_HOME
-REM alternate behavior is to override any or all of the dependent libraries
+REM Unset UIMACPP_HOME to avoid build problems
+set UIMACPP_HOME=
 
 REM need a Java JRE for the JNI interface
 if not exist %JAVA_INCLUDE%\jni.h goto nojava
 
-REM If UIMACPP_HOME undefined, all dependencies must be defined
-if not "%UIMACPP_HOME%"=="" (
-  REM default the overrides if not set
-  if "%APR_HOME%"==""     set APR_HOME=%UIMACPP_HOME%/noPlace
-  if "%ICU_HOME%"==""     set ICU_HOME=%UIMACPP_HOME%/noPlace
-  if "%XERCES_HOME%"==""  set XERCES_HOME=%UIMACPP_HOME%/noPlace
-)else (
-  REM UIMACPP_HOME undefined, all dependencies must be defined
-  if "%APR_HOME%"==""     goto noapr
-  if "%ICU_HOME%"==""     goto noicu
-  if "%XERCES_HOME%"==""  goto noxerces
-)
+REM Other requied dependencies
+if "%APR_HOME%"==""     goto noapr
+if "%ICU_HOME%"==""     goto noicu
+if "%XERCES_HOME%"==""  goto noxerces
 
+REM Optional dependency
 if "%ACTIVEMQ_HOME%"==""  (
   echo WARNING: ACTIVEMQ_HOME not set, deployCppService will fail to build.
 )
@@ -53,15 +46,15 @@
 goto end
 
 :noapr
-echo need UIMACPP_HOME or APR_HOME to be set
+echo need APR_HOME to be set
 goto end
 
 :noicu
-echo need UIMACPP_HOME or ICU_HOME to be set
+echo need ICU_HOME to be set
 goto end
 
 :noxerces
-echo need UIMACPP_HOME or XERCES_HOME to be set
+echo need XERCES_HOME to be set
 goto end
 
 :nojava