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/03/17 20:21:16 UTC
svn commit: r638035 - in /incubator/uima/uimacpp/trunk/src:
deployCppService.vcproj uimacpp.sln utils/deployCppService.hpp
Author: eae
Date: Mon Mar 17 12:21:14 2008
New Revision: 638035
URL: http://svn.apache.org/viewvc?rev=638035&view=rev
Log:
UIMA-790
Modified:
incubator/uima/uimacpp/trunk/src/deployCppService.vcproj
incubator/uima/uimacpp/trunk/src/uimacpp.sln
incubator/uima/uimacpp/trunk/src/utils/deployCppService.hpp
Modified: incubator/uima/uimacpp/trunk/src/deployCppService.vcproj
URL: http://svn.apache.org/viewvc/incubator/uima/uimacpp/trunk/src/deployCppService.vcproj?rev=638035&r1=638034&r2=638035&view=diff
==============================================================================
--- incubator/uima/uimacpp/trunk/src/deployCppService.vcproj (original)
+++ incubator/uima/uimacpp/trunk/src/deployCppService.vcproj Mon Mar 17 12:21:14 2008
@@ -17,8 +17,8 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="$(InputDir)"
- IntermediateDirectory="Debug"
+ OutputDirectory="../Debug/bin"
+ IntermediateDirectory="$(OutDir)/../$(ProjectName)"
ConfigurationType="1"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
CharacterSet="2"
@@ -41,16 +41,17 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="$(ACTIVEMQ_HOME)\src\main;$(UIMACPP_HOME)\include;$(UIMACPP_HOME)\include\apr"
- PreprocessorDefinitions="CONSOLE;_DEBUG;"
- MinimalRebuild="false"
+ AdditionalIncludeDirectories="cas;framework;"$(APR_HOME)\include";"$(ICU_HOME)\include";"$(XERCES_HOME)\include";"$(JAVA_HOME)\include";"$(JAVA_HOME)\include\win32";"$(UIMACPP_HOME)\include";"$(UIMACPP_HOME)\include\apr";"$(ACTIVEMQ_HOME)\src\main""
+ PreprocessorDefinitions="UIMA_SUPPRESS_TIMING;WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
+ IgnoreStandardIncludePath="false"
+ MinimalRebuild="true"
+ ExceptionHandling="1"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
UsePrecompiledHeader="0"
- ObjectFile="$(IntDir)/$(ProjectName)"
WarningLevel="0"
Detect64BitPortabilityProblems="true"
- DebugInformationFormat="4"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -63,13 +64,12 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wsock32.lib rpcrt4.lib activemq-cppd.lib uimaD.lib xerces-c_2.lib icuuc.lib libapr$(APR_VER).lib"
- OutputFile="$(OutDir)/$(ProjectName)D.exe"
+ AdditionalDependencies="wsock32.lib rpcrt4.lib activemq-cpp.lib xerces-c_2.lib icuuc.lib libapr-1.lib uimaD.lib"
+ OutputFile="$(OutDir)/deployCppServiceD.exe"
LinkIncremental="1"
- AdditionalLibraryDirectories=""$(ACTIVEMQ_HOME)\vs2005-build\DebugDLL";"$(UIMACPP_HOME)\lib";"$(ConfigurationName)";c:\windows\system32;"C:\Program Files\Microsoft Visual Studio .NET 2003\Vc7\PlatformSDK\Lib""
- IgnoreAllDefaultLibraries="false"
+ AdditionalLibraryDirectories=""$(OutDir)\..\lib";"$(APR_HOME)\$(ConfigurationName)";"$(XERCES_HOME)\lib";"$(ICU_HOME)\lib";"$(UIMACPP_HOME)\lib";"$(ACTIVEMQ_HOME)\vs2005-build\ReleaseDLL""
GenerateDebugInformation="true"
- ProgramDatabaseFile="$(OutDir)/$(ProjectName).pdb"
+ ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
SubSystem="1"
TargetMachine="1"
/>
@@ -100,8 +100,8 @@
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="$(InputDir)"
- IntermediateDirectory="Release"
+ OutputDirectory="../Release/bin"
+ IntermediateDirectory="$(OutDir)/../$(ProjectName)"
ConfigurationType="1"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
CharacterSet="2"
@@ -123,16 +123,16 @@
/>
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="$(ACTIVEMQ_HOME)\src\main;$(UIMACPP_HOME)\include;$(UIMACPP_HOME)\include\apr"
- PreprocessorDefinitions="CONSOLE"
+ Optimization="3"
+ AdditionalIncludeDirectories="cas;framework;"$(APR_HOME)\include";"$(ICU_HOME)\include";"$(XERCES_HOME)\include";"$(JAVA_HOME)\include";"$(JAVA_HOME)\include\win32";"$(UIMACPP_HOME)\include";"$(UIMACPP_HOME)\include\apr";"$(ACTIVEMQ_HOME)\src\main""
+ PreprocessorDefinitions="UIMA_SUPPRESS_TIMING;TRACEOFF;NDEBUG;WIN32;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
+ MinimalRebuild="false"
+ BasicRuntimeChecks="0"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
- ObjectFile="$(IntDir)/$(ProjectName)"
WarningLevel="0"
Detect64BitPortabilityProblems="true"
- DebugInformationFormat="0"
- CallingConvention="0"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -145,13 +145,12 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalOptions="/LTCG"
- AdditionalDependencies="wsock32.lib rpcrt4.lib activemq-cpp.lib uima.lib xerces-c_2.lib icuuc.lib libapr$(APR_VER).lib"
- OutputFile="$(OutDir)/$(ProjectName).exe"
+ AdditionalDependencies="wsock32.lib rpcrt4.lib activemq-cpp.lib xerces-c_2.lib icuuc.lib libapr-1.lib uima.lib"
+ OutputFile="$(OutDir)/deployCppService.exe"
LinkIncremental="1"
- AdditionalLibraryDirectories=""$(ACTIVEMQ_HOME)\vs2005-build\ReleaseDLL";"$(UIMACPP_HOME)\lib";"$(ConfigurationName)";c:\windows\system32;"C:\Program Files\Microsoft Visual Studio .NET 2003\Vc7\PlatformSDK\Lib""
+ AdditionalLibraryDirectories=""$(OutDir)\..\lib";"$(APR_HOME)\$(ConfigurationName)";"$(XERCES_HOME)\lib";"$(ICU_HOME)\lib";"$(UIMACPP_HOME)\lib";"$(ACTIVEMQ_HOME)\vs2005-build\ReleaseDLL""
GenerateDebugInformation="false"
- ProgramDatabaseFile="$(OutDir)/$(ProjectName).pdb"
+ ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
SubSystem="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
@@ -192,35 +191,19 @@
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
- RelativePath=".\ActiveMQAnalysisEngineService.cpp"
+ RelativePath=".\utils\ActiveMQAnalysisEngineService.cpp"
>
</File>
<File
- RelativePath=".\ActiveMQAnalysisEngineService.hpp"
+ RelativePath=".\utils\ActiveMQAnalysisEngineService.hpp"
>
</File>
<File
- RelativePath=".\deployCppService.cpp"
+ RelativePath="utils\deployCppService.cpp"
>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)/$(InputName)1.obj"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)/$(InputName)1.obj"
- />
- </FileConfiguration>
</File>
<File
- RelativePath=".\deployCppService.hpp"
+ RelativePath=".\utils\deployCppService.hpp"
>
</File>
</Filter>
Modified: incubator/uima/uimacpp/trunk/src/uimacpp.sln
URL: http://svn.apache.org/viewvc/incubator/uima/uimacpp/trunk/src/uimacpp.sln?rev=638035&r1=638034&r2=638035&view=diff
==============================================================================
--- incubator/uima/uimacpp/trunk/src/uimacpp.sln (original)
+++ incubator/uima/uimacpp/trunk/src/uimacpp.sln Mon Mar 17 12:21:14 2008
@@ -4,8 +4,9 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "install", "install.vcproj", "{023122EC-3490-49E1-ABE6-B7D755E757B0}"
ProjectSection(ProjectDependencies) = postProject
- {9F230EC0-DB18-46AC-BB02-DC1E6974A463} = {9F230EC0-DB18-46AC-BB02-DC1E6974A463}
+ {BB5DD1BE-CCC4-42DD-A8C7-A607D1970A5A} = {BB5DD1BE-CCC4-42DD-A8C7-A607D1970A5A}
{70B51CFD-850A-44D1-BF14-A44A1CB27550} = {70B51CFD-850A-44D1-BF14-A44A1CB27550}
+ {9F230EC0-DB18-46AC-BB02-DC1E6974A463} = {9F230EC0-DB18-46AC-BB02-DC1E6974A463}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "runaecpp", "runaecpp.vcproj", "{9F230EC0-DB18-46AC-BB02-DC1E6974A463}"
@@ -13,6 +14,8 @@
{70B51CFD-850A-44D1-BF14-A44A1CB27550} = {70B51CFD-850A-44D1-BF14-A44A1CB27550}
EndProjectSection
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "deployCppService", "deployCppService.vcproj", "{BB5DD1BE-CCC4-42DD-A8C7-A607D1970A5A}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -31,6 +34,10 @@
{9F230EC0-DB18-46AC-BB02-DC1E6974A463}.Debug|Win32.Build.0 = Debug|Win32
{9F230EC0-DB18-46AC-BB02-DC1E6974A463}.Release|Win32.ActiveCfg = Release|Win32
{9F230EC0-DB18-46AC-BB02-DC1E6974A463}.Release|Win32.Build.0 = Release|Win32
+ {BB5DD1BE-CCC4-42DD-A8C7-A607D1970A5A}.Debug|Win32.ActiveCfg = Debug|Win32
+ {BB5DD1BE-CCC4-42DD-A8C7-A607D1970A5A}.Debug|Win32.Build.0 = Debug|Win32
+ {BB5DD1BE-CCC4-42DD-A8C7-A607D1970A5A}.Release|Win32.ActiveCfg = Release|Win32
+ {BB5DD1BE-CCC4-42DD-A8C7-A607D1970A5A}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Modified: incubator/uima/uimacpp/trunk/src/utils/deployCppService.hpp
URL: http://svn.apache.org/viewvc/incubator/uima/uimacpp/trunk/src/utils/deployCppService.hpp?rev=638035&r1=638034&r2=638035&view=diff
==============================================================================
--- incubator/uima/uimacpp/trunk/src/utils/deployCppService.hpp (original)
+++ incubator/uima/uimacpp/trunk/src/utils/deployCppService.hpp Mon Mar 17 12:21:14 2008
@@ -671,7 +671,7 @@
return -2;
}
- rv = apr_socket_create(&s, sa->family, SOCK_STREAM, pool);
+ rv = apr_socket_create(&cs, sa->family, SOCK_STREAM, APR_PROTO_TCP, pool);
if (rv != APR_SUCCESS) {
cerr << "ERROR: apr_socket_create() logger connection at port " << javaport << endl;
return -3;
@@ -685,7 +685,7 @@
}
//commands connection
- rv = apr_socket_create(&cs, sa->family, SOCK_STREAM, pool);
+ rv = apr_socket_create(&cs, sa->family, SOCK_STREAM, APR_PROTO_TCP, pool);
if (rv != APR_SUCCESS) {
cerr << "ERROR: apr_socket_create() commands connection at port " << javaport << endl;
return -5;