svn commit: r503702 - in /incubator/uima/uimacpp/trunk/src: checkEnvVars.bat winmake.cmd

[ea...@apache.org]

Author: eae
Date: Mon Feb  5 06:42:38 2007
New Revision: 503702

URL: http://svn.apache.org/viewvc?view=rev&rev=503702
Log:
switch to JAVA_INCLUDE and add build target

Modified:
    incubator/uima/uimacpp/trunk/src/checkEnvVars.bat
    incubator/uima/uimacpp/trunk/src/winmake.cmd

Modified: incubator/uima/uimacpp/trunk/src/checkEnvVars.bat
URL: http://svn.apache.org/viewvc/incubator/uima/uimacpp/trunk/src/checkEnvVars.bat?view=diff&rev=503702&r1=503701&r2=503702
==============================================================================
--- incubator/uima/uimacpp/trunk/src/checkEnvVars.bat (original)
+++ incubator/uima/uimacpp/trunk/src/checkEnvVars.bat Mon Feb  5 06:42:38 2007
@@ -4,10 +4,17 @@
 @REM which are include in the SDK
 @REM These may be overridden by setting APR_HOME or ICU_HOME or XERCES_HOME
 
-if "%JAVA_HOME%"=="" (
-echo Error: JAVA_HOME not defined
-) else (
-if not exist "%JAVA_HOME%\include\jni.h" echo Error: failed to find JDK headers in %JAVA_HOME%\include
+if "%JAVA_INCLUDE%"=="" (
+ if "%JAVA_HOME%"=="" (
+   echo Error: JAVA_INCLUDE not defined
+   goto end
+  )
+ set JAVA_INCLUDE=%JAVA_HOME%\include
+)
+
+if not exist "%JAVA_INCLUDE%\jni.h" (
+  echo Error: failed to find JDK headers in %JAVA_INCLUDE%
+  goto end
 )
 
 if "%UIMACPP_HOME%"=="" goto noTAF

Modified: incubator/uima/uimacpp/trunk/src/winmake.cmd
URL: http://svn.apache.org/viewvc/incubator/uima/uimacpp/trunk/src/winmake.cmd?view=diff&rev=503702&r1=503701&r2=503702
==============================================================================
--- incubator/uima/uimacpp/trunk/src/winmake.cmd (original)
+++ incubator/uima/uimacpp/trunk/src/winmake.cmd Mon Feb  5 06:42:38 2007
@@ -5,8 +5,14 @@
 REM alternate behavior is to override any or all of the dependent libraries
 
 REM need a Java JRE for the JNI interface
-if "%JAVA_HOME%"==""    set    JAVA_HOME=c:\PROGRA~1\IBM\Java142
-if not exist %JAVA_HOME%\include\jni.h goto nojava
+if "%JAVA_INCLUDE%"=="" (
+ if "%JAVA_HOME%"=="" (
+   echo Error: JAVA_INCLUDE not defined
+   goto end
+  )
+ set JAVA_INCLUDE=%JAVA_HOME%\include
+)
+if not exist %JAVA_INCLUDE%\jni.h goto nojava
 
 REM If UIMACPP_HOME undefined, all dependencies must be defined
 if not "%UIMACPP_HOME%"=="" (
@@ -23,7 +29,13 @@
 )
 
 REM Start project build
-devenv uimacpp.sln /build release
+if "%~1" == "" (
+ set TARGET=release
+) else (
+ set TARGET=%~1
+)
+echo devenv uimacpp.sln /build %TARGET%
+devenv uimacpp.sln /build %TARGET%
 goto end
 
 :noapr
@@ -39,7 +51,7 @@
 goto end
 
 :nojava
-echo %JAVA_HOME%\include does not exist or does not contain jni.h
+echo %JAVA_INCLUDE% does not exist or does not contain jni.h
 
 :end
 endlocal