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 2008/01/03 17:06:17 UTC
svn commit: r608538 - in /incubator/uima/uimacpp/trunk/src: ./ test/src/
Author: eae
Date: Thu Jan 3 08:06:16 2008
New Revision: 608538
URL: http://svn.apache.org/viewvc?rev=608538&view=rev
Log:
UIMA-688 changes for windows
Modified:
incubator/uima/uimacpp/trunk/src/runaecpp.vcproj
incubator/uima/uimacpp/trunk/src/test/src/MeetingAnnotator.vcproj
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/uimacpp.vcproj
incubator/uima/uimacpp/trunk/src/winmake.cmd
Modified: incubator/uima/uimacpp/trunk/src/runaecpp.vcproj
URL: http://svn.apache.org/viewvc/incubator/uima/uimacpp/trunk/src/runaecpp.vcproj?rev=608538&r1=608537&r2=608538&view=diff
==============================================================================
--- incubator/uima/uimacpp/trunk/src/runaecpp.vcproj (original)
+++ incubator/uima/uimacpp/trunk/src/runaecpp.vcproj Thu Jan 3 08:06:16 2008
@@ -64,7 +64,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="xerces-c_2.lib icuuc.lib libapr$(APR_VER).lib uimaD.lib"
+ AdditionalDependencies="xerces-c_2.lib icuuc.lib libapr-1.lib uimaD.lib"
OutputFile="$(OutDir)/runAECppD.exe"
LinkIncremental="1"
AdditionalLibraryDirectories=""$(OutDir)\..\lib";"$(APR_HOME)\$(ConfigurationName)";"$(XERCES_HOME)\lib";"$(ICU_HOME)\lib";"$(UIMACPP_HOME)\lib""
@@ -145,7 +145,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="xerces-c_2.lib icuuc.lib libapr$(APR_VER).lib uima.lib"
+ AdditionalDependencies="xerces-c_2.lib icuuc.lib libapr-1.lib uima.lib"
OutputFile="$(OutDir)/runAECpp.exe"
LinkIncremental="1"
AdditionalLibraryDirectories=""$(OutDir)\..\lib";"$(APR_HOME)\$(ConfigurationName)";"$(XERCES_HOME)\lib";"$(ICU_HOME)\lib";"$(UIMACPP_HOME)\lib""
Modified: incubator/uima/uimacpp/trunk/src/test/src/MeetingAnnotator.vcproj
URL: http://svn.apache.org/viewvc/incubator/uima/uimacpp/trunk/src/test/src/MeetingAnnotator.vcproj?rev=608538&r1=608537&r2=608538&view=diff
==============================================================================
--- incubator/uima/uimacpp/trunk/src/test/src/MeetingAnnotator.vcproj (original)
+++ incubator/uima/uimacpp/trunk/src/test/src/MeetingAnnotator.vcproj Thu Jan 3 08:06:16 2008
@@ -62,7 +62,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="icuuc.lib libapr$(APR_VER).lib uimaD.lib"
+ AdditionalDependencies="icuuc.lib libapr-1.lib uimaD.lib"
OutputFile="$(OutDir)\$(ProjectName)D.dll"
LinkIncremental="1"
AdditionalLibraryDirectories=""$(OutDir)";"$(APR_HOME)\Debug";"$(XERCES_HOME)\lib";"$(ICU_HOME)\lib";"$(UIMACPP_HOME)\lib";..\..\..\install\lib"
@@ -144,7 +144,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="icuuc.lib libapr$(APR_VER).lib uima.lib"
+ AdditionalDependencies="icuuc.lib libapr-1.lib uima.lib"
OutputFile="$(OutDir)\$(ProjectName).dll"
LinkIncremental="1"
AdditionalLibraryDirectories=""$(OutDir)";"$(APR_HOME)\Release";"$(XERCES_HOME)\lib";"$(ICU_HOME)\lib";"$(UIMACPP_HOME)\lib";..\..\..\install\lib"
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?rev=608538&r1=608537&r2=608538&view=diff
==============================================================================
--- incubator/uima/uimacpp/trunk/src/test/src/SimpleTextSegmenter.vcproj (original)
+++ incubator/uima/uimacpp/trunk/src/test/src/SimpleTextSegmenter.vcproj Thu Jan 3 08:06:16 2008
@@ -62,7 +62,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="icuuc.lib libapr$(APR_VER).lib uimaD.lib"
+ AdditionalDependencies="icuuc.lib libapr-1.lib uimaD.lib"
OutputFile="$(OutDir)\lib$(ProjectName)D.dll"
LinkIncremental="1"
AdditionalLibraryDirectories=""$(OutDir)";"$(APR_HOME)\Debug";"$(XERCES_HOME)\lib";"$(ICU_HOME)\lib";"$(UIMACPP_HOME)\lib";..\..\..\install\lib"
@@ -144,7 +144,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="icuuc.lib libapr$(APR_VER).lib uima.lib"
+ AdditionalDependencies="icuuc.lib libapr-1.lib uima.lib"
OutputFile="$(OutDir)\lib$(ProjectName).dll"
LinkIncremental="1"
AdditionalLibraryDirectories=""$(OutDir)";"$(APR_HOME)\Release";"$(XERCES_HOME)\lib";"$(ICU_HOME)\lib";"$(UIMACPP_HOME)\lib";..\..\..\install\lib"
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?rev=608538&r1=608537&r2=608538&view=diff
==============================================================================
--- incubator/uima/uimacpp/trunk/src/test/src/SofaStreamHandlerFile.vcproj (original)
+++ incubator/uima/uimacpp/trunk/src/test/src/SofaStreamHandlerFile.vcproj Thu Jan 3 08:06:16 2008
@@ -62,7 +62,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="icuuc.lib libapr$(APR_VER).lib uimaD.lib"
+ AdditionalDependencies="icuuc.lib libapr-1.lib uimaD.lib"
OutputFile="$(OutDir)\$(ProjectName)D.dll"
LinkIncremental="1"
AdditionalLibraryDirectories=""$(OutDir)";"$(APR_HOME)\Debug";"$(XERCES_HOME)\lib";"$(ICU_HOME)\lib";"$(UIMACPP_HOME)\lib";..\..\..\install\lib"
@@ -144,7 +144,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="icuuc.lib libapr$(APR_VER).lib uima.lib"
+ AdditionalDependencies="icuuc.lib libapr-1.lib uima.lib"
OutputFile="$(OutDir)\$(ProjectName).dll"
LinkIncremental="1"
AdditionalLibraryDirectories=""$(OutDir)";"$(APR_HOME)\Release";"$(XERCES_HOME)\lib";"$(ICU_HOME)\lib";"$(UIMACPP_HOME)\lib";..\..\..\install\lib"
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?rev=608538&r1=608537&r2=608538&view=diff
==============================================================================
--- incubator/uima/uimacpp/trunk/src/test/src/TextSegmentConsumer.vcproj (original)
+++ incubator/uima/uimacpp/trunk/src/test/src/TextSegmentConsumer.vcproj Thu Jan 3 08:06:16 2008
@@ -62,7 +62,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="icuuc.lib libapr$(APR_VER).lib uimaD.lib"
+ AdditionalDependencies="icuuc.lib libapr-1.lib uimaD.lib"
OutputFile="$(OutDir)\lib$(ProjectName)D.dll"
LinkIncremental="1"
AdditionalLibraryDirectories=""$(OutDir)";"$(APR_HOME)\Debug";"$(XERCES_HOME)\lib";"$(ICU_HOME)\lib";"$(UIMACPP_HOME)\lib";..\..\..\install\lib"
@@ -144,7 +144,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="icuuc.lib libapr$(APR_VER).lib uima.lib"
+ AdditionalDependencies="icuuc.lib libapr-1.lib uima.lib"
OutputFile="$(OutDir)\lib$(ProjectName).dll"
LinkIncremental="1"
AdditionalLibraryDirectories=""$(OutDir)";"$(APR_HOME)\Release";"$(XERCES_HOME)\lib";"$(ICU_HOME)\lib";"$(UIMACPP_HOME)\lib";..\..\..\install\lib"
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?rev=608538&r1=608537&r2=608538&view=diff
==============================================================================
--- incubator/uima/uimacpp/trunk/src/test/src/plugin_annotator_dump.vcproj (original)
+++ incubator/uima/uimacpp/trunk/src/test/src/plugin_annotator_dump.vcproj Thu Jan 3 08:06:16 2008
@@ -61,7 +61,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="icuuc.lib libapr$(APR_VER).lib uimaD.lib"
+ AdditionalDependencies="icuuc.lib libapr-1.lib uimaD.lib"
OutputFile="$(OutDir)\libdumpD.dll"
LinkIncremental="1"
AdditionalLibraryDirectories=""$(OutDir)";"$(APR_HOME)\Debug";"$(XERCES_HOME)\lib";"$(ICU_HOME)\lib";"$(UIMACPP_HOME)\lib";..\..\..\install\lib"
@@ -143,7 +143,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="icuuc.lib libapr$(APR_VER).lib uima.lib"
+ AdditionalDependencies="icuuc.lib libapr-1.lib uima.lib"
OutputFile="$(OutDir)\libdump.dll"
LinkIncremental="1"
AdditionalLibraryDirectories=""$(OutDir)";"$(APR_HOME)\Release";"$(XERCES_HOME)\lib";"$(ICU_HOME)\lib";"$(UIMACPP_HOME)\lib";..\..\..\install\lib"
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?rev=608538&r1=608537&r2=608538&view=diff
==============================================================================
--- incubator/uima/uimacpp/trunk/src/test/src/plugin_tokenizer.vcproj (original)
+++ incubator/uima/uimacpp/trunk/src/test/src/plugin_tokenizer.vcproj Thu Jan 3 08:06:16 2008
@@ -61,7 +61,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="icuuc.lib uimaD.lib libapr$(APR_VER).lib"
+ AdditionalDependencies="icuuc.lib uimaD.lib libapr-1.lib"
OutputFile="$(OutDir)\libtoknzD.dll"
LinkIncremental="1"
AdditionalLibraryDirectories=""$(OutDir)";"$(APR_HOME)\Debug";"$(XERCES_HOME)\lib";"$(ICU_HOME)\lib";"$(UIMACPP_HOME)\lib";..\..\..\install\lib"
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?rev=608538&r1=608537&r2=608538&view=diff
==============================================================================
--- incubator/uima/uimacpp/trunk/src/test/src/test_cas.vcproj (original)
+++ incubator/uima/uimacpp/trunk/src/test/src/test_cas.vcproj Thu Jan 3 08:06:16 2008
@@ -61,7 +61,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="xerces-c_2.lib icuuc.lib libapr$(APR_VER).lib uimaD.lib"
+ AdditionalDependencies="xerces-c_2.lib icuuc.lib libapr-1.lib uimaD.lib"
OutputFile="$(OutDir)/test_casD.exe"
LinkIncremental="1"
AdditionalLibraryDirectories=""$(APR_HOME)\Debug";"$(XERCES_HOME)\lib";"$(ICU_HOME)\lib";"$(UIMACPP_HOME)\lib";..\..\..\install\lib"
@@ -143,7 +143,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="xerces-c_2.lib icuuc.lib libapr$(APR_VER).lib uima.lib"
+ AdditionalDependencies="xerces-c_2.lib icuuc.lib libapr-1.lib uima.lib"
OutputFile="$(OutDir)/test_cas.exe"
LinkIncremental="1"
AdditionalLibraryDirectories=""$(APR_HOME)\Release";"$(XERCES_HOME)\lib";"$(ICU_HOME)\lib";"$(UIMACPP_HOME)\lib";..\..\..\install\lib"
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?rev=608538&r1=608537&r2=608538&view=diff
==============================================================================
--- incubator/uima/uimacpp/trunk/src/test/src/test_casserializer.vcproj (original)
+++ incubator/uima/uimacpp/trunk/src/test/src/test_casserializer.vcproj Thu Jan 3 08:06:16 2008
@@ -61,7 +61,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="xerces-c_2.lib icuuc.lib libapr$(APR_VER).lib uimaD.lib"
+ AdditionalDependencies="xerces-c_2.lib icuuc.lib libapr-1.lib uimaD.lib"
OutputFile="$(OutDir)/test_casserializerD.exe"
LinkIncremental="1"
AdditionalLibraryDirectories=""$(APR_HOME)\Debug";"$(XERCES_HOME)\lib";"$(ICU_HOME)\lib";"$(UIMACPP_HOME)\lib";..\..\..\install\lib"
@@ -141,7 +141,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="xerces-c_2.lib icuuc.lib libapr$(APR_VER).lib uima.lib"
+ AdditionalDependencies="xerces-c_2.lib icuuc.lib libapr-1.lib uima.lib"
OutputFile="$(OutDir)/test_casserializer.exe"
LinkIncremental="1"
AdditionalLibraryDirectories=""$(APR_HOME)\Release";"$(XERCES_HOME)\lib";"$(ICU_HOME)\lib";"$(UIMACPP_HOME)\lib";..\..\..\install\lib"
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?rev=608538&r1=608537&r2=608538&view=diff
==============================================================================
--- incubator/uima/uimacpp/trunk/src/test/src/test_engine.vcproj (original)
+++ incubator/uima/uimacpp/trunk/src/test/src/test_engine.vcproj Thu Jan 3 08:06:16 2008
@@ -62,7 +62,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="xerces-c_2.lib icuuc.lib libapr$(APR_VER).lib uimaD.lib"
+ AdditionalDependencies="xerces-c_2.lib icuuc.lib libapr-1.lib uimaD.lib"
OutputFile="$(OutDir)/test_engineD.exe"
LinkIncremental="1"
AdditionalLibraryDirectories=""$(APR_HOME)\Debug";"$(XERCES_HOME)\lib";"$(ICU_HOME)\lib";"$(UIMACPP_HOME)\lib";..\..\..\install\lib"
@@ -142,7 +142,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="xerces-c_2.lib icuuc.lib libapr$(APR_VER).lib uima.lib"
+ AdditionalDependencies="xerces-c_2.lib icuuc.lib libapr-1.lib uima.lib"
OutputFile="$(OutDir)/test_engine.exe"
LinkIncremental="1"
AdditionalLibraryDirectories=""$(APR_HOME)\Release";"$(XERCES_HOME)\lib";"$(ICU_HOME)\lib";"$(UIMACPP_HOME)\lib";..\..\..\install\lib"
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?rev=608538&r1=608537&r2=608538&view=diff
==============================================================================
--- incubator/uima/uimacpp/trunk/src/test/src/test_iterators.vcproj (original)
+++ incubator/uima/uimacpp/trunk/src/test/src/test_iterators.vcproj Thu Jan 3 08:06:16 2008
@@ -61,7 +61,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="xerces-c_2.lib icuuc.lib libapr$(APR_VER).lib uimaD.lib"
+ AdditionalDependencies="xerces-c_2.lib icuuc.lib libapr-1.lib uimaD.lib"
OutputFile="$(OutDir)\test_iteratorsD.exe"
LinkIncremental="1"
AdditionalLibraryDirectories=""$(APR_HOME)\Debug";"$(XERCES_HOME)\lib";"$(ICU_HOME)\lib";"$(UIMACPP_HOME)\lib";..\..\..\install\lib"
@@ -141,7 +141,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="xerces-c_2.lib icuuc.lib libapr$(APR_VER).lib uima.lib"
+ AdditionalDependencies="xerces-c_2.lib icuuc.lib libapr-1.lib uima.lib"
OutputFile="$(OutDir)\test_iterators.exe"
LinkIncremental="1"
AdditionalLibraryDirectories=""$(APR_HOME)\Release";"$(XERCES_HOME)\lib";"$(ICU_HOME)\lib";"$(UIMACPP_HOME)\lib";..\..\..\install\lib"
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?rev=608538&r1=608537&r2=608538&view=diff
==============================================================================
--- incubator/uima/uimacpp/trunk/src/test/src/test_language.vcproj (original)
+++ incubator/uima/uimacpp/trunk/src/test/src/test_language.vcproj Thu Jan 3 08:06:16 2008
@@ -61,7 +61,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="xerces-c_2.lib icuuc.lib libapr$(APR_VER).lib uimaD.lib"
+ AdditionalDependencies="xerces-c_2.lib icuuc.lib libapr-1.lib uimaD.lib"
OutputFile="$(OutDir)/test_languageD.exe"
LinkIncremental="1"
AdditionalLibraryDirectories=""$(APR_HOME)\Debug";"$(XERCES_HOME)\lib";"$(ICU_HOME)\lib";"$(UIMACPP_HOME)\lib";..\..\..\install\lib"
@@ -141,7 +141,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="xerces-c_2.lib icuuc.lib libapr$(APR_VER).lib uima.lib"
+ AdditionalDependencies="xerces-c_2.lib icuuc.lib libapr-1.lib uima.lib"
OutputFile="$(OutDir)/test_language.exe"
LinkIncremental="1"
AdditionalLibraryDirectories=""$(APR_HOME)\Release";"$(XERCES_HOME)\lib";"$(ICU_HOME)\lib";"$(UIMACPP_HOME)\lib";..\..\..\install\lib"
Modified: incubator/uima/uimacpp/trunk/src/uimacpp.vcproj
URL: http://svn.apache.org/viewvc/incubator/uima/uimacpp/trunk/src/uimacpp.vcproj?rev=608538&r1=608537&r2=608538&view=diff
==============================================================================
--- incubator/uima/uimacpp/trunk/src/uimacpp.vcproj (original)
+++ incubator/uima/uimacpp/trunk/src/uimacpp.vcproj Thu Jan 3 08:06:16 2008
@@ -67,7 +67,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="xerces-c_2.lib icuuc.lib libapr$(APR_VER).lib"
+ AdditionalDependencies="xerces-c_2.lib icuuc.lib libapr-1.lib"
OutputFile="$(OutDir)\..\bin\uimaD.dll"
LinkIncremental="1"
AdditionalLibraryDirectories=""$(OutDir)";"$(APR_HOME)\Debug";"$(XERCES_HOME)\lib";"$(ICU_HOME)\lib";"$(UIMACPP_HOME)\lib""
@@ -154,7 +154,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="xerces-c_2.lib icuuc.lib libapr$(APR_VER).lib"
+ AdditionalDependencies="xerces-c_2.lib icuuc.lib libapr-1.lib"
OutputFile="$(OutDir)\..\bin\uima.dll"
LinkIncremental="1"
AdditionalLibraryDirectories=""$(OutDir)";"$(APR_HOME)\Release";"$(XERCES_HOME)\lib";"$(ICU_HOME)\lib";"$(UIMACPP_HOME)\lib""
Modified: incubator/uima/uimacpp/trunk/src/winmake.cmd
URL: http://svn.apache.org/viewvc/incubator/uima/uimacpp/trunk/src/winmake.cmd?rev=608538&r1=608537&r2=608538&view=diff
==============================================================================
--- incubator/uima/uimacpp/trunk/src/winmake.cmd (original)
+++ incubator/uima/uimacpp/trunk/src/winmake.cmd Thu Jan 3 08:06:16 2008
@@ -34,7 +34,6 @@
)else (
REM UIMACPP_HOME undefined, all dependencies must be defined
if "%APR_HOME%"=="" goto noapr
- echo remember to set APR_VER=-1 to use APR version 1.x
if "%ICU_HOME%"=="" goto noicu
if "%XERCES_HOME%"=="" goto noxerces
)