[fdo-commits] r2612 - in trunk/Providers/KingOracle/src: Message
Message/inc Overrides
svn_fdo at osgeo.org
svn_fdo at osgeo.org
Fri Feb 23 16:15:54 EST 2007
Author: haris
Date: 2007-02-23 16:15:54 -0500 (Fri, 23 Feb 2007)
New Revision: 2612
Modified:
trunk/Providers/KingOracle/src/Message/KgOraMessage.mc
trunk/Providers/KingOracle/src/Message/KgOraMessageStatic.h
trunk/Providers/KingOracle/src/Message/KgOraMessageStatic.rc
trunk/Providers/KingOracle/src/Message/KingOracleMessage.vcproj
trunk/Providers/KingOracle/src/Message/KingOracleMessage.vcproj.HARIS4.Haris.user
trunk/Providers/KingOracle/src/Message/MSG00001.bin
trunk/Providers/KingOracle/src/Message/inc/KgOraMessage.h
trunk/Providers/KingOracle/src/Overrides/FdoKgOraClassDefinition.cpp
trunk/Providers/KingOracle/src/Overrides/FdoKgOraColumnDefinition.cpp
trunk/Providers/KingOracle/src/Overrides/FdoKgOraOverrides.rc
trunk/Providers/KingOracle/src/Overrides/FdoKgOraPhysicalSchemaMapping.cpp
trunk/Providers/KingOracle/src/Overrides/FdoKgOraPropertyDefinition.cpp
trunk/Providers/KingOracle/src/Overrides/KingOracleOverrides.vcproj
trunk/Providers/KingOracle/src/Overrides/KingOracleOverrides.vcproj.HARIS4.Haris.user
Log:
upload 0.6.1 version
Modified: trunk/Providers/KingOracle/src/Message/KgOraMessage.mc
===================================================================
--- trunk/Providers/KingOracle/src/Message/KgOraMessage.mc 2007-02-23 21:13:21 UTC (rev 2611)
+++ trunk/Providers/KingOracle/src/Message/KgOraMessage.mc 2007-02-23 21:15:54 UTC (rev 2612)
@@ -185,13 +185,13 @@
MessageId=3004
SymbolicName=M_KGORA_CONNECTION_PROPERTY_USERNAME
Language=English
-ServiceName
+Username
.
MessageId=3005
SymbolicName=M_KGORA_CONNECTION_PROPERTY_PASSWORD
Language=English
-ServiceName
+Password
.
MessageId=3006
@@ -200,6 +200,11 @@
OracleSchema
.
+MessageId=3007
+SymbolicName=M_KGORA_CONNECTION_PROPERTY_FDO_VIEWS_TABLE
+Language=English
+FdoViewsTable
+.
;//************************************************************************************
;//************************************************************************************
Modified: trunk/Providers/KingOracle/src/Message/KgOraMessageStatic.h
===================================================================
--- trunk/Providers/KingOracle/src/Message/KgOraMessageStatic.h 2007-02-23 21:13:21 UTC (rev 2611)
+++ trunk/Providers/KingOracle/src/Message/KgOraMessageStatic.h 2007-02-23 21:15:54 UTC (rev 2612)
@@ -24,17 +24,21 @@
#else
char *g_KgOraMsgCat = "KingOracleMessage.cat";
#endif
-GisString* NlsMsgGet(int msg_num, char* default_msg, ...)
+FdoString* NlsMsgGet(int msg_num, char* default_msg, ...)
{
va_list varargs;
va_start(varargs, default_msg);
- GisString* ret = GisException::NLSGetMessage(msg_num, default_msg, g_KgOraMsgCat, varargs);
+ #ifdef _FDO_3_1
+ FdoString* ret = GisException::NLSGetMessage(msg_num, default_msg, g_KgOraMsgCat, varargs);
+ #else
+ FdoString* ret = FdoException::NLSGetMessage(msg_num, default_msg, g_KgOraMsgCat, varargs);
+ #endif
va_end(varargs);
return ret;
}
#else // KGORA_MESSAGE_DEFINE
extern char *g_KgOraMsgCat;
-extern GisString* NlsMsgGet(int msg_num, char* default_msg, ...);
+extern FdoString* NlsMsgGet(int msg_num, char* default_msg, ...);
#endif // KGORA_MESSAGE_DEFINE
Modified: trunk/Providers/KingOracle/src/Message/KgOraMessageStatic.rc
===================================================================
--- trunk/Providers/KingOracle/src/Message/KgOraMessageStatic.rc 2007-02-23 21:13:21 UTC (rev 2611)
+++ trunk/Providers/KingOracle/src/Message/KgOraMessageStatic.rc 2007-02-23 21:15:54 UTC (rev 2612)
@@ -65,8 +65,8 @@
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,3,0,0
- PRODUCTVERSION 3,3,0,0
+ FILEVERSION 0,1,1,0
+ PRODUCTVERSION 0,1,1,0
FILEFLAGSMASK 0x17L
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -86,7 +86,7 @@
VALUE "FileDescription", "FDO King.Oracle Provider Messages"
VALUE "FileVersion", "0.1.1.R000"
VALUE "InternalName", "KingOracleMessage"
- VALUE "LegalCopyright", "Copyright © 2007"
+ VALUE "LegalCopyright", "Copyright © 2006"
VALUE "OriginalFilename", "KingOracleMessage.dll"
VALUE "ProductName", "Feature Data Objects"
VALUE "ProductVersion", "0.1.1.0"
Modified: trunk/Providers/KingOracle/src/Message/KingOracleMessage.vcproj
===================================================================
--- trunk/Providers/KingOracle/src/Message/KingOracleMessage.vcproj 2007-02-23 21:13:21 UTC (rev 2611)
+++ trunk/Providers/KingOracle/src/Message/KingOracleMessage.vcproj 2007-02-23 21:15:54 UTC (rev 2612)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="8.00"
+ Version="8,00"
Name="KingOracleMessage"
ProjectGUID="{655D105C-2C30-484D-80F8-556772000572}"
RootNamespace="KingOracleMessage"
@@ -15,8 +15,8 @@
</ToolFiles>
<Configurations>
<Configuration
- Name="Debug|Win32"
- OutputDirectory="Dbg"
+ Name="Debug_Fdo_3_2|Win32"
+ OutputDirectory="..\..\Bin\Win32\$(ConfigurationName)"
IntermediateDirectory="Dbg"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
@@ -85,12 +85,12 @@
<Tool
Name="VCPostBuildEventTool"
Description="Versioning $(ProjectName).dll"
- CommandLine="..\..\..\..\thirdparty\util\stampver\StampVer.exe -v"..\..\..\SubDoc\Providers.version" -f"0.4.1.0%PROVIDERS_VERSION%" $(OutDir)\$(ProjectName).dll"
+ CommandLine="..\..\..\..\thirdparty\util\stampver\StampVer.exe -v"..\..\..\SubDoc\Providers.version" -f"0.5.1.0%PROVIDERS_VERSION%" $(OutDir)\$(ProjectName).dll"
/>
</Configuration>
<Configuration
- Name="Release|Win32"
- OutputDirectory="Rel"
+ Name="Release_Fdo_3_2|Win32"
+ OutputDirectory="..\..\Bin\Win32\$(ConfigurationName)"
IntermediateDirectory="Rel"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
@@ -158,12 +158,12 @@
<Tool
Name="VCPostBuildEventTool"
Description="Versioning $(ProjectName).dll"
- CommandLine="..\..\..\..\thirdparty\util\stampver\StampVer.exe -v"..\..\..\SubDoc\Providers.version" -f"0.4.1.0%PROVIDERS_VERSION%" $(OutDir)\$(ProjectName).dll"
+ CommandLine="..\..\..\..\thirdparty\util\stampver\StampVer.exe -v"..\..\..\SubDoc\Providers.version" -f"0.5.1.0%PROVIDERS_VERSION%" $(OutDir)\$(ProjectName).dll"
/>
</Configuration>
<Configuration
- Name="InstantClient_Release|Win32"
- OutputDirectory="$(ConfigurationName)"
+ Name="InstantClient_Release_Fdo_3_2|Win32"
+ OutputDirectory="..\..\Bin\Win32\$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
@@ -231,9 +231,229 @@
<Tool
Name="VCPostBuildEventTool"
Description="Versioning $(ProjectName).dll"
- CommandLine="..\..\..\..\thirdparty\util\stampver\StampVer.exe -v"..\..\..\SubDoc\Providers.version" -f"0.4.1.0%PROVIDERS_VERSION%" $(OutDir)\$(ProjectName).dll"
+ CommandLine="..\..\..\..\thirdparty\util\stampver\StampVer.exe -v"..\..\..\SubDoc\Providers.version" -f"0.5.1.0%PROVIDERS_VERSION%" $(OutDir)\$(ProjectName).dll"
/>
</Configuration>
+ <Configuration
+ Name="Debug_Fdo_3_1|Win32"
+ OutputDirectory="..\..\Bin\Win32\$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)"
+ ConfigurationType="2"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ CharacterSet="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
+ MinimalRebuild="true"
+ RuntimeLibrary="3"
+ DebugInformationFormat="3"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ IgnoreImportLibrary="true"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(OutDir)/$(ProjectName).pdb"
+ ResourceOnlyDLL="true"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ Description="Versioning $(ProjectName).dll"
+ CommandLine="..\..\..\..\thirdparty\util\stampver\StampVer.exe -v"..\..\..\SubDoc\Providers.version" -f"0.5.1.0%PROVIDERS_VERSION%" $(OutDir)\$(ProjectName).dll"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release_Fdo_3_1|Win32"
+ OutputDirectory="..\..\Bin\Win32\$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)"
+ ConfigurationType="2"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ CharacterSet="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
+ MinimalRebuild="true"
+ RuntimeLibrary="2"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ IgnoreImportLibrary="true"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(OutDir)/$(ProjectName).pdb"
+ ResourceOnlyDLL="true"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ Description="Versioning $(ProjectName).dll"
+ CommandLine="..\..\..\..\thirdparty\util\stampver\StampVer.exe -v"..\..\..\SubDoc\Providers.version" -f"0.5.1.0%PROVIDERS_VERSION%" $(OutDir)\$(ProjectName).dll"
+ />
+ </Configuration>
+ <Configuration
+ Name="InstantClient_Release_Fdo_3_1|Win32"
+ OutputDirectory="..\..\Bin\Win32\$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)"
+ ConfigurationType="2"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ CharacterSet="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
+ MinimalRebuild="true"
+ RuntimeLibrary="2"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ IgnoreImportLibrary="true"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(OutDir)/$(ProjectName).pdb"
+ ResourceOnlyDLL="true"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ Description="Versioning $(ProjectName).dll"
+ CommandLine="..\..\..\..\thirdparty\util\stampver\StampVer.exe -v"..\..\..\SubDoc\Providers.version" -f"0.5.1.0%PROVIDERS_VERSION%" $(OutDir)\$(ProjectName).dll"
+ />
+ </Configuration>
</Configurations>
<References>
</References>
@@ -242,7 +462,7 @@
RelativePath=".\KgOraMessage.mc"
>
<FileConfiguration
- Name="Debug|Win32"
+ Name="Debug_Fdo_3_2|Win32"
>
<Tool
Name="VCCustomBuildTool"
@@ -253,7 +473,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Release|Win32"
+ Name="Release_Fdo_3_2|Win32"
>
<Tool
Name="VCCustomBuildTool"
@@ -264,7 +484,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="InstantClient_Release|Win32"
+ Name="InstantClient_Release_Fdo_3_2|Win32"
>
<Tool
Name="VCCustomBuildTool"
@@ -274,6 +494,39 @@
Outputs="inc\KgOraMessage.h;.\KgOraMessage.rc"
/>
</FileConfiguration>
+ <FileConfiguration
+ Name="Debug_Fdo_3_1|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ Description="Performing Custom Build Step: Creating KgOraEMessage.h and ShpMessage.rc from KgOraMessage.mc"
+ CommandLine="mc -U -h inc\ -r .\ ./KgOraMessage.mc
ren .\KgOraMessage.rc KgOraMessageDynamic.rc
copy .\KgOraMessageStatic.rc+.\KgOraMessageDynamic.rc .\KgOraMessage.rc
del .\KgOraMessageDynamic.rc
ren inc\KgOraMessage.h KgOraMessageDynamic.h
copy KgOraMessageStatic.h+inc\KgOraMessageDynamic.h inc\KgOraMessage.h
del inc\KgOraMessageDynamic.h
"
+ AdditionalDependencies="KgOraMessage.mc;KgOraMessageStatic.h"
+ Outputs="inc\KgOraMessage.h;.\KgOraMessage.rc"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release_Fdo_3_1|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ Description="Performing Custom Build Step: Creating KgOraEMessage.h and ShpMessage.rc from KgOraMessage.mc"
+ CommandLine="mc -U -h inc\ -r .\ ./KgOraMessage.mc
ren .\KgOraMessage.rc KgOraMessageDynamic.rc
copy .\KgOraMessageStatic.rc+.\KgOraMessageDynamic.rc .\KgOraMessage.rc
del .\KgOraMessageDynamic.rc
ren inc\KgOraMessage.h KgOraMessageDynamic.h
copy KgOraMessageStatic.h+inc\KgOraMessageDynamic.h inc\KgOraMessage.h
del inc\KgOraMessageDynamic.h
"
+ AdditionalDependencies="KgOraMessage.mc;KgOraMessageStatic.h"
+ Outputs="inc\KgOraMessage.h;.\KgOraMessage.rc"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="InstantClient_Release_Fdo_3_1|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ Description="Performing Custom Build Step: Creating KgOraEMessage.h and ShpMessage.rc from KgOraMessage.mc"
+ CommandLine="mc -U -h inc\ -r .\ ./KgOraMessage.mc
ren .\KgOraMessage.rc KgOraMessageDynamic.rc
copy .\KgOraMessageStatic.rc+.\KgOraMessageDynamic.rc .\KgOraMessage.rc
del .\KgOraMessageDynamic.rc
ren inc\KgOraMessage.h KgOraMessageDynamic.h
copy KgOraMessageStatic.h+inc\KgOraMessageDynamic.h inc\KgOraMessage.h
del inc\KgOraMessageDynamic.h
"
+ AdditionalDependencies="KgOraMessage.mc;KgOraMessageStatic.h"
+ Outputs="inc\KgOraMessage.h;.\KgOraMessage.rc"
+ />
+ </FileConfiguration>
</File>
<File
RelativePath=".\KgOraMessageStatic.h"
Modified: trunk/Providers/KingOracle/src/Message/KingOracleMessage.vcproj.HARIS4.Haris.user
===================================================================
--- trunk/Providers/KingOracle/src/Message/KingOracleMessage.vcproj.HARIS4.Haris.user 2007-02-23 21:13:21 UTC (rev 2611)
+++ trunk/Providers/KingOracle/src/Message/KingOracleMessage.vcproj.HARIS4.Haris.user 2007-02-23 21:15:54 UTC (rev 2612)
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioUserFile
ProjectType="Visual C++"
- Version="8.00"
+ Version="8,00"
ShowAllFiles="false"
>
<Configurations>
<Configuration
- Name="Debug|Win32"
+ Name="Debug_Fdo_3_2|Win32"
>
<DebugSettings
Command=""
@@ -34,7 +34,7 @@
/>
</Configuration>
<Configuration
- Name="Release|Win32"
+ Name="Release_Fdo_3_2|Win32"
>
<DebugSettings
Command=""
@@ -62,7 +62,7 @@
/>
</Configuration>
<Configuration
- Name="InstantClient_Release|Win32"
+ Name="InstantClient_Release_Fdo_3_2|Win32"
>
<DebugSettings
Command=""
@@ -89,5 +89,89 @@
MPIAcceptFilter=""
/>
</Configuration>
+ <Configuration
+ Name="Debug_Fdo_3_1|Win32"
+ >
+ <DebugSettings
+ Command=""
+ WorkingDirectory=""
+ CommandArguments=""
+ Attach="false"
+ DebuggerType="3"
+ Remote="1"
+ RemoteMachine="HARIS4"
+ RemoteCommand=""
+ HttpUrl=""
+ PDBPath=""
+ SQLDebugging=""
+ Environment=""
+ EnvironmentMerge="true"
+ DebuggerFlavor=""
+ MPIRunCommand=""
+ MPIRunArguments=""
+ MPIRunWorkingDirectory=""
+ ApplicationCommand=""
+ ApplicationArguments=""
+ ShimCommand=""
+ MPIAcceptMode=""
+ MPIAcceptFilter=""
+ />
+ </Configuration>
+ <Configuration
+ Name="Release_Fdo_3_1|Win32"
+ >
+ <DebugSettings
+ Command=""
+ WorkingDirectory=""
+ CommandArguments=""
+ Attach="false"
+ DebuggerType="3"
+ Remote="1"
+ RemoteMachine="HARIS4"
+ RemoteCommand=""
+ HttpUrl=""
+ PDBPath=""
+ SQLDebugging=""
+ Environment=""
+ EnvironmentMerge="true"
+ DebuggerFlavor=""
+ MPIRunCommand=""
+ MPIRunArguments=""
+ MPIRunWorkingDirectory=""
+ ApplicationCommand=""
+ ApplicationArguments=""
+ ShimCommand=""
+ MPIAcceptMode=""
+ MPIAcceptFilter=""
+ />
+ </Configuration>
+ <Configuration
+ Name="InstantClient_Release_Fdo_3_1|Win32"
+ >
+ <DebugSettings
+ Command=""
+ WorkingDirectory=""
+ CommandArguments=""
+ Attach="false"
+ DebuggerType="3"
+ Remote="1"
+ RemoteMachine="HARIS4"
+ RemoteCommand=""
+ HttpUrl=""
+ PDBPath=""
+ SQLDebugging=""
+ Environment=""
+ EnvironmentMerge="true"
+ DebuggerFlavor=""
+ MPIRunCommand=""
+ MPIRunArguments=""
+ MPIRunWorkingDirectory=""
+ ApplicationCommand=""
+ ApplicationArguments=""
+ ShimCommand=""
+ MPIAcceptMode=""
+ MPIAcceptFilter=""
+ />
+ </Configuration>
</Configurations>
</VisualStudioUserFile>
Modified: trunk/Providers/KingOracle/src/Message/MSG00001.bin
===================================================================
(Binary files differ)
Modified: trunk/Providers/KingOracle/src/Message/inc/KgOraMessage.h
===================================================================
--- trunk/Providers/KingOracle/src/Message/inc/KgOraMessage.h 2007-02-23 21:13:21 UTC (rev 2611)
+++ trunk/Providers/KingOracle/src/Message/inc/KgOraMessage.h 2007-02-23 21:15:54 UTC (rev 2612)
@@ -24,18 +24,22 @@
#else
char *g_KgOraMsgCat = "KingOracleMessage.cat";
#endif
-GisString* NlsMsgGet(int msg_num, char* default_msg, ...)
+FdoString* NlsMsgGet(int msg_num, char* default_msg, ...)
{
va_list varargs;
va_start(varargs, default_msg);
- GisString* ret = GisException::NLSGetMessage(msg_num, default_msg, g_KgOraMsgCat, varargs);
+ #ifdef _FDO_3_1
+ FdoString* ret = GisException::NLSGetMessage(msg_num, default_msg, g_KgOraMsgCat, varargs);
+ #else
+ FdoString* ret = FdoException::NLSGetMessage(msg_num, default_msg, g_KgOraMsgCat, varargs);
+ #endif
va_end(varargs);
return ret;
}
#else // KGORA_MESSAGE_DEFINE
extern char *g_KgOraMsgCat;
-extern GisString* NlsMsgGet(int msg_num, char* default_msg, ...);
+extern FdoString* NlsMsgGet(int msg_num, char* default_msg, ...);
#endif // KGORA_MESSAGE_DEFINE
//************************************************************************************
@@ -382,7 +386,7 @@
//
// MessageText:
//
-// ServiceName
+// Username
//
#define M_KGORA_CONNECTION_PROPERTY_USERNAME 0x00000BBCL
@@ -391,7 +395,7 @@
//
// MessageText:
//
-// ServiceName
+// Password
//
#define M_KGORA_CONNECTION_PROPERTY_PASSWORD 0x00000BBDL
@@ -404,6 +408,15 @@
//
#define M_KGORA_CONNECTION_PROPERTY_ORACLE_SCHEMA 0x00000BBEL
+//
+// MessageId: M_KGORA_CONNECTION_PROPERTY_FDO_VIEWS_TABLE
+//
+// MessageText:
+//
+// FdoViewsTable
+//
+#define M_KGORA_CONNECTION_PROPERTY_FDO_VIEWS_TABLE 0x00000BBFL
+
//************************************************************************************
//************************************************************************************
//** SCHEMA-RELATED MESSAGES
Modified: trunk/Providers/KingOracle/src/Overrides/FdoKgOraClassDefinition.cpp
===================================================================
--- trunk/Providers/KingOracle/src/Overrides/FdoKgOraClassDefinition.cpp 2007-02-23 21:13:21 UTC (rev 2611)
+++ trunk/Providers/KingOracle/src/Overrides/FdoKgOraClassDefinition.cpp 2007-02-23 21:15:54 UTC (rev 2612)
@@ -42,33 +42,33 @@
FdoKgOraPropertyDefinitionCollection* FdoKgOraClassDefinition::GetProperties() const
{
- return GIS_SAFE_ADDREF(m_Properties.p);
+ return FDO_SAFE_ADDREF(m_Properties.p);
}
-void FdoKgOraClassDefinition::InitFromXml(GisXmlSaxContext* Context, GisXmlAttributeCollection* Attrs)
+void FdoKgOraClassDefinition::InitFromXml(FdoXmlSaxContext* Context, FdoXmlAttributeCollection* Attrs)
{
try
{
BaseType::InitFromXml(Context, Attrs);
- GisXmlAttributeP att = Attrs->FindItem(FdoKgOraXmlGlobals::g_KgOraFullTableNameAttribute);
+ FdoXmlAttributeP att = Attrs->FindItem(FdoKgOraXmlGlobals::g_KgOraFullTableNameAttribute);
if (att != NULL)
{
SetOracleFullTableName(att->GetValue());
}
}
- catch (GisException* e)
+ catch (FdoException* e)
{
Context->AddError(e);
e->Release();
}
}//end of FdoKgOraClassDefinition::InitFromXml
-GisXmlSaxHandler* FdoKgOraClassDefinition::XmlStartElement(GisXmlSaxContext* Context,FdoString* Uri, FdoString* Name, FdoString* QName, GisXmlAttributeCollection* Attrs)
+FdoXmlSaxHandler* FdoKgOraClassDefinition::XmlStartElement(FdoXmlSaxContext* Context,FdoString* Uri, FdoString* Name, FdoString* QName, FdoXmlAttributeCollection* Attrs)
{
- GisXmlSaxHandler* ret = NULL;
+ FdoXmlSaxHandler* ret = NULL;
try
{
@@ -85,7 +85,7 @@
}
}
}
- catch (GisException* e)
+ catch (FdoException* e)
{
Context->AddError(e);
e->Release();
@@ -94,12 +94,12 @@
return ret;
}//end of FdoKgOraClassDefinition::XmlStartElement
-GisBoolean FdoKgOraClassDefinition::XmlEndElement(GisXmlSaxContext* Context, FdoString* Uri, FdoString* Name, FdoString* QName)
+FdoBoolean FdoKgOraClassDefinition::XmlEndElement(FdoXmlSaxContext* Context, FdoString* Uri, FdoString* Name, FdoString* QName)
{
return BaseType::XmlEndElement(Context, Uri, Name, QName);
}//end of FdoKgOraClassDefinition::XmlEndElement
-void FdoKgOraClassDefinition::_writeXml(GisXmlWriter* Writer, const FdoXmlFlags* Flags)
+void FdoKgOraClassDefinition::_writeXml(FdoXmlWriter* Writer, const FdoXmlFlags* Flags)
{
Writer->WriteStartElement(FdoKgOraXmlGlobals::g_KgOraClassDefinitionElement);
@@ -108,7 +108,7 @@
Writer->WriteAttribute(FdoKgOraXmlGlobals::g_KgOraFullTableNameAttribute, GetOracleFullTableName());
- for (GisInt32 i = 0; i < m_Properties->GetCount(); i++)
+ for (FdoInt32 i = 0; i < m_Properties->GetCount(); i++)
{
FdoKgOraPropertyDefinitionP prop_def = m_Properties->GetItem(i);
prop_def->_writeXml(Writer, Flags);
@@ -124,13 +124,13 @@
{
// Find property with column name ColumnName
- for (GisInt32 i=0; i<m_Properties->GetCount(); i++)
+ for (FdoInt32 i=0; i<m_Properties->GetCount(); i++)
{
- GisPtr<FdoKgOraPropertyDefinition> prop_def = m_Properties->GetItem(i);
- GisPtr<FdoKgOraColumnDefinition> coldef = prop_def->GetColumn();
+ FdoPtr<FdoKgOraPropertyDefinition> prop_def = m_Properties->GetItem(i);
+ FdoPtr<FdoKgOraColumnDefinition> coldef = prop_def->GetColumn();
if( wcscmp(coldef->GetName(), ColumnName) == 0 )
{
- return GIS_SAFE_ADDREF( prop_def.p );
+ return FDO_SAFE_ADDREF( prop_def.p );
}
}
Modified: trunk/Providers/KingOracle/src/Overrides/FdoKgOraColumnDefinition.cpp
===================================================================
--- trunk/Providers/KingOracle/src/Overrides/FdoKgOraColumnDefinition.cpp 2007-02-23 21:13:21 UTC (rev 2611)
+++ trunk/Providers/KingOracle/src/Overrides/FdoKgOraColumnDefinition.cpp 2007-02-23 21:15:54 UTC (rev 2612)
@@ -38,22 +38,22 @@
delete this;
}
-void FdoKgOraColumnDefinition::InitFromXml(GisXmlSaxContext* Context, GisXmlAttributeCollection* Attrs)
+void FdoKgOraColumnDefinition::InitFromXml(FdoXmlSaxContext* Context, FdoXmlAttributeCollection* Attrs)
{
BaseType::InitFromXml(Context, Attrs);
}
-GisXmlSaxHandler* FdoKgOraColumnDefinition::XmlStartElement(GisXmlSaxContext* Context,FdoString* Uri, FdoString* Name, FdoString* QName, GisXmlAttributeCollection* Attrs)
+FdoXmlSaxHandler* FdoKgOraColumnDefinition::XmlStartElement(FdoXmlSaxContext* Context,FdoString* Uri, FdoString* Name, FdoString* QName, FdoXmlAttributeCollection* Attrs)
{
return BaseType::XmlStartElement(Context, Uri, Name, QName, Attrs);
}
-GisBoolean FdoKgOraColumnDefinition::XmlEndElement(GisXmlSaxContext* Context,FdoString* Uri, FdoString* Name, FdoString* QName)
+FdoBoolean FdoKgOraColumnDefinition::XmlEndElement(FdoXmlSaxContext* Context,FdoString* Uri, FdoString* Name, FdoString* QName)
{
return BaseType::XmlEndElement(Context, Uri, Name, QName);
}
-void FdoKgOraColumnDefinition::_writeXml(GisXmlWriter* Writer, const FdoXmlFlags* Flags)
+void FdoKgOraColumnDefinition::_writeXml(FdoXmlWriter* Writer, const FdoXmlFlags* Flags)
{
Writer->WriteStartElement(FdoKgOraXmlGlobals::g_KgOraColumnElement);
Modified: trunk/Providers/KingOracle/src/Overrides/FdoKgOraOverrides.rc
===================================================================
--- trunk/Providers/KingOracle/src/Overrides/FdoKgOraOverrides.rc 2007-02-23 21:13:21 UTC (rev 2611)
+++ trunk/Providers/KingOracle/src/Overrides/FdoKgOraOverrides.rc 2007-02-23 21:15:54 UTC (rev 2612)
@@ -53,8 +53,8 @@
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,3,0,0
- PRODUCTVERSION 3,3,0,0
+ FILEVERSION 0,1,1,0
+ PRODUCTVERSION 0,1,1,0
FILEFLAGSMASK 0x17L
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -71,9 +71,9 @@
BEGIN
VALUE "CompanyName", "SL-King"
VALUE "FileDescription", "FDO King.Oracle Overrides"
- VALUE "FileVersion", "3.3.0.R000"
+ VALUE "FileVersion", "3.1.0.R000"
VALUE "InternalName", "KingOracleOverrides"
- VALUE "LegalCopyright", "Copyright © 2007"
+ VALUE "LegalCopyright", "Copyright © 2006"
VALUE "OriginalFilename", "KingOracleOverrides.dll"
VALUE "ProductName", "Feature Data Objects"
VALUE "ProductVersion", "0.1.1.0"
Modified: trunk/Providers/KingOracle/src/Overrides/FdoKgOraPhysicalSchemaMapping.cpp
===================================================================
--- trunk/Providers/KingOracle/src/Overrides/FdoKgOraPhysicalSchemaMapping.cpp 2007-02-23 21:13:21 UTC (rev 2611)
+++ trunk/Providers/KingOracle/src/Overrides/FdoKgOraPhysicalSchemaMapping.cpp 2007-02-23 21:15:54 UTC (rev 2612)
@@ -48,17 +48,17 @@
FdoKgOraClassCollection* FdoKgOraPhysicalSchemaMapping::GetClasses() const
{
- return GIS_SAFE_ADDREF(m_Classes.p);
+ return FDO_SAFE_ADDREF(m_Classes.p);
}
-void FdoKgOraPhysicalSchemaMapping::InitFromXml(GisXmlSaxContext* Context, GisXmlAttributeCollection* Attrs)
+void FdoKgOraPhysicalSchemaMapping::InitFromXml(FdoXmlSaxContext* Context, FdoXmlAttributeCollection* Attrs)
{
BaseType::InitFromXml(Context, Attrs);
}
-GisXmlSaxHandler* FdoKgOraPhysicalSchemaMapping::XmlStartElement(GisXmlSaxContext* Context,FdoString* Uri, FdoString* Name, FdoString* QName, GisXmlAttributeCollection* Attrs)
+FdoXmlSaxHandler* FdoKgOraPhysicalSchemaMapping::XmlStartElement(FdoXmlSaxContext* Context,FdoString* Uri, FdoString* Name, FdoString* QName, FdoXmlAttributeCollection* Attrs)
{
- GisXmlSaxHandler* ret = NULL;
+ FdoXmlSaxHandler* ret = NULL;
try
{
@@ -76,7 +76,7 @@
}
}
}
- catch (GisException* e)
+ catch (FdoException* e)
{
Context->AddError(e);
e->Release();
@@ -86,21 +86,21 @@
}//end of FdoKgOraPhysicalSchemaMapping::XmlStartElement
-GisBoolean FdoKgOraPhysicalSchemaMapping::XmlEndElement(GisXmlSaxContext* Context,FdoString* Uri, FdoString* Name, FdoString* QName)
+FdoBoolean FdoKgOraPhysicalSchemaMapping::XmlEndElement(FdoXmlSaxContext* Context,FdoString* Uri, FdoString* Name, FdoString* QName)
{
return BaseType::XmlEndElement(Context, Uri, Name, QName);
}
-void FdoKgOraPhysicalSchemaMapping::_writeXml( GisXmlWriter* Writer, const FdoXmlFlags* Flags )
+void FdoKgOraPhysicalSchemaMapping::_writeXml( FdoXmlWriter* Writer, const FdoXmlFlags* Flags )
{
Writer->WriteStartElement(FdoKgOraXmlGlobals::g_KgOraSchemaMapping);
BaseType::_writeXml(Writer, Flags);
- Writer->WriteAttribute(GisXml::mXmlnsPref, FdoKgOraXmlGlobals::g_KgOraXmlnsValue);
+ Writer->WriteAttribute(FdoXml::mXmlnsPref, FdoKgOraXmlGlobals::g_KgOraXmlnsValue);
- for (GisInt32 i = 0; i < m_Classes->GetCount(); i++)
+ for (FdoInt32 i = 0; i < m_Classes->GetCount(); i++)
{
FdoKgOraClassDefinitionP classDef = m_Classes->GetItem(i);
classDef->_writeXml(Writer, Flags);
@@ -114,13 +114,13 @@
FdoKgOraClassDefinition* FdoKgOraPhysicalSchemaMapping::FindByClassName(FdoString *ClassName)
{
- for (GisInt32 i=0; i<m_Classes->GetCount(); i++)
+ for (FdoInt32 i=0; i<m_Classes->GetCount(); i++)
{
- GisPtr<FdoKgOraClassDefinition> classdef = m_Classes->GetItem(i);
+ FdoPtr<FdoKgOraClassDefinition> classdef = m_Classes->GetItem(i);
// TODO: do case-insensitive compare on WIN32 platform, case-sensitive on other platforms
if( wcscmp(classdef->GetName(), ClassName) == 0 )
{
- return GIS_SAFE_ADDREF(classdef.p);
+ return FDO_SAFE_ADDREF(classdef.p);
break;
}
}
Modified: trunk/Providers/KingOracle/src/Overrides/FdoKgOraPropertyDefinition.cpp
===================================================================
--- trunk/Providers/KingOracle/src/Overrides/FdoKgOraPropertyDefinition.cpp 2007-02-23 21:13:21 UTC (rev 2611)
+++ trunk/Providers/KingOracle/src/Overrides/FdoKgOraPropertyDefinition.cpp 2007-02-23 21:15:54 UTC (rev 2612)
@@ -39,22 +39,22 @@
FdoKgOraColumnDefinition* FdoKgOraPropertyDefinition::GetColumn() const
{
- return GIS_SAFE_ADDREF(m_ColumnDefinition.p);
+ return FDO_SAFE_ADDREF(m_ColumnDefinition.p);
}
void FdoKgOraPropertyDefinition::SetColumn(FdoKgOraColumnDefinition * Definition)
{
- m_ColumnDefinition = GIS_SAFE_ADDREF(Definition);
+ m_ColumnDefinition = FDO_SAFE_ADDREF(Definition);
}
-void FdoKgOraPropertyDefinition::InitFromXml(GisXmlSaxContext* pContext, GisXmlAttributeCollection* attrs)
+void FdoKgOraPropertyDefinition::InitFromXml(FdoXmlSaxContext* pContext, FdoXmlAttributeCollection* attrs)
{
BaseType::InitFromXml(pContext, attrs);
}
-GisXmlSaxHandler* FdoKgOraPropertyDefinition::XmlStartElement(GisXmlSaxContext* Context,FdoString* Uri, FdoString* Name, FdoString* QName, GisXmlAttributeCollection* Attrs)
+FdoXmlSaxHandler* FdoKgOraPropertyDefinition::XmlStartElement(FdoXmlSaxContext* Context,FdoString* Uri, FdoString* Name, FdoString* QName, FdoXmlAttributeCollection* Attrs)
{
- GisXmlSaxHandler* ret = NULL;
+ FdoXmlSaxHandler* ret = NULL;
try
{
@@ -71,7 +71,7 @@
}
}
}
- catch (GisException* e)
+ catch (FdoException* e)
{
Context->AddError(e);
e->Release();
@@ -81,12 +81,12 @@
}//end of FdoKgOraPropertyDefinition::XmlStartElement
-GisBoolean FdoKgOraPropertyDefinition::XmlEndElement(GisXmlSaxContext* Context, FdoString* Uri, FdoString* Name, FdoString* QName)
+FdoBoolean FdoKgOraPropertyDefinition::XmlEndElement(FdoXmlSaxContext* Context, FdoString* Uri, FdoString* Name, FdoString* QName)
{
return BaseType::XmlEndElement(Context, Uri, Name, QName);
}
-void FdoKgOraPropertyDefinition::_writeXml(GisXmlWriter* Writer, const FdoXmlFlags* Flags)
+void FdoKgOraPropertyDefinition::_writeXml(FdoXmlWriter* Writer, const FdoXmlFlags* Flags)
{
Writer->WriteStartElement(FdoKgOraXmlGlobals::g_KgOraPropertyElement);
Modified: trunk/Providers/KingOracle/src/Overrides/KingOracleOverrides.vcproj
===================================================================
--- trunk/Providers/KingOracle/src/Overrides/KingOracleOverrides.vcproj 2007-02-23 21:13:21 UTC (rev 2611)
+++ trunk/Providers/KingOracle/src/Overrides/KingOracleOverrides.vcproj 2007-02-23 21:15:54 UTC (rev 2612)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="gb2312"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="8.00"
+ Version="8,00"
Name="KingOracleOverrides"
ProjectGUID="{5B5F49A3-7760-4171-9F3C-47BB775EC4FE}"
RootNamespace="KingOracleOverrides"
@@ -16,8 +16,8 @@
</ToolFiles>
<Configurations>
<Configuration
- Name="Debug|Win32"
- OutputDirectory="Dbg"
+ Name="Debug_Fdo_3_2|Win32"
+ OutputDirectory="..\..\Bin\Win32\$(ConfigurationName)"
IntermediateDirectory="Dbg"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
@@ -41,7 +41,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\inc;..\..\..\FdoCommon\inc;..\..\..\..\Fdo\Unmanaged\inc"
+ AdditionalIncludeDirectories="..\..\inc;..\..\..\..\Fdo\Unmanaged\inc;..\..\..\..\Utilities\Common\inc"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FDOKGORA_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
MinimalRebuild="true"
RuntimeLibrary="3"
@@ -65,9 +65,9 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="Fdo.lib GisCommon.lib FdoCommon.lib"
+ AdditionalDependencies="FDO.lib FDOCommon.lib ProvidersCommon.lib"
LinkIncremental="2"
- AdditionalLibraryDirectories="..\..\..\..\Fdo\Unmanaged\lib\iwins\debug;..\..\..\FdoCommon\lib\iwins\debug"
+ AdditionalLibraryDirectories="..\..\..\..\Fdo\Unmanaged\Lib\Win32\Debug\;..\..\..\..\Utilities\Common\Lib\Win32\Debug"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)/$(ProjectName).pdb"
SubSystem="2"
@@ -98,12 +98,12 @@
<Tool
Name="VCPostBuildEventTool"
Description="Versioning $(ProjectName).dll"
- CommandLine="..\..\..\..\thirdparty\util\stampver\StampVer.exe -v"..\..\..\SubDoc\Providers.version" -f"0.3.3.0%PROVIDERS_VERSION%" $(OutDir)\$(ProjectName).dll"
+ CommandLine="..\..\..\..\thirdparty\util\stampver\StampVer.exe -v"..\..\..\SubDoc\Providers.version" -f"0.5.1.0%PROVIDERS_VERSION%" $(OutDir)\$(ProjectName).dll"
/>
</Configuration>
<Configuration
- Name="Release|Win32"
- OutputDirectory="Rel"
+ Name="Release_Fdo_3_2|Win32"
+ OutputDirectory="..\..\Bin\Win32\$(ConfigurationName)"
IntermediateDirectory="Rel"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
@@ -129,7 +129,7 @@
Optimization="2"
InlineFunctionExpansion="1"
OmitFramePointers="true"
- AdditionalIncludeDirectories="..\..\inc;..\..\..\FdoCommon\inc;..\..\..\..\FDO\Unmanaged\inc"
+ AdditionalIncludeDirectories="..\..\inc;..\..\..\..\Fdo\Unmanaged\inc;..\..\..\..\Utilities\Common\inc"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FDOKGORA_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
StringPooling="true"
RuntimeLibrary="2"
@@ -154,10 +154,10 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="Fdo.lib GisCommon.lib ..\..\..\fdocommon\lib\iwins\release\fdocommon.lib"
+ AdditionalDependencies="FDO.lib FDOCommon.lib ProvidersCommon.lib"
OutputFile="$(OutDir)/$(ProjectName).dll"
LinkIncremental="0"
- AdditionalLibraryDirectories="..\..\..\..\Fdo\Unmanaged\lib\iwins\release;..\..\..\FdoCommon\lib\iwins\release"
+ AdditionalLibraryDirectories="..\..\..\..\Fdo\Unmanaged\Lib\Win32\Release\;..\..\..\..\Utilities\Common\Lib\Win32\Release\"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)/$(ProjectName).pdb"
SubSystem="2"
@@ -190,12 +190,12 @@
<Tool
Name="VCPostBuildEventTool"
Description="Versioning $(ProjectName).dll"
- CommandLine="..\..\..\..\thirdparty\util\stampver\StampVer.exe -v"..\..\..\SubDoc\Providers.version" -f"0.3.3.0%PROVIDERS_VERSION%" $(OutDir)\$(ProjectName).dll"
+ CommandLine="..\..\..\..\thirdparty\util\stampver\StampVer.exe -v"..\..\..\SubDoc\Providers.version" -f"0.5.1.0%PROVIDERS_VERSION%" $(OutDir)\$(ProjectName).dll"
/>
</Configuration>
<Configuration
- Name="InstantClient_Release|Win32"
- OutputDirectory="$(ConfigurationName)"
+ Name="InstantClient_Release_Fdo_3_2|Win32"
+ OutputDirectory="..\..\Bin\Win32\$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
@@ -221,7 +221,7 @@
Optimization="2"
InlineFunctionExpansion="1"
OmitFramePointers="true"
- AdditionalIncludeDirectories="..\..\inc;..\..\..\FdoCommon\inc;..\..\..\..\FDO\Unmanaged\inc"
+ AdditionalIncludeDirectories="..\..\inc;..\..\..\..\Fdo\Unmanaged\inc;..\..\..\..\Utilities\Common\inc"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FDOKGORA_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
StringPooling="true"
RuntimeLibrary="2"
@@ -246,10 +246,10 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="Fdo.lib GisCommon.lib ..\..\..\fdocommon\lib\iwins\release\fdocommon.lib"
+ AdditionalDependencies="FDO.lib FdoCommon.lib ProvidersCommon.lib"
OutputFile="$(OutDir)/$(ProjectName).dll"
LinkIncremental="0"
- AdditionalLibraryDirectories="..\..\..\..\Fdo\Unmanaged\lib\iwins\release;..\..\..\FdoCommon\lib\iwins\release"
+ AdditionalLibraryDirectories="..\..\..\..\Fdo\Unmanaged\Lib\Win32\Release\;..\..\..\..\Utilities\Common\Lib\Win32\Release\"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)/$(ProjectName).pdb"
SubSystem="2"
@@ -282,9 +282,279 @@
<Tool
Name="VCPostBuildEventTool"
Description="Versioning $(ProjectName).dll"
- CommandLine="..\..\..\..\thirdparty\util\stampver\StampVer.exe -v"..\..\..\SubDoc\Providers.version" -f"0.3.3.0%PROVIDERS_VERSION%" $(OutDir)\$(ProjectName).dll"
+ CommandLine="..\..\..\..\thirdparty\util\stampver\StampVer.exe -v"..\..\..\SubDoc\Providers.version" -f"0.5.1.0%PROVIDERS_VERSION%" $(OutDir)\$(ProjectName).dll"
/>
</Configuration>
+ <Configuration
+ Name="Debug_Fdo_3_1|Win32"
+ OutputDirectory="..\..\Bin\Win32\$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)"
+ ConfigurationType="2"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ CharacterSet="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\..\inc;"D:\Development\MapGuide OpenSource\v1.0.2\OpenSource_FDO\fdo\Unmanaged\inc";"D:\Development\MapGuide OpenSource\v1.0.2\OpenSource_FDO\providers\FdoCommon\inc""
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FDOKGORA_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_FDO_3_1"
+ MinimalRebuild="true"
+ RuntimeLibrary="3"
+ TreatWChar_tAsBuiltInType="true"
+ RuntimeTypeInfo="true"
+ UsePrecompiledHeader="2"
+ PrecompiledHeaderThrough="Stdafx.h"
+ BrowseInformation="1"
+ WarningLevel="4"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="4"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="Fdo.lib GisCommon.lib FdoCommon.lib"
+ LinkIncremental="2"
+ AdditionalLibraryDirectories=""D:\Development\MapGuide OpenSource\v1.0.2\OpenSource_FDO\fdo\Unmanaged\lib\iwins\debug";"D:\Development\MapGuide OpenSource\v1.0.2\OpenSource_FDO\providers\FdoCommon\lib\iwins\debug""
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(OutDir)/$(ProjectName).pdb"
+ SubSystem="2"
+ ImportLibrary="$(OutDir)/$(TargetName).lib"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ Description="Versioning $(ProjectName).dll"
+ CommandLine="..\..\..\..\thirdparty\util\stampver\StampVer.exe -v"..\..\..\SubDoc\Providers.version" -f"0.5.1.0%PROVIDERS_VERSION%" $(OutDir)\$(ProjectName).dll"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release_Fdo_3_1|Win32"
+ OutputDirectory="..\..\Bin\Win32\$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)"
+ ConfigurationType="2"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ OmitFramePointers="true"
+ AdditionalIncludeDirectories="..\..\inc;"D:\Development\MapGuide OpenSource\v1.0.2\OpenSource_FDO\fdo\Unmanaged\inc";"D:\Development\MapGuide OpenSource\v1.0.2\OpenSource_FDO\providers\FdoCommon\inc""
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FDOKGORA_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_FDO_3_1"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ TreatWChar_tAsBuiltInType="true"
+ RuntimeTypeInfo="true"
+ UsePrecompiledHeader="2"
+ PrecompiledHeaderThrough="Stdafx.h"
+ BrowseInformation="1"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="Fdo.lib GisCommon.lib FdoCommon.lib"
+ OutputFile="$(OutDir)/$(ProjectName).dll"
+ LinkIncremental="0"
+ AdditionalLibraryDirectories=""D:\Development\MapGuide OpenSource\v1.0.2\OpenSource_FDO\fdo\Unmanaged\lib\iwins\release";"D:\Development\MapGuide OpenSource\v1.0.2\OpenSource_FDO\providers\FdoCommon\lib\iwins\release""
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(OutDir)/$(ProjectName).pdb"
+ SubSystem="2"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
+ ImportLibrary="$(OutDir)/$(TargetName).lib"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ Description="Versioning $(ProjectName).dll"
+ CommandLine="..\..\..\..\thirdparty\util\stampver\StampVer.exe -v"..\..\..\SubDoc\Providers.version" -f"0.5.1.0%PROVIDERS_VERSION%" $(OutDir)\$(ProjectName).dll"
+ />
+ </Configuration>
+ <Configuration
+ Name="InstantClient_Release_Fdo_3_1|Win32"
+ OutputDirectory="..\..\Bin\Win32\$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)"
+ ConfigurationType="2"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ OmitFramePointers="true"
+ AdditionalIncludeDirectories="..\..\inc;"D:\Development\MapGuide OpenSource\v1.0.2\OpenSource_FDO\fdo\Unmanaged\inc";"D:\Development\MapGuide OpenSource\v1.0.2\OpenSource_FDO\providers\FdoCommon\inc""
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FDOKGORA_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_FDO_3_1"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ TreatWChar_tAsBuiltInType="true"
+ RuntimeTypeInfo="true"
+ UsePrecompiledHeader="2"
+ PrecompiledHeaderThrough="Stdafx.h"
+ BrowseInformation="1"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="Fdo.lib GisCommon.lib FdoCommon.lib"
+ OutputFile="$(OutDir)/$(ProjectName).dll"
+ LinkIncremental="0"
+ AdditionalLibraryDirectories=""D:\Development\MapGuide OpenSource\v1.0.2\OpenSource_FDO\fdo\Unmanaged\lib\iwins\release";"D:\Development\MapGuide OpenSource\v1.0.2\OpenSource_FDO\providers\FdoCommon\lib\iwins\release""
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(OutDir)/$(ProjectName).pdb"
+ SubSystem="2"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
+ ImportLibrary="$(OutDir)/$(TargetName).lib"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ Description="Versioning $(ProjectName).dll"
+ CommandLine="..\..\..\..\thirdparty\util\stampver\StampVer.exe -v"..\..\..\SubDoc\Providers.version" -f"0.5.1.0%PROVIDERS_VERSION%" $(OutDir)\$(ProjectName).dll"
+ />
+ </Configuration>
</Configurations>
<References>
</References>
@@ -325,7 +595,7 @@
RelativePath="stdafx.cpp"
>
<FileConfiguration
- Name="Debug|Win32"
+ Name="Debug_Fdo_3_2|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -333,7 +603,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Release|Win32"
+ Name="Release_Fdo_3_2|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -341,13 +611,37 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="InstantClient_Release|Win32"
+ Name="InstantClient_Release_Fdo_3_2|Win32"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="1"
/>
</FileConfiguration>
+ <FileConfiguration
+ Name="Debug_Fdo_3_1|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ UsePrecompiledHeader="1"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release_Fdo_3_1|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ UsePrecompiledHeader="1"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="InstantClient_Release_Fdo_3_1|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ UsePrecompiledHeader="1"
+ />
+ </FileConfiguration>
</File>
</Filter>
<Filter
Modified: trunk/Providers/KingOracle/src/Overrides/KingOracleOverrides.vcproj.HARIS4.Haris.user
===================================================================
--- trunk/Providers/KingOracle/src/Overrides/KingOracleOverrides.vcproj.HARIS4.Haris.user 2007-02-23 21:13:21 UTC (rev 2611)
+++ trunk/Providers/KingOracle/src/Overrides/KingOracleOverrides.vcproj.HARIS4.Haris.user 2007-02-23 21:15:54 UTC (rev 2612)
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="gb2312"?>
<VisualStudioUserFile
ProjectType="Visual C++"
- Version="8.00"
+ Version="8,00"
ShowAllFiles="false"
>
<Configurations>
<Configuration
- Name="Debug|Win32"
+ Name="Debug_Fdo_3_2|Win32"
>
<DebugSettings
Command=""
@@ -34,7 +34,7 @@
/>
</Configuration>
<Configuration
- Name="Release|Win32"
+ Name="Release_Fdo_3_2|Win32"
>
<DebugSettings
Command=""
@@ -62,7 +62,7 @@
/>
</Configuration>
<Configuration
- Name="InstantClient_Release|Win32"
+ Name="InstantClient_Release_Fdo_3_2|Win32"
>
<DebugSettings
Command=""
@@ -89,5 +89,89 @@
MPIAcceptFilter=""
/>
</Configuration>
+ <Configuration
+ Name="Debug_Fdo_3_1|Win32"
+ >
+ <DebugSettings
+ Command=""
+ WorkingDirectory=""
+ CommandArguments=""
+ Attach="false"
+ DebuggerType="3"
+ Remote="1"
+ RemoteMachine="HARIS4"
+ RemoteCommand=""
+ HttpUrl=""
+ PDBPath=""
+ SQLDebugging=""
+ Environment=""
+ EnvironmentMerge="true"
+ DebuggerFlavor=""
+ MPIRunCommand=""
+ MPIRunArguments=""
+ MPIRunWorkingDirectory=""
+ ApplicationCommand=""
+ ApplicationArguments=""
+ ShimCommand=""
+ MPIAcceptMode=""
+ MPIAcceptFilter=""
+ />
+ </Configuration>
+ <Configuration
+ Name="Release_Fdo_3_1|Win32"
+ >
+ <DebugSettings
+ Command=""
+ WorkingDirectory=""
+ CommandArguments=""
+ Attach="false"
+ DebuggerType="3"
+ Remote="1"
+ RemoteMachine="HARIS4"
+ RemoteCommand=""
+ HttpUrl=""
+ PDBPath=""
+ SQLDebugging=""
+ Environment=""
+ EnvironmentMerge="true"
+ DebuggerFlavor=""
+ MPIRunCommand=""
+ MPIRunArguments=""
+ MPIRunWorkingDirectory=""
+ ApplicationCommand=""
+ ApplicationArguments=""
+ ShimCommand=""
+ MPIAcceptMode=""
+ MPIAcceptFilter=""
+ />
+ </Configuration>
+ <Configuration
+ Name="InstantClient_Release_Fdo_3_1|Win32"
+ >
+ <DebugSettings
+ Command=""
+ WorkingDirectory=""
+ CommandArguments=""
+ Attach="false"
+ DebuggerType="3"
+ Remote="1"
+ RemoteMachine="HARIS4"
+ RemoteCommand=""
+ HttpUrl=""
+ PDBPath=""
+ SQLDebugging=""
+ Environment=""
+ EnvironmentMerge="true"
+ DebuggerFlavor=""
+ MPIRunCommand=""
+ MPIRunArguments=""
+ MPIRunWorkingDirectory=""
+ ApplicationCommand=""
+ ApplicationArguments=""
+ ShimCommand=""
+ MPIAcceptMode=""
+ MPIAcceptFilter=""
+ />
+ </Configuration>
</Configurations>
</VisualStudioUserFile>
More information about the fdo-commits
mailing list