From: <di...@us...> - 2010-12-29 08:35:27
|
Revision: 52087 http://firebird.svn.sourceforge.net/firebird/?rev=52087&view=rev Author: dimitr Date: 2010-12-29 08:35:20 +0000 (Wed, 29 Dec 2010) Log Message: ----------- Cleanup. For a long time already, the only proper way to generate gds32.dll is to use instclient.exe. Modified Paths: -------------- firebird/branches/B2_1_Release/builds/win32/msvc7/Firebird2.sln firebird/branches/B2_1_Release/builds/win32/msvc8/Firebird2.sln firebird/branches/B2_1_Release/builds/win32/msvc9/Firebird2.sln firebird/branches/B2_1_Release/src/jrd/isc_version.h Removed Paths: ------------- firebird/branches/B2_1_Release/builds/win32/msvc7/gds32.vcproj firebird/branches/B2_1_Release/builds/win32/msvc8/gds32.vcproj firebird/branches/B2_1_Release/builds/win32/msvc9/gds32.vcproj firebird/branches/B2_1_Release/src/jrd/isc_version.rc Modified: firebird/branches/B2_1_Release/builds/win32/msvc7/Firebird2.sln =================================================================== --- firebird/branches/B2_1_Release/builds/win32/msvc7/Firebird2.sln 2010-12-29 08:12:04 UTC (rev 52086) +++ firebird/branches/B2_1_Release/builds/win32/msvc7/Firebird2.sln 2010-12-29 08:35:20 UTC (rev 52087) @@ -113,11 +113,6 @@ {492E7BDA-8948-408D-A43E-4C0A5B86AFB8} = {492E7BDA-8948-408D-A43E-4C0A5B86AFB8} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gds32", "gds32.vcproj", "{C02A54D0-689F-49B6-8F63-7C73EF42E312}" - ProjectSection(ProjectDependencies) = postProject - {492E7BDA-8948-408D-A43E-4C0A5B86AFB8} = {492E7BDA-8948-408D-A43E-4C0A5B86AFB8} - EndProjectSection -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gfix", "gfix.vcproj", "{44A9E4AD-B932-4620-B319-431A153BB341}" ProjectSection(ProjectDependencies) = postProject {15605F44-BFFD-444F-AD4C-55DC9D704465} = {15605F44-BFFD-444F-AD4C-55DC9D704465} @@ -327,10 +322,6 @@ {E8B8E0CE-F47F-48BD-8911-C11805A711D9}.Debug.Build.0 = Debug|Win32 {E8B8E0CE-F47F-48BD-8911-C11805A711D9}.Release.ActiveCfg = Release|Win32 {E8B8E0CE-F47F-48BD-8911-C11805A711D9}.Release.Build.0 = Release|Win32 - {C02A54D0-689F-49B6-8F63-7C73EF42E312}.Debug.ActiveCfg = Debug|Win32 - {C02A54D0-689F-49B6-8F63-7C73EF42E312}.Debug.Build.0 = Debug|Win32 - {C02A54D0-689F-49B6-8F63-7C73EF42E312}.Release.ActiveCfg = Release|Win32 - {C02A54D0-689F-49B6-8F63-7C73EF42E312}.Release.Build.0 = Release|Win32 {44A9E4AD-B932-4620-B319-431A153BB341}.Debug.ActiveCfg = Debug|Win32 {44A9E4AD-B932-4620-B319-431A153BB341}.Debug.Build.0 = Debug|Win32 {44A9E4AD-B932-4620-B319-431A153BB341}.Release.ActiveCfg = Release|Win32 Deleted: firebird/branches/B2_1_Release/builds/win32/msvc7/gds32.vcproj =================================================================== --- firebird/branches/B2_1_Release/builds/win32/msvc7/gds32.vcproj 2010-12-29 08:12:04 UTC (rev 52086) +++ firebird/branches/B2_1_Release/builds/win32/msvc7/gds32.vcproj 2010-12-29 08:35:20 UTC (rev 52087) @@ -1,196 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="7.10" - Name="gds32" - SccProjectName="" - SccLocalPath=""> - <Platforms> - <Platform - Name="Win32"/> - </Platforms> - <Configurations> - <Configuration - Name="Release|Win32" - OutputDirectory="..\..\..\temp\release\gds32" - IntermediateDirectory="..\..\..\temp\release\gds32" - ConfigurationType="2" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="FALSE" - CharacterSet="2"> - <Tool - Name="VCCLCompilerTool" - AdditionalOptions="/EHsc-" - Optimization="4" - GlobalOptimizations="TRUE" - InlineFunctionExpansion="1" - EnableIntrinsicFunctions="TRUE" - ImproveFloatingPointConsistency="TRUE" - FavorSizeOrSpeed="1" - OmitFramePointers="TRUE" - AdditionalIncludeDirectories="../../../src/include,../../../src/include/gen" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;GDS32" - ExceptionHandling="FALSE" - RuntimeLibrary="2" - RuntimeTypeInfo="FALSE" - PrecompiledHeaderFile="..\..\..\temp\release\gds32/gds32.pch" - AssemblerListingLocation="..\..\..\temp\release\gds32/" - ObjectFile="..\..\..\temp\release\gds32/" - ProgramDataBaseFileName="..\..\..\temp\release\gds32/" - WarningLevel="3" - SuppressStartupBanner="TRUE" - DebugInformationFormat="3" - CompileAs="0"/> - <Tool - Name="VCCustomBuildTool"/> - <Tool - Name="VCLinkerTool" - AdditionalOptions="/MACHINE:I386" - AdditionalDependencies="msvcrt.lib" - OutputFile="..\..\..\temp\release\firebird\bin\gds32.dll" - LinkIncremental="1" - SuppressStartupBanner="TRUE" - ModuleDefinitionFile="..\defs\gds32.def" - GenerateDebugInformation="TRUE" - ImportLibrary="..\..\..\temp\release\gds32\gds32.lib"/> - <Tool - Name="VCMIDLTool" - PreprocessorDefinitions="_DEBUG" - MkTypLibCompatible="TRUE" - SuppressStartupBanner="TRUE" - TargetEnvironment="1" - TypeLibraryName="..\..\..\temp\release\gds32\gds32.tlb"/> - <Tool - Name="VCPostBuildEventTool"/> - <Tool - Name="VCPreBuildEventTool"/> - <Tool - Name="VCPreLinkEventTool"/> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG" - Culture="1053"/> - <Tool - Name="VCWebServiceProxyGeneratorTool"/> - <Tool - Name="VCXMLDataGeneratorTool"/> - <Tool - Name="VCWebDeploymentTool"/> - <Tool - Name="VCManagedWrapperGeneratorTool"/> - <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - </Configuration> - <Configuration - Name="Debug|Win32" - OutputDirectory="..\..\..\temp\debug\gds32" - IntermediateDirectory="..\..\..\temp\debug\gds32" - ConfigurationType="2" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="FALSE" - CharacterSet="2"> - <Tool - Name="VCCLCompilerTool" - AdditionalOptions="/EHsc-" - Optimization="0" - AdditionalIncludeDirectories="../../../src/include,../../../src/include/gen" - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;GDS32" - ExceptionHandling="FALSE" - BasicRuntimeChecks="3" - RuntimeLibrary="3" - RuntimeTypeInfo="FALSE" - PrecompiledHeaderFile="..\..\..\temp\debug\gds32/gds32.pch" - AssemblerListingLocation="..\..\..\temp\debug\gds32/" - ObjectFile="..\..\..\temp\debug\gds32/" - ProgramDataBaseFileName="..\..\..\temp\debug\gds32/" - WarningLevel="3" - SuppressStartupBanner="TRUE" - DebugInformationFormat="3" - CompileAs="0"/> - <Tool - Name="VCCustomBuildTool"/> - <Tool - Name="VCLinkerTool" - AdditionalOptions="/MACHINE:I386" - AdditionalDependencies="msvcrt.lib" - OutputFile="..\..\..\temp\debug\firebird\bin\gds32.dll" - LinkIncremental="1" - SuppressStartupBanner="TRUE" - ModuleDefinitionFile="..\defs\gds32.def" - GenerateDebugInformation="TRUE" - ProgramDatabaseFile="..\..\..\temp\debug\gds32\gds32.pdb" - ImportLibrary="..\..\..\temp\debug\gds32\gds32.lib"/> - <Tool - Name="VCMIDLTool" - PreprocessorDefinitions="_DEBUG" - MkTypLibCompatible="TRUE" - SuppressStartupBanner="TRUE" - TargetEnvironment="1" - TypeLibraryName="..\..\..\temp\debug\gds32\gds32.tlb"/> - <Tool - Name="VCPostBuildEventTool"/> - <Tool - Name="VCPreBuildEventTool"/> - <Tool - Name="VCPreLinkEventTool"/> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG" - Culture="1053"/> - <Tool - Name="VCWebServiceProxyGeneratorTool"/> - <Tool - Name="VCXMLDataGeneratorTool"/> - <Tool - Name="VCWebDeploymentTool"/> - <Tool - Name="VCManagedWrapperGeneratorTool"/> - <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <Filter - Name="JRD files" - Filter=""> - <File - RelativePath="..\..\..\src\jrd\os\win32\ibinitdll.cpp"> - </File> - </Filter> - <Filter - Name="Resource files" - Filter=""> - <File - RelativePath="..\..\..\src\jrd\isc_version.rc"> - <FileConfiguration - Name="Release|Win32"> - <Tool - Name="VCResourceCompilerTool" - AdditionalIncludeDirectories="..\..\..\src\jrd;$(NoInherit)"/> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32"> - <Tool - Name="VCResourceCompilerTool" - AdditionalIncludeDirectories="..\..\..\src\jrd;$(NoInherit)"/> - </FileConfiguration> - </File> - </Filter> - <Filter - Name="COMMON files"> - <File - RelativePath="..\..\..\src\common\classes\alloc.cpp"> - </File> - <File - RelativePath="..\..\..\src\common\fb_exception.cpp"> - </File> - </Filter> - <File - RelativePath="..\defs\gds32.def"> - </File> - </Files> - <Globals> - </Globals> -</VisualStudioProject> Modified: firebird/branches/B2_1_Release/builds/win32/msvc8/Firebird2.sln =================================================================== --- firebird/branches/B2_1_Release/builds/win32/msvc8/Firebird2.sln 2010-12-29 08:12:04 UTC (rev 52086) +++ firebird/branches/B2_1_Release/builds/win32/msvc8/Firebird2.sln 2010-12-29 08:35:20 UTC (rev 52087) @@ -90,11 +90,6 @@ {15605F44-BFFD-444F-AD4C-55DC9D704465} = {15605F44-BFFD-444F-AD4C-55DC9D704465} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gds32", "gds32.vcproj", "{C02A54D0-689F-49B6-8F63-7C73EF42E312}" - ProjectSection(ProjectDependencies) = postProject - {492E7BDA-8948-408D-A43E-4C0A5B86AFB8} = {492E7BDA-8948-408D-A43E-4C0A5B86AFB8} - EndProjectSection -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gfix", "gfix.vcproj", "{44A9E4AD-B932-4620-B319-431A153BB341}" ProjectSection(ProjectDependencies) = postProject {492E7BDA-8948-408D-A43E-4C0A5B86AFB8} = {492E7BDA-8948-408D-A43E-4C0A5B86AFB8} @@ -359,14 +354,6 @@ {E8B8E0CE-F47F-48BD-8911-C11805A711D9}.Release|Win32.Build.0 = Release|Win32 {E8B8E0CE-F47F-48BD-8911-C11805A711D9}.Release|x64.ActiveCfg = Release|x64 {E8B8E0CE-F47F-48BD-8911-C11805A711D9}.Release|x64.Build.0 = Release|x64 - {C02A54D0-689F-49B6-8F63-7C73EF42E312}.Debug|Win32.ActiveCfg = Debug|Win32 - {C02A54D0-689F-49B6-8F63-7C73EF42E312}.Debug|Win32.Build.0 = Debug|Win32 - {C02A54D0-689F-49B6-8F63-7C73EF42E312}.Debug|x64.ActiveCfg = Debug|x64 - {C02A54D0-689F-49B6-8F63-7C73EF42E312}.Debug|x64.Build.0 = Debug|x64 - {C02A54D0-689F-49B6-8F63-7C73EF42E312}.Release|Win32.ActiveCfg = Release|Win32 - {C02A54D0-689F-49B6-8F63-7C73EF42E312}.Release|Win32.Build.0 = Release|Win32 - {C02A54D0-689F-49B6-8F63-7C73EF42E312}.Release|x64.ActiveCfg = Release|x64 - {C02A54D0-689F-49B6-8F63-7C73EF42E312}.Release|x64.Build.0 = Release|x64 {44A9E4AD-B932-4620-B319-431A153BB341}.Debug|Win32.ActiveCfg = Debug|Win32 {44A9E4AD-B932-4620-B319-431A153BB341}.Debug|Win32.Build.0 = Debug|Win32 {44A9E4AD-B932-4620-B319-431A153BB341}.Debug|x64.ActiveCfg = Debug|x64 Deleted: firebird/branches/B2_1_Release/builds/win32/msvc8/gds32.vcproj =================================================================== --- firebird/branches/B2_1_Release/builds/win32/msvc8/gds32.vcproj 2010-12-29 08:12:04 UTC (rev 52086) +++ firebird/branches/B2_1_Release/builds/win32/msvc8/gds32.vcproj 2010-12-29 08:35:20 UTC (rev 52087) @@ -1,395 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="8.00" - Name="gds32" - ProjectGUID="{C02A54D0-689F-49B6-8F63-7C73EF42E312}" - > - <Platforms> - <Platform - Name="Win32" - /> - <Platform - Name="x64" - /> - </Platforms> - <ToolFiles> - </ToolFiles> - <Configurations> - <Configuration - Name="Release|Win32" - ConfigurationType="2" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;.\firebird2.vsprops;.\firebird2release.vsprops" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="false" - CharacterSet="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - PreprocessorDefinitions="_DEBUG" - MkTypLibCompatible="true" - TargetEnvironment="1" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="2" - InlineFunctionExpansion="1" - EnableIntrinsicFunctions="true" - FavorSizeOrSpeed="1" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;GDS32" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG" - Culture="1053" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="msvcrt.lib" - OutputFile="..\..\..\temp\$(PlatformName)\$(ConfigurationName)\firebird\bin\$(ProjectName).dll" - LinkIncremental="1" - ModuleDefinitionFile="..\defs\gds32.def" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCWebDeploymentTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - <Configuration - Name="Release|x64" - ConfigurationType="2" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;.\firebird2.vsprops;.\firebird2release.vsprops" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="false" - CharacterSet="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - PreprocessorDefinitions="_DEBUG" - MkTypLibCompatible="true" - TargetEnvironment="3" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="2" - InlineFunctionExpansion="1" - EnableIntrinsicFunctions="true" - FavorSizeOrSpeed="1" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;GDS32" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG" - Culture="1053" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="msvcrt.lib" - OutputFile="..\..\..\temp\$(PlatformName)\$(ConfigurationName)\firebird\bin\$(ProjectName).dll" - LinkIncremental="1" - ModuleDefinitionFile="..\defs\gds32.def" - TargetMachine="17" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCWebDeploymentTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - <Configuration - Name="Debug|Win32" - ConfigurationType="2" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;.\firebird2.vsprops;.\firebird2debug.vsprops" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="false" - CharacterSet="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - PreprocessorDefinitions="_DEBUG" - MkTypLibCompatible="true" - TargetEnvironment="1" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;GDS32" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG" - Culture="1053" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="msvcrt.lib" - OutputFile="..\..\..\temp\$(PlatformName)\$(ConfigurationName)\firebird\bin\$(ProjectName).dll" - LinkIncremental="1" - ModuleDefinitionFile="..\defs\gds32.def" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCWebDeploymentTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - <Configuration - Name="Debug|x64" - ConfigurationType="2" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;.\firebird2.vsprops;.\firebird2debug.vsprops" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="false" - CharacterSet="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - PreprocessorDefinitions="_DEBUG" - MkTypLibCompatible="true" - TargetEnvironment="3" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;GDS32" - Detect64BitPortabilityProblems="true" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG" - Culture="1053" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="msvcrt.lib" - OutputFile="..\..\..\temp\$(PlatformName)\$(ConfigurationName)\firebird\bin\$(ProjectName).dll" - LinkIncremental="1" - ModuleDefinitionFile="..\defs\gds32.def" - TargetMachine="17" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCWebDeploymentTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <Filter - Name="JRD files" - > - <File - RelativePath="..\..\..\src\jrd\os\win32\ibinitdll.cpp" - > - </File> - </Filter> - <Filter - Name="Resource files" - > - <File - RelativePath="..\..\..\src\jrd\isc_version.rc" - > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCResourceCompilerTool" - AdditionalIncludeDirectories="..\..\..\src\jrd;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|x64" - > - <Tool - Name="VCResourceCompilerTool" - AdditionalIncludeDirectories="..\..\..\src\jrd;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCResourceCompilerTool" - AdditionalIncludeDirectories="..\..\..\src\jrd;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|x64" - > - <Tool - Name="VCResourceCompilerTool" - AdditionalIncludeDirectories="..\..\..\src\jrd;$(NoInherit)" - /> - </FileConfiguration> - </File> - </Filter> - <Filter - Name="COMMON files" - > - <File - RelativePath="..\..\..\src\common\classes\alloc.cpp" - > - </File> - <File - RelativePath="..\..\..\src\common\fb_exception.cpp" - > - </File> - </Filter> - <File - RelativePath="..\defs\gds32.def" - > - </File> - </Files> - <Globals> - </Globals> -</VisualStudioProject> Modified: firebird/branches/B2_1_Release/builds/win32/msvc9/Firebird2.sln =================================================================== --- firebird/branches/B2_1_Release/builds/win32/msvc9/Firebird2.sln 2010-12-29 08:12:04 UTC (rev 52086) +++ firebird/branches/B2_1_Release/builds/win32/msvc9/Firebird2.sln 2010-12-29 08:35:20 UTC (rev 52087) @@ -90,11 +90,6 @@ {15605F44-BFFD-444F-AD4C-55DC9D704465} = {15605F44-BFFD-444F-AD4C-55DC9D704465} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gds32", "gds32.vcproj", "{C02A54D0-689F-49B6-8F63-7C73EF42E312}" - ProjectSection(ProjectDependencies) = postProject - {492E7BDA-8948-408D-A43E-4C0A5B86AFB8} = {492E7BDA-8948-408D-A43E-4C0A5B86AFB8} - EndProjectSection -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gfix", "gfix.vcproj", "{44A9E4AD-B932-4620-B319-431A153BB341}" ProjectSection(ProjectDependencies) = postProject {492E7BDA-8948-408D-A43E-4C0A5B86AFB8} = {492E7BDA-8948-408D-A43E-4C0A5B86AFB8} @@ -359,14 +354,6 @@ {E8B8E0CE-F47F-48BD-8911-C11805A711D9}.Release|Win32.Build.0 = Release|Win32 {E8B8E0CE-F47F-48BD-8911-C11805A711D9}.Release|x64.ActiveCfg = Release|x64 {E8B8E0CE-F47F-48BD-8911-C11805A711D9}.Release|x64.Build.0 = Release|x64 - {C02A54D0-689F-49B6-8F63-7C73EF42E312}.Debug|Win32.ActiveCfg = Debug|Win32 - {C02A54D0-689F-49B6-8F63-7C73EF42E312}.Debug|Win32.Build.0 = Debug|Win32 - {C02A54D0-689F-49B6-8F63-7C73EF42E312}.Debug|x64.ActiveCfg = Debug|x64 - {C02A54D0-689F-49B6-8F63-7C73EF42E312}.Debug|x64.Build.0 = Debug|x64 - {C02A54D0-689F-49B6-8F63-7C73EF42E312}.Release|Win32.ActiveCfg = Release|Win32 - {C02A54D0-689F-49B6-8F63-7C73EF42E312}.Release|Win32.Build.0 = Release|Win32 - {C02A54D0-689F-49B6-8F63-7C73EF42E312}.Release|x64.ActiveCfg = Release|x64 - {C02A54D0-689F-49B6-8F63-7C73EF42E312}.Release|x64.Build.0 = Release|x64 {44A9E4AD-B932-4620-B319-431A153BB341}.Debug|Win32.ActiveCfg = Debug|Win32 {44A9E4AD-B932-4620-B319-431A153BB341}.Debug|Win32.Build.0 = Debug|Win32 {44A9E4AD-B932-4620-B319-431A153BB341}.Debug|x64.ActiveCfg = Debug|x64 Deleted: firebird/branches/B2_1_Release/builds/win32/msvc9/gds32.vcproj =================================================================== --- firebird/branches/B2_1_Release/builds/win32/msvc9/gds32.vcproj 2010-12-29 08:12:04 UTC (rev 52086) +++ firebird/branches/B2_1_Release/builds/win32/msvc9/gds32.vcproj 2010-12-29 08:35:20 UTC (rev 52087) @@ -1,392 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="9,00" - Name="gds32" - ProjectGUID="{C02A54D0-689F-49B6-8F63-7C73EF42E312}" - TargetFrameworkVersion="131072" - > - <Platforms> - <Platform - Name="Win32" - /> - <Platform - Name="x64" - /> - </Platforms> - <ToolFiles> - </ToolFiles> - <Configurations> - <Configuration - Name="Release|Win32" - ConfigurationType="2" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;.\firebird2.vsprops;.\firebird2release.vsprops" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="false" - CharacterSet="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - PreprocessorDefinitions="_DEBUG" - MkTypLibCompatible="true" - TargetEnvironment="1" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="2" - InlineFunctionExpansion="1" - EnableIntrinsicFunctions="true" - FavorSizeOrSpeed="1" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;GDS32" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG" - Culture="1053" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="msvcrt.lib" - OutputFile="..\..\..\temp\$(PlatformName)\$(ConfigurationName)\firebird\bin\$(ProjectName).dll" - LinkIncremental="1" - ModuleDefinitionFile="..\defs\gds32.def" - RandomizedBaseAddress="1" - DataExecutionPrevention="0" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - <Configuration - Name="Release|x64" - ConfigurationType="2" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;.\firebird2.vsprops;.\firebird2release.vsprops" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="false" - CharacterSet="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - PreprocessorDefinitions="_DEBUG" - MkTypLibCompatible="true" - TargetEnvironment="3" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="2" - InlineFunctionExpansion="1" - EnableIntrinsicFunctions="true" - FavorSizeOrSpeed="1" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;GDS32" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG" - Culture="1053" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="msvcrt.lib" - OutputFile="..\..\..\temp\$(PlatformName)\$(ConfigurationName)\firebird\bin\$(ProjectName).dll" - LinkIncremental="1" - ModuleDefinitionFile="..\defs\gds32.def" - RandomizedBaseAddress="1" - DataExecutionPrevention="0" - TargetMachine="17" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - <Configuration - Name="Debug|Win32" - ConfigurationType="2" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;.\firebird2.vsprops;.\firebird2debug.vsprops" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="false" - CharacterSet="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - PreprocessorDefinitions="_DEBUG" - MkTypLibCompatible="true" - TargetEnvironment="1" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;GDS32" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG" - Culture="1053" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="msvcrt.lib" - OutputFile="..\..\..\temp\$(PlatformName)\$(ConfigurationName)\firebird\bin\$(ProjectName).dll" - LinkIncremental="1" - ModuleDefinitionFile="..\defs\gds32.def" - RandomizedBaseAddress="1" - DataExecutionPrevention="0" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - <Configuration - Name="Debug|x64" - ConfigurationType="2" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;.\firebird2.vsprops;.\firebird2debug.vsprops" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="false" - CharacterSet="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - PreprocessorDefinitions="_DEBUG" - MkTypLibCompatible="true" - TargetEnvironment="3" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;GDS32" - Detect64BitPortabilityProblems="true" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG" - Culture="1053" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="msvcrt.lib" - OutputFile="..\..\..\temp\$(PlatformName)\$(ConfigurationName)\firebird\bin\$(ProjectName).dll" - LinkIncremental="1" - ModuleDefinitionFile="..\defs\gds32.def" - RandomizedBaseAddress="1" - DataExecutionPrevention="0" - TargetMachine="17" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <Filter - Name="JRD files" - > - <File - RelativePath="..\..\..\src\jrd\os\win32\ibinitdll.cpp" - > - </File> - </Filter> - <Filter - Name="Resource files" - > - <File - RelativePath="..\..\..\src\jrd\isc_version.rc" - > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCResourceCompilerTool" - AdditionalIncludeDirectories="..\..\..\src\jrd;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|x64" - > - <Tool - Name="VCResourceCompilerTool" - AdditionalIncludeDirectories="..\..\..\src\jrd;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCResourceCompilerTool" - AdditionalIncludeDirectories="..\..\..\src\jrd;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|x64" - > - <Tool - Name="VCResourceCompilerTool" - AdditionalIncludeDirectories="..\..\..\src\jrd;$(NoInherit)" - /> - </FileConfiguration> - </File> - </Filter> - <Filter - Name="COMMON files" - > - <File - RelativePath="..\..\..\src\common\classes\alloc.cpp" - > - </File> - <File - RelativePath="..\..\..\src\common\fb_exception.cpp" - > - </File> - </Filter> - <File - RelativePath="..\defs\gds32.def" - > - </File> - </Files> - <Globals> - </Globals> -</VisualStudioProject> Modified: firebird/branches/B2_1_Release/src/jrd/isc_version.h =================================================================== --- firebird/branches/B2_1_Release/src/jrd/isc_version.h 2010-12-29 08:12:04 UTC (rev 52086) +++ firebird/branches/B2_1_Release/src/jrd/isc_version.h 2010-12-29 08:35:20 UTC (rev 52087) @@ -17,7 +17,5 @@ * Contributor(s): ______________________________________. */ -#define ISC_FILE_VER_STRING "WI-V6.3.4.18314" -#define ISC_FILE_VER_NUMBER 6, 3, 4, 18314 #define ISC_MAJOR_VER "6" #define ISC_MINOR_VER "3" Deleted: firebird/branches/B2_1_Release/src/jrd/isc_version.rc =================================================================== --- firebird/branches/B2_1_Release/src/jrd/isc_version.rc 2010-12-29 08:12:04 UTC (rev 52086) +++ firebird/branches/B2_1_Release/src/jrd/isc_version.rc 2010-12-29 08:35:20 UTC (rev 52087) @@ -1,53 +0,0 @@ -/* - * The contents of this file are subject to the Interbase Public - * License Version 1.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy - * of the License at http://www.Inprise.com/IPL.html - * - * Software distributed under the License is distributed on an - * "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express - * or implied. See the License for the specific language governing - * rights and limitations under the License. - * - * The Original Code was created by Inprise Corporation - * and its predecessors. Portions created by Inprise Corporation are - * Copyright (C) Inprise Corporation. - * - * All Rights Reserved. - * Contributor(s): ______________________________________. - */ - -#include <winver.h> -#include "../jrd/build_no.h" -#include "../jrd/isc_version.h" - -VS_VERSION_INFO VERSIONINFO -FILEFLAGSMASK VS_FF_PRERELEASE -FILEFLAGS VS_FF_PRERELEASE | VS_FF_SPECIALBUILD -FILEVERSION ISC_FILE_VER_NUMBER -PRODUCTVERSION ISC_FILE_VER_NUMBER -FILEOS VOS_NT_WINDOWS32 - -FILETYPE VFT_APP -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904E4" - BEGIN - VALUE "Comments", "This product created by the Firebird - All Copyright (c) retained by the individual contributors - original code Copyright (c) 2000 Inprise Corporation and predecessors.\0" - VALUE "CompanyName", "Firebird Project\0" - VALUE "FileDescription", "Firebird SQL Server\0" - VALUE "FileVersion", ISC_FILE_VER_STRING - VALUE "InternalName", "Firebird\0" - VALUE "LegalCopyright", "All Copyright (c) retained by individual contributors - original code Copyright (c) 2000 Inprise Corporation\0" - VALUE "ProductName", "Firebird SQL Server\0" - VALUE "ProductVersion", PRODUCT_VER_STRING - VALUE "SpecialBuild", FB_BUILD_SUFFIX - END - END - - BLOCK "VarFileInfo" - BEGIN /* Language | Translation */ - VALUE "Translation", 0x409, 1252 /* U.S. English, Windows Multilingual */ - END -END This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |