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/08 14:09:36 UTC
svn commit: r504878 - in /incubator/uima/uimacpp/trunk/src: ./ test/src/
Author: eae
Date: Thu Feb 8 05:09:35 2007
New Revision: 504878
URL: http://svn.apache.org/viewvc?view=rev&rev=504878
Log:
UIMA-287 make UIMACPP_HOME optional for build & test
Modified:
incubator/uima/uimacpp/trunk/src/checkEnvVars.bat
incubator/uima/uimacpp/trunk/src/test/src/SimpleTextSegmenter.vcproj
incubator/uima/uimacpp/trunk/src/test/src/SofaStreamHandlerFile.vcproj
incubator/uima/uimacpp/trunk/src/test/src/TextSegmentConsumer.vcproj
incubator/uima/uimacpp/trunk/src/test/src/plugin_annotator_dump.vcproj
incubator/uima/uimacpp/trunk/src/test/src/plugin_tokenizer.vcproj
incubator/uima/uimacpp/trunk/src/test/src/test_cas.vcproj
incubator/uima/uimacpp/trunk/src/test/src/test_casserializer.vcproj
incubator/uima/uimacpp/trunk/src/test/src/test_engine.vcproj
incubator/uima/uimacpp/trunk/src/test/src/test_iterators.vcproj
incubator/uima/uimacpp/trunk/src/test/src/test_language.vcproj
incubator/uima/uimacpp/trunk/src/test/src/test_primitivetypes.vcproj
incubator/uima/uimacpp/trunk/src/test/src/test_sofa.vcproj
incubator/uima/uimacpp/trunk/src/test/src/test_typepriority.vcproj
incubator/uima/uimacpp/trunk/src/test/src/test_xcasdeserialization.vcproj
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=504878&r1=504877&r2=504878
==============================================================================
--- incubator/uima/uimacpp/trunk/src/checkEnvVars.bat (original)
+++ incubator/uima/uimacpp/trunk/src/checkEnvVars.bat Thu Feb 8 05:09:35 2007
@@ -4,14 +4,6 @@
@REM which are include in the SDK
@REM These may be overridden by setting APR_HOME or ICU_HOME or XERCES_HOME
-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
Modified: incubator/uima/uimacpp/trunk/src/test/src/SimpleTextSegmenter.vcproj
URL: http://svn.apache.org/viewvc/incubator/uima/uimacpp/trunk/src/test/src/SimpleTextSegmenter.vcproj?view=diff&rev=504878&r1=504877&r2=504878
==============================================================================
--- incubator/uima/uimacpp/trunk/src/test/src/SimpleTextSegmenter.vcproj (original)
+++ incubator/uima/uimacpp/trunk/src/test/src/SimpleTextSegmenter.vcproj Thu Feb 8 05:09:35 2007
@@ -20,7 +20,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories=".;"$(APR_HOME)\include";"$(ICU_HOME)\include";"$(XERCES_HOME)\include";"$(JAVA_HOME)\include";"$(JAVA_HOME)\include\win32";"$(UIMACPP_HOME)\include";"$(UIMACPP_HOME)\include\apr""
+ AdditionalIncludeDirectories=".;"$(APR_HOME)\include";"$(ICU_HOME)\include";"$(XERCES_HOME)\include";"$(UIMACPP_HOME)\include";"$(UIMACPP_HOME)\include\apr";..\..\cas;..\..\framework"
PreprocessorDefinitions="UIMA_SUPPRESS_TIMING;WIN32;_DEBUG;_WINDOWS;_USRDLL"
MinimalRebuild="TRUE"
BasicRuntimeChecks="3"
@@ -36,7 +36,7 @@
AdditionalDependencies="icuuc.lib libapr$(APR_VER).lib uimaD.lib"
OutputFile="$(OutDir)\lib$(ProjectName).dll"
LinkIncremental="1"
- AdditionalLibraryDirectories=""$(OutDir)";"$(APR_HOME)\Debug";"$(XERCES_HOME)\lib";"$(ICU_HOME)\lib";"$(UIMACPP_HOME)\lib""
+ AdditionalLibraryDirectories=""$(OutDir)";"$(APR_HOME)\Debug";"$(XERCES_HOME)\lib";"$(ICU_HOME)\lib";"$(UIMACPP_HOME)\lib";..\..\..\install\lib"
GenerateDebugInformation="TRUE"
ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
SubSystem="2"
@@ -72,7 +72,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="3"
- AdditionalIncludeDirectories=".;"$(APR_HOME)\include";"$(ICU_HOME)\include";"$(XERCES_HOME)\include";"$(JAVA_HOME)\include";"$(JAVA_HOME)\include\win32";"$(UIMACPP_HOME)\include";"$(UIMACPP_HOME)\include\apr""
+ AdditionalIncludeDirectories=".;"$(APR_HOME)\include";"$(ICU_HOME)\include";"$(XERCES_HOME)\include";"$(UIMACPP_HOME)\include";"$(UIMACPP_HOME)\include\apr";..\..\cas;..\..\framework"
PreprocessorDefinitions="UIMA_SUPPRESS_TIMING;TRACEOFF;NDEBUG;WIN32;_WINDOWS;_USRDLL"
MinimalRebuild="FALSE"
BasicRuntimeChecks="0"
@@ -88,7 +88,7 @@
AdditionalDependencies="icuuc.lib libapr$(APR_VER).lib uima.lib"
OutputFile="$(OutDir)\lib$(ProjectName).dll"
LinkIncremental="1"
- AdditionalLibraryDirectories=""$(OutDir)";"$(APR_HOME)\Release";"$(XERCES_HOME)\lib";"$(ICU_HOME)\lib";"$(UIMACPP_HOME)\lib""
+ AdditionalLibraryDirectories=""$(OutDir)";"$(APR_HOME)\Release";"$(XERCES_HOME)\lib";"$(ICU_HOME)\lib";"$(UIMACPP_HOME)\lib";..\..\..\install\lib"
GenerateDebugInformation="FALSE"
ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
SubSystem="2"
Modified: incubator/uima/uimacpp/trunk/src/test/src/SofaStreamHandlerFile.vcproj
URL: http://svn.apache.org/viewvc/incubator/uima/uimacpp/trunk/src/test/src/SofaStreamHandlerFile.vcproj?view=diff&rev=504878&r1=504877&r2=504878
==============================================================================
--- incubator/uima/uimacpp/trunk/src/test/src/SofaStreamHandlerFile.vcproj (original)
+++ incubator/uima/uimacpp/trunk/src/test/src/SofaStreamHandlerFile.vcproj Thu Feb 8 05:09:35 2007
@@ -20,7 +20,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories=".;"$(APR_HOME)\include";"$(ICU_HOME)\include";"$(XERCES_HOME)\include";"$(JAVA_HOME)\include";"$(JAVA_HOME)\include\win32";"$(UIMACPP_HOME)\include";"$(UIMACPP_HOME)\include\apr""
+ AdditionalIncludeDirectories=".;"$(APR_HOME)\include";"$(ICU_HOME)\include";"$(XERCES_HOME)\include";"$(UIMACPP_HOME)\include";"$(UIMACPP_HOME)\include\apr";..\..\cas;..\..\framework"
PreprocessorDefinitions="UIMA_SUPPRESS_TIMING;WIN32;_DEBUG;_WINDOWS;_USRDLL"
MinimalRebuild="TRUE"
BasicRuntimeChecks="3"
@@ -36,7 +36,7 @@
AdditionalDependencies="icuuc.lib libapr$(APR_VER).lib uimaD.lib"
OutputFile="$(OutDir)\$(ProjectName).dll"
LinkIncremental="1"
- AdditionalLibraryDirectories=""$(OutDir)";"$(APR_HOME)\Debug";"$(XERCES_HOME)\lib";"$(ICU_HOME)\lib";"$(UIMACPP_HOME)\lib""
+ AdditionalLibraryDirectories=""$(OutDir)";"$(APR_HOME)\Debug";"$(XERCES_HOME)\lib";"$(ICU_HOME)\lib";"$(UIMACPP_HOME)\lib";..\..\..\install\lib"
GenerateDebugInformation="TRUE"
ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
SubSystem="2"
@@ -72,7 +72,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="3"
- AdditionalIncludeDirectories=".;"$(APR_HOME)\include";"$(ICU_HOME)\include";"$(XERCES_HOME)\include";"$(JAVA_HOME)\include";"$(JAVA_HOME)\include\win32";"$(UIMACPP_HOME)\include";"$(UIMACPP_HOME)\include\apr""
+ AdditionalIncludeDirectories=".;"$(APR_HOME)\include";"$(ICU_HOME)\include";"$(XERCES_HOME)\include";"$(UIMACPP_HOME)\include";"$(UIMACPP_HOME)\include\apr";..\..\cas;..\..\framework"
PreprocessorDefinitions="UIMA_SUPPRESS_TIMING;TRACEOFF;NDEBUG;WIN32;_WINDOWS;_USRDLL"
MinimalRebuild="FALSE"
BasicRuntimeChecks="0"
@@ -88,7 +88,7 @@
AdditionalDependencies="icuuc.lib libapr$(APR_VER).lib uima.lib"
OutputFile="$(OutDir)\$(ProjectName).dll"
LinkIncremental="1"
- AdditionalLibraryDirectories=""$(OutDir)";"$(APR_HOME)\Release";"$(XERCES_HOME)\lib";"$(ICU_HOME)\lib";"$(UIMACPP_HOME)\lib""
+ AdditionalLibraryDirectories=""$(OutDir)";"$(APR_HOME)\Release";"$(XERCES_HOME)\lib";"$(ICU_HOME)\lib";"$(UIMACPP_HOME)\lib";..\..\..\install\lib"
GenerateDebugInformation="FALSE"
ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
SubSystem="2"
Modified: incubator/uima/uimacpp/trunk/src/test/src/TextSegmentConsumer.vcproj
URL: http://svn.apache.org/viewvc/incubator/uima/uimacpp/trunk/src/test/src/TextSegmentConsumer.vcproj?view=diff&rev=504878&r1=504877&r2=504878
==============================================================================
--- incubator/uima/uimacpp/trunk/src/test/src/TextSegmentConsumer.vcproj (original)
+++ incubator/uima/uimacpp/trunk/src/test/src/TextSegmentConsumer.vcproj Thu Feb 8 05:09:35 2007
@@ -20,7 +20,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories=".;"$(APR_HOME)\include";"$(ICU_HOME)\include";"$(XERCES_HOME)\include";"$(JAVA_HOME)\include";"$(JAVA_HOME)\include\win32";"$(UIMACPP_HOME)\include";"$(UIMACPP_HOME)\include\apr""
+ AdditionalIncludeDirectories=".;"$(APR_HOME)\include";"$(ICU_HOME)\include";"$(XERCES_HOME)\include";"$(UIMACPP_HOME)\include";"$(UIMACPP_HOME)\include\apr";..\..\cas;..\..\framework"
PreprocessorDefinitions="UIMA_SUPPRESS_TIMING;WIN32;_DEBUG;_WINDOWS;_USRDLL"
MinimalRebuild="TRUE"
BasicRuntimeChecks="3"
@@ -36,7 +36,7 @@
AdditionalDependencies="icuuc.lib libapr$(APR_VER).lib uimaD.lib"
OutputFile="$(OutDir)\lib$(ProjectName).dll"
LinkIncremental="1"
- AdditionalLibraryDirectories=""$(OutDir)";"$(APR_HOME)\Debug";"$(XERCES_HOME)\lib";"$(ICU_HOME)\lib";"$(UIMACPP_HOME)\lib""
+ AdditionalLibraryDirectories=""$(OutDir)";"$(APR_HOME)\Debug";"$(XERCES_HOME)\lib";"$(ICU_HOME)\lib";"$(UIMACPP_HOME)\lib";..\..\..\install\lib"
GenerateDebugInformation="TRUE"
ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
SubSystem="2"
@@ -72,7 +72,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="3"
- AdditionalIncludeDirectories=".;"$(APR_HOME)\include";"$(ICU_HOME)\include";"$(XERCES_HOME)\include";"$(JAVA_HOME)\include";"$(JAVA_HOME)\include\win32";"$(UIMACPP_HOME)\include";"$(UIMACPP_HOME)\include\apr""
+ AdditionalIncludeDirectories=".;"$(APR_HOME)\include";"$(ICU_HOME)\include";"$(XERCES_HOME)\include";"$(UIMACPP_HOME)\include";"$(UIMACPP_HOME)\include\apr";..\..\cas;..\..\framework"
PreprocessorDefinitions="UIMA_SUPPRESS_TIMING;TRACEOFF;NDEBUG;WIN32;_WINDOWS;_USRDLL"
MinimalRebuild="FALSE"
BasicRuntimeChecks="0"
@@ -88,7 +88,7 @@
AdditionalDependencies="icuuc.lib libapr$(APR_VER).lib uima.lib"
OutputFile="$(OutDir)\lib$(ProjectName).dll"
LinkIncremental="1"
- AdditionalLibraryDirectories=""$(OutDir)";"$(APR_HOME)\Release";"$(XERCES_HOME)\lib";"$(ICU_HOME)\lib";"$(UIMACPP_HOME)\lib""
+ AdditionalLibraryDirectories=""$(OutDir)";"$(APR_HOME)\Release";"$(XERCES_HOME)\lib";"$(ICU_HOME)\lib";"$(UIMACPP_HOME)\lib";..\..\..\install\lib"
GenerateDebugInformation="FALSE"
ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
SubSystem="2"
Modified: incubator/uima/uimacpp/trunk/src/test/src/plugin_annotator_dump.vcproj
URL: http://svn.apache.org/viewvc/incubator/uima/uimacpp/trunk/src/test/src/plugin_annotator_dump.vcproj?view=diff&rev=504878&r1=504877&r2=504878
==============================================================================
--- incubator/uima/uimacpp/trunk/src/test/src/plugin_annotator_dump.vcproj (original)
+++ incubator/uima/uimacpp/trunk/src/test/src/plugin_annotator_dump.vcproj Thu Feb 8 05:09:35 2007
@@ -19,7 +19,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories=".;"$(APR_HOME)\include";"$(ICU_HOME)\include";"$(XERCES_HOME)\include";"$(JAVA_HOME)\include";"$(JAVA_HOME)\include\win32";"$(UIMACPP_HOME)\include";"$(UIMACPP_HOME)\include\apr""
+ AdditionalIncludeDirectories=".;"$(APR_HOME)\include";"$(ICU_HOME)\include";"$(XERCES_HOME)\include";"$(UIMACPP_HOME)\include";"$(UIMACPP_HOME)\include\apr";..\..\cas;..\..\framework"
PreprocessorDefinitions="UIMA_SUPPRESS_TIMING;WIN32;_DEBUG;_WINDOWS;_USRDLL"
MinimalRebuild="TRUE"
BasicRuntimeChecks="3"
@@ -35,7 +35,7 @@
AdditionalDependencies="icuuc.lib libapr$(APR_VER).lib uimaD.lib"
OutputFile="$(OutDir)\libdump.dll"
LinkIncremental="1"
- AdditionalLibraryDirectories=""$(OutDir)";"$(APR_HOME)\Debug";"$(XERCES_HOME)\lib";"$(ICU_HOME)\lib";"$(UIMACPP_HOME)\lib""
+ AdditionalLibraryDirectories=""$(OutDir)";"$(APR_HOME)\Debug";"$(XERCES_HOME)\lib";"$(ICU_HOME)\lib";"$(UIMACPP_HOME)\lib";..\..\..\install\lib"
GenerateDebugInformation="TRUE"
ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
SubSystem="2"
@@ -71,7 +71,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="3"
- AdditionalIncludeDirectories=".;"$(APR_HOME)\include";"$(ICU_HOME)\include";"$(XERCES_HOME)\include";"$(JAVA_HOME)\include";"$(JAVA_HOME)\include\win32";"$(UIMACPP_HOME)\include";"$(UIMACPP_HOME)\include\apr""
+ AdditionalIncludeDirectories=".;"$(APR_HOME)\include";"$(ICU_HOME)\include";"$(XERCES_HOME)\include";"$(UIMACPP_HOME)\include";"$(UIMACPP_HOME)\include\apr";..\..\cas;..\..\framework"
PreprocessorDefinitions="UIMA_SUPPRESS_TIMING;TRACEOFF;NDEBUG;WIN32;_WINDOWS;_USRDLL"
MinimalRebuild="FALSE"
BasicRuntimeChecks="0"
@@ -87,7 +87,7 @@
AdditionalDependencies="icuuc.lib libapr$(APR_VER).lib uima.lib"
OutputFile="$(OutDir)\libdump.dll"
LinkIncremental="1"
- AdditionalLibraryDirectories=""$(OutDir)";"$(APR_HOME)\Release";"$(XERCES_HOME)\lib";"$(ICU_HOME)\lib";"$(UIMACPP_HOME)\lib""
+ AdditionalLibraryDirectories=""$(OutDir)";"$(APR_HOME)\Release";"$(XERCES_HOME)\lib";"$(ICU_HOME)\lib";"$(UIMACPP_HOME)\lib";..\..\..\install\lib"
GenerateDebugInformation="FALSE"
ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
SubSystem="2"
Modified: incubator/uima/uimacpp/trunk/src/test/src/plugin_tokenizer.vcproj
URL: http://svn.apache.org/viewvc/incubator/uima/uimacpp/trunk/src/test/src/plugin_tokenizer.vcproj?view=diff&rev=504878&r1=504877&r2=504878
==============================================================================
--- incubator/uima/uimacpp/trunk/src/test/src/plugin_tokenizer.vcproj (original)
+++ incubator/uima/uimacpp/trunk/src/test/src/plugin_tokenizer.vcproj Thu Feb 8 05:09:35 2007
@@ -19,7 +19,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories=".;"$(APR_HOME)\include";"$(ICU_HOME)\include";"$(XERCES_HOME)\include";"$(JAVA_HOME)\include";"$(JAVA_HOME)\include\win32";"$(UIMACPP_HOME)\include";"$(UIMACPP_HOME)\include\apr""
+ AdditionalIncludeDirectories=".;"$(APR_HOME)\include";"$(ICU_HOME)\include";"$(XERCES_HOME)\include";"$(UIMACPP_HOME)\include";"$(UIMACPP_HOME)\include\apr";..\..\cas;..\..\framework"
PreprocessorDefinitions="UIMA_SUPPRESS_TIMING;WIN32;_DEBUG;_WINDOWS;_USRDLL"
MinimalRebuild="TRUE"
BasicRuntimeChecks="3"
@@ -35,7 +35,7 @@
AdditionalDependencies="icuuc.lib uimaD.lib libapr$(APR_VER).lib"
OutputFile="$(OutDir)\libtoknz.dll"
LinkIncremental="1"
- AdditionalLibraryDirectories=""$(OutDir)";"$(APR_HOME)\Debug";"$(XERCES_HOME)\lib";"$(ICU_HOME)\lib";"$(UIMACPP_HOME)\lib""
+ AdditionalLibraryDirectories=""$(OutDir)";"$(APR_HOME)\Debug";"$(XERCES_HOME)\lib";"$(ICU_HOME)\lib";"$(UIMACPP_HOME)\lib";..\..\..\install\lib"
GenerateDebugInformation="TRUE"
ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
SubSystem="2"
@@ -71,7 +71,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="3"
- AdditionalIncludeDirectories=".;"$(APR_HOME)\include";"$(ICU_HOME)\include";"$(XERCES_HOME)\include";"$(JAVA_HOME)\include";"$(JAVA_HOME)\include\win32";"$(UIMACPP_HOME)\include";"$(UIMACPP_HOME)\include\apr""
+ AdditionalIncludeDirectories=".;"$(APR_HOME)\include";"$(ICU_HOME)\include";"$(XERCES_HOME)\include";"$(UIMACPP_HOME)\include";"$(UIMACPP_HOME)\include\apr";..\..\cas;..\..\framework"
PreprocessorDefinitions="UIMA_SUPPRESS_TIMING;TRACEOFF;NDEBUG;WIN32;_WINDOWS;_USRDLL"
MinimalRebuild="FALSE"
BasicRuntimeChecks="0"
@@ -87,7 +87,7 @@
AdditionalDependencies="icuuc.lib uima.lib"
OutputFile="$(OutDir)\libtoknz.dll"
LinkIncremental="1"
- AdditionalLibraryDirectories=""$(OutDir)";"$(APR_HOME)\Release";"$(XERCES_HOME)\lib";"$(ICU_HOME)\lib";"$(UIMACPP_HOME)\lib""
+ AdditionalLibraryDirectories=""$(OutDir)";"$(APR_HOME)\Release";"$(XERCES_HOME)\lib";"$(ICU_HOME)\lib";"$(UIMACPP_HOME)\lib";..\..\..\install\lib"
GenerateDebugInformation="FALSE"
ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
SubSystem="2"
Modified: incubator/uima/uimacpp/trunk/src/test/src/test_cas.vcproj
URL: http://svn.apache.org/viewvc/incubator/uima/uimacpp/trunk/src/test/src/test_cas.vcproj?view=diff&rev=504878&r1=504877&r2=504878
==============================================================================
--- incubator/uima/uimacpp/trunk/src/test/src/test_cas.vcproj (original)
+++ incubator/uima/uimacpp/trunk/src/test/src/test_cas.vcproj Thu Feb 8 05:09:35 2007
@@ -19,7 +19,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories=".;"$(APR_HOME)\include";"$(ICU_HOME)\include";"$(XERCES_HOME)\include";"$(JAVA_HOME)\include";"$(JAVA_HOME)\include\win32";"$(UIMACPP_HOME)\include";"$(UIMACPP_HOME)\include\apr""
+ AdditionalIncludeDirectories=".;"$(APR_HOME)\include";"$(ICU_HOME)\include";"$(XERCES_HOME)\include";"$(UIMACPP_HOME)\include";"$(UIMACPP_HOME)\include\apr";..\..\cas;..\..\framework"
PreprocessorDefinitions="UIMA_SUPPRESS_TIMING;WIN32;_CONSOLE"
MinimalRebuild="TRUE"
BasicRuntimeChecks="3"
@@ -35,7 +35,7 @@
AdditionalDependencies="xerces-c_2.lib icuuc.lib libapr$(APR_VER).lib uimaD.lib"
OutputFile="$(OutDir)/test_cas.exe"
LinkIncremental="1"
- AdditionalLibraryDirectories=""$(APR_HOME)\Debug";"$(XERCES_HOME)\lib";"$(ICU_HOME)\lib";"$(UIMACPP_HOME)\lib""
+ AdditionalLibraryDirectories=""$(APR_HOME)\Debug";"$(XERCES_HOME)\lib";"$(ICU_HOME)\lib";"$(UIMACPP_HOME)\lib";..\..\..\install\lib"
GenerateDebugInformation="TRUE"
ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
SubSystem="1"
@@ -72,7 +72,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="3"
- AdditionalIncludeDirectories=".;"$(APR_HOME)\include";"$(ICU_HOME)\include";"$(XERCES_HOME)\include";"$(JAVA_HOME)\include";"$(JAVA_HOME)\include\win32";"$(UIMACPP_HOME)\include";"$(UIMACPP_HOME)\include\apr""
+ AdditionalIncludeDirectories=".;"$(APR_HOME)\include";"$(ICU_HOME)\include";"$(XERCES_HOME)\include";"$(UIMACPP_HOME)\include";"$(UIMACPP_HOME)\include\apr";..\..\cas;..\..\framework"
PreprocessorDefinitions="UIMA_SUPPRESS_TIMING;TRACEOFF;NDEBUG;WIN32;_CONSOLE"
BasicRuntimeChecks="0"
RuntimeLibrary="2"
@@ -87,7 +87,7 @@
AdditionalDependencies="xerces-c_2.lib icuuc.lib libapr$(APR_VER).lib uima.lib"
OutputFile="$(OutDir)/test_cas.exe"
LinkIncremental="1"
- AdditionalLibraryDirectories=""$(APR_HOME)\Release";"$(XERCES_HOME)\lib";"$(ICU_HOME)\lib";"$(UIMACPP_HOME)\lib""
+ AdditionalLibraryDirectories=""$(APR_HOME)\Release";"$(XERCES_HOME)\lib";"$(ICU_HOME)\lib";"$(UIMACPP_HOME)\lib";..\..\..\install\lib"
GenerateDebugInformation="FALSE"
ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
SubSystem="1"
Modified: incubator/uima/uimacpp/trunk/src/test/src/test_casserializer.vcproj
URL: http://svn.apache.org/viewvc/incubator/uima/uimacpp/trunk/src/test/src/test_casserializer.vcproj?view=diff&rev=504878&r1=504877&r2=504878
==============================================================================
--- incubator/uima/uimacpp/trunk/src/test/src/test_casserializer.vcproj (original)
+++ incubator/uima/uimacpp/trunk/src/test/src/test_casserializer.vcproj Thu Feb 8 05:09:35 2007
@@ -19,7 +19,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories=".;"$(APR_HOME)\include";"$(ICU_HOME)\include";"$(XERCES_HOME)\include";"$(JAVA_HOME)\include";"$(JAVA_HOME)\include\win32";"$(UIMACPP_HOME)\include";"$(UIMACPP_HOME)\include\apr""
+ AdditionalIncludeDirectories=".;"$(APR_HOME)\include";"$(ICU_HOME)\include";"$(XERCES_HOME)\include";"$(UIMACPP_HOME)\include";"$(UIMACPP_HOME)\include\apr";..\..\cas;..\..\framework"
PreprocessorDefinitions="UIMA_SUPPRESS_TIMING;WIN32;_CONSOLE"
MinimalRebuild="TRUE"
BasicRuntimeChecks="3"
@@ -35,7 +35,7 @@
AdditionalDependencies="xerces-c_2.lib icuuc.lib libapr$(APR_VER).lib uimaD.lib"
OutputFile="$(OutDir)/test_casserializer.exe"
LinkIncremental="1"
- AdditionalLibraryDirectories=""$(APR_HOME)\Debug";"$(XERCES_HOME)\lib";"$(ICU_HOME)\lib";"$(UIMACPP_HOME)\lib""
+ AdditionalLibraryDirectories=""$(APR_HOME)\Debug";"$(XERCES_HOME)\lib";"$(ICU_HOME)\lib";"$(UIMACPP_HOME)\lib";..\..\..\install\lib"
GenerateDebugInformation="TRUE"
ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
SubSystem="1"
@@ -70,7 +70,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="3"
- AdditionalIncludeDirectories=".;"$(APR_HOME)\include";"$(ICU_HOME)\include";"$(XERCES_HOME)\include";"$(JAVA_HOME)\include";"$(JAVA_HOME)\include\win32";"$(UIMACPP_HOME)\include";"$(UIMACPP_HOME)\include\apr""
+ AdditionalIncludeDirectories=".;"$(APR_HOME)\include";"$(ICU_HOME)\include";"$(XERCES_HOME)\include";"$(UIMACPP_HOME)\include";"$(UIMACPP_HOME)\include\apr";..\..\cas;..\..\framework"
PreprocessorDefinitions="UIMA_SUPPRESS_TIMING;TRACEOFF;NDEBUG;WIN32;_CONSOLE"
BasicRuntimeChecks="0"
RuntimeLibrary="2"
@@ -85,7 +85,7 @@
AdditionalDependencies="xerces-c_2.lib icuuc.lib libapr$(APR_VER).lib uima.lib"
OutputFile="$(OutDir)/test_casserializer.exe"
LinkIncremental="1"
- AdditionalLibraryDirectories=""$(APR_HOME)\Release";"$(XERCES_HOME)\lib";"$(ICU_HOME)\lib";"$(UIMACPP_HOME)\lib""
+ AdditionalLibraryDirectories=""$(APR_HOME)\Release";"$(XERCES_HOME)\lib";"$(ICU_HOME)\lib";"$(UIMACPP_HOME)\lib";..\..\..\install\lib"
GenerateDebugInformation="FALSE"
ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
SubSystem="1"
Modified: incubator/uima/uimacpp/trunk/src/test/src/test_engine.vcproj
URL: http://svn.apache.org/viewvc/incubator/uima/uimacpp/trunk/src/test/src/test_engine.vcproj?view=diff&rev=504878&r1=504877&r2=504878
==============================================================================
--- incubator/uima/uimacpp/trunk/src/test/src/test_engine.vcproj (original)
+++ incubator/uima/uimacpp/trunk/src/test/src/test_engine.vcproj Thu Feb 8 05:09:35 2007
@@ -20,7 +20,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories=".;"$(APR_HOME)\include";"$(ICU_HOME)\include";"$(XERCES_HOME)\include";"$(JAVA_HOME)\include";"$(JAVA_HOME)\include\win32";"$(UIMACPP_HOME)\include";"$(UIMACPP_HOME)\include\apr""
+ AdditionalIncludeDirectories=".;"$(APR_HOME)\include";"$(ICU_HOME)\include";"$(XERCES_HOME)\include";"$(UIMACPP_HOME)\include";"$(UIMACPP_HOME)\include\apr";..\..\cas;..\..\framework"
PreprocessorDefinitions="UIMA_SUPPRESS_TIMING;WIN32;_CONSOLE;_DEBUG"
MinimalRebuild="TRUE"
BasicRuntimeChecks="3"
@@ -36,7 +36,7 @@
AdditionalDependencies="xerces-c_2.lib icuuc.lib libapr$(APR_VER).lib uimaD.lib"
OutputFile="$(OutDir)/test_engine.exe"
LinkIncremental="1"
- AdditionalLibraryDirectories=""$(APR_HOME)\Debug";"$(XERCES_HOME)\lib";"$(ICU_HOME)\lib";"$(UIMACPP_HOME)\lib""
+ AdditionalLibraryDirectories=""$(APR_HOME)\Debug";"$(XERCES_HOME)\lib";"$(ICU_HOME)\lib";"$(UIMACPP_HOME)\lib";..\..\..\install\lib"
GenerateDebugInformation="TRUE"
ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
SubSystem="1"
@@ -71,7 +71,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="3"
- AdditionalIncludeDirectories=".;"$(APR_HOME)\include";"$(ICU_HOME)\include";"$(XERCES_HOME)\include";"$(JAVA_HOME)\include";"$(JAVA_HOME)\include\win32";"$(UIMACPP_HOME)\include";"$(UIMACPP_HOME)\include\apr""
+ AdditionalIncludeDirectories=".;"$(APR_HOME)\include";"$(ICU_HOME)\include";"$(XERCES_HOME)\include";"$(UIMACPP_HOME)\include";"$(UIMACPP_HOME)\include\apr";..\..\cas;..\..\framework"
PreprocessorDefinitions="UIMA_SUPPRESS_TIMING;TRACEOFF;NDEBUG;WIN32;_CONSOLE"
BasicRuntimeChecks="0"
RuntimeLibrary="2"
@@ -86,7 +86,7 @@
AdditionalDependencies="xerces-c_2.lib icuuc.lib libapr$(APR_VER).lib uima.lib"
OutputFile="$(OutDir)/test_engine.exe"
LinkIncremental="1"
- AdditionalLibraryDirectories=""$(APR_HOME)\Release";"$(XERCES_HOME)\lib";"$(ICU_HOME)\lib";"$(UIMACPP_HOME)\lib""
+ AdditionalLibraryDirectories=""$(APR_HOME)\Release";"$(XERCES_HOME)\lib";"$(ICU_HOME)\lib";"$(UIMACPP_HOME)\lib";..\..\..\install\lib"
GenerateDebugInformation="FALSE"
ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
SubSystem="1"
Modified: incubator/uima/uimacpp/trunk/src/test/src/test_iterators.vcproj
URL: http://svn.apache.org/viewvc/incubator/uima/uimacpp/trunk/src/test/src/test_iterators.vcproj?view=diff&rev=504878&r1=504877&r2=504878
==============================================================================
--- incubator/uima/uimacpp/trunk/src/test/src/test_iterators.vcproj (original)
+++ incubator/uima/uimacpp/trunk/src/test/src/test_iterators.vcproj Thu Feb 8 05:09:35 2007
@@ -19,7 +19,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories=".;"$(APR_HOME)\include";"$(ICU_HOME)\include";"$(XERCES_HOME)\include";"$(JAVA_HOME)\include";"$(JAVA_HOME)\include\win32";"$(UIMACPP_HOME)\include";"$(UIMACPP_HOME)\include\apr""
+ AdditionalIncludeDirectories=".;"$(APR_HOME)\include";"$(ICU_HOME)\include";"$(XERCES_HOME)\include";"$(UIMACPP_HOME)\include";"$(UIMACPP_HOME)\include\apr";..\..\cas;..\..\framework"
PreprocessorDefinitions="UIMA_SUPPRESS_TIMING;WIN32;_CONSOLE"
MinimalRebuild="TRUE"
BasicRuntimeChecks="3"
@@ -35,7 +35,7 @@
AdditionalDependencies="xerces-c_2.lib icuuc.lib libapr$(APR_VER).lib uimaD.lib"
OutputFile="$(OutDir)\test_iterators.exe"
LinkIncremental="1"
- AdditionalLibraryDirectories=""$(APR_HOME)\Debug";"$(XERCES_HOME)\lib";"$(ICU_HOME)\lib";"$(UIMACPP_HOME)\lib""
+ AdditionalLibraryDirectories=""$(APR_HOME)\Debug";"$(XERCES_HOME)\lib";"$(ICU_HOME)\lib";"$(UIMACPP_HOME)\lib";..\..\..\install\lib"
GenerateDebugInformation="TRUE"
ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
SubSystem="1"
@@ -70,7 +70,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="3"
- AdditionalIncludeDirectories=".;"$(APR_HOME)\include";"$(ICU_HOME)\include";"$(XERCES_HOME)\include";"$(JAVA_HOME)\include";"$(JAVA_HOME)\include\win32";"$(UIMACPP_HOME)\include";"$(UIMACPP_HOME)\include\apr""
+ AdditionalIncludeDirectories=".;"$(APR_HOME)\include";"$(ICU_HOME)\include";"$(XERCES_HOME)\include";"$(UIMACPP_HOME)\include";"$(UIMACPP_HOME)\include\apr";..\..\cas;..\..\framework"
PreprocessorDefinitions="UIMA_SUPPRESS_TIMING;TRACEOFF;NDEBUG;WIN32;_CONSOLE"
BasicRuntimeChecks="0"
RuntimeLibrary="2"
@@ -85,7 +85,7 @@
AdditionalDependencies="xerces-c_2.lib icuuc.lib libapr$(APR_VER).lib uima.lib"
OutputFile="$(OutDir)\test_iterators.exe"
LinkIncremental="1"
- AdditionalLibraryDirectories=""$(APR_HOME)\Release";"$(XERCES_HOME)\lib";"$(ICU_HOME)\lib";"$(UIMACPP_HOME)\lib""
+ AdditionalLibraryDirectories=""$(APR_HOME)\Release";"$(XERCES_HOME)\lib";"$(ICU_HOME)\lib";"$(UIMACPP_HOME)\lib";..\..\..\install\lib"
GenerateDebugInformation="FALSE"
ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
SubSystem="1"
Modified: incubator/uima/uimacpp/trunk/src/test/src/test_language.vcproj
URL: http://svn.apache.org/viewvc/incubator/uima/uimacpp/trunk/src/test/src/test_language.vcproj?view=diff&rev=504878&r1=504877&r2=504878
==============================================================================
--- incubator/uima/uimacpp/trunk/src/test/src/test_language.vcproj (original)
+++ incubator/uima/uimacpp/trunk/src/test/src/test_language.vcproj Thu Feb 8 05:09:35 2007
@@ -19,7 +19,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories=".;"$(APR_HOME)\include";"$(ICU_HOME)\include";"$(XERCES_HOME)\include";"$(JAVA_HOME)\include";"$(JAVA_HOME)\include\win32";"$(UIMACPP_HOME)\include";"$(UIMACPP_HOME)\include\apr""
+ AdditionalIncludeDirectories=".;"$(APR_HOME)\include";"$(ICU_HOME)\include";"$(XERCES_HOME)\include";"$(UIMACPP_HOME)\include";"$(UIMACPP_HOME)\include\apr";..\..\cas;..\..\framework"
PreprocessorDefinitions="UIMA_SUPPRESS_TIMING;WIN32;_CONSOLE"
MinimalRebuild="TRUE"
BasicRuntimeChecks="3"
@@ -35,7 +35,7 @@
AdditionalDependencies="xerces-c_2.lib icuuc.lib libapr$(APR_VER).lib uimaD.lib"
OutputFile="$(OutDir)/test_language.exe"
LinkIncremental="1"
- AdditionalLibraryDirectories=""$(APR_HOME)\Debug";"$(XERCES_HOME)\lib";"$(ICU_HOME)\lib";"$(UIMACPP_HOME)\lib""
+ AdditionalLibraryDirectories=""$(APR_HOME)\Debug";"$(XERCES_HOME)\lib";"$(ICU_HOME)\lib";"$(UIMACPP_HOME)\lib";..\..\..\install\lib"
GenerateDebugInformation="TRUE"
ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
SubSystem="1"
@@ -70,7 +70,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="3"
- AdditionalIncludeDirectories=".;"$(APR_HOME)\include";"$(ICU_HOME)\include";"$(XERCES_HOME)\include";"$(JAVA_HOME)\include";"$(JAVA_HOME)\include\win32";"$(UIMACPP_HOME)\include";"$(UIMACPP_HOME)\include\apr""
+ AdditionalIncludeDirectories=".;"$(APR_HOME)\include";"$(ICU_HOME)\include";"$(XERCES_HOME)\include";"$(UIMACPP_HOME)\include";"$(UIMACPP_HOME)\include\apr";..\..\cas;..\..\framework"
PreprocessorDefinitions="UIMA_SUPPRESS_TIMING;TRACEOFF;NDEBUG;WIN32;_CONSOLE"
BasicRuntimeChecks="0"
RuntimeLibrary="2"
@@ -85,7 +85,7 @@
AdditionalDependencies="xerces-c_2.lib icuuc.lib libapr$(APR_VER).lib uima.lib"
OutputFile="$(OutDir)/test_language.exe"
LinkIncremental="1"
- AdditionalLibraryDirectories=""$(APR_HOME)\Release";"$(XERCES_HOME)\lib";"$(ICU_HOME)\lib";"$(UIMACPP_HOME)\lib""
+ AdditionalLibraryDirectories=""$(APR_HOME)\Release";"$(XERCES_HOME)\lib";"$(ICU_HOME)\lib";"$(UIMACPP_HOME)\lib";..\..\..\install\lib"
GenerateDebugInformation="FALSE"
ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
SubSystem="1"
Modified: incubator/uima/uimacpp/trunk/src/test/src/test_primitivetypes.vcproj
URL: http://svn.apache.org/viewvc/incubator/uima/uimacpp/trunk/src/test/src/test_primitivetypes.vcproj?view=diff&rev=504878&r1=504877&r2=504878
==============================================================================
--- incubator/uima/uimacpp/trunk/src/test/src/test_primitivetypes.vcproj (original)
+++ incubator/uima/uimacpp/trunk/src/test/src/test_primitivetypes.vcproj Thu Feb 8 05:09:35 2007
@@ -19,7 +19,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories=".;"$(APR_HOME)\include";"$(ICU_HOME)\include";"$(XERCES_HOME)\include";"$(JAVA_HOME)\include";"$(JAVA_HOME)\include\win32";"$(UIMACPP_HOME)\include";"$(UIMACPP_HOME)\include\apr""
+ AdditionalIncludeDirectories=".;"$(APR_HOME)\include";"$(ICU_HOME)\include";"$(XERCES_HOME)\include";"$(UIMACPP_HOME)\include";"$(UIMACPP_HOME)\include\apr";..\..\cas;..\..\framework"
PreprocessorDefinitions="UIMA_SUPPRESS_TIMING;WIN32;_CONSOLE"
MinimalRebuild="TRUE"
BasicRuntimeChecks="3"
@@ -32,10 +32,10 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="xerces-c_2.lib icuuc.lib uima.lib"
+ AdditionalDependencies="xerces-c_2.lib icuuc.lib uimaD.lib"
OutputFile="$(OutDir)/test_primitivetypes.exe"
LinkIncremental="2"
- AdditionalLibraryDirectories=""$(APR_HOME)\Debug";"$(XERCES_HOME)\lib";"$(ICU_HOME)\lib";"$(UIMACPP_HOME)\lib""
+ AdditionalLibraryDirectories=""$(APR_HOME)\Debug";"$(XERCES_HOME)\lib";"$(ICU_HOME)\lib";"$(UIMACPP_HOME)\lib";..\..\..\install\lib"
GenerateDebugInformation="TRUE"
ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
SubSystem="1"
@@ -70,7 +70,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="3"
- AdditionalIncludeDirectories=".;"$(APR_HOME)\include";"$(ICU_HOME)\include";"$(XERCES_HOME)\include";"$(JAVA_HOME)\include";"$(JAVA_HOME)\include\win32";"$(UIMACPP_HOME)\include";"$(UIMACPP_HOME)\include\apr""
+ AdditionalIncludeDirectories=".;"$(APR_HOME)\include";"$(ICU_HOME)\include";"$(XERCES_HOME)\include";"$(UIMACPP_HOME)\include";"$(UIMACPP_HOME)\include\apr";..\..\cas;..\..\framework"
PreprocessorDefinitions="UIMA_SUPPRESS_TIMING;TRACEOFF;NDEBUG;WIN32;_CONSOLE"
BasicRuntimeChecks="0"
RuntimeLibrary="2"
@@ -85,7 +85,7 @@
AdditionalDependencies="xerces-c_2.lib icuuc.lib uima.lib"
OutputFile="$(OutDir)/test_primitivetypes.exe"
LinkIncremental="1"
- AdditionalLibraryDirectories=""$(APR_HOME)\Release";"$(XERCES_HOME)\lib";"$(ICU_HOME)\lib";"$(UIMACPP_HOME)\lib""
+ AdditionalLibraryDirectories=""$(APR_HOME)\Release";"$(XERCES_HOME)\lib";"$(ICU_HOME)\lib";"$(UIMACPP_HOME)\lib";..\..\..\install\lib"
GenerateDebugInformation="FALSE"
ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
SubSystem="1"
Modified: incubator/uima/uimacpp/trunk/src/test/src/test_sofa.vcproj
URL: http://svn.apache.org/viewvc/incubator/uima/uimacpp/trunk/src/test/src/test_sofa.vcproj?view=diff&rev=504878&r1=504877&r2=504878
==============================================================================
--- incubator/uima/uimacpp/trunk/src/test/src/test_sofa.vcproj (original)
+++ incubator/uima/uimacpp/trunk/src/test/src/test_sofa.vcproj Thu Feb 8 05:09:35 2007
@@ -19,7 +19,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories=".;"$(APR_HOME)\include";"$(ICU_HOME)\include";"$(XERCES_HOME)\include";"$(JAVA_HOME)\include";"$(JAVA_HOME)\include\win32";"$(UIMACPP_HOME)\include";"$(UIMACPP_HOME)\include\apr""
+ AdditionalIncludeDirectories=".;"$(APR_HOME)\include";"$(ICU_HOME)\include";"$(XERCES_HOME)\include";"$(UIMACPP_HOME)\include";"$(UIMACPP_HOME)\include\apr";..\..\cas;..\..\framework"
PreprocessorDefinitions="UIMA_SUPPRESS_TIMING;WIN32;_CONSOLE"
MinimalRebuild="TRUE"
BasicRuntimeChecks="3"
@@ -35,7 +35,7 @@
AdditionalDependencies="xerces-c_2.lib icuuc.lib uimaD.lib"
OutputFile="$(OutDir)/test_sofa.exe"
LinkIncremental="2"
- AdditionalLibraryDirectories=""$(APR_HOME)\Debug";"$(XERCES_HOME)\lib";"$(ICU_HOME)\lib";"$(UIMACPP_HOME)\lib""
+ AdditionalLibraryDirectories=""$(APR_HOME)\Debug";"$(XERCES_HOME)\lib";"$(ICU_HOME)\lib";"$(UIMACPP_HOME)\lib";..\..\..\install\lib"
GenerateDebugInformation="TRUE"
ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
SubSystem="1"
@@ -70,7 +70,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="3"
- AdditionalIncludeDirectories=".;"$(APR_HOME)\include";"$(ICU_HOME)\include";"$(XERCES_HOME)\include";"$(JAVA_HOME)\include";"$(JAVA_HOME)\include\win32";"$(UIMACPP_HOME)\include";"$(UIMACPP_HOME)\include\apr""
+ AdditionalIncludeDirectories=".;"$(APR_HOME)\include";"$(ICU_HOME)\include";"$(XERCES_HOME)\include";"$(UIMACPP_HOME)\include";"$(UIMACPP_HOME)\include\apr";..\..\cas;..\..\framework"
PreprocessorDefinitions="UIMA_SUPPRESS_TIMING;TRACEOFF;NDEBUG;WIN32;_CONSOLE"
BasicRuntimeChecks="0"
RuntimeLibrary="2"
@@ -85,7 +85,7 @@
AdditionalDependencies="xerces-c_2.lib icuuc.lib uima.lib"
OutputFile="$(OutDir)/test_sofa.exe"
LinkIncremental="1"
- AdditionalLibraryDirectories=""$(APR_HOME)\Release";"$(XERCES_HOME)\lib";"$(ICU_HOME)\lib";"$(UIMACPP_HOME)\lib""
+ AdditionalLibraryDirectories=""$(APR_HOME)\Release";"$(XERCES_HOME)\lib";"$(ICU_HOME)\lib";"$(UIMACPP_HOME)\lib";..\..\..\install\lib"
GenerateDebugInformation="FALSE"
ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
SubSystem="1"
Modified: incubator/uima/uimacpp/trunk/src/test/src/test_typepriority.vcproj
URL: http://svn.apache.org/viewvc/incubator/uima/uimacpp/trunk/src/test/src/test_typepriority.vcproj?view=diff&rev=504878&r1=504877&r2=504878
==============================================================================
--- incubator/uima/uimacpp/trunk/src/test/src/test_typepriority.vcproj (original)
+++ incubator/uima/uimacpp/trunk/src/test/src/test_typepriority.vcproj Thu Feb 8 05:09:35 2007
@@ -19,7 +19,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories=".;"$(APR_HOME)\include";"$(ICU_HOME)\include";"$(XERCES_HOME)\include";"$(JAVA_HOME)\include";"$(JAVA_HOME)\include\win32";"$(UIMACPP_HOME)\include";"$(UIMACPP_HOME)\include\apr""
+ AdditionalIncludeDirectories=".;"$(APR_HOME)\include";"$(ICU_HOME)\include";"$(XERCES_HOME)\include";"$(UIMACPP_HOME)\include";"$(UIMACPP_HOME)\include\apr";..\..\cas;..\..\framework"
PreprocessorDefinitions="UIMA_SUPPRESS_TIMING;WIN32;_CONSOLE"
MinimalRebuild="TRUE"
BasicRuntimeChecks="3"
@@ -35,7 +35,7 @@
AdditionalDependencies="xerces-c_2.lib icuuc.lib uimaD.lib"
OutputFile="$(OutDir)/test_typepriority.exe"
LinkIncremental="2"
- AdditionalLibraryDirectories=""$(APR_HOME)\Debug";"$(XERCES_HOME)\lib";"$(ICU_HOME)\lib";"$(UIMACPP_HOME)\lib""
+ AdditionalLibraryDirectories=""$(APR_HOME)\Debug";"$(XERCES_HOME)\lib";"$(ICU_HOME)\lib";"$(UIMACPP_HOME)\lib";..\..\..\install\lib"
GenerateDebugInformation="TRUE"
ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
SubSystem="1"
@@ -70,7 +70,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="3"
- AdditionalIncludeDirectories=".;"$(APR_HOME)\include";"$(ICU_HOME)\include";"$(XERCES_HOME)\include";"$(JAVA_HOME)\include";"$(JAVA_HOME)\include\win32";"$(UIMACPP_HOME)\include";"$(UIMACPP_HOME)\include\apr""
+ AdditionalIncludeDirectories=".;"$(APR_HOME)\include";"$(ICU_HOME)\include";"$(XERCES_HOME)\include";"$(UIMACPP_HOME)\include";"$(UIMACPP_HOME)\include\apr";..\..\cas;..\..\framework"
PreprocessorDefinitions="UIMA_SUPPRESS_TIMING;TRACEOFF;NDEBUG;WIN32;_CONSOLE"
BasicRuntimeChecks="0"
RuntimeLibrary="2"
@@ -85,7 +85,7 @@
AdditionalDependencies="xerces-c_2.lib icuuc.lib uima.lib"
OutputFile="$(OutDir)/test_typepriority.exe"
LinkIncremental="1"
- AdditionalLibraryDirectories=""$(APR_HOME)\Release";"$(XERCES_HOME)\lib";"$(ICU_HOME)\lib";"$(UIMACPP_HOME)\lib""
+ AdditionalLibraryDirectories=""$(APR_HOME)\Release";"$(XERCES_HOME)\lib";"$(ICU_HOME)\lib";"$(UIMACPP_HOME)\lib";..\..\..\install\lib"
GenerateDebugInformation="FALSE"
ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
SubSystem="1"
Modified: incubator/uima/uimacpp/trunk/src/test/src/test_xcasdeserialization.vcproj
URL: http://svn.apache.org/viewvc/incubator/uima/uimacpp/trunk/src/test/src/test_xcasdeserialization.vcproj?view=diff&rev=504878&r1=504877&r2=504878
==============================================================================
--- incubator/uima/uimacpp/trunk/src/test/src/test_xcasdeserialization.vcproj (original)
+++ incubator/uima/uimacpp/trunk/src/test/src/test_xcasdeserialization.vcproj Thu Feb 8 05:09:35 2007
@@ -19,7 +19,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories=".;"$(APR_HOME)\include";"$(ICU_HOME)\include";"$(XERCES_HOME)\include";"$(JAVA_HOME)\include";"$(JAVA_HOME)\include\win32";"$(UIMACPP_HOME)\include";"$(UIMACPP_HOME)\include\apr""
+ AdditionalIncludeDirectories=".;"$(APR_HOME)\include";"$(ICU_HOME)\include";"$(XERCES_HOME)\include";"$(UIMACPP_HOME)\include";"$(UIMACPP_HOME)\include\apr";..\..\cas;..\..\framework"
PreprocessorDefinitions="UIMA_SUPPRESS_TIMING;WIN32;_CONSOLE"
MinimalRebuild="TRUE"
BasicRuntimeChecks="3"
@@ -35,7 +35,7 @@
AdditionalDependencies="xerces-c_2.lib icuuc.lib uimaD.lib"
OutputFile="$(OutDir)/test_xcasdeserialization.exe"
LinkIncremental="2"
- AdditionalLibraryDirectories=""$(APR_HOME)\Debug";"$(XERCES_HOME)\lib";"$(ICU_HOME)\lib";"$(UIMACPP_HOME)\lib""
+ AdditionalLibraryDirectories=""$(APR_HOME)\Debug";"$(XERCES_HOME)\lib";"$(ICU_HOME)\lib";"$(UIMACPP_HOME)\lib";..\..\..\install\lib"
GenerateDebugInformation="TRUE"
ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
SubSystem="1"
@@ -70,7 +70,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="3"
- AdditionalIncludeDirectories=".;"$(APR_HOME)\include";"$(ICU_HOME)\include";"$(XERCES_HOME)\include";"$(JAVA_HOME)\include";"$(JAVA_HOME)\include\win32";"$(UIMACPP_HOME)\include";"$(UIMACPP_HOME)\include\apr""
+ AdditionalIncludeDirectories=".;"$(APR_HOME)\include";"$(ICU_HOME)\include";"$(XERCES_HOME)\include";"$(UIMACPP_HOME)\include";"$(UIMACPP_HOME)\include\apr";..\..\cas;..\..\framework"
PreprocessorDefinitions="UIMA_SUPPRESS_TIMING;TRACEOFF;NDEBUG;WIN32;_CONSOLE"
BasicRuntimeChecks="0"
RuntimeLibrary="2"
@@ -85,7 +85,7 @@
AdditionalDependencies="xerces-c_2.lib icuuc.lib uima.lib"
OutputFile="$(OutDir)/test_xcasdeserialization.exe"
LinkIncremental="1"
- AdditionalLibraryDirectories=""$(APR_HOME)\Release";"$(XERCES_HOME)\lib";"$(ICU_HOME)\lib";"$(UIMACPP_HOME)\lib""
+ AdditionalLibraryDirectories=""$(APR_HOME)\Release";"$(XERCES_HOME)\lib";"$(ICU_HOME)\lib";"$(UIMACPP_HOME)\lib";..\..\..\install\lib"
GenerateDebugInformation="FALSE"
ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
SubSystem="1"
Modified: incubator/uima/uimacpp/trunk/src/winmake.cmd
URL: http://svn.apache.org/viewvc/incubator/uima/uimacpp/trunk/src/winmake.cmd?view=diff&rev=504878&r1=504877&r2=504878
==============================================================================
--- incubator/uima/uimacpp/trunk/src/winmake.cmd (original)
+++ incubator/uima/uimacpp/trunk/src/winmake.cmd Thu Feb 8 05:09:35 2007
@@ -5,13 +5,6 @@
REM alternate behavior is to override any or all of the dependent libraries
REM need a Java JRE for the JNI interface
-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
@@ -30,12 +23,12 @@
REM Start project build
if "%~1" == "" (
- set TARGET=release
+ set OPERATION=/build release
) else (
- set TARGET=%~1
+ set OPERATION=%1 %2 %3 %4 %5
)
-echo devenv uimacpp.sln /build %TARGET%
-devenv uimacpp.sln /build %TARGET%
+echo devenv uimacpp.sln %OPERATION%
+devenv uimacpp.sln %OPERATION%
goto end
:noapr
@@ -51,7 +44,7 @@
goto end
:nojava
-echo %JAVA_INCLUDE% does not exist or does not contain jni.h
+echo JAVA_INCLUDE is not set or does not contain jni.h
:end
endlocal