From: <asf...@us...> - 2010-06-29 16:22:56
|
Revision: 51301 http://firebird.svn.sourceforge.net/firebird/?rev=51301&view=rev Author: asfernandes Date: 2010-06-29 16:22:48 +0000 (Tue, 29 Jun 2010) Log Message: ----------- Fix run from MSVC10 IDE Modified Paths: -------------- firebird/trunk/builds/win32/msvc10/btyacc.vcxproj firebird/trunk/builds/win32/msvc10/build_msg.vcxproj firebird/trunk/builds/win32/msvc10/codes.vcxproj firebird/trunk/builds/win32/msvc10/fb2control.vcxproj firebird/trunk/builds/win32/msvc10/fb_inet_server.vcxproj firebird/trunk/builds/win32/msvc10/fb_lock_print.vcxproj firebird/trunk/builds/win32/msvc10/fbclient.vcxproj firebird/trunk/builds/win32/msvc10/fbembed.vcxproj firebird/trunk/builds/win32/msvc10/fbguard.vcxproj firebird/trunk/builds/win32/msvc10/fbrmclib.vcxproj firebird/trunk/builds/win32/msvc10/fbserver.vcxproj firebird/trunk/builds/win32/msvc10/fbsvcmgr.vcxproj firebird/trunk/builds/win32/msvc10/fbtrace.vcxproj firebird/trunk/builds/win32/msvc10/fbtracemgr.vcxproj firebird/trunk/builds/win32/msvc10/fbudf.vcxproj firebird/trunk/builds/win32/msvc10/gbak.vcxproj firebird/trunk/builds/win32/msvc10/gbak_embed.vcxproj firebird/trunk/builds/win32/msvc10/gfix.vcxproj firebird/trunk/builds/win32/msvc10/gpre.vcxproj firebird/trunk/builds/win32/msvc10/gpre_boot.vcxproj firebird/trunk/builds/win32/msvc10/gpre_embed.vcxproj firebird/trunk/builds/win32/msvc10/gsec.vcxproj firebird/trunk/builds/win32/msvc10/gsplit.vcxproj firebird/trunk/builds/win32/msvc10/gstat.vcxproj firebird/trunk/builds/win32/msvc10/ib_udf.vcxproj firebird/trunk/builds/win32/msvc10/ib_util.vcxproj firebird/trunk/builds/win32/msvc10/instclient.vcxproj firebird/trunk/builds/win32/msvc10/instreg.vcxproj firebird/trunk/builds/win32/msvc10/instsvc.vcxproj firebird/trunk/builds/win32/msvc10/intl.vcxproj firebird/trunk/builds/win32/msvc10/isql.vcxproj firebird/trunk/builds/win32/msvc10/isql_embed.vcxproj firebird/trunk/builds/win32/msvc10/nbackup.vcxproj firebird/trunk/builds/win32/msvc10/qli.vcxproj firebird/trunk/builds/win32/msvc10/udr_engine.vcxproj Modified: firebird/trunk/builds/win32/msvc10/btyacc.vcxproj =================================================================== --- firebird/trunk/builds/win32/msvc10/btyacc.vcxproj 2010-06-29 16:19:19 UTC (rev 51300) +++ firebird/trunk/builds/win32/msvc10/btyacc.vcxproj 2010-06-29 16:22:48 UTC (rev 51301) @@ -90,6 +90,10 @@ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet> <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /> <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> Modified: firebird/trunk/builds/win32/msvc10/build_msg.vcxproj =================================================================== --- firebird/trunk/builds/win32/msvc10/build_msg.vcxproj 2010-06-29 16:19:19 UTC (rev 51300) +++ firebird/trunk/builds/win32/msvc10/build_msg.vcxproj 2010-06-29 16:22:48 UTC (rev 51301) @@ -89,6 +89,10 @@ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet> <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /> <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ClCompile> Modified: firebird/trunk/builds/win32/msvc10/codes.vcxproj =================================================================== --- firebird/trunk/builds/win32/msvc10/codes.vcxproj 2010-06-29 16:19:19 UTC (rev 51300) +++ firebird/trunk/builds/win32/msvc10/codes.vcxproj 2010-06-29 16:22:48 UTC (rev 51301) @@ -88,6 +88,10 @@ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet> <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /> <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> Modified: firebird/trunk/builds/win32/msvc10/fb2control.vcxproj =================================================================== --- firebird/trunk/builds/win32/msvc10/fb2control.vcxproj 2010-06-29 16:19:19 UTC (rev 51300) +++ firebird/trunk/builds/win32/msvc10/fb2control.vcxproj 2010-06-29 16:22:48 UTC (rev 51301) @@ -75,7 +75,7 @@ <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion> <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental> <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental> - <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\</OutDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir> <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental> <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkIncremental> <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet> @@ -90,6 +90,9 @@ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet> <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /> <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <Midl> Modified: firebird/trunk/builds/win32/msvc10/fb_inet_server.vcxproj =================================================================== --- firebird/trunk/builds/win32/msvc10/fb_inet_server.vcxproj 2010-06-29 16:19:19 UTC (rev 51300) +++ firebird/trunk/builds/win32/msvc10/fb_inet_server.vcxproj 2010-06-29 16:22:48 UTC (rev 51301) @@ -88,6 +88,10 @@ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet> <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /> <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <Midl> Modified: firebird/trunk/builds/win32/msvc10/fb_lock_print.vcxproj =================================================================== --- firebird/trunk/builds/win32/msvc10/fb_lock_print.vcxproj 2010-06-29 16:19:19 UTC (rev 51300) +++ firebird/trunk/builds/win32/msvc10/fb_lock_print.vcxproj 2010-06-29 16:22:48 UTC (rev 51301) @@ -88,6 +88,10 @@ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet> <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /> <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ClCompile> Modified: firebird/trunk/builds/win32/msvc10/fbclient.vcxproj =================================================================== --- firebird/trunk/builds/win32/msvc10/fbclient.vcxproj 2010-06-29 16:19:19 UTC (rev 51300) +++ firebird/trunk/builds/win32/msvc10/fbclient.vcxproj 2010-06-29 16:22:48 UTC (rev 51301) @@ -88,6 +88,10 @@ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet> <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /> <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Midl> Modified: firebird/trunk/builds/win32/msvc10/fbembed.vcxproj =================================================================== --- firebird/trunk/builds/win32/msvc10/fbembed.vcxproj 2010-06-29 16:19:19 UTC (rev 51300) +++ firebird/trunk/builds/win32/msvc10/fbembed.vcxproj 2010-06-29 16:22:48 UTC (rev 51301) @@ -88,6 +88,10 @@ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet> <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /> <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Midl> Modified: firebird/trunk/builds/win32/msvc10/fbguard.vcxproj =================================================================== --- firebird/trunk/builds/win32/msvc10/fbguard.vcxproj 2010-06-29 16:19:19 UTC (rev 51300) +++ firebird/trunk/builds/win32/msvc10/fbguard.vcxproj 2010-06-29 16:22:48 UTC (rev 51301) @@ -88,6 +88,10 @@ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet> <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /> <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <Midl> Modified: firebird/trunk/builds/win32/msvc10/fbrmclib.vcxproj =================================================================== --- firebird/trunk/builds/win32/msvc10/fbrmclib.vcxproj 2010-06-29 16:19:19 UTC (rev 51300) +++ firebird/trunk/builds/win32/msvc10/fbrmclib.vcxproj 2010-06-29 16:22:48 UTC (rev 51301) @@ -50,6 +50,10 @@ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet> <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" /> <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" /> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Midl> Modified: firebird/trunk/builds/win32/msvc10/fbserver.vcxproj =================================================================== --- firebird/trunk/builds/win32/msvc10/fbserver.vcxproj 2010-06-29 16:19:19 UTC (rev 51300) +++ firebird/trunk/builds/win32/msvc10/fbserver.vcxproj 2010-06-29 16:22:48 UTC (rev 51301) @@ -88,6 +88,10 @@ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet> <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /> <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <Midl> Modified: firebird/trunk/builds/win32/msvc10/fbsvcmgr.vcxproj =================================================================== --- firebird/trunk/builds/win32/msvc10/fbsvcmgr.vcxproj 2010-06-29 16:19:19 UTC (rev 51300) +++ firebird/trunk/builds/win32/msvc10/fbsvcmgr.vcxproj 2010-06-29 16:22:48 UTC (rev 51301) @@ -88,6 +88,10 @@ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet> <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /> <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> Modified: firebird/trunk/builds/win32/msvc10/fbtrace.vcxproj =================================================================== --- firebird/trunk/builds/win32/msvc10/fbtrace.vcxproj 2010-06-29 16:19:19 UTC (rev 51300) +++ firebird/trunk/builds/win32/msvc10/fbtrace.vcxproj 2010-06-29 16:22:48 UTC (rev 51301) @@ -88,6 +88,10 @@ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet> <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /> <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\plugins\</OutDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\plugins\</OutDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\plugins\</OutDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\plugins\</OutDir> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> Modified: firebird/trunk/builds/win32/msvc10/fbtracemgr.vcxproj =================================================================== --- firebird/trunk/builds/win32/msvc10/fbtracemgr.vcxproj 2010-06-29 16:19:19 UTC (rev 51300) +++ firebird/trunk/builds/win32/msvc10/fbtracemgr.vcxproj 2010-06-29 16:22:48 UTC (rev 51301) @@ -90,6 +90,10 @@ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet> <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /> <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> Modified: firebird/trunk/builds/win32/msvc10/fbudf.vcxproj =================================================================== --- firebird/trunk/builds/win32/msvc10/fbudf.vcxproj 2010-06-29 16:19:19 UTC (rev 51300) +++ firebird/trunk/builds/win32/msvc10/fbudf.vcxproj 2010-06-29 16:22:48 UTC (rev 51301) @@ -92,6 +92,10 @@ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet> <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /> <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\udf\</OutDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\udf\</OutDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\udf\</OutDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\udf\</OutDir> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <Midl> Modified: firebird/trunk/builds/win32/msvc10/gbak.vcxproj =================================================================== --- firebird/trunk/builds/win32/msvc10/gbak.vcxproj 2010-06-29 16:19:19 UTC (rev 51300) +++ firebird/trunk/builds/win32/msvc10/gbak.vcxproj 2010-06-29 16:22:48 UTC (rev 51301) @@ -88,6 +88,10 @@ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet> <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /> <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> Modified: firebird/trunk/builds/win32/msvc10/gbak_embed.vcxproj =================================================================== --- firebird/trunk/builds/win32/msvc10/gbak_embed.vcxproj 2010-06-29 16:19:19 UTC (rev 51300) +++ firebird/trunk/builds/win32/msvc10/gbak_embed.vcxproj 2010-06-29 16:22:48 UTC (rev 51301) @@ -88,6 +88,10 @@ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet> <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /> <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> Modified: firebird/trunk/builds/win32/msvc10/gfix.vcxproj =================================================================== --- firebird/trunk/builds/win32/msvc10/gfix.vcxproj 2010-06-29 16:19:19 UTC (rev 51300) +++ firebird/trunk/builds/win32/msvc10/gfix.vcxproj 2010-06-29 16:22:48 UTC (rev 51301) @@ -89,6 +89,10 @@ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet> <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /> <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> Modified: firebird/trunk/builds/win32/msvc10/gpre.vcxproj =================================================================== --- firebird/trunk/builds/win32/msvc10/gpre.vcxproj 2010-06-29 16:19:19 UTC (rev 51300) +++ firebird/trunk/builds/win32/msvc10/gpre.vcxproj 2010-06-29 16:22:48 UTC (rev 51301) @@ -89,6 +89,10 @@ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet> <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /> <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ClCompile> Modified: firebird/trunk/builds/win32/msvc10/gpre_boot.vcxproj =================================================================== --- firebird/trunk/builds/win32/msvc10/gpre_boot.vcxproj 2010-06-29 16:19:19 UTC (rev 51300) +++ firebird/trunk/builds/win32/msvc10/gpre_boot.vcxproj 2010-06-29 16:22:48 UTC (rev 51301) @@ -89,6 +89,10 @@ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet> <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /> <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ClCompile> Modified: firebird/trunk/builds/win32/msvc10/gpre_embed.vcxproj =================================================================== --- firebird/trunk/builds/win32/msvc10/gpre_embed.vcxproj 2010-06-29 16:19:19 UTC (rev 51300) +++ firebird/trunk/builds/win32/msvc10/gpre_embed.vcxproj 2010-06-29 16:22:48 UTC (rev 51301) @@ -89,6 +89,10 @@ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet> <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /> <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ClCompile> Modified: firebird/trunk/builds/win32/msvc10/gsec.vcxproj =================================================================== --- firebird/trunk/builds/win32/msvc10/gsec.vcxproj 2010-06-29 16:19:19 UTC (rev 51300) +++ firebird/trunk/builds/win32/msvc10/gsec.vcxproj 2010-06-29 16:22:48 UTC (rev 51301) @@ -88,6 +88,10 @@ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet> <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /> <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ClCompile> Modified: firebird/trunk/builds/win32/msvc10/gsplit.vcxproj =================================================================== --- firebird/trunk/builds/win32/msvc10/gsplit.vcxproj 2010-06-29 16:19:19 UTC (rev 51300) +++ firebird/trunk/builds/win32/msvc10/gsplit.vcxproj 2010-06-29 16:22:48 UTC (rev 51301) @@ -89,6 +89,10 @@ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet> <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /> <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> Modified: firebird/trunk/builds/win32/msvc10/gstat.vcxproj =================================================================== --- firebird/trunk/builds/win32/msvc10/gstat.vcxproj 2010-06-29 16:19:19 UTC (rev 51300) +++ firebird/trunk/builds/win32/msvc10/gstat.vcxproj 2010-06-29 16:22:48 UTC (rev 51301) @@ -88,6 +88,10 @@ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet> <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /> <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> Modified: firebird/trunk/builds/win32/msvc10/ib_udf.vcxproj =================================================================== --- firebird/trunk/builds/win32/msvc10/ib_udf.vcxproj 2010-06-29 16:19:19 UTC (rev 51300) +++ firebird/trunk/builds/win32/msvc10/ib_udf.vcxproj 2010-06-29 16:22:48 UTC (rev 51301) @@ -92,6 +92,10 @@ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet> <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /> <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\udf\</OutDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\udf\</OutDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\udf\</OutDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\udf\</OutDir> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Midl> Modified: firebird/trunk/builds/win32/msvc10/ib_util.vcxproj =================================================================== --- firebird/trunk/builds/win32/msvc10/ib_util.vcxproj 2010-06-29 16:19:19 UTC (rev 51300) +++ firebird/trunk/builds/win32/msvc10/ib_util.vcxproj 2010-06-29 16:22:48 UTC (rev 51301) @@ -92,6 +92,10 @@ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet> <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /> <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <Midl> Modified: firebird/trunk/builds/win32/msvc10/instclient.vcxproj =================================================================== --- firebird/trunk/builds/win32/msvc10/instclient.vcxproj 2010-06-29 16:19:19 UTC (rev 51300) +++ firebird/trunk/builds/win32/msvc10/instclient.vcxproj 2010-06-29 16:22:48 UTC (rev 51301) @@ -89,6 +89,10 @@ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet> <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /> <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ClCompile> Modified: firebird/trunk/builds/win32/msvc10/instreg.vcxproj =================================================================== --- firebird/trunk/builds/win32/msvc10/instreg.vcxproj 2010-06-29 16:19:19 UTC (rev 51300) +++ firebird/trunk/builds/win32/msvc10/instreg.vcxproj 2010-06-29 16:22:48 UTC (rev 51301) @@ -89,6 +89,10 @@ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet> <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /> <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> Modified: firebird/trunk/builds/win32/msvc10/instsvc.vcxproj =================================================================== --- firebird/trunk/builds/win32/msvc10/instsvc.vcxproj 2010-06-29 16:19:19 UTC (rev 51300) +++ firebird/trunk/builds/win32/msvc10/instsvc.vcxproj 2010-06-29 16:22:48 UTC (rev 51301) @@ -89,6 +89,10 @@ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet> <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /> <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ClCompile> Modified: firebird/trunk/builds/win32/msvc10/intl.vcxproj =================================================================== --- firebird/trunk/builds/win32/msvc10/intl.vcxproj 2010-06-29 16:19:19 UTC (rev 51300) +++ firebird/trunk/builds/win32/msvc10/intl.vcxproj 2010-06-29 16:22:48 UTC (rev 51301) @@ -92,6 +92,14 @@ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet> <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /> <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\intl\</OutDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\intl\</OutDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\intl\</OutDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\intl\</OutDir> + <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">fbintl</TargetName> + <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">fbintl</TargetName> + <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">fbintl</TargetName> + <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">fbintl</TargetName> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <Midl> Modified: firebird/trunk/builds/win32/msvc10/isql.vcxproj =================================================================== --- firebird/trunk/builds/win32/msvc10/isql.vcxproj 2010-06-29 16:19:19 UTC (rev 51300) +++ firebird/trunk/builds/win32/msvc10/isql.vcxproj 2010-06-29 16:22:48 UTC (rev 51301) @@ -89,6 +89,10 @@ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet> <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /> <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> Modified: firebird/trunk/builds/win32/msvc10/isql_embed.vcxproj =================================================================== --- firebird/trunk/builds/win32/msvc10/isql_embed.vcxproj 2010-06-29 16:19:19 UTC (rev 51300) +++ firebird/trunk/builds/win32/msvc10/isql_embed.vcxproj 2010-06-29 16:22:48 UTC (rev 51301) @@ -89,6 +89,10 @@ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet> <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /> <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> Modified: firebird/trunk/builds/win32/msvc10/nbackup.vcxproj =================================================================== --- firebird/trunk/builds/win32/msvc10/nbackup.vcxproj 2010-06-29 16:19:19 UTC (rev 51300) +++ firebird/trunk/builds/win32/msvc10/nbackup.vcxproj 2010-06-29 16:22:48 UTC (rev 51301) @@ -88,6 +88,10 @@ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet> <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /> <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> Modified: firebird/trunk/builds/win32/msvc10/qli.vcxproj =================================================================== --- firebird/trunk/builds/win32/msvc10/qli.vcxproj 2010-06-29 16:19:19 UTC (rev 51300) +++ firebird/trunk/builds/win32/msvc10/qli.vcxproj 2010-06-29 16:22:48 UTC (rev 51301) @@ -88,6 +88,10 @@ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet> <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /> <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> Modified: firebird/trunk/builds/win32/msvc10/udr_engine.vcxproj =================================================================== --- firebird/trunk/builds/win32/msvc10/udr_engine.vcxproj 2010-06-29 16:19:19 UTC (rev 51300) +++ firebird/trunk/builds/win32/msvc10/udr_engine.vcxproj 2010-06-29 16:22:48 UTC (rev 51301) @@ -92,6 +92,10 @@ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet> <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /> <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\plugins\</OutDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\plugins\</OutDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\plugins\</OutDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\plugins\</OutDir> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Midl> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <hv...@us...> - 2010-06-30 21:29:51
|
Revision: 51306 http://firebird.svn.sourceforge.net/firebird/?rev=51306&view=rev Author: hvlad Date: 2010-06-30 21:29:41 +0000 (Wed, 30 Jun 2010) Log Message: ----------- VC10 build: leave build_msg.exe and codes.exe at intermediate build folder else make_boot failed Modified Paths: -------------- firebird/trunk/builds/win32/msvc10/build_msg.vcxproj firebird/trunk/builds/win32/msvc10/codes.vcxproj Modified: firebird/trunk/builds/win32/msvc10/build_msg.vcxproj =================================================================== --- firebird/trunk/builds/win32/msvc10/build_msg.vcxproj 2010-06-30 21:27:53 UTC (rev 51305) +++ firebird/trunk/builds/win32/msvc10/build_msg.vcxproj 2010-06-30 21:29:41 UTC (rev 51306) @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|Win32"> @@ -89,10 +89,6 @@ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet> <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /> <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /> - <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir> - <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir> - <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir> - <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ClCompile> Modified: firebird/trunk/builds/win32/msvc10/codes.vcxproj =================================================================== --- firebird/trunk/builds/win32/msvc10/codes.vcxproj 2010-06-30 21:27:53 UTC (rev 51305) +++ firebird/trunk/builds/win32/msvc10/codes.vcxproj 2010-06-30 21:29:41 UTC (rev 51306) @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|Win32"> @@ -88,10 +88,6 @@ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet> <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /> <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /> - <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir> - <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir> - <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir> - <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\bin\</OutDir> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <asf...@us...> - 2010-07-12 15:51:52
|
Revision: 51331 http://firebird.svn.sourceforge.net/firebird/?rev=51331&view=rev Author: asfernandes Date: 2010-07-12 15:51:46 +0000 (Mon, 12 Jul 2010) Log Message: ----------- Fix MSVC10 build Modified Paths: -------------- firebird/trunk/builds/win32/msvc10/engine.vcxproj firebird/trunk/builds/win32/msvc10/engine.vcxproj.filters firebird/trunk/builds/win32/msvc10/engine_classic.vcxproj firebird/trunk/builds/win32/msvc10/engine_classic.vcxproj.filters firebird/trunk/builds/win32/msvc10/engine_embed.vcxproj firebird/trunk/builds/win32/msvc10/engine_embed.vcxproj.filters Modified: firebird/trunk/builds/win32/msvc10/engine.vcxproj =================================================================== --- firebird/trunk/builds/win32/msvc10/engine.vcxproj 2010-07-12 08:09:46 UTC (rev 51330) +++ firebird/trunk/builds/win32/msvc10/engine.vcxproj 2010-07-12 15:51:46 UTC (rev 51331) @@ -221,6 +221,7 @@ <ClCompile Include="..\..\..\src\jrd\PreparedStatement.cpp" /> <ClCompile Include="..\..\..\src\jrd\RandomGenerator.cpp" /> <ClCompile Include="..\..\..\src\jrd\RecordBuffer.cpp" /> + <ClCompile Include="..\..\..\src\jrd\recsrc\UsersTableScan.cpp" /> <ClCompile Include="..\..\..\src\jrd\Relation.cpp" /> <ClCompile Include="..\..\..\src\jrd\ResultSet.cpp" /> <ClCompile Include="..\..\..\src\jrd\rlck.cpp" /> Modified: firebird/trunk/builds/win32/msvc10/engine.vcxproj.filters =================================================================== --- firebird/trunk/builds/win32/msvc10/engine.vcxproj.filters 2010-07-12 08:09:46 UTC (rev 51330) +++ firebird/trunk/builds/win32/msvc10/engine.vcxproj.filters 2010-07-12 15:51:46 UTC (rev 51331) @@ -423,6 +423,9 @@ <ClCompile Include="..\..\..\src\gpre\pretty.cpp"> <Filter>GPRE files</Filter> </ClCompile> + <ClCompile Include="..\..\..\src\jrd\recsrc\UsersTableScan.cpp"> + <Filter>JRD files\Data Access</Filter> + </ClCompile> </ItemGroup> <ItemGroup> <ClInclude Include="..\..\..\src\jrd\acl.h"> Modified: firebird/trunk/builds/win32/msvc10/engine_classic.vcxproj =================================================================== --- firebird/trunk/builds/win32/msvc10/engine_classic.vcxproj 2010-07-12 08:09:46 UTC (rev 51330) +++ firebird/trunk/builds/win32/msvc10/engine_classic.vcxproj 2010-07-12 15:51:46 UTC (rev 51331) @@ -221,6 +221,7 @@ <ClCompile Include="..\..\..\src\jrd\PreparedStatement.cpp" /> <ClCompile Include="..\..\..\src\jrd\RandomGenerator.cpp" /> <ClCompile Include="..\..\..\src\jrd\RecordBuffer.cpp" /> + <ClCompile Include="..\..\..\src\jrd\recsrc\UsersTableScan.cpp" /> <ClCompile Include="..\..\..\src\jrd\Relation.cpp" /> <ClCompile Include="..\..\..\src\jrd\ResultSet.cpp" /> <ClCompile Include="..\..\..\src\jrd\rlck.cpp" /> Modified: firebird/trunk/builds/win32/msvc10/engine_classic.vcxproj.filters =================================================================== --- firebird/trunk/builds/win32/msvc10/engine_classic.vcxproj.filters 2010-07-12 08:09:46 UTC (rev 51330) +++ firebird/trunk/builds/win32/msvc10/engine_classic.vcxproj.filters 2010-07-12 15:51:46 UTC (rev 51331) @@ -423,6 +423,9 @@ <ClCompile Include="..\..\..\src\gpre\pretty.cpp"> <Filter>GPRE files</Filter> </ClCompile> + <ClCompile Include="..\..\..\src\jrd\recsrc\UsersTableScan.cpp"> + <Filter>JRD files\Data Access</Filter> + </ClCompile> </ItemGroup> <ItemGroup> <ClInclude Include="..\..\..\src\jrd\acl.h"> Modified: firebird/trunk/builds/win32/msvc10/engine_embed.vcxproj =================================================================== --- firebird/trunk/builds/win32/msvc10/engine_embed.vcxproj 2010-07-12 08:09:46 UTC (rev 51330) +++ firebird/trunk/builds/win32/msvc10/engine_embed.vcxproj 2010-07-12 15:51:46 UTC (rev 51331) @@ -221,6 +221,7 @@ <ClCompile Include="..\..\..\src\jrd\PreparedStatement.cpp" /> <ClCompile Include="..\..\..\src\jrd\RandomGenerator.cpp" /> <ClCompile Include="..\..\..\src\jrd\RecordBuffer.cpp" /> + <ClCompile Include="..\..\..\src\jrd\recsrc\UsersTableScan.cpp" /> <ClCompile Include="..\..\..\src\jrd\Relation.cpp" /> <ClCompile Include="..\..\..\src\jrd\ResultSet.cpp" /> <ClCompile Include="..\..\..\src\jrd\rlck.cpp" /> Modified: firebird/trunk/builds/win32/msvc10/engine_embed.vcxproj.filters =================================================================== --- firebird/trunk/builds/win32/msvc10/engine_embed.vcxproj.filters 2010-07-12 08:09:46 UTC (rev 51330) +++ firebird/trunk/builds/win32/msvc10/engine_embed.vcxproj.filters 2010-07-12 15:51:46 UTC (rev 51331) @@ -423,6 +423,9 @@ <ClCompile Include="..\..\..\src\gpre\pretty.cpp"> <Filter>GPRE files</Filter> </ClCompile> + <ClCompile Include="..\..\..\src\jrd\recsrc\UsersTableScan.cpp"> + <Filter>JRD files\Data Access</Filter> + </ClCompile> </ItemGroup> <ItemGroup> <ClInclude Include="..\..\..\src\jrd\acl.h"> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <asf...@us...> - 2010-07-26 23:05:16
|
Revision: 51373 http://firebird.svn.sourceforge.net/firebird/?rev=51373&view=rev Author: asfernandes Date: 2010-07-26 23:05:10 +0000 (Mon, 26 Jul 2010) Log Message: ----------- Fix MSVC10 build Modified Paths: -------------- firebird/trunk/builds/win32/msvc10/fb_inet_server.vcxproj firebird/trunk/builds/win32/msvc10/fb_inet_server.vcxproj.filters firebird/trunk/builds/win32/msvc10/fbserver.vcxproj firebird/trunk/builds/win32/msvc10/fbserver.vcxproj.filters firebird/trunk/builds/win32/msvc10/gsec.vcxproj firebird/trunk/builds/win32/msvc10/gsec.vcxproj.filters Modified: firebird/trunk/builds/win32/msvc10/fb_inet_server.vcxproj =================================================================== --- firebird/trunk/builds/win32/msvc10/fb_inet_server.vcxproj 2010-07-26 13:31:43 UTC (rev 51372) +++ firebird/trunk/builds/win32/msvc10/fb_inet_server.vcxproj 2010-07-26 23:05:10 UTC (rev 51373) @@ -208,11 +208,12 @@ <ItemGroup> <ClCompile Include="..\..\..\src\utilities\gsec\call_service.cpp" /> <ClCompile Include="..\..\..\gen\$(Platform)\utilities\gstat\dba.cpp" /> + <ClCompile Include="..\..\..\gen\$(Platform)\auth\SecurityDatabase\LegacyManagement.cpp" /> <ClCompile Include="..\..\..\src\utilities\gsec\gsec.cpp" /> <ClCompile Include="..\..\..\src\utilities\nbackup.cpp" /> <ClCompile Include="..\..\..\src\utilities\nbackup\nbkMain.cpp" /> <ClCompile Include="..\..\..\src\utilities\gstat\ppg.cpp" /> - <ClCompile Include="..\..\..\gen\$(Platform)\utilities\gsec\security.cpp" /> + <ClCompile Include="..\..\..\src\utilities\gsec\security.cpp" /> <ClCompile Include="..\..\..\src\jrd\trace\TraceCmdLine.cpp" /> <ClCompile Include="..\..\..\src\jrd\trace\TraceService.cpp" /> <ClCompile Include="..\..\..\src\remote\os\win32\chop.cpp" /> Modified: firebird/trunk/builds/win32/msvc10/fb_inet_server.vcxproj.filters =================================================================== --- firebird/trunk/builds/win32/msvc10/fb_inet_server.vcxproj.filters 2010-07-26 13:31:43 UTC (rev 51372) +++ firebird/trunk/builds/win32/msvc10/fb_inet_server.vcxproj.filters 2010-07-26 23:05:10 UTC (rev 51373) @@ -22,6 +22,9 @@ <ClCompile Include="..\..\..\gen\$(Platform)\utilities\gstat\dba.cpp"> <Filter>UTILITIES files</Filter> </ClCompile> + <ClCompile Include="..\..\..\gen\$(Platform)\auth\SecurityDatabase\LegacyManagement.cpp"> + <Filter>UTILITIES files</Filter> + </ClCompile> <ClCompile Include="..\..\..\src\utilities\gsec\gsec.cpp"> <Filter>UTILITIES files</Filter> </ClCompile> @@ -34,7 +37,7 @@ <ClCompile Include="..\..\..\src\utilities\gstat\ppg.cpp"> <Filter>UTILITIES files</Filter> </ClCompile> - <ClCompile Include="..\..\..\gen\$(Platform)\utilities\gsec\security.cpp"> + <ClCompile Include="..\..\..\src\utilities\gsec\security.cpp"> <Filter>UTILITIES files</Filter> </ClCompile> <ClCompile Include="..\..\..\src\jrd\trace\TraceCmdLine.cpp"> Modified: firebird/trunk/builds/win32/msvc10/fbserver.vcxproj =================================================================== --- firebird/trunk/builds/win32/msvc10/fbserver.vcxproj 2010-07-26 13:31:43 UTC (rev 51372) +++ firebird/trunk/builds/win32/msvc10/fbserver.vcxproj 2010-07-26 23:05:10 UTC (rev 51373) @@ -215,11 +215,12 @@ <ClCompile Include="..\..\..\src\remote\os\win32\window.cpp" /> <ClCompile Include="..\..\..\src\utilities\gsec\call_service.cpp" /> <ClCompile Include="..\..\..\gen\$(Platform)\utilities\gstat\dba.cpp" /> + <ClCompile Include="..\..\..\gen\$(Platform)\auth\SecurityDatabase\LegacyManagement.cpp" /> <ClCompile Include="..\..\..\src\utilities\gsec\gsec.cpp" /> <ClCompile Include="..\..\..\src\utilities\nbackup.cpp" /> <ClCompile Include="..\..\..\src\utilities\nbackup\nbkMain.cpp" /> <ClCompile Include="..\..\..\src\utilities\gstat\ppg.cpp" /> - <ClCompile Include="..\..\..\gen\$(Platform)\utilities\gsec\security.cpp" /> + <ClCompile Include="..\..\..\src\utilities\gsec\security.cpp" /> <ClCompile Include="..\..\..\src\jrd\trace\TraceCmdLine.cpp" /> <ClCompile Include="..\..\..\src\jrd\trace\TraceService.cpp" /> </ItemGroup> Modified: firebird/trunk/builds/win32/msvc10/fbserver.vcxproj.filters =================================================================== --- firebird/trunk/builds/win32/msvc10/fbserver.vcxproj.filters 2010-07-26 13:31:43 UTC (rev 51372) +++ firebird/trunk/builds/win32/msvc10/fbserver.vcxproj.filters 2010-07-26 23:05:10 UTC (rev 51373) @@ -43,6 +43,9 @@ <ClCompile Include="..\..\..\gen\$(Platform)\utilities\gstat\dba.cpp"> <Filter>UTILITIES files</Filter> </ClCompile> + <ClCompile Include="..\..\..\gen\$(Platform)\auth\SecurityDatabase\LegacyManagement.cpp"> + <Filter>UTILITIES files</Filter> + </ClCompile> <ClCompile Include="..\..\..\src\utilities\gsec\gsec.cpp"> <Filter>UTILITIES files</Filter> </ClCompile> @@ -55,7 +58,7 @@ <ClCompile Include="..\..\..\src\utilities\gstat\ppg.cpp"> <Filter>UTILITIES files</Filter> </ClCompile> - <ClCompile Include="..\..\..\gen\$(Platform)\utilities\gsec\security.cpp"> + <ClCompile Include="..\..\..\src\utilities\gsec\security.cpp"> <Filter>UTILITIES files</Filter> </ClCompile> <ClCompile Include="..\..\..\src\jrd\trace\TraceCmdLine.cpp"> Modified: firebird/trunk/builds/win32/msvc10/gsec.vcxproj =================================================================== --- firebird/trunk/builds/win32/msvc10/gsec.vcxproj 2010-07-26 13:31:43 UTC (rev 51372) +++ firebird/trunk/builds/win32/msvc10/gsec.vcxproj 2010-07-26 23:05:10 UTC (rev 51373) @@ -183,7 +183,7 @@ <ClCompile Include="..\..\..\src\utilities\gsec\call_service.cpp" /> <ClCompile Include="..\..\..\src\utilities\gsec\gsec.cpp" /> <ClCompile Include="..\..\..\src\utilities\gsec\gsecMain.cpp" /> - <ClCompile Include="..\..\..\gen\$(Platform)\utilities\gsec\security.cpp" /> + <ClCompile Include="..\..\..\src\utilities\gsec\security.cpp" /> <ClCompile Include="..\..\..\src\jrd\enc.cpp" /> <ClCompile Include="..\..\..\src\jrd\os\win32\guid.cpp" /> <ClCompile Include="..\..\..\src\jrd\isc.cpp" /> Modified: firebird/trunk/builds/win32/msvc10/gsec.vcxproj.filters =================================================================== --- firebird/trunk/builds/win32/msvc10/gsec.vcxproj.filters 2010-07-26 13:31:43 UTC (rev 51372) +++ firebird/trunk/builds/win32/msvc10/gsec.vcxproj.filters 2010-07-26 23:05:10 UTC (rev 51373) @@ -26,7 +26,7 @@ <ClCompile Include="..\..\..\src\utilities\gsec\gsecMain.cpp"> <Filter>UTILITIES files</Filter> </ClCompile> - <ClCompile Include="..\..\..\gen\$(Platform)\utilities\gsec\security.cpp"> + <ClCompile Include="..\..\..\src\utilities\gsec\security.cpp"> <Filter>UTILITIES files</Filter> </ClCompile> <ClCompile Include="..\..\..\src\jrd\enc.cpp"> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <asf...@us...> - 2010-08-27 15:15:01
|
Revision: 51494 http://firebird.svn.sourceforge.net/firebird/?rev=51494&view=rev Author: asfernandes Date: 2010-08-27 15:14:55 +0000 (Fri, 27 Aug 2010) Log Message: ----------- Fix MSVC10 build Modified Paths: -------------- firebird/trunk/builds/win32/msvc10/dsql_server.vcxproj firebird/trunk/builds/win32/msvc10/dsql_server.vcxproj.filters firebird/trunk/builds/win32/msvc10/dsql_server_classic.vcxproj firebird/trunk/builds/win32/msvc10/dsql_server_classic.vcxproj.filters Modified: firebird/trunk/builds/win32/msvc10/dsql_server.vcxproj =================================================================== --- firebird/trunk/builds/win32/msvc10/dsql_server.vcxproj 2010-08-27 03:20:25 UTC (rev 51493) +++ firebird/trunk/builds/win32/msvc10/dsql_server.vcxproj 2010-08-27 15:14:55 UTC (rev 51494) @@ -142,6 +142,7 @@ <ClCompile Include="..\..\..\src\dsql\BlrWriter.cpp" /> <ClCompile Include="..\..\..\src\dsql\ddl.cpp" /> <ClCompile Include="..\..\..\src\dsql\dsql.cpp" /> + <ClCompile Include="..\..\..\src\dsql\DsqlCompilerScratch.cpp" /> <ClCompile Include="..\..\..\src\dsql\DSqlDataTypeUtil.cpp" /> <ClCompile Include="..\..\..\src\dsql\errd.cpp" /> <ClCompile Include="..\..\..\src\dsql\ExprNodes.cpp" /> @@ -184,6 +185,7 @@ <ClInclude Include="..\..\..\src\dsql\DdlNodes.h" /> <ClInclude Include="..\..\..\src\dsql\dsql.h" /> <ClInclude Include="..\..\..\src\dsql\dsql_proto.h" /> + <ClInclude Include="..\..\..\src\dsql\DsqlCompilerScratch.h" /> <ClInclude Include="..\..\..\src\dsql\DSqlDataTypeUtil.h" /> <ClInclude Include="..\..\..\src\dsql\errd_proto.h" /> <ClInclude Include="..\..\..\src\dsql\ExprNodes.h" /> Modified: firebird/trunk/builds/win32/msvc10/dsql_server.vcxproj.filters =================================================================== --- firebird/trunk/builds/win32/msvc10/dsql_server.vcxproj.filters 2010-08-27 03:20:25 UTC (rev 51493) +++ firebird/trunk/builds/win32/msvc10/dsql_server.vcxproj.filters 2010-08-27 15:14:55 UTC (rev 51494) @@ -34,6 +34,9 @@ <ClCompile Include="..\..\..\src\dsql\dsql.cpp"> <Filter>DSQL files</Filter> </ClCompile> + <ClCompile Include="..\..\..\src\dsql\DsqlCompilerScratch.cpp"> + <Filter>DSQL files</Filter> + </ClCompile> <ClCompile Include="..\..\..\src\dsql\DSqlDataTypeUtil.cpp"> <Filter>DSQL files</Filter> </ClCompile> @@ -150,6 +153,9 @@ <ClInclude Include="..\..\..\src\dsql\dsql_proto.h"> <Filter>Header files</Filter> </ClInclude> + <ClInclude Include="..\..\..\src\dsql\DsqlCompilerScratch.h"> + <Filter>Header files</Filter> + </ClInclude> <ClInclude Include="..\..\..\src\dsql\DSqlDataTypeUtil.h"> <Filter>Header files</Filter> </ClInclude> Modified: firebird/trunk/builds/win32/msvc10/dsql_server_classic.vcxproj =================================================================== --- firebird/trunk/builds/win32/msvc10/dsql_server_classic.vcxproj 2010-08-27 03:20:25 UTC (rev 51493) +++ firebird/trunk/builds/win32/msvc10/dsql_server_classic.vcxproj 2010-08-27 15:14:55 UTC (rev 51494) @@ -142,6 +142,7 @@ <ClCompile Include="..\..\..\src\dsql\BlrWriter.cpp" /> <ClCompile Include="..\..\..\src\dsql\ddl.cpp" /> <ClCompile Include="..\..\..\src\dsql\dsql.cpp" /> + <ClCompile Include="..\..\..\src\dsql\DsqlCompilerScratch.cpp" /> <ClCompile Include="..\..\..\src\dsql\DSqlDataTypeUtil.cpp" /> <ClCompile Include="..\..\..\src\dsql\errd.cpp" /> <ClCompile Include="..\..\..\src\dsql\ExprNodes.cpp" /> @@ -184,6 +185,7 @@ <ClInclude Include="..\..\..\src\dsql\DdlNodes.h" /> <ClInclude Include="..\..\..\src\dsql\dsql.h" /> <ClInclude Include="..\..\..\src\dsql\dsql_proto.h" /> + <ClInclude Include="..\..\..\src\dsql\DsqlCompilerScratch.h" /> <ClInclude Include="..\..\..\src\dsql\DSqlDataTypeUtil.h" /> <ClInclude Include="..\..\..\src\dsql\errd_proto.h" /> <ClInclude Include="..\..\..\src\dsql\ExprNodes.h" /> Modified: firebird/trunk/builds/win32/msvc10/dsql_server_classic.vcxproj.filters =================================================================== --- firebird/trunk/builds/win32/msvc10/dsql_server_classic.vcxproj.filters 2010-08-27 03:20:25 UTC (rev 51493) +++ firebird/trunk/builds/win32/msvc10/dsql_server_classic.vcxproj.filters 2010-08-27 15:14:55 UTC (rev 51494) @@ -34,6 +34,9 @@ <ClCompile Include="..\..\..\src\dsql\dsql.cpp"> <Filter>DSQL files</Filter> </ClCompile> + <ClCompile Include="..\..\..\src\dsql\DsqlCompilerScratch.cpp"> + <Filter>DSQL files</Filter> + </ClCompile> <ClCompile Include="..\..\..\src\dsql\DSqlDataTypeUtil.cpp"> <Filter>DSQL files</Filter> </ClCompile> @@ -150,6 +153,9 @@ <ClInclude Include="..\..\..\src\dsql\dsql_proto.h"> <Filter>Header files</Filter> </ClInclude> + <ClInclude Include="..\..\..\src\dsql\DsqlCompilerScratch.h"> + <Filter>Header files</Filter> + </ClInclude> <ClInclude Include="..\..\..\src\dsql\DSqlDataTypeUtil.h"> <Filter>Header files</Filter> </ClInclude> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <hv...@us...> - 2010-10-21 11:43:44
|
Revision: 51747 http://firebird.svn.sourceforge.net/firebird/?rev=51747&view=rev Author: hvlad Date: 2010-10-21 11:43:37 +0000 (Thu, 21 Oct 2010) Log Message: ----------- User management plugin. Works with gsec, supports manage of user accounts at security database. Modified Paths: -------------- firebird/trunk/builds/win32/msvc10/Firebird3.sln Added Paths: ----------- firebird/trunk/builds/win32/msvc10/user_management.vcxproj firebird/trunk/builds/win32/msvc10/user_management.vcxproj.filters Modified: firebird/trunk/builds/win32/msvc10/Firebird3.sln =================================================================== --- firebird/trunk/builds/win32/msvc10/Firebird3.sln 2010-10-21 11:41:46 UTC (rev 51746) +++ firebird/trunk/builds/win32/msvc10/Firebird3.sln 2010-10-21 11:43:37 UTC (rev 51747) @@ -31,6 +31,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gpre", "gpre.vcxproj", "{D84F0839-28A4-40B2-B5F4-F5E1E7F48FD0}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gsec", "gsec.vcxproj", "{7043CC61-DEC1-4C6B-86B9-0E911D1094C9}" + ProjectSection(ProjectDependencies) = postProject + {D836FBF5-071E-4E04-8D63-C7EB6701B296} = {D836FBF5-071E-4E04-8D63-C7EB6701B296} + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gsplit", "gsplit.vcxproj", "{B7F22B7F-9937-4874-9A8B-6AB4E36E74A5}" EndProject @@ -72,6 +75,8 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "yvalve", "yvalve.vcxproj", "{4FE03933-98CD-4879-A135-FD9430087A6B}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "user_management", "user_management.vcxproj", "{D836FBF5-071E-4E04-8D63-C7EB6701B296}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -334,6 +339,14 @@ {4FE03933-98CD-4879-A135-FD9430087A6B}.Release|Win32.Build.0 = Release|Win32 {4FE03933-98CD-4879-A135-FD9430087A6B}.Release|x64.ActiveCfg = Release|x64 {4FE03933-98CD-4879-A135-FD9430087A6B}.Release|x64.Build.0 = Release|x64 + {D836FBF5-071E-4E04-8D63-C7EB6701B296}.Debug|Win32.ActiveCfg = Debug|Win32 + {D836FBF5-071E-4E04-8D63-C7EB6701B296}.Debug|Win32.Build.0 = Debug|Win32 + {D836FBF5-071E-4E04-8D63-C7EB6701B296}.Debug|x64.ActiveCfg = Debug|x64 + {D836FBF5-071E-4E04-8D63-C7EB6701B296}.Debug|x64.Build.0 = Debug|x64 + {D836FBF5-071E-4E04-8D63-C7EB6701B296}.Release|Win32.ActiveCfg = Release|Win32 + {D836FBF5-071E-4E04-8D63-C7EB6701B296}.Release|Win32.Build.0 = Release|Win32 + {D836FBF5-071E-4E04-8D63-C7EB6701B296}.Release|x64.ActiveCfg = Release|x64 + {D836FBF5-071E-4E04-8D63-C7EB6701B296}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE Added: firebird/trunk/builds/win32/msvc10/user_management.vcxproj =================================================================== --- firebird/trunk/builds/win32/msvc10/user_management.vcxproj (rev 0) +++ firebird/trunk/builds/win32/msvc10/user_management.vcxproj 2010-10-21 11:43:37 UTC (rev 51747) @@ -0,0 +1,186 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Debug|x64"> + <Configuration>Debug</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|x64"> + <Configuration>Release</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + </ItemGroup> + <PropertyGroup Label="Globals"> + <ProjectGuid>{D836FBF5-071E-4E04-8D63-C7EB6701B296}</ProjectGuid> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>DynamicLibrary</ConfigurationType> + <CharacterSet>MultiByte</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>DynamicLibrary</ConfigurationType> + <CharacterSet>MultiByte</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> + <ConfigurationType>DynamicLibrary</ConfigurationType> + <CharacterSet>MultiByte</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> + <ConfigurationType>DynamicLibrary</ConfigurationType> + <CharacterSet>MultiByte</CharacterSet> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" /> + <Import Project="firebird2.props" /> + <Import Project="firebird2release.props" /> + <Import Project="DllNoEmbedManifest.props" /> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" /> + <Import Project="firebird2.props" /> + <Import Project="firebird2debug.props" /> + <Import Project="DllNoEmbedManifest.props" /> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" /> + <Import Project="firebird2.props" /> + <Import Project="firebird2release.props" /> + <Import Project="DllNoEmbedManifest.props" /> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" /> + <Import Project="firebird2.props" /> + <Import Project="firebird2debug.props" /> + <Import Project="DllNoEmbedManifest.props" /> + </ImportGroup> + <PropertyGroup Label="UserMacros" /> + <PropertyGroup> + <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion> + <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental> + <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental> + <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkIncremental> + <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental> + <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet> + <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" /> + <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" /> + <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet> + <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" /> + <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" /> + <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet> + <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" /> + <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" /> + <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet> + <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /> + <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\plugins\</OutDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\plugins\</OutDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\plugins\</OutDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\plugins\</OutDir> + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <Optimization>Disabled</Optimization> + <AdditionalIncludeDirectories>..\..\..\src\include;..\..\..\src\include\gen;..\..\..\src\common\classes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>WIN32;_DEBUG;DEV_BUILD;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + </ClCompile> + <Link> + <RandomizedBaseAddress>false</RandomizedBaseAddress> + <DataExecutionPrevention> + </DataExecutionPrevention> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <Optimization>MaxSpeed</Optimization> + <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> + <IntrinsicFunctions>true</IntrinsicFunctions> + <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> + <AdditionalIncludeDirectories>..\..\..\src\include\gen;..\..\..\src\include;..\..\..\src\common\classes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PrecompiledHeader> + </PrecompiledHeader> + </ClCompile> + <Link> + <RandomizedBaseAddress>false</RandomizedBaseAddress> + <DataExecutionPrevention> + </DataExecutionPrevention> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <Midl> + <TargetEnvironment>X64</TargetEnvironment> + </Midl> + <ClCompile> + <Optimization>Disabled</Optimization> + <AdditionalIncludeDirectories>..\..\..\src\include;..\..\..\src\include\gen;..\..\..\src\common\classes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>WIN32;_DEBUG;DEV_BUILD;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + </ClCompile> + <Link> + <RandomizedBaseAddress>false</RandomizedBaseAddress> + <DataExecutionPrevention> + </DataExecutionPrevention> + <TargetMachine>MachineX64</TargetMachine> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <Midl> + <TargetEnvironment>X64</TargetEnvironment> + </Midl> + <ClCompile> + <Optimization>MaxSpeed</Optimization> + <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> + <IntrinsicFunctions>true</IntrinsicFunctions> + <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> + <AdditionalIncludeDirectories>..\..\..\src\include\gen;..\..\..\src\include;..\..\..\src\common\classes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PrecompiledHeader> + </PrecompiledHeader> + </ClCompile> + <Link> + <RandomizedBaseAddress>false</RandomizedBaseAddress> + <DataExecutionPrevention> + </DataExecutionPrevention> + <TargetMachine>MachineX64</TargetMachine> + </Link> + </ItemDefinitionGroup> + <ItemGroup> + <ResourceCompile Include="..\..\..\src\jrd\version.rc" /> + </ItemGroup> + <ItemGroup> + <None Include="..\..\..\src\auth\SecurityDatabase\LegacyManagement.epp" /> + </ItemGroup> + <ItemGroup> + <ProjectReference Include="common.vcxproj"> + <Project>{15605f44-bffd-444f-ad4c-55dc9d704465}</Project> + <ReferenceOutputAssembly>false</ReferenceOutputAssembly> + </ProjectReference> + <ProjectReference Include="yvalve.vcxproj"> + <Project>{4fe03933-98cd-4879-a135-fd9430087a6b}</Project> + </ProjectReference> + </ItemGroup> + <ItemGroup> + <ClInclude Include="..\..\..\src\auth\SecurityDatabase\LegacyManagement.h" /> + </ItemGroup> + <ItemGroup> + <ClCompile Include="..\..\..\gen\auth\SecurityDatabase\LegacyManagement.cpp" /> + </ItemGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> + <ImportGroup Label="ExtensionTargets"> + </ImportGroup> +</Project> \ No newline at end of file Property changes on: firebird/trunk/builds/win32/msvc10/user_management.vcxproj ___________________________________________________________________ Added: svn:mime-type + text/plain Added: svn:eol-style + native Added: firebird/trunk/builds/win32/msvc10/user_management.vcxproj.filters =================================================================== --- firebird/trunk/builds/win32/msvc10/user_management.vcxproj.filters (rev 0) +++ firebird/trunk/builds/win32/msvc10/user_management.vcxproj.filters 2010-10-21 11:43:37 UTC (rev 51747) @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup> + <Filter Include="Resource files"> + <UniqueIdentifier>{f5abfba7-e5fe-444a-8f3a-71613bd06b14}</UniqueIdentifier> + </Filter> + </ItemGroup> + <ItemGroup> + <ResourceCompile Include="..\..\..\src\jrd\version.rc"> + <Filter>Resource files</Filter> + </ResourceCompile> + </ItemGroup> + <ItemGroup> + <None Include="..\..\..\src\auth\SecurityDatabase\LegacyManagement.epp" /> + </ItemGroup> + <ItemGroup> + <ClInclude Include="..\..\..\src\auth\SecurityDatabase\LegacyManagement.h" /> + </ItemGroup> + <ItemGroup> + <ClCompile Include="..\..\..\gen\auth\SecurityDatabase\LegacyManagement.cpp" /> + </ItemGroup> +</Project> \ No newline at end of file Property changes on: firebird/trunk/builds/win32/msvc10/user_management.vcxproj.filters ___________________________________________________________________ Added: svn:mime-type + text/plain Added: svn:eol-style + native This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <hv...@us...> - 2010-10-22 17:55:49
|
Revision: 51756 http://firebird.svn.sourceforge.net/firebird/?rev=51756&view=rev Author: hvlad Date: 2010-10-22 17:55:42 +0000 (Fri, 22 Oct 2010) Log Message: ----------- Misc Modified Paths: -------------- firebird/trunk/builds/win32/msvc10/fbguard.vcxproj firebird/trunk/builds/win32/msvc10/fbguard.vcxproj.filters firebird/trunk/builds/win32/msvc10/gstat.vcxproj firebird/trunk/builds/win32/msvc10/gstat.vcxproj.filters firebird/trunk/builds/win32/msvc10/ib_udf.vcxproj.filters firebird/trunk/builds/win32/msvc10/ib_util.vcxproj.filters firebird/trunk/builds/win32/msvc10/instclient.vcxproj firebird/trunk/builds/win32/msvc10/instclient.vcxproj.filters firebird/trunk/builds/win32/msvc10/intl.vcxproj.filters firebird/trunk/builds/win32/msvc10/isql.vcxproj.filters firebird/trunk/builds/win32/msvc10/qli.vcxproj firebird/trunk/builds/win32/msvc10/qli.vcxproj.filters firebird/trunk/builds/win32/msvc10/remote.vcxproj firebird/trunk/builds/win32/msvc10/remote.vcxproj.filters firebird/trunk/builds/win32/msvc10/udr_engine.vcxproj.filters firebird/trunk/builds/win32/msvc10/user_management.vcxproj.filters Modified: firebird/trunk/builds/win32/msvc10/fbguard.vcxproj =================================================================== --- firebird/trunk/builds/win32/msvc10/fbguard.vcxproj 2010-10-22 15:00:22 UTC (rev 51755) +++ firebird/trunk/builds/win32/msvc10/fbguard.vcxproj 2010-10-22 17:55:42 UTC (rev 51756) @@ -197,7 +197,6 @@ <ItemGroup> <ClInclude Include="..\..\..\src\iscguard\cntlg_proto.h" /> <ClInclude Include="..\..\..\src\iscguard\iscguard.h" /> - <ClInclude Include="..\..\..\src\misc\status.h" /> </ItemGroup> <ItemGroup> <ResourceCompile Include="..\..\..\src\iscguard\iscguard.rc"> Modified: firebird/trunk/builds/win32/msvc10/fbguard.vcxproj.filters =================================================================== --- firebird/trunk/builds/win32/msvc10/fbguard.vcxproj.filters 2010-10-22 15:00:22 UTC (rev 51755) +++ firebird/trunk/builds/win32/msvc10/fbguard.vcxproj.filters 2010-10-22 17:55:42 UTC (rev 51756) @@ -34,9 +34,6 @@ <ClInclude Include="..\..\..\src\iscguard\iscguard.h"> <Filter>Header files</Filter> </ClInclude> - <ClInclude Include="..\..\..\src\misc\status.h"> - <Filter>Header files</Filter> - </ClInclude> </ItemGroup> <ItemGroup> <ResourceCompile Include="..\..\..\src\iscguard\iscguard.rc"> Modified: firebird/trunk/builds/win32/msvc10/gstat.vcxproj =================================================================== --- firebird/trunk/builds/win32/msvc10/gstat.vcxproj 2010-10-22 15:00:22 UTC (rev 51755) +++ firebird/trunk/builds/win32/msvc10/gstat.vcxproj 2010-10-22 17:55:42 UTC (rev 51756) @@ -184,7 +184,7 @@ </ItemGroup> <ItemGroup> <ClInclude Include="..\..\..\src\jrd\btn.h" /> - <ClInclude Include="..\..\..\src\utilities\ppg_proto.h" /> + <ClInclude Include="..\..\..\src\utilities\gstat\ppg_proto.h" /> </ItemGroup> <ItemGroup> <ResourceCompile Include="..\..\..\src\jrd\version.rc"> Modified: firebird/trunk/builds/win32/msvc10/gstat.vcxproj.filters =================================================================== --- firebird/trunk/builds/win32/msvc10/gstat.vcxproj.filters 2010-10-22 15:00:22 UTC (rev 51755) +++ firebird/trunk/builds/win32/msvc10/gstat.vcxproj.filters 2010-10-22 17:55:42 UTC (rev 51756) @@ -17,9 +17,6 @@ </Filter> </ItemGroup> <ItemGroup> - <ClCompile Include="..\..\..\gen\$(Platform)\utilities\gstat\dba.cpp"> - <Filter>UTILITIES files</Filter> - </ClCompile> <ClCompile Include="..\..\..\src\utilities\gstat\ppg.cpp"> <Filter>UTILITIES files</Filter> </ClCompile> @@ -32,12 +29,15 @@ <ClCompile Include="..\..\..\src\utilities\gstat\main\gstatMain.cpp"> <Filter>UTILITIES files</Filter> </ClCompile> + <ClCompile Include="..\..\..\gen\utilities\gstat\dba.cpp"> + <Filter>UTILITIES files</Filter> + </ClCompile> </ItemGroup> <ItemGroup> <ClInclude Include="..\..\..\src\jrd\btn.h"> <Filter>Header files</Filter> </ClInclude> - <ClInclude Include="..\..\..\src\utilities\ppg_proto.h"> + <ClInclude Include="..\..\..\src\utilities\gstat\ppg_proto.h"> <Filter>Header files</Filter> </ClInclude> </ItemGroup> Modified: firebird/trunk/builds/win32/msvc10/ib_udf.vcxproj.filters =================================================================== --- firebird/trunk/builds/win32/msvc10/ib_udf.vcxproj.filters 2010-10-22 15:00:22 UTC (rev 51755) +++ firebird/trunk/builds/win32/msvc10/ib_udf.vcxproj.filters 2010-10-22 17:55:42 UTC (rev 51756) @@ -29,8 +29,6 @@ </ResourceCompile> </ItemGroup> <ItemGroup> - <None Include="..\defs\ib_udf.def"> - <Filter>EXTLIB files</Filter> - </None> + <None Include="..\defs\ib_udf.def" /> </ItemGroup> </Project> \ No newline at end of file Modified: firebird/trunk/builds/win32/msvc10/ib_util.vcxproj.filters =================================================================== --- firebird/trunk/builds/win32/msvc10/ib_util.vcxproj.filters 2010-10-22 15:00:22 UTC (rev 51755) +++ firebird/trunk/builds/win32/msvc10/ib_util.vcxproj.filters 2010-10-22 17:55:42 UTC (rev 51756) @@ -29,8 +29,6 @@ </ResourceCompile> </ItemGroup> <ItemGroup> - <None Include="..\defs\ib_util.def"> - <Filter>EXTLIB files</Filter> - </None> + <None Include="..\defs\ib_util.def" /> </ItemGroup> </Project> \ No newline at end of file Modified: firebird/trunk/builds/win32/msvc10/instclient.vcxproj =================================================================== --- firebird/trunk/builds/win32/msvc10/instclient.vcxproj 2010-10-22 15:00:22 UTC (rev 51755) +++ firebird/trunk/builds/win32/msvc10/instclient.vcxproj 2010-10-22 17:55:42 UTC (rev 51756) @@ -188,7 +188,7 @@ <ClCompile Include="..\..\..\src\utilities\install\install_client.cpp" /> </ItemGroup> <ItemGroup> - <ClInclude Include="..\..\..\src\utilities\install_proto.h" /> + <ClInclude Include="..\..\..\src\utilities\install\install_proto.h" /> </ItemGroup> <ItemGroup> <ResourceCompile Include="..\..\..\src\jrd\version.rc"> Modified: firebird/trunk/builds/win32/msvc10/instclient.vcxproj.filters =================================================================== --- firebird/trunk/builds/win32/msvc10/instclient.vcxproj.filters 2010-10-22 15:00:22 UTC (rev 51755) +++ firebird/trunk/builds/win32/msvc10/instclient.vcxproj.filters 2010-10-22 17:55:42 UTC (rev 51756) @@ -22,7 +22,7 @@ </ClCompile> </ItemGroup> <ItemGroup> - <ClInclude Include="..\..\..\src\utilities\install_proto.h"> + <ClInclude Include="..\..\..\src\utilities\install\install_proto.h"> <Filter>Header files</Filter> </ClInclude> </ItemGroup> Modified: firebird/trunk/builds/win32/msvc10/intl.vcxproj.filters =================================================================== --- firebird/trunk/builds/win32/msvc10/intl.vcxproj.filters 2010-10-22 15:00:22 UTC (rev 51755) +++ firebird/trunk/builds/win32/msvc10/intl.vcxproj.filters 2010-10-22 17:55:42 UTC (rev 51756) @@ -12,9 +12,6 @@ <Filter Include="Resource files"> <UniqueIdentifier>{8e2ee845-fff9-4741-891d-132cfbad590e}</UniqueIdentifier> </Filter> - <Filter Include="COMMON files"> - <UniqueIdentifier>{e97d721f-8964-4061-adb8-983bf7fecb77}</UniqueIdentifier> - </Filter> </ItemGroup> <ItemGroup> <ClCompile Include="..\..\..\src\intl\cs_big5.cpp"> @@ -111,11 +108,6 @@ </ResourceCompile> </ItemGroup> <ItemGroup> - <None Include="..\defs\intl.def"> - <Filter>INTL files</Filter> - </None> - </ItemGroup> - <ItemGroup> <ClInclude Include="..\..\..\src\intl\ldcommon.h"> <Filter>Header files</Filter> </ClInclude> @@ -567,4 +559,7 @@ <Filter>Header files</Filter> </ClInclude> </ItemGroup> + <ItemGroup> + <None Include="..\defs\intl.def" /> + </ItemGroup> </Project> \ No newline at end of file Modified: firebird/trunk/builds/win32/msvc10/isql.vcxproj.filters =================================================================== --- firebird/trunk/builds/win32/msvc10/isql.vcxproj.filters 2010-10-22 15:00:22 UTC (rev 51755) +++ firebird/trunk/builds/win32/msvc10/isql.vcxproj.filters 2010-10-22 17:55:42 UTC (rev 51756) @@ -5,10 +5,6 @@ <UniqueIdentifier>{432b17da-feb5-4854-bf4a-2eade764f005}</UniqueIdentifier> <Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat</Extensions> </Filter> - <Filter Include="ISQL files\epp Source Files"> - <UniqueIdentifier>{a0276ced-d198-4e65-bb2b-d78e9c5e1f3c}</UniqueIdentifier> - <Extensions>epp</Extensions> - </Filter> <Filter Include="Header files"> <UniqueIdentifier>{0e9c9357-7411-4d36-b6da-5bf58d471259}</UniqueIdentifier> <Extensions>h;hpp;hxx;hm;inl</Extensions> @@ -16,6 +12,13 @@ <Filter Include="Resource files"> <UniqueIdentifier>{64a46d33-07a2-4c68-8ae0-30be298677f3}</UniqueIdentifier> </Filter> + <Filter Include="ISQL files\GPRE epp"> + <UniqueIdentifier>{a0276ced-d198-4e65-bb2b-d78e9c5e1f3c}</UniqueIdentifier> + <Extensions>epp</Extensions> + </Filter> + <Filter Include="ISQL files\GPRE cpp"> + <UniqueIdentifier>{b3973b46-4da2-46d6-921f-d6e87e3ba3e7}</UniqueIdentifier> + </Filter> </ItemGroup> <ItemGroup> <ClCompile Include="..\..\..\src\isql\ColList.cpp"> @@ -37,24 +40,24 @@ <Filter>ISQL files</Filter> </ClCompile> <ClCompile Include="..\..\..\gen\isql\extract.cpp"> - <Filter>ISQL files</Filter> + <Filter>ISQL files\GPRE cpp</Filter> </ClCompile> <ClCompile Include="..\..\..\gen\isql\isql.cpp"> - <Filter>ISQL files</Filter> + <Filter>ISQL files\GPRE cpp</Filter> </ClCompile> <ClCompile Include="..\..\..\gen\isql\show.cpp"> - <Filter>ISQL files</Filter> + <Filter>ISQL files\GPRE cpp</Filter> </ClCompile> </ItemGroup> <ItemGroup> <None Include="..\..\..\src\isql\extract.epp"> - <Filter>ISQL files\epp Source Files</Filter> + <Filter>ISQL files\GPRE epp</Filter> </None> <None Include="..\..\..\src\isql\isql.epp"> - <Filter>ISQL files\epp Source Files</Filter> + <Filter>ISQL files\GPRE epp</Filter> </None> <None Include="..\..\..\src\isql\show.epp"> - <Filter>ISQL files\epp Source Files</Filter> + <Filter>ISQL files\GPRE epp</Filter> </None> </ItemGroup> <ItemGroup> Modified: firebird/trunk/builds/win32/msvc10/qli.vcxproj =================================================================== --- firebird/trunk/builds/win32/msvc10/qli.vcxproj 2010-10-22 15:00:22 UTC (rev 51755) +++ firebird/trunk/builds/win32/msvc10/qli.vcxproj 2010-10-22 17:55:42 UTC (rev 51756) @@ -223,6 +223,43 @@ <Project>{4fe03933-98cd-4879-a135-fd9430087a6b}</Project> </ProjectReference> </ItemGroup> + <ItemGroup> + <ClInclude Include="..\..\..\src\qli\all_proto.h" /> + <ClInclude Include="..\..\..\src\qli\blk.h" /> + <ClInclude Include="..\..\..\src\qli\comma_proto.h" /> + <ClInclude Include="..\..\..\src\qli\compile.h" /> + <ClInclude Include="..\..\..\src\qli\compi_proto.h" /> + <ClInclude Include="..\..\..\src\qli\dtr.h" /> + <ClInclude Include="..\..\..\src\qli\err_proto.h" /> + <ClInclude Include="..\..\..\src\qli\eval_proto.h" /> + <ClInclude Include="..\..\..\src\qli\exe.h" /> + <ClInclude Include="..\..\..\src\qli\exe_proto.h" /> + <ClInclude Include="..\..\..\src\qli\expan_proto.h" /> + <ClInclude Include="..\..\..\src\qli\format.h" /> + <ClInclude Include="..\..\..\src\qli\forma_proto.h" /> + <ClInclude Include="..\..\..\src\qli\gener_proto.h" /> + <ClInclude Include="..\..\..\src\qli\help_proto.h" /> + <ClInclude Include="..\..\..\src\qli\hsh_proto.h" /> + <ClInclude Include="..\..\..\src\qli\lex_proto.h" /> + <ClInclude Include="..\..\..\src\qli\meta_proto.h" /> + <ClInclude Include="..\..\..\src\qli\mov_proto.h" /> + <ClInclude Include="..\..\..\src\qli\parse.h" /> + <ClInclude Include="..\..\..\src\qli\parse_proto.h" /> + <ClInclude Include="..\..\..\src\qli\picst_proto.h" /> + <ClInclude Include="..\..\..\src\qli\procddl1.h" /> + <ClInclude Include="..\..\..\src\qli\procddl2.h" /> + <ClInclude Include="..\..\..\src\qli\procddl3.h" /> + <ClInclude Include="..\..\..\src\qli\procddl4.h" /> + <ClInclude Include="..\..\..\src\qli\proc_ddl.h" /> + <ClInclude Include="..\..\..\src\qli\proc_proto.h" /> + <ClInclude Include="..\..\..\src\qli\qliswi.h" /> + <ClInclude Include="..\..\..\src\qli\report.h" /> + <ClInclude Include="..\..\..\src\qli\repor_proto.h" /> + <ClInclude Include="..\..\..\src\qli\reqs.h" /> + <ClInclude Include="..\..\..\src\qli\show_proto.h" /> + <ClInclude Include="..\..\..\src\qli\symbols.h" /> + <ClInclude Include="..\..\..\src\qli\words.h" /> + </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> </ImportGroup> Modified: firebird/trunk/builds/win32/msvc10/qli.vcxproj.filters =================================================================== --- firebird/trunk/builds/win32/msvc10/qli.vcxproj.filters 2010-10-22 15:00:22 UTC (rev 51755) +++ firebird/trunk/builds/win32/msvc10/qli.vcxproj.filters 2010-10-22 17:55:42 UTC (rev 51756) @@ -4,12 +4,6 @@ <Filter Include="QLI files"> <UniqueIdentifier>{da3cf9eb-a5b6-4478-87a3-3da5fa0c95a8}</UniqueIdentifier> </Filter> - <Filter Include="QLI files\epp files"> - <UniqueIdentifier>{a1a82d81-9dc5-4076-8daa-a05176116840}</UniqueIdentifier> - </Filter> - <Filter Include="QLI files\Generated files"> - <UniqueIdentifier>{28befd96-6561-4892-8120-10fe6777523c}</UniqueIdentifier> - </Filter> <Filter Include="JRD files"> <UniqueIdentifier>{f6c663b8-6259-4bf6-b108-0d891c74d097}</UniqueIdentifier> </Filter> @@ -20,6 +14,12 @@ <Filter Include="Resource files"> <UniqueIdentifier>{34f2b335-6604-4188-a20b-e9916b80b05c}</UniqueIdentifier> </Filter> + <Filter Include="QLI files\GPRE epp"> + <UniqueIdentifier>{a1a82d81-9dc5-4076-8daa-a05176116840}</UniqueIdentifier> + </Filter> + <Filter Include="QLI files\GPRE cpp"> + <UniqueIdentifier>{28befd96-6561-4892-8120-10fe6777523c}</UniqueIdentifier> + </Filter> </ItemGroup> <ItemGroup> <ClCompile Include="..\..\..\src\qli\all.cpp"> @@ -74,30 +74,30 @@ <Filter>JRD files</Filter> </ClCompile> <ClCompile Include="..\..\..\gen\qli\help.cpp"> - <Filter>QLI files\Generated files</Filter> + <Filter>QLI files\GPRE cpp</Filter> </ClCompile> <ClCompile Include="..\..\..\gen\qli\proc.cpp"> - <Filter>QLI files\Generated files</Filter> + <Filter>QLI files\GPRE cpp</Filter> </ClCompile> <ClCompile Include="..\..\..\gen\qli\meta.cpp"> - <Filter>QLI files\Generated files</Filter> + <Filter>QLI files\GPRE cpp</Filter> </ClCompile> <ClCompile Include="..\..\..\gen\qli\show.cpp"> - <Filter>QLI files\Generated files</Filter> + <Filter>QLI files\GPRE cpp</Filter> </ClCompile> </ItemGroup> <ItemGroup> <None Include="..\..\..\src\qli\help.epp"> - <Filter>QLI files\epp files</Filter> + <Filter>QLI files\GPRE epp</Filter> </None> <None Include="..\..\..\src\qli\meta.epp"> - <Filter>QLI files\epp files</Filter> + <Filter>QLI files\GPRE epp</Filter> </None> <None Include="..\..\..\src\qli\proc.epp"> - <Filter>QLI files\epp files</Filter> + <Filter>QLI files\GPRE epp</Filter> </None> <None Include="..\..\..\src\qli\show.epp"> - <Filter>QLI files\epp files</Filter> + <Filter>QLI files\GPRE epp</Filter> </None> </ItemGroup> <ItemGroup> @@ -105,4 +105,111 @@ <Filter>Resource files</Filter> </ResourceCompile> </ItemGroup> + <ItemGroup> + <ClInclude Include="..\..\..\src\qli\words.h"> + <Filter>Header files</Filter> + </ClInclude> + <ClInclude Include="..\..\..\src\qli\all_proto.h"> + <Filter>Header files</Filter> + </ClInclude> + <ClInclude Include="..\..\..\src\qli\blk.h"> + <Filter>Header files</Filter> + </ClInclude> + <ClInclude Include="..\..\..\src\qli\comma_proto.h"> + <Filter>Header files</Filter> + </ClInclude> + <ClInclude Include="..\..\..\src\qli\compi_proto.h"> + <Filter>Header files</Filter> + </ClInclude> + <ClInclude Include="..\..\..\src\qli\compile.h"> + <Filter>Header files</Filter> + </ClInclude> + <ClInclude Include="..\..\..\src\qli\dtr.h"> + <Filter>Header files</Filter> + </ClInclude> + <ClInclude Include="..\..\..\src\qli\err_proto.h"> + <Filter>Header files</Filter> + </ClInclude> + <ClInclude Include="..\..\..\src\qli\eval_proto.h"> + <Filter>Header files</Filter> + </ClInclude> + <ClInclude Include="..\..\..\src\qli\exe.h"> + <Filter>Header files</Filter> + </ClInclude> + <ClInclude Include="..\..\..\src\qli\exe_proto.h"> + <Filter>Header files</Filter> + </ClInclude> + <ClInclude Include="..\..\..\src\qli\expan_proto.h"> + <Filter>Header files</Filter> + </ClInclude> + <ClInclude Include="..\..\..\src\qli\forma_proto.h"> + <Filter>Header files</Filter> + </ClInclude> + <ClInclude Include="..\..\..\src\qli\format.h"> + <Filter>Header files</Filter> + </ClInclude> + <ClInclude Include="..\..\..\src\qli\gener_proto.h"> + <Filter>Header files</Filter> + </ClInclude> + <ClInclude Include="..\..\..\src\qli\help_proto.h"> + <Filter>Header files</Filter> + </ClInclude> + <ClInclude Include="..\..\..\src\qli\hsh_proto.h"> + <Filter>Header files</Filter> + </ClInclude> + <ClInclude Include="..\..\..\src\qli\lex_proto.h"> + <Filter>Header files</Filter> + </ClInclude> + <ClInclude Include="..\..\..\src\qli\meta_proto.h"> + <Filter>Header files</Filter> + </ClInclude> + <ClInclude Include="..\..\..\src\qli\mov_proto.h"> + <Filter>Header files</Filter> + </ClInclude> + <ClInclude Include="..\..\..\src\qli\parse.h"> + <Filter>Header files</Filter> + </ClInclude> + <ClInclude Include="..\..\..\src\qli\parse_proto.h"> + <Filter>Header files</Filter> + </ClInclude> + <ClInclude Include="..\..\..\src\qli\picst_proto.h"> + <Filter>Header files</Filter> + </ClInclude> + <ClInclude Include="..\..\..\src\qli\proc_ddl.h"> + <Filter>Header files</Filter> + </ClInclude> + <ClInclude Include="..\..\..\src\qli\proc_proto.h"> + <Filter>Header files</Filter> + </ClInclude> + <ClInclude Include="..\..\..\src\qli\procddl1.h"> + <Filter>Header files</Filter> + </ClInclude> + <ClInclude Include="..\..\..\src\qli\procddl2.h"> + <Filter>Header files</Filter> + </ClInclude> + <ClInclude Include="..\..\..\src\qli\procddl3.h"> + <Filter>Header files</Filter> + </ClInclude> + <ClInclude Include="..\..\..\src\qli\procddl4.h"> + <Filter>Header files</Filter> + </ClInclude> + <ClInclude Include="..\..\..\src\qli\qliswi.h"> + <Filter>Header files</Filter> + </ClInclude> + <ClInclude Include="..\..\..\src\qli\repor_proto.h"> + <Filter>Header files</Filter> + </ClInclude> + <ClInclude Include="..\..\..\src\qli\report.h"> + <Filter>Header files</Filter> + </ClInclude> + <ClInclude Include="..\..\..\src\qli\reqs.h"> + <Filter>Header files</Filter> + </ClInclude> + <ClInclude Include="..\..\..\src\qli\show_proto.h"> + <Filter>Header files</Filter> + </ClInclude> + <ClInclude Include="..\..\..\src\qli\symbols.h"> + <Filter>Header files</Filter> + </ClInclude> + </ItemGroup> </Project> \ No newline at end of file Modified: firebird/trunk/builds/win32/msvc10/remote.vcxproj =================================================================== --- firebird/trunk/builds/win32/msvc10/remote.vcxproj 2010-10-22 15:00:22 UTC (rev 51755) +++ firebird/trunk/builds/win32/msvc10/remote.vcxproj 2010-10-22 17:55:42 UTC (rev 51756) @@ -157,7 +157,6 @@ <ClInclude Include="..\..\..\src\remote\protocol.h" /> <ClInclude Include="..\..\..\src\remote\proto_proto.h" /> <ClInclude Include="..\..\..\src\remote\remote.h" /> - <ClInclude Include="..\..\..\src\remote\remote_def.h" /> <ClInclude Include="..\..\..\src\remote\remot_proto.h" /> </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> Modified: firebird/trunk/builds/win32/msvc10/remote.vcxproj.filters =================================================================== --- firebird/trunk/builds/win32/msvc10/remote.vcxproj.filters 2010-10-22 15:00:22 UTC (rev 51755) +++ firebird/trunk/builds/win32/msvc10/remote.vcxproj.filters 2010-10-22 17:55:42 UTC (rev 51756) @@ -61,9 +61,6 @@ <ClInclude Include="..\..\..\src\remote\remote.h"> <Filter>Header files</Filter> </ClInclude> - <ClInclude Include="..\..\..\src\remote\remote_def.h"> - <Filter>Header files</Filter> - </ClInclude> <ClInclude Include="..\..\..\src\remote\os\win32\wnet_proto.h"> <Filter>Header files</Filter> </ClInclude> Modified: firebird/trunk/builds/win32/msvc10/udr_engine.vcxproj.filters =================================================================== --- firebird/trunk/builds/win32/msvc10/udr_engine.vcxproj.filters 2010-10-22 15:00:22 UTC (rev 51755) +++ firebird/trunk/builds/win32/msvc10/udr_engine.vcxproj.filters 2010-10-22 17:55:42 UTC (rev 51756) @@ -29,8 +29,6 @@ </ResourceCompile> </ItemGroup> <ItemGroup> - <None Include="..\defs\udr_engine.def"> - <Filter>Source files</Filter> - </None> + <None Include="..\defs\udr_engine.def" /> </ItemGroup> </Project> \ No newline at end of file Modified: firebird/trunk/builds/win32/msvc10/user_management.vcxproj.filters =================================================================== --- firebird/trunk/builds/win32/msvc10/user_management.vcxproj.filters 2010-10-22 15:00:22 UTC (rev 51755) +++ firebird/trunk/builds/win32/msvc10/user_management.vcxproj.filters 2010-10-22 17:55:42 UTC (rev 51756) @@ -4,6 +4,15 @@ <Filter Include="Resource files"> <UniqueIdentifier>{f5abfba7-e5fe-444a-8f3a-71613bd06b14}</UniqueIdentifier> </Filter> + <Filter Include="headers"> + <UniqueIdentifier>{4d7668b6-d659-4684-ac32-6285d87a8977}</UniqueIdentifier> + </Filter> + <Filter Include="GPRE cpp"> + <UniqueIdentifier>{65cc725f-d68d-46a8-b9fd-1a442c5aa8bb}</UniqueIdentifier> + </Filter> + <Filter Include="GPRE epp"> + <UniqueIdentifier>{a4bf3426-2fd1-4474-8dcf-41acdd200b1a}</UniqueIdentifier> + </Filter> </ItemGroup> <ItemGroup> <ResourceCompile Include="..\..\..\src\jrd\version.rc"> @@ -11,12 +20,18 @@ </ResourceCompile> </ItemGroup> <ItemGroup> - <None Include="..\..\..\src\auth\SecurityDatabase\LegacyManagement.epp" /> + <None Include="..\..\..\src\auth\SecurityDatabase\LegacyManagement.epp"> + <Filter>GPRE epp</Filter> + </None> </ItemGroup> <ItemGroup> - <ClInclude Include="..\..\..\src\auth\SecurityDatabase\LegacyManagement.h" /> + <ClInclude Include="..\..\..\src\auth\SecurityDatabase\LegacyManagement.h"> + <Filter>headers</Filter> + </ClInclude> </ItemGroup> <ItemGroup> - <ClCompile Include="..\..\..\gen\auth\SecurityDatabase\LegacyManagement.cpp" /> + <ClCompile Include="..\..\..\gen\auth\SecurityDatabase\LegacyManagement.cpp"> + <Filter>GPRE cpp</Filter> + </ClCompile> </ItemGroup> </Project> \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <hv...@us...> - 2010-10-29 21:40:40
|
Revision: 51801 http://firebird.svn.sourceforge.net/firebird/?rev=51801&view=rev Author: hvlad Date: 2010-10-29 21:40:34 +0000 (Fri, 29 Oct 2010) Log Message: ----------- Fixed linker warnings Modified Paths: -------------- firebird/trunk/builds/win32/msvc10/common.vcxproj firebird/trunk/builds/win32/msvc10/remote.vcxproj firebird/trunk/builds/win32/msvc10/yvalve.vcxproj Modified: firebird/trunk/builds/win32/msvc10/common.vcxproj =================================================================== --- firebird/trunk/builds/win32/msvc10/common.vcxproj 2010-10-29 21:39:12 UTC (rev 51800) +++ firebird/trunk/builds/win32/msvc10/common.vcxproj 2010-10-29 21:40:34 UTC (rev 51801) @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|Win32"> @@ -258,7 +258,7 @@ <Culture>0x041d</Culture> </ResourceCompile> <Lib> - <AdditionalDependencies>mpr.lib;Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies> </Lib> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> @@ -274,7 +274,7 @@ <Culture>0x041d</Culture> </ResourceCompile> <Lib> - <AdditionalDependencies>mpr.lib;Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies> </Lib> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> @@ -294,7 +294,7 @@ <Culture>0x041d</Culture> </ResourceCompile> <Lib> - <AdditionalDependencies>mpr.lib;Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies> </Lib> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> @@ -313,7 +313,7 @@ <Culture>0x041d</Culture> </ResourceCompile> <Lib> - <AdditionalDependencies>mpr.lib;Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies> </Lib> </ItemDefinitionGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> Modified: firebird/trunk/builds/win32/msvc10/remote.vcxproj =================================================================== --- firebird/trunk/builds/win32/msvc10/remote.vcxproj 2010-10-29 21:39:12 UTC (rev 51800) +++ firebird/trunk/builds/win32/msvc10/remote.vcxproj 2010-10-29 21:40:34 UTC (rev 51801) @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|Win32"> @@ -94,6 +94,9 @@ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <Culture>0x041d</Culture> </ResourceCompile> + <Lib> + <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies> + </Lib> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <Midl> @@ -107,6 +110,9 @@ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <Culture>0x041d</Culture> </ResourceCompile> + <Lib> + <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies> + </Lib> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ClCompile> @@ -120,6 +126,9 @@ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <Culture>0x041d</Culture> </ResourceCompile> + <Lib> + <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies> + </Lib> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <Midl> @@ -136,6 +145,9 @@ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <Culture>0x041d</Culture> </ResourceCompile> + <Lib> + <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies> + </Lib> </ItemDefinitionGroup> <ItemGroup> <ClCompile Include="..\..\..\src\remote\inet.cpp" /> Modified: firebird/trunk/builds/win32/msvc10/yvalve.vcxproj =================================================================== --- firebird/trunk/builds/win32/msvc10/yvalve.vcxproj 2010-10-29 21:39:12 UTC (rev 51800) +++ firebird/trunk/builds/win32/msvc10/yvalve.vcxproj 2010-10-29 21:40:34 UTC (rev 51801) @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|Win32"> @@ -166,7 +166,7 @@ </ResourceCompile> <Link> <ModuleDefinitionFile>..\defs\firebird.def</ModuleDefinitionFile> - <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>ws2_32.lib;mpr.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> @@ -183,7 +183,7 @@ </ResourceCompile> <Link> <ModuleDefinitionFile>..\defs\firebird.def</ModuleDefinitionFile> - <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>ws2_32.lib;mpr.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> @@ -203,7 +203,7 @@ </ResourceCompile> <Link> <ModuleDefinitionFile>..\defs\firebird.def</ModuleDefinitionFile> - <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>ws2_32.lib;mpr.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> @@ -222,7 +222,7 @@ </ResourceCompile> <Link> <ModuleDefinitionFile>..\defs\firebird.def</ModuleDefinitionFile> - <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>ws2_32.lib;mpr.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <hv...@us...> - 2011-01-24 20:32:28
|
Revision: 52193 http://firebird.svn.sourceforge.net/firebird/?rev=52193&view=rev Author: hvlad Date: 2011-01-24 20:32:21 +0000 (Mon, 24 Jan 2011) Log Message: ----------- Update MSVC10 build files Modified Paths: -------------- firebird/trunk/builds/win32/msvc10/engine.vcxproj firebird/trunk/builds/win32/msvc10/engine.vcxproj.filters firebird/trunk/builds/win32/msvc10/fbtrace.vcxproj firebird/trunk/builds/win32/msvc10/fbtrace.vcxproj.filters firebird/trunk/builds/win32/msvc10/user_management.vcxproj firebird/trunk/builds/win32/msvc10/user_management.vcxproj.filters firebird/trunk/builds/win32/msvc10/yvalve.vcxproj firebird/trunk/builds/win32/msvc10/yvalve.vcxproj.filters Modified: firebird/trunk/builds/win32/msvc10/engine.vcxproj =================================================================== --- firebird/trunk/builds/win32/msvc10/engine.vcxproj 2011-01-24 16:36:29 UTC (rev 52192) +++ firebird/trunk/builds/win32/msvc10/engine.vcxproj 2011-01-24 20:32:21 UTC (rev 52193) @@ -101,7 +101,6 @@ <ClCompile Include="..\..\..\src\jrd\os\win32\winnt.cpp" /> <ClCompile Include="..\..\..\src\jrd\pag.cpp" /> <ClCompile Include="..\..\..\src\jrd\par.cpp" /> - <ClCompile Include="..\..\..\src\jrd\PluginManager.cpp" /> <ClCompile Include="..\..\..\src\jrd\PreparedStatement.cpp" /> <ClCompile Include="..\..\..\src\jrd\RandomGenerator.cpp" /> <ClCompile Include="..\..\..\src\jrd\RecordBuffer.cpp" /> @@ -291,7 +290,6 @@ <ClInclude Include="..\..\..\src\jrd\pag_proto.h" /> <ClInclude Include="..\..\..\src\jrd\par_proto.h" /> <ClInclude Include="..\..\..\src\jrd\pcmet_proto.h" /> - <ClInclude Include="..\..\..\src\jrd\PluginManager.h" /> <ClInclude Include="..\..\..\src\jrd\PreparedStatement.h" /> <ClInclude Include="..\..\..\src\jrd\que.h" /> <ClInclude Include="..\..\..\src\jrd\RandomGenerator.h" /> @@ -371,6 +369,7 @@ <None Include="..\..\..\src\jrd\pcmet.epp" /> <None Include="..\..\..\src\jrd\scl.epp" /> <None Include="..\..\..\src\utilities\gstat\dba.epp" /> + <None Include="..\defs\plugin.def" /> </ItemGroup> <ItemGroup> <ProjectReference Include="alice.vcxproj"> @@ -476,10 +475,10 @@ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet> <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /> <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /> - <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\</OutDir> - <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\</OutDir> - <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\</OutDir> - <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\</OutDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\plugins\</OutDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\plugins\</OutDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\plugins\</OutDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\plugins\</OutDir> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> @@ -494,6 +493,7 @@ <Link> <AdditionalDependencies>mpr.lib;icuuc.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalLibraryDirectories>../../../extern/icu/$(Platform)/release/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <ModuleDefinitionFile>..\defs\plugin.def</ModuleDefinitionFile> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> @@ -512,6 +512,7 @@ <Link> <AdditionalDependencies>mpr.lib;icuuc.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalLibraryDirectories>../../../extern/icu/$(Platform)/release/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <ModuleDefinitionFile>..\defs\plugin.def</ModuleDefinitionFile> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> @@ -532,6 +533,7 @@ <Link> <AdditionalDependencies>mpr.lib;icuuc.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalLibraryDirectories>../../../extern/icu/$(Platform)/$(Configuration)/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <ModuleDefinitionFile>..\defs\plugin.def</ModuleDefinitionFile> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> @@ -555,9 +557,10 @@ <Link> <AdditionalDependencies>mpr.lib;icuuc.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalLibraryDirectories>../../../extern/icu/$(Platform)/$(Configuration)/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <ModuleDefinitionFile>..\defs\plugin.def</ModuleDefinitionFile> </Link> </ItemDefinitionGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> </ImportGroup> -</Project> +</Project> \ No newline at end of file Modified: firebird/trunk/builds/win32/msvc10/engine.vcxproj.filters =================================================================== --- firebird/trunk/builds/win32/msvc10/engine.vcxproj.filters 2011-01-24 16:36:29 UTC (rev 52192) +++ firebird/trunk/builds/win32/msvc10/engine.vcxproj.filters 2011-01-24 20:32:21 UTC (rev 52193) @@ -321,9 +321,6 @@ <ClCompile Include="..\..\..\src\jrd\par.cpp"> <Filter>JRD files</Filter> </ClCompile> - <ClCompile Include="..\..\..\src\jrd\PluginManager.cpp"> - <Filter>JRD files</Filter> - </ClCompile> <ClCompile Include="..\..\..\src\jrd\PreparedStatement.cpp"> <Filter>JRD files</Filter> </ClCompile> @@ -890,9 +887,6 @@ <ClInclude Include="..\..\..\src\jrd\pcmet_proto.h"> <Filter>Header files</Filter> </ClInclude> - <ClInclude Include="..\..\..\src\jrd\PluginManager.h"> - <Filter>Header files</Filter> - </ClInclude> <ClInclude Include="..\..\..\src\jrd\PreparedStatement.h"> <Filter>Header files</Filter> </ClInclude> @@ -1084,10 +1078,11 @@ <None Include="..\..\..\src\dsql\parse.y"> <Filter>DSQL</Filter> </None> + <None Include="..\defs\plugin.def" /> </ItemGroup> <ItemGroup> <ResourceCompile Include="..\..\..\src\jrd\version.rc"> <Filter>Resource files</Filter> </ResourceCompile> </ItemGroup> -</Project> +</Project> \ No newline at end of file Modified: firebird/trunk/builds/win32/msvc10/fbtrace.vcxproj =================================================================== --- firebird/trunk/builds/win32/msvc10/fbtrace.vcxproj 2011-01-24 16:36:29 UTC (rev 52192) +++ firebird/trunk/builds/win32/msvc10/fbtrace.vcxproj 2011-01-24 20:32:21 UTC (rev 52193) @@ -106,6 +106,7 @@ <RandomizedBaseAddress>false</RandomizedBaseAddress> <DataExecutionPrevention> </DataExecutionPrevention> + <ModuleDefinitionFile>..\defs\plugin.def</ModuleDefinitionFile> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> @@ -125,6 +126,7 @@ <RandomizedBaseAddress>false</RandomizedBaseAddress> <DataExecutionPrevention> </DataExecutionPrevention> + <ModuleDefinitionFile>..\defs\plugin.def</ModuleDefinitionFile> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> @@ -143,6 +145,7 @@ <DataExecutionPrevention> </DataExecutionPrevention> <TargetMachine>MachineX64</TargetMachine> + <ModuleDefinitionFile>..\defs\plugin.def</ModuleDefinitionFile> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> @@ -166,6 +169,7 @@ <DataExecutionPrevention> </DataExecutionPrevention> <TargetMachine>MachineX64</TargetMachine> + <ModuleDefinitionFile>..\defs\plugin.def</ModuleDefinitionFile> </Link> </ItemDefinitionGroup> <ItemGroup> @@ -196,6 +200,9 @@ <Project>{4fe03933-98cd-4879-a135-fd9430087a6b}</Project> </ProjectReference> </ItemGroup> + <ItemGroup> + <None Include="..\defs\plugin.def" /> + </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> </ImportGroup> Modified: firebird/trunk/builds/win32/msvc10/fbtrace.vcxproj.filters =================================================================== --- firebird/trunk/builds/win32/msvc10/fbtrace.vcxproj.filters 2011-01-24 16:36:29 UTC (rev 52192) +++ firebird/trunk/builds/win32/msvc10/fbtrace.vcxproj.filters 2011-01-24 20:32:21 UTC (rev 52193) @@ -59,4 +59,7 @@ <Filter>Resource Files</Filter> </ResourceCompile> </ItemGroup> + <ItemGroup> + <None Include="..\defs\plugin.def" /> + </ItemGroup> </Project> \ No newline at end of file Modified: firebird/trunk/builds/win32/msvc10/user_management.vcxproj =================================================================== --- firebird/trunk/builds/win32/msvc10/user_management.vcxproj 2011-01-24 16:36:29 UTC (rev 52192) +++ firebird/trunk/builds/win32/msvc10/user_management.vcxproj 2011-01-24 20:32:21 UTC (rev 52193) @@ -103,6 +103,7 @@ <RandomizedBaseAddress>false</RandomizedBaseAddress> <DataExecutionPrevention> </DataExecutionPrevention> + <ModuleDefinitionFile>..\defs\plugin.def</ModuleDefinitionFile> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> @@ -120,6 +121,7 @@ <RandomizedBaseAddress>false</RandomizedBaseAddress> <DataExecutionPrevention> </DataExecutionPrevention> + <ModuleDefinitionFile>..\defs\plugin.def</ModuleDefinitionFile> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> @@ -136,6 +138,7 @@ <DataExecutionPrevention> </DataExecutionPrevention> <TargetMachine>MachineX64</TargetMachine> + <ModuleDefinitionFile>..\defs\plugin.def</ModuleDefinitionFile> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> @@ -157,6 +160,7 @@ <DataExecutionPrevention> </DataExecutionPrevention> <TargetMachine>MachineX64</TargetMachine> + <ModuleDefinitionFile>..\defs\plugin.def</ModuleDefinitionFile> </Link> </ItemDefinitionGroup> <ItemGroup> @@ -164,6 +168,7 @@ </ItemGroup> <ItemGroup> <None Include="..\..\..\src\auth\SecurityDatabase\LegacyManagement.epp" /> + <None Include="..\defs\plugin.def" /> </ItemGroup> <ItemGroup> <ProjectReference Include="common.vcxproj"> Modified: firebird/trunk/builds/win32/msvc10/user_management.vcxproj.filters =================================================================== --- firebird/trunk/builds/win32/msvc10/user_management.vcxproj.filters 2011-01-24 16:36:29 UTC (rev 52192) +++ firebird/trunk/builds/win32/msvc10/user_management.vcxproj.filters 2011-01-24 20:32:21 UTC (rev 52193) @@ -23,6 +23,7 @@ <None Include="..\..\..\src\auth\SecurityDatabase\LegacyManagement.epp"> <Filter>GPRE epp</Filter> </None> + <None Include="..\defs\plugin.def" /> </ItemGroup> <ItemGroup> <ClInclude Include="..\..\..\src\auth\SecurityDatabase\LegacyManagement.h"> Modified: firebird/trunk/builds/win32/msvc10/yvalve.vcxproj =================================================================== --- firebird/trunk/builds/win32/msvc10/yvalve.vcxproj 2011-01-24 16:36:29 UTC (rev 52192) +++ firebird/trunk/builds/win32/msvc10/yvalve.vcxproj 2011-01-24 20:32:21 UTC (rev 52193) @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|Win32"> @@ -27,7 +27,9 @@ <ClCompile Include="..\..\..\src\yvalve\alt.cpp" /> <ClCompile Include="..\..\..\src\yvalve\gds.cpp" /> <ClCompile Include="..\..\..\src\yvalve\keywords.cpp" /> + <ClCompile Include="..\..\..\src\yvalve\MasterImplementation.cpp" /> <ClCompile Include="..\..\..\src\yvalve\perf.cpp" /> + <ClCompile Include="..\..\..\src\yvalve\PluginManager.cpp" /> <ClCompile Include="..\..\..\src\yvalve\preparse.cpp" /> <ClCompile Include="..\..\..\src\yvalve\user_dsql.cpp" /> <ClCompile Include="..\..\..\src\yvalve\utl.cpp" /> @@ -44,6 +46,7 @@ <ClInclude Include="..\..\..\src\yvalve\keywords.h" /> <ClInclude Include="..\..\..\src\yvalve\perf.h" /> <ClInclude Include="..\..\..\src\yvalve\perf_proto.h" /> + <ClInclude Include="..\..\..\src\yvalve\PluginManager.h" /> <ClInclude Include="..\..\..\src\yvalve\prepa_proto.h" /> <ClInclude Include="..\..\..\src\yvalve\user__proto.h" /> <ClInclude Include="..\..\..\src\yvalve\utly_proto.h" /> Modified: firebird/trunk/builds/win32/msvc10/yvalve.vcxproj.filters =================================================================== --- firebird/trunk/builds/win32/msvc10/yvalve.vcxproj.filters 2011-01-24 16:36:29 UTC (rev 52192) +++ firebird/trunk/builds/win32/msvc10/yvalve.vcxproj.filters 2011-01-24 20:32:21 UTC (rev 52193) @@ -66,6 +66,12 @@ <ClCompile Include="..\..\..\src\remote\client\interface.cpp"> <Filter>Remote client</Filter> </ClCompile> + <ClCompile Include="..\..\..\src\yvalve\PluginManager.cpp"> + <Filter>source</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\yvalve\MasterImplementation.cpp"> + <Filter>source</Filter> + </ClCompile> </ItemGroup> <ItemGroup> <ClInclude Include="..\..\..\src\yvalve\why_proto.h"> @@ -110,6 +116,9 @@ <ClInclude Include="..\..\..\src\auth\trusted\AuthSspi.h"> <Filter>headers</Filter> </ClInclude> + <ClInclude Include="..\..\..\src\yvalve\PluginManager.h"> + <Filter>headers</Filter> + </ClInclude> </ItemGroup> <ItemGroup> <ResourceCompile Include="..\..\..\src\jrd\version.rc"> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <hv...@us...> - 2011-04-17 08:33:15
|
Revision: 52748 http://firebird.svn.sourceforge.net/firebird/?rev=52748&view=rev Author: hvlad Date: 2011-04-17 08:33:09 +0000 (Sun, 17 Apr 2011) Log Message: ----------- Update MSVC10 build Modified Paths: -------------- firebird/trunk/builds/win32/msvc10/common.vcxproj firebird/trunk/builds/win32/msvc10/common.vcxproj.filters firebird/trunk/builds/win32/msvc10/yvalve.vcxproj firebird/trunk/builds/win32/msvc10/yvalve.vcxproj.filters Modified: firebird/trunk/builds/win32/msvc10/common.vcxproj =================================================================== --- firebird/trunk/builds/win32/msvc10/common.vcxproj 2011-04-17 05:04:24 UTC (rev 52747) +++ firebird/trunk/builds/win32/msvc10/common.vcxproj 2011-04-17 08:33:09 UTC (rev 52748) @@ -66,6 +66,7 @@ <ClCompile Include="..\..\..\src\common\sdl.cpp" /> <ClCompile Include="..\..\..\src\common\security.cpp" /> <ClCompile Include="..\..\..\src\common\sha.cpp" /> + <ClCompile Include="..\..\..\src\common\StatementMetadata.cpp" /> <ClCompile Include="..\..\..\src\common\StatusArg.cpp" /> <ClCompile Include="..\..\..\src\common\StatusHolder.cpp" /> <ClCompile Include="..\..\..\src\common\TextType.cpp" /> @@ -164,6 +165,7 @@ <ClInclude Include="..\..\..\src\common\sdltable.h" /> <ClInclude Include="..\..\..\src\common\sdl_proto.h" /> <ClInclude Include="..\..\..\src\common\sha.h" /> + <ClInclude Include="..\..\..\src\common\StatementMetadata.h" /> <ClInclude Include="..\..\..\src\common\StatusArg.h" /> <ClInclude Include="..\..\..\src\common\StatusHolder.h" /> <ClInclude Include="..\..\..\src\common\stuff.h" /> Modified: firebird/trunk/builds/win32/msvc10/common.vcxproj.filters =================================================================== --- firebird/trunk/builds/win32/msvc10/common.vcxproj.filters 2011-04-17 05:04:24 UTC (rev 52747) +++ firebird/trunk/builds/win32/msvc10/common.vcxproj.filters 2011-04-17 08:33:09 UTC (rev 52748) @@ -186,6 +186,9 @@ <ClCompile Include="..\..\..\src\common\security.cpp"> <Filter>common</Filter> </ClCompile> + <ClCompile Include="..\..\..\src\common\StatementMetadata.cpp"> + <Filter>common</Filter> + </ClCompile> </ItemGroup> <ItemGroup> <ClInclude Include="..\..\..\src\common\xdr_proto.h"> @@ -482,5 +485,8 @@ <ClInclude Include="..\..\..\src\common\gdsassert.h"> <Filter>headers</Filter> </ClInclude> + <ClInclude Include="..\..\..\src\common\StatementMetadata.h"> + <Filter>headers</Filter> + </ClInclude> </ItemGroup> </Project> \ No newline at end of file Modified: firebird/trunk/builds/win32/msvc10/yvalve.vcxproj =================================================================== --- firebird/trunk/builds/win32/msvc10/yvalve.vcxproj 2011-04-17 05:04:24 UTC (rev 52747) +++ firebird/trunk/builds/win32/msvc10/yvalve.vcxproj 2011-04-17 08:33:09 UTC (rev 52748) @@ -33,7 +33,6 @@ <ClCompile Include="..\..\..\src\yvalve\preparse.cpp" /> <ClCompile Include="..\..\..\src\yvalve\user_dsql.cpp" /> <ClCompile Include="..\..\..\src\yvalve\utl.cpp" /> - <ClCompile Include="..\..\..\src\yvalve\utly.cpp" /> <ClCompile Include="..\..\..\src\yvalve\why.cpp" /> </ItemGroup> <ItemGroup> @@ -49,7 +48,6 @@ <ClInclude Include="..\..\..\src\yvalve\PluginManager.h" /> <ClInclude Include="..\..\..\src\yvalve\prepa_proto.h" /> <ClInclude Include="..\..\..\src\yvalve\user__proto.h" /> - <ClInclude Include="..\..\..\src\yvalve\utly_proto.h" /> <ClInclude Include="..\..\..\src\yvalve\utl_proto.h" /> <ClInclude Include="..\..\..\src\yvalve\why_proto.h" /> </ItemGroup> Modified: firebird/trunk/builds/win32/msvc10/yvalve.vcxproj.filters =================================================================== --- firebird/trunk/builds/win32/msvc10/yvalve.vcxproj.filters 2011-04-17 05:04:24 UTC (rev 52747) +++ firebird/trunk/builds/win32/msvc10/yvalve.vcxproj.filters 2011-04-17 08:33:09 UTC (rev 52748) @@ -48,9 +48,6 @@ <ClCompile Include="..\..\..\src\yvalve\utl.cpp"> <Filter>source</Filter> </ClCompile> - <ClCompile Include="..\..\..\src\yvalve\utly.cpp"> - <Filter>source</Filter> - </ClCompile> <ClCompile Include="..\..\..\src\auth\SecurityDatabase\LegacyClient.cpp"> <Filter>Auth</Filter> </ClCompile> @@ -107,9 +104,6 @@ <ClInclude Include="..\..\..\src\yvalve\utl_proto.h"> <Filter>headers</Filter> </ClInclude> - <ClInclude Include="..\..\..\src\yvalve\utly_proto.h"> - <Filter>headers</Filter> - </ClInclude> <ClInclude Include="..\..\..\src\auth\SecurityDatabase\LegacyClient.h"> <Filter>headers</Filter> </ClInclude> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <hv...@us...> - 2011-04-26 07:05:38
|
Revision: 52815 http://firebird.svn.sourceforge.net/firebird/?rev=52815&view=rev Author: hvlad Date: 2011-04-26 07:05:29 +0000 (Tue, 26 Apr 2011) Log Message: ----------- Update MSVC10 build Modified Paths: -------------- firebird/trunk/builds/win32/msvc10/common.vcxproj firebird/trunk/builds/win32/msvc10/common.vcxproj.filters firebird/trunk/builds/win32/msvc10/engine.vcxproj firebird/trunk/builds/win32/msvc10/engine.vcxproj.filters Modified: firebird/trunk/builds/win32/msvc10/common.vcxproj =================================================================== --- firebird/trunk/builds/win32/msvc10/common.vcxproj 2011-04-26 06:59:03 UTC (rev 52814) +++ firebird/trunk/builds/win32/msvc10/common.vcxproj 2011-04-26 07:05:29 UTC (rev 52815) @@ -32,7 +32,6 @@ <ClCompile Include="..\..\..\src\common\classes\locks.cpp" /> <ClCompile Include="..\..\..\src\common\classes\MetaName.cpp" /> <ClCompile Include="..\..\..\src\common\classes\MsgPrint.cpp" /> - <ClCompile Include="..\..\..\src\common\classes\PublicHandle.cpp" /> <ClCompile Include="..\..\..\src\common\classes\SafeArg.cpp" /> <ClCompile Include="..\..\..\src\common\classes\semaphore.cpp" /> <ClCompile Include="..\..\..\src\common\classes\Switches.cpp" /> @@ -111,7 +110,6 @@ <ClInclude Include="..\..\..\src\common\classes\NestConst.h" /> <ClInclude Include="..\..\..\src\common\classes\Nullable.h" /> <ClInclude Include="..\..\..\src\common\classes\objects_array.h" /> - <ClInclude Include="..\..\..\src\common\classes\PublicHandle.h" /> <ClInclude Include="..\..\..\src\common\classes\QualifiedName.h" /> <ClInclude Include="..\..\..\src\common\classes\RefCounted.h" /> <ClInclude Include="..\..\..\src\common\classes\RefMutex.h" /> Modified: firebird/trunk/builds/win32/msvc10/common.vcxproj.filters =================================================================== --- firebird/trunk/builds/win32/msvc10/common.vcxproj.filters 2011-04-26 06:59:03 UTC (rev 52814) +++ firebird/trunk/builds/win32/msvc10/common.vcxproj.filters 2011-04-26 07:05:29 UTC (rev 52815) @@ -132,9 +132,6 @@ <ClCompile Include="..\..\..\src\common\classes\MsgPrint.cpp"> <Filter>classes</Filter> </ClCompile> - <ClCompile Include="..\..\..\src\common\classes\PublicHandle.cpp"> - <Filter>classes</Filter> - </ClCompile> <ClCompile Include="..\..\..\src\common\classes\SafeArg.cpp"> <Filter>classes</Filter> </ClCompile> @@ -392,9 +389,6 @@ <ClInclude Include="..\..\..\src\common\classes\objects_array.h"> <Filter>headers</Filter> </ClInclude> - <ClInclude Include="..\..\..\src\common\classes\PublicHandle.h"> - <Filter>headers</Filter> - </ClInclude> <ClInclude Include="..\..\..\src\common\classes\QualifiedName.h"> <Filter>headers</Filter> </ClInclude> Modified: firebird/trunk/builds/win32/msvc10/engine.vcxproj =================================================================== --- firebird/trunk/builds/win32/msvc10/engine.vcxproj 2011-04-26 06:59:03 UTC (rev 52814) +++ firebird/trunk/builds/win32/msvc10/engine.vcxproj 2011-04-26 07:05:29 UTC (rev 52815) @@ -226,6 +226,7 @@ <ClInclude Include="..\..\..\src\jrd\dyn_proto.h" /> <ClInclude Include="..\..\..\src\jrd\dyn_ut_proto.h" /> <ClInclude Include="..\..\..\src\jrd\ErrorImpl.h" /> + <ClInclude Include="..\..\..\src\jrd\EngineInterface.h" /> <ClInclude Include="..\..\..\src\jrd\err_proto.h" /> <ClInclude Include="..\..\..\src\jrd\event.h" /> <ClInclude Include="..\..\..\src\jrd\event_proto.h" /> Modified: firebird/trunk/builds/win32/msvc10/engine.vcxproj.filters =================================================================== --- firebird/trunk/builds/win32/msvc10/engine.vcxproj.filters 2011-04-26 06:59:03 UTC (rev 52814) +++ firebird/trunk/builds/win32/msvc10/engine.vcxproj.filters 2011-04-26 07:05:29 UTC (rev 52815) @@ -707,6 +707,9 @@ <ClInclude Include="..\..\..\src\jrd\ErrorImpl.h"> <Filter>Header files</Filter> </ClInclude> + <ClInclude Include="..\..\..\src\jrd\EngineInterface.h"> + <Filter>Header files</Filter> + </ClInclude> <ClInclude Include="..\..\..\src\jrd\event.h"> <Filter>Header files</Filter> </ClInclude> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <hv...@us...> - 2011-05-24 20:44:53
|
Revision: 52999 http://firebird.svn.sourceforge.net/firebird/?rev=52999&view=rev Author: hvlad Date: 2011-05-24 20:44:47 +0000 (Tue, 24 May 2011) Log Message: ----------- Cleanup Modified Paths: -------------- firebird/trunk/builds/win32/msvc10/common.vcxproj firebird/trunk/builds/win32/msvc10/common.vcxproj.filters firebird/trunk/builds/win32/msvc10/engine.vcxproj firebird/trunk/builds/win32/msvc10/engine.vcxproj.filters firebird/trunk/builds/win32/msvc10/yvalve.vcxproj.filters Modified: firebird/trunk/builds/win32/msvc10/common.vcxproj =================================================================== --- firebird/trunk/builds/win32/msvc10/common.vcxproj 2011-05-24 15:20:15 UTC (rev 52998) +++ firebird/trunk/builds/win32/msvc10/common.vcxproj 2011-05-24 20:44:47 UTC (rev 52999) @@ -104,7 +104,6 @@ <ClInclude Include="..\..\..\src\common\classes\Hash.h" /> <ClInclude Include="..\..\..\src\common\classes\ImplementHelper.h" /> <ClInclude Include="..\..\..\src\common\classes\init.h" /> - <ClInclude Include="..\..\..\src\common\classes\Interlock.h" /> <ClInclude Include="..\..\..\src\common\classes\locks.h" /> <ClInclude Include="..\..\..\src\common\classes\MetaName.h" /> <ClInclude Include="..\..\..\src\common\classes\MsgPrint.h" /> Modified: firebird/trunk/builds/win32/msvc10/common.vcxproj.filters =================================================================== --- firebird/trunk/builds/win32/msvc10/common.vcxproj.filters 2011-05-24 15:20:15 UTC (rev 52998) +++ firebird/trunk/builds/win32/msvc10/common.vcxproj.filters 2011-05-24 20:44:47 UTC (rev 52999) @@ -371,9 +371,6 @@ <ClInclude Include="..\..\..\src\common\classes\init.h"> <Filter>headers</Filter> </ClInclude> - <ClInclude Include="..\..\..\src\common\classes\Interlock.h"> - <Filter>headers</Filter> - </ClInclude> <ClInclude Include="..\..\..\src\common\classes\locks.h"> <Filter>headers</Filter> </ClInclude> Modified: firebird/trunk/builds/win32/msvc10/engine.vcxproj =================================================================== --- firebird/trunk/builds/win32/msvc10/engine.vcxproj 2011-05-24 15:20:15 UTC (rev 52998) +++ firebird/trunk/builds/win32/msvc10/engine.vcxproj 2011-05-24 20:44:47 UTC (rev 52999) @@ -277,7 +277,6 @@ <ClInclude Include="..\..\..\src\jrd\msg_encode.h" /> <ClInclude Include="..\..\..\src\jrd\names.h" /> <ClInclude Include="..\..\..\src\jrd\nbak.h" /> - <ClInclude Include="..\..\..\src\jrd\nod.h" /> <ClInclude Include="..\..\..\src\jrd\ntrace.h" /> <ClInclude Include="..\..\..\src\jrd\obj.h" /> <ClInclude Include="..\..\..\src\jrd\ods.h" /> Modified: firebird/trunk/builds/win32/msvc10/engine.vcxproj.filters =================================================================== --- firebird/trunk/builds/win32/msvc10/engine.vcxproj.filters 2011-05-24 15:20:15 UTC (rev 52998) +++ firebird/trunk/builds/win32/msvc10/engine.vcxproj.filters 2011-05-24 20:44:47 UTC (rev 52999) @@ -848,9 +848,6 @@ <ClInclude Include="..\..\..\src\jrd\nbak.h"> <Filter>Header files</Filter> </ClInclude> - <ClInclude Include="..\..\..\src\jrd\nod.h"> - <Filter>Header files</Filter> - </ClInclude> <ClInclude Include="..\..\..\src\jrd\ntrace.h"> <Filter>Header files</Filter> </ClInclude> Modified: firebird/trunk/builds/win32/msvc10/yvalve.vcxproj.filters =================================================================== --- firebird/trunk/builds/win32/msvc10/yvalve.vcxproj.filters 2011-05-24 15:20:15 UTC (rev 52998) +++ firebird/trunk/builds/win32/msvc10/yvalve.vcxproj.filters 2011-05-24 20:44:47 UTC (rev 52999) @@ -30,7 +30,7 @@ <ClCompile Include="..\..\..\src\yvalve\alt.cpp"> <Filter>source</Filter> </ClCompile> - <ClCompile Include="..\..\..\src\yvalve\DistributedTransaction.cpp" /> + <ClCompile Include="..\..\..\src\yvalve\DistributedTransaction.cpp"> <Filter>source</Filter> </ClCompile> <ClCompile Include="..\..\..\src\yvalve\gds.cpp"> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <hv...@us...> - 2011-12-26 23:35:55
|
Revision: 53773 http://firebird.svn.sourceforge.net/firebird/?rev=53773&view=rev Author: hvlad Date: 2011-12-26 23:35:48 +0000 (Mon, 26 Dec 2011) Log Message: ----------- Update VS 2010 build to support SRP. New plugin srp.dll is created - it is necessary for user management using SRP. VC8\VC9 builds will follow tomorrow. Modified Paths: -------------- firebird/trunk/builds/win32/msvc10/Firebird3.sln firebird/trunk/builds/win32/msvc10/common.vcxproj firebird/trunk/builds/win32/msvc10/common.vcxproj.filters firebird/trunk/builds/win32/msvc10/fbserver.vcxproj firebird/trunk/builds/win32/msvc10/fbserver.vcxproj.filters firebird/trunk/builds/win32/msvc10/firebird2.props firebird/trunk/builds/win32/msvc10/remote.vcxproj firebird/trunk/builds/win32/msvc10/remote.vcxproj.filters firebird/trunk/builds/win32/msvc10/yvalve.vcxproj firebird/trunk/builds/win32/msvc10/yvalve.vcxproj.filters Added Paths: ----------- firebird/trunk/builds/win32/msvc10/srp.filters firebird/trunk/builds/win32/msvc10/srp.vcxproj Modified: firebird/trunk/builds/win32/msvc10/Firebird3.sln =================================================================== --- firebird/trunk/builds/win32/msvc10/Firebird3.sln 2011-12-26 23:20:12 UTC (rev 53772) +++ firebird/trunk/builds/win32/msvc10/Firebird3.sln 2011-12-26 23:35:48 UTC (rev 53773) @@ -77,6 +77,8 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "legacy_usermanager", "legacy_usermanager.vcxproj", "{D836FBF5-071E-4E04-8D63-C7EB6701B296}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "srp", "srp.vcxproj", "{BD00D28E-6667-414E-A4B1-6BEFC07ADB42}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -347,6 +349,14 @@ {D836FBF5-071E-4E04-8D63-C7EB6701B296}.Release|Win32.Build.0 = Release|Win32 {D836FBF5-071E-4E04-8D63-C7EB6701B296}.Release|x64.ActiveCfg = Release|x64 {D836FBF5-071E-4E04-8D63-C7EB6701B296}.Release|x64.Build.0 = Release|x64 + {BD00D28E-6667-414E-A4B1-6BEFC07ADB42}.Debug|Win32.ActiveCfg = Debug|Win32 + {BD00D28E-6667-414E-A4B1-6BEFC07ADB42}.Debug|Win32.Build.0 = Debug|Win32 + {BD00D28E-6667-414E-A4B1-6BEFC07ADB42}.Debug|x64.ActiveCfg = Debug|x64 + {BD00D28E-6667-414E-A4B1-6BEFC07ADB42}.Debug|x64.Build.0 = Debug|x64 + {BD00D28E-6667-414E-A4B1-6BEFC07ADB42}.Release|Win32.ActiveCfg = Release|Win32 + {BD00D28E-6667-414E-A4B1-6BEFC07ADB42}.Release|Win32.Build.0 = Release|Win32 + {BD00D28E-6667-414E-A4B1-6BEFC07ADB42}.Release|x64.ActiveCfg = Release|x64 + {BD00D28E-6667-414E-A4B1-6BEFC07ADB42}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE Modified: firebird/trunk/builds/win32/msvc10/common.vcxproj =================================================================== --- firebird/trunk/builds/win32/msvc10/common.vcxproj 2011-12-26 23:20:12 UTC (rev 53772) +++ firebird/trunk/builds/win32/msvc10/common.vcxproj 2011-12-26 23:35:48 UTC (rev 53773) @@ -20,6 +20,7 @@ </ItemGroup> <ItemGroup> <ClCompile Include="..\..\..\src\common\Auth.cpp" /> + <ClCompile Include="..\..\..\src\common\BigInteger.cpp" /> <ClCompile Include="..\..\..\src\common\call_service.cpp" /> <ClCompile Include="..\..\..\src\common\CharSet.cpp" /> <ClCompile Include="..\..\..\src\common\classes\alloc.cpp" /> @@ -82,6 +83,7 @@ </ItemGroup> <ItemGroup> <ClInclude Include="..\..\..\src\common\Auth.h" /> + <ClInclude Include="..\..\..\src\common\BigInteger.h" /> <ClInclude Include="..\..\..\src\common\call_service.h" /> <ClInclude Include="..\..\..\src\common\cdbtable.h" /> <ClInclude Include="..\..\..\src\common\CharSet.h" /> @@ -262,7 +264,7 @@ <Culture>0x041d</Culture> </ResourceCompile> <Lib> - <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>ws2_32.lib;../../../extern/libtommath/lib/$(PlatformName)\Release\tommath.lib;%(AdditionalDependencies)</AdditionalDependencies> </Lib> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> @@ -278,7 +280,7 @@ <Culture>0x041d</Culture> </ResourceCompile> <Lib> - <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>ws2_32.lib;../../../extern/libtommath/lib/$(PlatformName)\Release\tommath.lib;%(AdditionalDependencies)</AdditionalDependencies> </Lib> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> @@ -298,7 +300,7 @@ <Culture>0x041d</Culture> </ResourceCompile> <Lib> - <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>ws2_32.lib;../../../extern/libtommath/lib/$(PlatformName)\Release\tommath.lib;%(AdditionalDependencies)</AdditionalDependencies> </Lib> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> @@ -317,7 +319,7 @@ <Culture>0x041d</Culture> </ResourceCompile> <Lib> - <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>ws2_32.lib;../../../extern/libtommath/lib/$(PlatformName)\Release\tommath.lib;%(AdditionalDependencies)</AdditionalDependencies> </Lib> </ItemDefinitionGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> Modified: firebird/trunk/builds/win32/msvc10/common.vcxproj.filters =================================================================== --- firebird/trunk/builds/win32/msvc10/common.vcxproj.filters 2011-12-26 23:20:12 UTC (rev 53772) +++ firebird/trunk/builds/win32/msvc10/common.vcxproj.filters 2011-12-26 23:35:48 UTC (rev 53773) @@ -195,6 +195,9 @@ <ClCompile Include="..\..\..\src\common\classes\ImplementHelper.cpp"> <Filter>classes</Filter> </ClCompile> + <ClCompile Include="..\..\..\src\common\BigInteger.cpp"> + <Filter>classes</Filter> + </ClCompile> </ItemGroup> <ItemGroup> <ClInclude Include="..\..\..\src\common\xdr_proto.h"> @@ -491,5 +494,8 @@ <ClInclude Include="..\..\..\src\common\classes\Synchronize.h"> <Filter>headers</Filter> </ClInclude> + <ClInclude Include="..\..\..\src\common\BigInteger.h"> + <Filter>headers</Filter> + </ClInclude> </ItemGroup> </Project> \ No newline at end of file Modified: firebird/trunk/builds/win32/msvc10/fbserver.vcxproj =================================================================== --- firebird/trunk/builds/win32/msvc10/fbserver.vcxproj 2011-12-26 23:20:12 UTC (rev 53772) +++ firebird/trunk/builds/win32/msvc10/fbserver.vcxproj 2011-12-26 23:35:48 UTC (rev 53773) @@ -206,6 +206,7 @@ </Link> </ItemDefinitionGroup> <ItemGroup> + <ClCompile Include="..\..\..\src\auth\SecureRemotePassword\server\SrpServer.cpp" /> <ClCompile Include="..\..\..\src\auth\SecurityDatabase\LegacyServer.cpp" /> <ClCompile Include="..\..\..\src\remote\server\os\win32\chop.cpp" /> <ClCompile Include="..\..\..\src\remote\server\os\win32\cntl.cpp" /> @@ -233,6 +234,9 @@ <Project>{4fe03933-98cd-4879-a135-fd9430087a6b}</Project> </ProjectReference> </ItemGroup> + <ItemGroup> + <ClInclude Include="..\..\..\src\auth\SecureRemotePassword\server\SrpServer.h" /> + </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> </ImportGroup> Modified: firebird/trunk/builds/win32/msvc10/fbserver.vcxproj.filters =================================================================== --- firebird/trunk/builds/win32/msvc10/fbserver.vcxproj.filters 2011-12-26 23:20:12 UTC (rev 53772) +++ firebird/trunk/builds/win32/msvc10/fbserver.vcxproj.filters 2011-12-26 23:35:48 UTC (rev 53773) @@ -34,6 +34,9 @@ <ClCompile Include="..\..\..\src\auth\SecurityDatabase\LegacyServer.cpp"> <Filter>AUTH files</Filter> </ClCompile> + <ClCompile Include="..\..\..\src\auth\SecureRemotePassword\server\SrpServer.cpp"> + <Filter>AUTH files</Filter> + </ClCompile> </ItemGroup> <ItemGroup> <None Include="..\..\..\src\remote\server\os\win32\server.ico"> @@ -48,4 +51,9 @@ <Filter>Resource files</Filter> </ResourceCompile> </ItemGroup> + <ItemGroup> + <ClInclude Include="..\..\..\src\auth\SecureRemotePassword\server\SrpServer.h"> + <Filter>AUTH files</Filter> + </ClInclude> + </ItemGroup> </Project> \ No newline at end of file Modified: firebird/trunk/builds/win32/msvc10/firebird2.props =================================================================== --- firebird/trunk/builds/win32/msvc10/firebird2.props 2011-12-26 23:20:12 UTC (rev 53772) +++ firebird/trunk/builds/win32/msvc10/firebird2.props 2011-12-26 23:35:48 UTC (rev 53773) @@ -10,7 +10,7 @@ <ClCompile> <AdditionalOptions>/EHsc- %(AdditionalOptions)</AdditionalOptions> <OmitFramePointers>true</OmitFramePointers> - <AdditionalIncludeDirectories>../../../src/include;../../../src/include/gen;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>../../../src/include;../../../src/include/gen;../../../extern/libtommath;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <ExceptionHandling> </ExceptionHandling> <RuntimeTypeInfo>false</RuntimeTypeInfo> Modified: firebird/trunk/builds/win32/msvc10/remote.vcxproj =================================================================== --- firebird/trunk/builds/win32/msvc10/remote.vcxproj 2011-12-26 23:20:12 UTC (rev 53772) +++ firebird/trunk/builds/win32/msvc10/remote.vcxproj 2011-12-26 23:35:48 UTC (rev 53773) @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|Win32"> @@ -150,6 +150,7 @@ </Lib> </ItemDefinitionGroup> <ItemGroup> + <ClCompile Include="..\..\..\src\auth\SecureRemotePassword\srp.cpp" /> <ClCompile Include="..\..\..\src\remote\inet.cpp" /> <ClCompile Include="..\..\..\src\remote\merge.cpp" /> <ClCompile Include="..\..\..\src\remote\os\win32\xnet.cpp" /> @@ -160,6 +161,8 @@ <ClCompile Include="..\..\..\src\auth\trusted\AuthSspi.cpp" /> </ItemGroup> <ItemGroup> + <ClInclude Include="..\..\..\src\auth\SecureRemotePassword\Message.h" /> + <ClInclude Include="..\..\..\src\auth\SecureRemotePassword\srp.h" /> <ClInclude Include="..\..\..\src\remote\inet_proto.h" /> <ClInclude Include="..\..\..\src\remote\merge_proto.h" /> <ClInclude Include="..\..\..\src\remote\os\win32\wnet_proto.h" /> Modified: firebird/trunk/builds/win32/msvc10/remote.vcxproj.filters =================================================================== --- firebird/trunk/builds/win32/msvc10/remote.vcxproj.filters 2011-12-26 23:20:12 UTC (rev 53772) +++ firebird/trunk/builds/win32/msvc10/remote.vcxproj.filters 2011-12-26 23:35:48 UTC (rev 53773) @@ -38,6 +38,9 @@ <ClCompile Include="..\..\..\src\remote\os\win32\xnet.cpp"> <Filter>REMOTE files</Filter> </ClCompile> + <ClCompile Include="..\..\..\src\auth\SecureRemotePassword\srp.cpp"> + <Filter>AUTH files</Filter> + </ClCompile> </ItemGroup> <ItemGroup> <ClInclude Include="..\..\..\src\remote\inet_proto.h"> @@ -70,5 +73,11 @@ <ClInclude Include="..\..\..\src\remote\os\win32\xnet_proto.h"> <Filter>Header files</Filter> </ClInclude> + <ClInclude Include="..\..\..\src\auth\SecureRemotePassword\srp.h"> + <Filter>Header files</Filter> + </ClInclude> + <ClInclude Include="..\..\..\src\auth\SecureRemotePassword\Message.h"> + <Filter>Header files</Filter> + </ClInclude> </ItemGroup> </Project> \ No newline at end of file Added: firebird/trunk/builds/win32/msvc10/srp.filters =================================================================== --- firebird/trunk/builds/win32/msvc10/srp.filters (rev 0) +++ firebird/trunk/builds/win32/msvc10/srp.filters 2011-12-26 23:35:48 UTC (rev 53773) @@ -0,0 +1,44 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup> + <None Include="..\defs\plugin.def" /> + </ItemGroup> + <ItemGroup> + <Filter Include="Header files"> + <UniqueIdentifier>{d8af7c2b-bb33-4a9f-86eb-97f66b12cc4b}</UniqueIdentifier> + </Filter> + <Filter Include="Resource files"> + <UniqueIdentifier>{aaffa049-3af6-4ac4-84b2-69e0e0f04dc0}</UniqueIdentifier> + </Filter> + <Filter Include="Source files"> + <UniqueIdentifier>{7e967250-14d2-42f2-acc1-5c7af7cab642}</UniqueIdentifier> + </Filter> + </ItemGroup> + <ItemGroup> + <ResourceCompile Include="..\..\..\src\jrd\version.rc"> + <Filter>Resource files</Filter> + </ResourceCompile> + </ItemGroup> + <ItemGroup> + <ClCompile Include="..\..\..\src\auth\SecureRemotePassword\manage\SrpManagement.cpp"> + <Filter>Source files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\auth\SecureRemotePassword\BigInteger.cpp"> + <Filter>Source files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\auth\SecureRemotePassword\srp.cpp"> + <Filter>Source files</Filter> + </ClCompile> + </ItemGroup> + <ItemGroup> + <ClInclude Include="..\..\..\src\auth\SecureRemotePassword\BigInteger.h"> + <Filter>Source files</Filter> + </ClInclude> + <ClInclude Include="..\..\..\src\auth\SecureRemotePassword\Message.h"> + <Filter>Source files</Filter> + </ClInclude> + <ClInclude Include="..\..\..\src\auth\SecureRemotePassword\srp.h"> + <Filter>Source files</Filter> + </ClInclude> + </ItemGroup> +</Project> \ No newline at end of file Property changes on: firebird/trunk/builds/win32/msvc10/srp.filters ___________________________________________________________________ Added: svn:mime-type + text/plain Added: svn:eol-style + native Added: firebird/trunk/builds/win32/msvc10/srp.vcxproj =================================================================== --- firebird/trunk/builds/win32/msvc10/srp.vcxproj (rev 0) +++ firebird/trunk/builds/win32/msvc10/srp.vcxproj 2011-12-26 23:35:48 UTC (rev 53773) @@ -0,0 +1,191 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Debug|x64"> + <Configuration>Debug</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|x64"> + <Configuration>Release</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + </ItemGroup> + <PropertyGroup Label="Globals"> + <ProjectGuid>{BD00D28E-6667-414E-A4B1-6BEFC07ADB42}</ProjectGuid> + <ProjectName>srp</ProjectName> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>DynamicLibrary</ConfigurationType> + <CharacterSet>MultiByte</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>DynamicLibrary</ConfigurationType> + <CharacterSet>MultiByte</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> + <ConfigurationType>DynamicLibrary</ConfigurationType> + <CharacterSet>MultiByte</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> + <ConfigurationType>DynamicLibrary</ConfigurationType> + <CharacterSet>MultiByte</CharacterSet> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" /> + <Import Project="firebird2.props" /> + <Import Project="firebird2release.props" /> + <Import Project="DllNoEmbedManifest.props" /> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" /> + <Import Project="firebird2.props" /> + <Import Project="firebird2debug.props" /> + <Import Project="DllNoEmbedManifest.props" /> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" /> + <Import Project="firebird2.props" /> + <Import Project="firebird2release.props" /> + <Import Project="DllNoEmbedManifest.props" /> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" /> + <Import Project="firebird2.props" /> + <Import Project="firebird2debug.props" /> + <Import Project="DllNoEmbedManifest.props" /> + </ImportGroup> + <PropertyGroup Label="UserMacros" /> + <PropertyGroup> + <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion> + <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental> + <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental> + <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkIncremental> + <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental> + <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet> + <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" /> + <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" /> + <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet> + <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" /> + <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" /> + <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet> + <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" /> + <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" /> + <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet> + <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /> + <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\plugins\</OutDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\plugins\</OutDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\plugins\</OutDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\plugins\</OutDir> + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <Optimization>Disabled</Optimization> + <AdditionalIncludeDirectories>..\..\..\src\include;..\..\..\src\include\gen;..\..\..\src\common\classes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>WIN32;_DEBUG;DEV_BUILD;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + </ClCompile> + <Link> + <RandomizedBaseAddress>false</RandomizedBaseAddress> + <DataExecutionPrevention> + </DataExecutionPrevention> + <ModuleDefinitionFile>..\defs\plugin.def</ModuleDefinitionFile> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <Optimization>MaxSpeed</Optimization> + <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> + <IntrinsicFunctions>true</IntrinsicFunctions> + <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> + <AdditionalIncludeDirectories>..\..\..\src\include\gen;..\..\..\src\include;..\..\..\src\common\classes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PrecompiledHeader> + </PrecompiledHeader> + </ClCompile> + <Link> + <RandomizedBaseAddress>false</RandomizedBaseAddress> + <DataExecutionPrevention> + </DataExecutionPrevention> + <ModuleDefinitionFile>..\defs\plugin.def</ModuleDefinitionFile> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <Midl> + <TargetEnvironment>X64</TargetEnvironment> + </Midl> + <ClCompile> + <Optimization>Disabled</Optimization> + <AdditionalIncludeDirectories>..\..\..\src\include;..\..\..\src\include\gen;..\..\..\src\common\classes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>WIN32;_DEBUG;DEV_BUILD;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + </ClCompile> + <Link> + <RandomizedBaseAddress>false</RandomizedBaseAddress> + <DataExecutionPrevention> + </DataExecutionPrevention> + <TargetMachine>MachineX64</TargetMachine> + <ModuleDefinitionFile>..\defs\plugin.def</ModuleDefinitionFile> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <Midl> + <TargetEnvironment>X64</TargetEnvironment> + </Midl> + <ClCompile> + <Optimization>MaxSpeed</Optimization> + <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> + <IntrinsicFunctions>true</IntrinsicFunctions> + <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> + <AdditionalIncludeDirectories>..\..\..\src\include\gen;..\..\..\src\include;..\..\..\src\common\classes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PrecompiledHeader> + </PrecompiledHeader> + </ClCompile> + <Link> + <RandomizedBaseAddress>false</RandomizedBaseAddress> + <DataExecutionPrevention> + </DataExecutionPrevention> + <TargetMachine>MachineX64</TargetMachine> + <ModuleDefinitionFile>..\defs\plugin.def</ModuleDefinitionFile> + </Link> + </ItemDefinitionGroup> + <ItemGroup> + <ResourceCompile Include="..\..\..\src\jrd\version.rc" /> + </ItemGroup> + <ItemGroup> + <None Include="..\defs\plugin.def" /> + </ItemGroup> + <ItemGroup> + <ProjectReference Include="common.vcxproj"> + <Project>{15605f44-bffd-444f-ad4c-55dc9d704465}</Project> + <ReferenceOutputAssembly>false</ReferenceOutputAssembly> + </ProjectReference> + <ProjectReference Include="remote.vcxproj"> + <Project>{4bcc693d-1745-45ed-8302-e5e2f979549a}</Project> + </ProjectReference> + <ProjectReference Include="yvalve.vcxproj"> + <Project>{4fe03933-98cd-4879-a135-fd9430087a6b}</Project> + </ProjectReference> + </ItemGroup> + <ItemGroup> + <ClCompile Include="..\..\..\src\auth\SecureRemotePassword\manage\SrpManagement.cpp" /> + </ItemGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> + <ImportGroup Label="ExtensionTargets"> + </ImportGroup> +</Project> \ No newline at end of file Property changes on: firebird/trunk/builds/win32/msvc10/srp.vcxproj ___________________________________________________________________ Added: svn:mime-type + text/plain Added: svn:eol-style + native Modified: firebird/trunk/builds/win32/msvc10/yvalve.vcxproj =================================================================== --- firebird/trunk/builds/win32/msvc10/yvalve.vcxproj 2011-12-26 23:20:12 UTC (rev 53772) +++ firebird/trunk/builds/win32/msvc10/yvalve.vcxproj 2011-12-26 23:35:48 UTC (rev 53773) @@ -21,6 +21,7 @@ <ItemGroup> <ClCompile Include="..\..\..\gen\yvalve\array.cpp" /> <ClCompile Include="..\..\..\gen\yvalve\blob.cpp" /> + <ClCompile Include="..\..\..\src\auth\SecureRemotePassword\client\SrpClient.cpp" /> <ClCompile Include="..\..\..\src\auth\SecurityDatabase\LegacyClient.cpp" /> <ClCompile Include="..\..\..\src\jrd\os\win32\ibinitdll.cpp" /> <ClCompile Include="..\..\..\src\remote\client\interface.cpp" /> @@ -37,6 +38,7 @@ <ClCompile Include="..\..\..\src\yvalve\why.cpp" /> </ItemGroup> <ItemGroup> + <ClInclude Include="..\..\..\src\auth\SecureRemotePassword\client\SrpClient.h" /> <ClInclude Include="..\..\..\src\auth\SecurityDatabase\LegacyClient.h" /> <ClInclude Include="..\..\..\src\auth\trusted\AuthSspi.h" /> <ClInclude Include="..\..\..\src\yvalve\alt_proto.h" /> Modified: firebird/trunk/builds/win32/msvc10/yvalve.vcxproj.filters =================================================================== --- firebird/trunk/builds/win32/msvc10/yvalve.vcxproj.filters 2011-12-26 23:20:12 UTC (rev 53772) +++ firebird/trunk/builds/win32/msvc10/yvalve.vcxproj.filters 2011-12-26 23:35:48 UTC (rev 53773) @@ -72,6 +72,9 @@ <ClCompile Include="..\..\..\src\yvalve\MasterImplementation.cpp"> <Filter>source</Filter> </ClCompile> + <ClCompile Include="..\..\..\src\auth\SecureRemotePassword\client\SrpClient.cpp"> + <Filter>Auth</Filter> + </ClCompile> </ItemGroup> <ItemGroup> <ClInclude Include="..\..\..\src\yvalve\why_proto.h"> @@ -116,6 +119,9 @@ <ClInclude Include="..\..\..\src\yvalve\PluginManager.h"> <Filter>headers</Filter> </ClInclude> + <ClInclude Include="..\..\..\src\auth\SecureRemotePassword\client\SrpClient.h"> + <Filter>headers</Filter> + </ClInclude> </ItemGroup> <ItemGroup> <ResourceCompile Include="..\..\..\src\jrd\version.rc"> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <hv...@us...> - 2012-01-02 11:14:26
|
Revision: 53804 http://firebird.svn.sourceforge.net/firebird/?rev=53804&view=rev Author: hvlad Date: 2012-01-02 11:14:20 +0000 (Mon, 02 Jan 2012) Log Message: ----------- Misc Added Paths: ----------- firebird/trunk/builds/win32/msvc10/srp.vcxproj.filters Removed Paths: ------------- firebird/trunk/builds/win32/msvc10/srp.filters Deleted: firebird/trunk/builds/win32/msvc10/srp.filters =================================================================== --- firebird/trunk/builds/win32/msvc10/srp.filters 2011-12-31 03:39:39 UTC (rev 53803) +++ firebird/trunk/builds/win32/msvc10/srp.filters 2012-01-02 11:14:20 UTC (rev 53804) @@ -1,44 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup> - <None Include="..\defs\plugin.def" /> - </ItemGroup> - <ItemGroup> - <Filter Include="Header files"> - <UniqueIdentifier>{d8af7c2b-bb33-4a9f-86eb-97f66b12cc4b}</UniqueIdentifier> - </Filter> - <Filter Include="Resource files"> - <UniqueIdentifier>{aaffa049-3af6-4ac4-84b2-69e0e0f04dc0}</UniqueIdentifier> - </Filter> - <Filter Include="Source files"> - <UniqueIdentifier>{7e967250-14d2-42f2-acc1-5c7af7cab642}</UniqueIdentifier> - </Filter> - </ItemGroup> - <ItemGroup> - <ResourceCompile Include="..\..\..\src\jrd\version.rc"> - <Filter>Resource files</Filter> - </ResourceCompile> - </ItemGroup> - <ItemGroup> - <ClCompile Include="..\..\..\src\auth\SecureRemotePassword\manage\SrpManagement.cpp"> - <Filter>Source files</Filter> - </ClCompile> - <ClCompile Include="..\..\..\src\auth\SecureRemotePassword\BigInteger.cpp"> - <Filter>Source files</Filter> - </ClCompile> - <ClCompile Include="..\..\..\src\auth\SecureRemotePassword\srp.cpp"> - <Filter>Source files</Filter> - </ClCompile> - </ItemGroup> - <ItemGroup> - <ClInclude Include="..\..\..\src\auth\SecureRemotePassword\BigInteger.h"> - <Filter>Source files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\auth\SecureRemotePassword\Message.h"> - <Filter>Source files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\auth\SecureRemotePassword\srp.h"> - <Filter>Source files</Filter> - </ClInclude> - </ItemGroup> -</Project> \ No newline at end of file Copied: firebird/trunk/builds/win32/msvc10/srp.vcxproj.filters (from rev 53803, firebird/trunk/builds/win32/msvc10/srp.filters) =================================================================== --- firebird/trunk/builds/win32/msvc10/srp.vcxproj.filters (rev 0) +++ firebird/trunk/builds/win32/msvc10/srp.vcxproj.filters 2012-01-02 11:14:20 UTC (rev 53804) @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup> + <None Include="..\defs\plugin.def" /> + </ItemGroup> + <ItemGroup> + <Filter Include="Source files"> + <UniqueIdentifier>{ae75b2f0-6301-43d5-ac84-b552b3f9b1fb}</UniqueIdentifier> + </Filter> + <Filter Include="Resource files"> + <UniqueIdentifier>{8a20ce21-8fe2-4921-bdf3-9e65efd23d2a}</UniqueIdentifier> + </Filter> + </ItemGroup> + <ItemGroup> + <ClCompile Include="..\..\..\src\auth\SecureRemotePassword\manage\SrpManagement.cpp"> + <Filter>Source files</Filter> + </ClCompile> + </ItemGroup> + <ItemGroup> + <ResourceCompile Include="..\..\..\src\jrd\version.rc"> + <Filter>Resource files</Filter> + </ResourceCompile> + </ItemGroup> +</Project> \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <hv...@us...> - 2012-06-13 07:59:20
|
Revision: 54629 http://firebird.svn.sourceforge.net/firebird/?rev=54629&view=rev Author: hvlad Date: 2012-06-13 07:59:09 +0000 (Wed, 13 Jun 2012) Log Message: ----------- Update msvc10 build Modified Paths: -------------- firebird/trunk/builds/win32/msvc10/engine.vcxproj firebird/trunk/builds/win32/msvc10/engine.vcxproj.filters Modified: firebird/trunk/builds/win32/msvc10/engine.vcxproj =================================================================== --- firebird/trunk/builds/win32/msvc10/engine.vcxproj 2012-06-13 03:32:45 UTC (rev 54628) +++ firebird/trunk/builds/win32/msvc10/engine.vcxproj 2012-06-13 07:59:09 UTC (rev 54629) @@ -60,6 +60,7 @@ <ClCompile Include="..\..\..\src\jrd\cch.cpp" /> <ClCompile Include="..\..\..\src\jrd\cmp.cpp" /> <ClCompile Include="..\..\..\src\jrd\Collation.cpp" /> + <ClCompile Include="..\..\..\src\jrd\CryptoManager.cpp" /> <ClCompile Include="..\..\..\src\jrd\cvt.cpp" /> <ClCompile Include="..\..\..\src\jrd\cvt2.cpp" /> <ClCompile Include="..\..\..\src\jrd\Database.cpp" /> @@ -204,6 +205,7 @@ <ClInclude Include="..\..\..\src\jrd\cmp_proto.h" /> <ClInclude Include="..\..\..\src\jrd\Collation.h" /> <ClInclude Include="..\..\..\src\jrd\constants.h" /> + <ClInclude Include="..\..\..\src\jrd\CryptoManager.h" /> <ClInclude Include="..\..\..\src\jrd\cvt2_proto.h" /> <ClInclude Include="..\..\..\src\jrd\cvt_proto.h" /> <ClInclude Include="..\..\..\src\jrd\Database.h" /> @@ -545,4 +547,4 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> </ImportGroup> -</Project> +</Project> \ No newline at end of file Modified: firebird/trunk/builds/win32/msvc10/engine.vcxproj.filters =================================================================== --- firebird/trunk/builds/win32/msvc10/engine.vcxproj.filters 2012-06-13 03:32:45 UTC (rev 54628) +++ firebird/trunk/builds/win32/msvc10/engine.vcxproj.filters 2012-06-13 07:59:09 UTC (rev 54629) @@ -450,6 +450,9 @@ <ClCompile Include="..\..\..\src\jrd\GarbageCollector.cpp"> <Filter>JRD files</Filter> </ClCompile> + <ClCompile Include="..\..\..\src\jrd\CryptoManager.cpp"> + <Filter>JRD files</Filter> + </ClCompile> </ItemGroup> <ItemGroup> <ClInclude Include="..\..\..\src\jrd\recsrc\RecordSource.h"> @@ -977,6 +980,9 @@ <ClInclude Include="..\..\..\src\jrd\GarbageCollector.h"> <Filter>Header files</Filter> </ClInclude> + <ClInclude Include="..\..\..\src\jrd\CryptoManager.h"> + <Filter>Header files</Filter> + </ClInclude> </ItemGroup> <ItemGroup> <None Include="..\..\..\src\dsql\DdlNodes.epp"> @@ -1031,4 +1037,4 @@ <Filter>Resource files</Filter> </ResourceCompile> </ItemGroup> -</Project> +</Project> \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <hv...@us...> - 2013-02-19 11:50:04
|
Revision: 57677 http://sourceforge.net/p/firebird/code/57677 Author: hvlad Date: 2013-02-19 11:50:00 +0000 (Tue, 19 Feb 2013) Log Message: ----------- Update MSVC10 build Modified Paths: -------------- firebird/trunk/builds/win32/msvc10/common.vcxproj firebird/trunk/builds/win32/msvc10/common.vcxproj.filters firebird/trunk/builds/win32/msvc10/engine.vcxproj firebird/trunk/builds/win32/msvc10/engine.vcxproj.filters firebird/trunk/builds/win32/msvc10/yvalve.vcxproj firebird/trunk/builds/win32/msvc10/yvalve.vcxproj.filters Modified: firebird/trunk/builds/win32/msvc10/common.vcxproj =================================================================== --- firebird/trunk/builds/win32/msvc10/common.vcxproj 2013-02-19 11:20:49 UTC (rev 57676) +++ firebird/trunk/builds/win32/msvc10/common.vcxproj 2013-02-19 11:50:00 UTC (rev 57677) @@ -25,12 +25,14 @@ <ClCompile Include="..\..\..\src\common\CharSet.cpp" /> <ClCompile Include="..\..\..\src\common\classes\alloc.cpp" /> <ClCompile Include="..\..\..\src\common\classes\BaseStream.cpp" /> + <ClCompile Include="..\..\..\src\common\classes\BlrWriter.cpp" /> <ClCompile Include="..\..\..\src\common\classes\ClumpletReader.cpp" /> <ClCompile Include="..\..\..\src\common\classes\ClumpletWriter.cpp" /> <ClCompile Include="..\..\..\src\common\classes\DbImplementation.cpp" /> <ClCompile Include="..\..\..\src\common\classes\fb_string.cpp" /> <ClCompile Include="..\..\..\src\common\classes\ImplementHelper.cpp" /> <ClCompile Include="..\..\..\src\common\classes\init.cpp" /> + <ClCompile Include="..\..\..\src\common\classes\InternalMessageBuffer.cpp" /> <ClCompile Include="..\..\..\src\common\classes\locks.cpp" /> <ClCompile Include="..\..\..\src\common\classes\MetaName.cpp" /> <ClCompile Include="..\..\..\src\common\classes\MsgPrint.cpp" /> @@ -59,6 +61,7 @@ <ClCompile Include="..\..\..\src\common\isc.cpp" /> <ClCompile Include="..\..\..\src\common\isc_file.cpp" /> <ClCompile Include="..\..\..\src\common\isc_sync.cpp" /> + <ClCompile Include="..\..\..\src\common\MsgMetadata.cpp" /> <ClCompile Include="..\..\..\src\common\os\win32\fbsyslog.cpp" /> <ClCompile Include="..\..\..\src\common\os\win32\guid.cpp" /> <ClCompile Include="..\..\..\src\common\os\win32\isc_ipc.cpp" /> @@ -93,6 +96,8 @@ <ClInclude Include="..\..\..\src\common\classes\array.h" /> <ClInclude Include="..\..\..\src\common\classes\auto.h" /> <ClInclude Include="..\..\..\src\common\classes\BaseStream.h" /> + <ClInclude Include="..\..\..\src\common\classes\BlrReader.h" /> + <ClInclude Include="..\..\..\src\common\classes\BlrWriter.h" /> <ClInclude Include="..\..\..\src\common\classes\ByteChunk.h" /> <ClInclude Include="..\..\..\src\common\classes\ClumpletReader.h" /> <ClInclude Include="..\..\..\src\common\classes\ClumpletWriter.h" /> @@ -108,6 +113,7 @@ <ClInclude Include="..\..\..\src\common\classes\Hash.h" /> <ClInclude Include="..\..\..\src\common\classes\ImplementHelper.h" /> <ClInclude Include="..\..\..\src\common\classes\init.h" /> + <ClInclude Include="..\..\..\src\common\classes\InternalMessageBuffer.h" /> <ClInclude Include="..\..\..\src\common\classes\locks.h" /> <ClInclude Include="..\..\..\src\common\classes\MetaName.h" /> <ClInclude Include="..\..\..\src\common\classes\MsgPrint.h" /> @@ -156,6 +162,7 @@ <ClInclude Include="..\..\..\src\common\isc_f_proto.h" /> <ClInclude Include="..\..\..\src\common\isc_proto.h" /> <ClInclude Include="..\..\..\src\common\isc_s_proto.h" /> + <ClInclude Include="..\..\..\src\common\MsgMetadata.h" /> <ClInclude Include="..\..\..\src\common\os\divorce.h" /> <ClInclude Include="..\..\..\src\common\os\fbsyslog.h" /> <ClInclude Include="..\..\..\src\common\os\guid.h" /> Modified: firebird/trunk/builds/win32/msvc10/common.vcxproj.filters =================================================================== --- firebird/trunk/builds/win32/msvc10/common.vcxproj.filters 2013-02-19 11:20:49 UTC (rev 57676) +++ firebird/trunk/builds/win32/msvc10/common.vcxproj.filters 2013-02-19 11:50:00 UTC (rev 57677) @@ -60,9 +60,6 @@ <ClCompile Include="..\..\..\src\common\pretty.cpp"> <Filter>common</Filter> </ClCompile> - <ClCompile Include="..\..\..\src\common\quad.cpp"> - <Filter>common</Filter> - </ClCompile> <ClCompile Include="..\..\..\src\common\ScanDir.cpp"> <Filter>common</Filter> </ClCompile> @@ -201,6 +198,18 @@ <ClCompile Include="..\..\..\src\common\classes\NoThrowTimeStamp.cpp"> <Filter>classes</Filter> </ClCompile> + <ClCompile Include="..\..\..\src\common\classes\BlrWriter.cpp"> + <Filter>classes</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\common\classes\InternalMessageBuffer.cpp"> + <Filter>classes</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\common\IntlParametersBlock.cpp"> + <Filter>common</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\common\MsgMetadata.cpp"> + <Filter>common</Filter> + </ClCompile> </ItemGroup> <ItemGroup> <ClInclude Include="..\..\..\src\common\xdr_proto.h"> @@ -263,12 +272,6 @@ <ClInclude Include="..\..\..\src\common\prett_proto.h"> <Filter>headers</Filter> </ClInclude> - <ClInclude Include="..\..\..\src\common\quad.h"> - <Filter>headers</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\common\quad_proto.h"> - <Filter>headers</Filter> - </ClInclude> <ClInclude Include="..\..\..\src\common\ScanDir.h"> <Filter>headers</Filter> </ClInclude> @@ -503,5 +506,20 @@ <ClInclude Include="..\..\..\src\common\classes\NoThrowTimeStamp.h"> <Filter>headers</Filter> </ClInclude> + <ClInclude Include="..\..\..\src\common\classes\BlrReader.h"> + <Filter>headers</Filter> + </ClInclude> + <ClInclude Include="..\..\..\src\common\classes\BlrWriter.h"> + <Filter>headers</Filter> + </ClInclude> + <ClInclude Include="..\..\..\src\common\classes\InternalMessageBuffer.h"> + <Filter>headers</Filter> + </ClInclude> + <ClInclude Include="..\..\..\src\common\IntlParametersBlock.h"> + <Filter>headers</Filter> + </ClInclude> + <ClInclude Include="..\..\..\src\common\MsgMetadata.h"> + <Filter>headers</Filter> + </ClInclude> </ItemGroup> </Project> \ No newline at end of file Modified: firebird/trunk/builds/win32/msvc10/engine.vcxproj =================================================================== --- firebird/trunk/builds/win32/msvc10/engine.vcxproj 2013-02-19 11:20:49 UTC (rev 57676) +++ firebird/trunk/builds/win32/msvc10/engine.vcxproj 2013-02-19 11:50:00 UTC (rev 57677) @@ -34,7 +34,7 @@ <ClCompile Include="..\..\..\gen\jrd\scl.cpp" /> <ClCompile Include="..\..\..\gen\utilities\gstat\dba.cpp" /> <ClCompile Include="..\..\..\src\dsql\AggNodes.cpp" /> - <ClCompile Include="..\..\..\src\dsql\BlrWriter.cpp" /> + <ClCompile Include="..\..\..\src\dsql\BlrDebugWriter.cpp" /> <ClCompile Include="..\..\..\src\dsql\BoolNodes.cpp" /> <ClCompile Include="..\..\..\src\dsql\ddl.cpp" /> <ClCompile Include="..\..\..\src\dsql\dsql.cpp" /> @@ -68,7 +68,6 @@ <ClCompile Include="..\..\..\src\jrd\DataTypeUtil.cpp" /> <ClCompile Include="..\..\..\src\jrd\DebugInterface.cpp" /> <ClCompile Include="..\..\..\src\jrd\err.cpp" /> - <ClCompile Include="..\..\..\src\jrd\ErrorImpl.cpp" /> <ClCompile Include="..\..\..\src\jrd\event.cpp" /> <ClCompile Include="..\..\..\src\jrd\evl.cpp" /> <ClCompile Include="..\..\..\src\jrd\exe.cpp" /> @@ -159,7 +158,7 @@ </ItemGroup> <ItemGroup> <ClInclude Include="..\..\..\src\dsql\AggNodes.h" /> - <ClInclude Include="..\..\..\src\dsql\BlrWriter.h" /> + <ClInclude Include="..\..\..\src\dsql\BlrDebugWriter.h" /> <ClInclude Include="..\..\..\src\dsql\BoolNodes.h" /> <ClInclude Include="..\..\..\src\dsql\chars.h" /> <ClInclude Include="..\..\..\src\dsql\DdlNodes.h" /> @@ -186,6 +185,7 @@ <ClInclude Include="..\..\..\src\dsql\utld_proto.h" /> <ClInclude Include="..\..\..\src\dsql\Visitors.h" /> <ClInclude Include="..\..\..\src\dsql\WinNodes.h" /> + <ClInclude Include="..\..\..\src\include\gen\iberror.h" /> <ClInclude Include="..\..\..\src\jrd\acl.h" /> <ClInclude Include="..\..\..\src\jrd\align.h" /> <ClInclude Include="..\..\..\src\jrd\Attachment.h" /> @@ -195,7 +195,6 @@ <ClInclude Include="..\..\..\src\jrd\blob_filter.h" /> <ClInclude Include="..\..\..\src\jrd\blp.h" /> <ClInclude Include="..\..\..\src\jrd\blr.h" /> - <ClInclude Include="..\..\..\src\jrd\BlrReader.h" /> <ClInclude Include="..\..\..\src\jrd\btn.h" /> <ClInclude Include="..\..\..\src\jrd\btr.h" /> <ClInclude Include="..\..\..\src\jrd\btr_proto.h" /> @@ -218,7 +217,6 @@ <ClInclude Include="..\..\..\src\jrd\drq.h" /> <ClInclude Include="..\..\..\src\jrd\dyn.h" /> <ClInclude Include="..\..\..\src\jrd\dyn_ut_proto.h" /> - <ClInclude Include="..\..\..\src\jrd\ErrorImpl.h" /> <ClInclude Include="..\..\..\src\jrd\EngineInterface.h" /> <ClInclude Include="..\..\..\src\jrd\err_proto.h" /> <ClInclude Include="..\..\..\src\jrd\event.h" /> Modified: firebird/trunk/builds/win32/msvc10/engine.vcxproj.filters =================================================================== --- firebird/trunk/builds/win32/msvc10/engine.vcxproj.filters 2013-02-19 11:20:49 UTC (rev 57676) +++ firebird/trunk/builds/win32/msvc10/engine.vcxproj.filters 2013-02-19 11:50:00 UTC (rev 57677) @@ -117,9 +117,6 @@ <ClCompile Include="..\..\..\src\dsql\AggNodes.cpp"> <Filter>DSQL</Filter> </ClCompile> - <ClCompile Include="..\..\..\src\dsql\BlrWriter.cpp"> - <Filter>DSQL</Filter> - </ClCompile> <ClCompile Include="..\..\..\src\dsql\BoolNodes.cpp"> <Filter>DSQL</Filter> </ClCompile> @@ -243,9 +240,6 @@ <ClCompile Include="..\..\..\src\jrd\err.cpp"> <Filter>JRD files</Filter> </ClCompile> - <ClCompile Include="..\..\..\src\jrd\ErrorImpl.cpp"> - <Filter>JRD files</Filter> - </ClCompile> <ClCompile Include="..\..\..\src\jrd\event.cpp"> <Filter>JRD files</Filter> </ClCompile> @@ -453,6 +447,9 @@ <ClCompile Include="..\..\..\src\jrd\CryptoManager.cpp"> <Filter>JRD files</Filter> </ClCompile> + <ClCompile Include="..\..\..\src\dsql\BlrDebugWriter.cpp"> + <Filter>DSQL</Filter> + </ClCompile> </ItemGroup> <ItemGroup> <ClInclude Include="..\..\..\src\jrd\recsrc\RecordSource.h"> @@ -467,9 +464,6 @@ <ClInclude Include="..\..\..\src\dsql\AggNodes.h"> <Filter>Header files</Filter> </ClInclude> - <ClInclude Include="..\..\..\src\dsql\BlrWriter.h"> - <Filter>Header files</Filter> - </ClInclude> <ClInclude Include="..\..\..\src\dsql\BoolNodes.h"> <Filter>Header files</Filter> </ClInclude> @@ -611,9 +605,6 @@ <ClInclude Include="..\..\..\src\jrd\blr.h"> <Filter>Header files</Filter> </ClInclude> - <ClInclude Include="..\..\..\src\jrd\BlrReader.h"> - <Filter>Header files</Filter> - </ClInclude> <ClInclude Include="..\..\..\src\jrd\btn.h"> <Filter>Header files</Filter> </ClInclude> @@ -680,9 +671,6 @@ <ClInclude Include="..\..\..\src\jrd\err_proto.h"> <Filter>Header files</Filter> </ClInclude> - <ClInclude Include="..\..\..\src\jrd\ErrorImpl.h"> - <Filter>Header files</Filter> - </ClInclude> <ClInclude Include="..\..\..\src\jrd\EngineInterface.h"> <Filter>Header files</Filter> </ClInclude> @@ -983,6 +971,12 @@ <ClInclude Include="..\..\..\src\jrd\CryptoManager.h"> <Filter>Header files</Filter> </ClInclude> + <ClInclude Include="..\..\..\src\include\gen\iberror.h"> + <Filter>Header files</Filter> + </ClInclude> + <ClInclude Include="..\..\..\src\dsql\BlrDebugWriter.h"> + <Filter>Header files</Filter> + </ClInclude> </ItemGroup> <ItemGroup> <None Include="..\..\..\src\dsql\DdlNodes.epp"> Modified: firebird/trunk/builds/win32/msvc10/yvalve.vcxproj =================================================================== --- firebird/trunk/builds/win32/msvc10/yvalve.vcxproj 2013-02-19 11:20:49 UTC (rev 57676) +++ firebird/trunk/builds/win32/msvc10/yvalve.vcxproj 2013-02-19 11:50:00 UTC (rev 57677) @@ -25,6 +25,7 @@ <ClCompile Include="..\..\..\src\auth\SecurityDatabase\LegacyClient.cpp" /> <ClCompile Include="..\..\..\src\jrd\os\win32\ibinitdll.cpp" /> <ClCompile Include="..\..\..\src\plugins\crypt\arc4\Arc4.cpp" /> + <ClCompile Include="..\..\..\src\remote\client\BlrFromMessage.cpp" /> <ClCompile Include="..\..\..\src\remote\client\interface.cpp" /> <ClCompile Include="..\..\..\src\yvalve\alt.cpp" /> <ClCompile Include="..\..\..\src\yvalve\DistributedTransaction.cpp" /> @@ -43,6 +44,7 @@ <ClInclude Include="..\..\..\src\auth\SecurityDatabase\LegacyClient.h" /> <ClInclude Include="..\..\..\src\auth\trusted\AuthSspi.h" /> <ClInclude Include="..\..\..\src\plugins\crypt\arc4\Arc4.h" /> + <ClInclude Include="..\..\..\src\remote\client\BlrFromMessage.h" /> <ClInclude Include="..\..\..\src\yvalve\alt_proto.h" /> <ClInclude Include="..\..\..\src\yvalve\array_proto.h" /> <ClInclude Include="..\..\..\src\yvalve\blob_proto.h" /> Modified: firebird/trunk/builds/win32/msvc10/yvalve.vcxproj.filters =================================================================== --- firebird/trunk/builds/win32/msvc10/yvalve.vcxproj.filters 2013-02-19 11:20:49 UTC (rev 57676) +++ firebird/trunk/builds/win32/msvc10/yvalve.vcxproj.filters 2013-02-19 11:50:00 UTC (rev 57677) @@ -78,6 +78,9 @@ <ClCompile Include="..\..\..\src\plugins\crypt\arc4\Arc4.cpp"> <Filter>source</Filter> </ClCompile> + <ClCompile Include="..\..\..\src\remote\client\BlrFromMessage.cpp"> + <Filter>Remote client</Filter> + </ClCompile> </ItemGroup> <ItemGroup> <ClInclude Include="..\..\..\src\yvalve\why_proto.h"> @@ -128,6 +131,9 @@ <ClInclude Include="..\..\..\src\plugins\crypt\arc4\Arc4.h"> <Filter>headers</Filter> </ClInclude> + <ClInclude Include="..\..\..\src\remote\client\BlrFromMessage.h"> + <Filter>headers</Filter> + </ClInclude> </ItemGroup> <ItemGroup> <ResourceCompile Include="..\..\..\src\jrd\version.rc"> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <di...@us...> - 2013-03-17 17:09:29
|
Revision: 57797 http://sourceforge.net/p/firebird/code/57797 Author: dimitr Date: 2013-03-17 17:09:26 +0000 (Sun, 17 Mar 2013) Log Message: ----------- Cleanup. MSVC10 does not like references to non-existing files. As for INTL, I see no sense in seeing all the charsets/collations in the IDE. Modified Paths: -------------- firebird/trunk/builds/win32/msvc10/engine.vcxproj firebird/trunk/builds/win32/msvc10/engine.vcxproj.filters firebird/trunk/builds/win32/msvc10/gsec.vcxproj firebird/trunk/builds/win32/msvc10/gsec.vcxproj.filters firebird/trunk/builds/win32/msvc10/intl.vcxproj firebird/trunk/builds/win32/msvc10/intl.vcxproj.filters firebird/trunk/builds/win32/msvc10/udr_engine.vcxproj firebird/trunk/builds/win32/msvc10/udr_engine.vcxproj.filters Modified: firebird/trunk/builds/win32/msvc10/engine.vcxproj =================================================================== --- firebird/trunk/builds/win32/msvc10/engine.vcxproj 2013-03-17 14:41:13 UTC (rev 57796) +++ firebird/trunk/builds/win32/msvc10/engine.vcxproj 2013-03-17 17:09:26 UTC (rev 57797) @@ -173,7 +173,6 @@ <ClInclude Include="..\..\..\src\dsql\make_proto.h" /> <ClInclude Include="..\..\..\src\dsql\metd_proto.h" /> <ClInclude Include="..\..\..\src\dsql\movd_proto.h" /> - <ClInclude Include="..\..\..\src\dsql\node.h" /> <ClInclude Include="..\..\..\src\dsql\Nodes.h" /> <ClInclude Include="..\..\..\src\dsql\PackageNodes.h" /> <ClInclude Include="..\..\..\src\dsql\Parser.h" /> Modified: firebird/trunk/builds/win32/msvc10/engine.vcxproj.filters =================================================================== --- firebird/trunk/builds/win32/msvc10/engine.vcxproj.filters 2013-03-17 14:41:13 UTC (rev 57796) +++ firebird/trunk/builds/win32/msvc10/engine.vcxproj.filters 2013-03-17 17:09:26 UTC (rev 57797) @@ -506,9 +506,6 @@ <ClInclude Include="..\..\..\src\dsql\movd_proto.h"> <Filter>Header files</Filter> </ClInclude> - <ClInclude Include="..\..\..\src\dsql\node.h"> - <Filter>Header files</Filter> - </ClInclude> <ClInclude Include="..\..\..\src\dsql\Nodes.h"> <Filter>Header files</Filter> </ClInclude> Modified: firebird/trunk/builds/win32/msvc10/gsec.vcxproj =================================================================== --- firebird/trunk/builds/win32/msvc10/gsec.vcxproj 2013-03-17 14:41:13 UTC (rev 57796) +++ firebird/trunk/builds/win32/msvc10/gsec.vcxproj 2013-03-17 17:09:26 UTC (rev 57797) @@ -181,7 +181,6 @@ </ItemGroup> <ItemGroup> <ClInclude Include="..\..\..\src\utilities\gsec\gsec.h" /> - <ClInclude Include="..\..\..\src\utilities\gsec\secur_proto.h" /> </ItemGroup> <ItemGroup> <ResourceCompile Include="..\..\..\src\jrd\version.rc"> Modified: firebird/trunk/builds/win32/msvc10/gsec.vcxproj.filters =================================================================== --- firebird/trunk/builds/win32/msvc10/gsec.vcxproj.filters 2013-03-17 14:41:13 UTC (rev 57796) +++ firebird/trunk/builds/win32/msvc10/gsec.vcxproj.filters 2013-03-17 17:09:26 UTC (rev 57797) @@ -25,9 +25,6 @@ <ClInclude Include="..\..\..\src\utilities\gsec\gsec.h"> <Filter>Header files</Filter> </ClInclude> - <ClInclude Include="..\..\..\src\utilities\gsec\secur_proto.h"> - <Filter>Header files</Filter> - </ClInclude> </ItemGroup> <ItemGroup> <ResourceCompile Include="..\..\..\src\jrd\version.rc"> Modified: firebird/trunk/builds/win32/msvc10/intl.vcxproj =================================================================== --- firebird/trunk/builds/win32/msvc10/intl.vcxproj 2013-03-17 14:41:13 UTC (rev 57796) +++ firebird/trunk/builds/win32/msvc10/intl.vcxproj 2013-03-17 17:09:26 UTC (rev 57797) @@ -266,152 +266,7 @@ </ItemGroup> <ItemGroup> <ClInclude Include="..\..\..\src\intl\charsets.h" /> - <ClInclude Include="..\..\..\src\intl\charsets\cs_437.h" /> - <ClInclude Include="..\..\..\src\intl\charsets\cs_737.h" /> - <ClInclude Include="..\..\..\src\intl\charsets\cs_775.h" /> - <ClInclude Include="..\..\..\src\intl\charsets\cs_850.h" /> - <ClInclude Include="..\..\..\src\intl\charsets\cs_852.h" /> - <ClInclude Include="..\..\..\src\intl\charsets\cs_857.h" /> - <ClInclude Include="..\..\..\src\intl\charsets\cs_858.h" /> - <ClInclude Include="..\..\..\src\intl\charsets\cs_860.h" /> - <ClInclude Include="..\..\..\src\intl\charsets\cs_861.h" /> - <ClInclude Include="..\..\..\src\intl\charsets\cs_862.h" /> - <ClInclude Include="..\..\..\src\intl\charsets\cs_863.h" /> - <ClInclude Include="..\..\..\src\intl\charsets\cs_864.h" /> - <ClInclude Include="..\..\..\src\intl\charsets\cs_865.h" /> - <ClInclude Include="..\..\..\src\intl\charsets\cs_866.h" /> - <ClInclude Include="..\..\..\src\intl\charsets\cs_869.h" /> - <ClInclude Include="..\..\..\src\intl\charsets\cs_big5.h" /> - <ClInclude Include="..\..\..\src\intl\charsets\cs_cyrl.h" /> - <ClInclude Include="..\..\..\src\intl\charsets\cs_gb2312.h" /> - <ClInclude Include="..\..\..\src\intl\charsets\cs_iso8859_1.h" /> - <ClInclude Include="..\..\..\src\intl\charsets\cs_iso8859_13.h" /> - <ClInclude Include="..\..\..\src\intl\charsets\cs_iso8859_2.h" /> - <ClInclude Include="..\..\..\src\intl\charsets\cs_iso8859_3.h" /> - <ClInclude Include="..\..\..\src\intl\charsets\cs_iso8859_4.h" /> - <ClInclude Include="..\..\..\src\intl\charsets\cs_iso8859_5.h" /> - <ClInclude Include="..\..\..\src\intl\charsets\cs_iso8859_6.h" /> - <ClInclude Include="..\..\..\src\intl\charsets\cs_iso8859_7.h" /> - <ClInclude Include="..\..\..\src\intl\charsets\cs_iso8859_8.h" /> - <ClInclude Include="..\..\..\src\intl\charsets\cs_iso8859_9.h" /> - <ClInclude Include="..\..\..\src\intl\charsets\cs_jis_0208_1990.h" /> - <ClInclude Include="..\..\..\src\intl\charsets\cs_koi8r.h" /> - <ClInclude Include="..\..\..\src\intl\charsets\cs_koi8u.h" /> - <ClInclude Include="..\..\..\src\intl\charsets\cs_ksc5601.h" /> - <ClInclude Include="..\..\..\src\intl\charsets\cs_next.h" /> - <ClInclude Include="..\..\..\src\intl\charsets\cs_sjis.h" /> - <ClInclude Include="..\..\..\src\intl\charsets\cs_w1250.h" /> - <ClInclude Include="..\..\..\src\intl\charsets\cs_w1251.h" /> - <ClInclude Include="..\..\..\src\intl\charsets\cs_w1252.h" /> - <ClInclude Include="..\..\..\src\intl\charsets\cs_w1253.h" /> - <ClInclude Include="..\..\..\src\intl\charsets\cs_w1254.h" /> - <ClInclude Include="..\..\..\src\intl\charsets\cs_w1255.h" /> - <ClInclude Include="..\..\..\src\intl\charsets\cs_w1256.h" /> - <ClInclude Include="..\..\..\src\intl\charsets\cs_w1257.h" /> - <ClInclude Include="..\..\..\src\intl\charsets\cs_w1258.h" /> - <ClInclude Include="..\..\..\src\intl\collations\bl88591ca0.h" /> - <ClInclude Include="..\..\..\src\intl\collations\bl88591da0.h" /> - <ClInclude Include="..\..\..\src\intl\collations\bl88591de0.h" /> - <ClInclude Include="..\..\..\src\intl\collations\bl88591es0.h" /> - <ClInclude Include="..\..\..\src\intl\collations\bl88591fi0.h" /> - <ClInclude Include="..\..\..\src\intl\collations\bl88591fr0.h" /> - <ClInclude Include="..\..\..\src\intl\collations\bl88591is0.h" /> - <ClInclude Include="..\..\..\src\intl\collations\bl88591it0.h" /> - <ClInclude Include="..\..\..\src\intl\collations\bl88591nl0.h" /> - <ClInclude Include="..\..\..\src\intl\collations\bl88591no0.h" /> - <ClInclude Include="..\..\..\src\intl\collations\bl88591pt0.h" /> - <ClInclude Include="..\..\..\src\intl\collations\bl88591ptbr0.h" /> - <ClInclude Include="..\..\..\src\intl\collations\bl88591sv0.h" /> - <ClInclude Include="..\..\..\src\intl\collations\bl88591uk0.h" /> - <ClInclude Include="..\..\..\src\intl\collations\bl88591us0.h" /> - <ClInclude Include="..\..\..\src\intl\collations\blNEXTde0.h" /> - <ClInclude Include="..\..\..\src\intl\collations\blNEXTes0.h" /> - <ClInclude Include="..\..\..\src\intl\collations\blNEXTfr0.h" /> - <ClInclude Include="..\..\..\src\intl\collations\blNEXTit0.h" /> - <ClInclude Include="..\..\..\src\intl\collations\blNEXTus0.h" /> - <ClInclude Include="..\..\..\src\intl\collations\db437de0.h" /> - <ClInclude Include="..\..\..\src\intl\collations\db437es1.h" /> - <ClInclude Include="..\..\..\src\intl\collations\db437fi0.h" /> - <ClInclude Include="..\..\..\src\intl\collations\db437fr0.h" /> - <ClInclude Include="..\..\..\src\intl\collations\db437it0.h" /> - <ClInclude Include="..\..\..\src\intl\collations\db437nl0.h" /> - <ClInclude Include="..\..\..\src\intl\collations\db437sv0.h" /> - <ClInclude Include="..\..\..\src\intl\collations\db437uk0.h" /> - <ClInclude Include="..\..\..\src\intl\collations\db437us0.h" /> - <ClInclude Include="..\..\..\src\intl\collations\db850cf0.h" /> - <ClInclude Include="..\..\..\src\intl\collations\db850de0.h" /> - <ClInclude Include="..\..\..\src\intl\collations\db850es0.h" /> - <ClInclude Include="..\..\..\src\intl\collations\db850fr0.h" /> - <ClInclude Include="..\..\..\src\intl\collations\db850it1.h" /> - <ClInclude Include="..\..\..\src\intl\collations\db850nl0.h" /> - <ClInclude Include="..\..\..\src\intl\collations\db850pt0.h" /> - <ClInclude Include="..\..\..\src\intl\collations\db850sv1.h" /> - <ClInclude Include="..\..\..\src\intl\collations\db850uk0.h" /> - <ClInclude Include="..\..\..\src\intl\collations\db850us0.h" /> - <ClInclude Include="..\..\..\src\intl\collations\db852cz0.h" /> - <ClInclude Include="..\..\..\src\intl\collations\db852po0.h" /> - <ClInclude Include="..\..\..\src\intl\collations\db852sl0.h" /> - <ClInclude Include="..\..\..\src\intl\collations\db857tr0.h" /> - <ClInclude Include="..\..\..\src\intl\collations\db860pt0.h" /> - <ClInclude Include="..\..\..\src\intl\collations\db863cf1.h" /> - <ClInclude Include="..\..\..\src\intl\collations\db865da0.h" /> - <ClInclude Include="..\..\..\src\intl\collations\db865no0.h" /> - <ClInclude Include="..\..\..\src\intl\collations\db866ru0.h" /> - <ClInclude Include="..\..\..\src\intl\collations\koi8r_ru.h" /> - <ClInclude Include="..\..\..\src\intl\collations\koi8u_ua.h" /> - <ClInclude Include="..\..\..\src\intl\collations\pd437intl.h" /> - <ClInclude Include="..\..\..\src\intl\collations\pd437swedfin.h" /> - <ClInclude Include="..\..\..\src\intl\collations\pd852czech.h" /> - <ClInclude Include="..\..\..\src\intl\collations\pd852hundc.h" /> - <ClInclude Include="..\..\..\src\intl\collations\pd852polish.h" /> - <ClInclude Include="..\..\..\src\intl\collations\pd852slovene.h" /> - <ClInclude Include="..\..\..\src\intl\collations\pd861iceland.h" /> - <ClInclude Include="..\..\..\src\intl\collations\pd865nordan40.h" /> - <ClInclude Include="..\..\..\src\intl\collations\pd866cyrr.h" /> - <ClInclude Include="..\..\..\src\intl\collations\pw1250czech.h" /> - <ClInclude Include="..\..\..\src\intl\collations\pw1250hun.h" /> - <ClInclude Include="..\..\..\src\intl\collations\pw1250hundc.h" /> - <ClInclude Include="..\..\..\src\intl\collations\pw1250polish.h" /> - <ClInclude Include="..\..\..\src\intl\collations\pw1250slov.h" /> - <ClInclude Include="..\..\..\src\intl\collations\pw1251cyrr.h" /> - <ClInclude Include="..\..\..\src\intl\collations\pw1252i850.h" /> - <ClInclude Include="..\..\..\src\intl\collations\pw1252intl.h" /> - <ClInclude Include="..\..\..\src\intl\collations\pw1252nor4.h" /> - <ClInclude Include="..\..\..\src\intl\collations\pw1252ptbr.h" /> - <ClInclude Include="..\..\..\src\intl\collations\pw1252span.h" /> - <ClInclude Include="..\..\..\src\intl\collations\pw1252swfn.h" /> - <ClInclude Include="..\..\..\src\intl\collations\pw1253greek1.h" /> - <ClInclude Include="..\..\..\src\intl\collations\pw1254turk.h" /> - <ClInclude Include="..\..\..\src\intl\collations\win1250bsba.h" /> - <ClInclude Include="..\..\..\src\intl\collations\win1257_ee.h" /> - <ClInclude Include="..\..\..\src\intl\collations\win1257_lt.h" /> - <ClInclude Include="..\..\..\src\intl\collations\win1257_lv.h" /> - <ClInclude Include="..\..\..\src\intl\collations\win_cz.h" /> - <ClInclude Include="..\..\..\src\intl\collations\win_cz_ci_ai.h" /> - <ClInclude Include="..\..\..\src\intl\collations\xx1251_ua.h" /> - <ClInclude Include="..\..\..\src\intl\collations\xx885913lt.h" /> - <ClInclude Include="..\..\..\src\intl\collations\xx88592czech.h" /> - <ClInclude Include="..\..\..\src\intl\collations\xx88592hun.h" /> - <ClInclude Include="..\..\..\src\intl\collations\xx88592plk.h" /> - <ClInclude Include="..\..\..\src\intl\conversions\tx437_865.h" /> - <ClInclude Include="..\..\..\src\intl\conversions\tx437_lat1.h" /> - <ClInclude Include="..\..\..\src\intl\conversions\tx865_lat1.h" /> <ClInclude Include="..\..\..\src\intl\country_codes.h" /> - <ClInclude Include="..\..\..\src\intl\cs_icu.h" /> - <ClInclude Include="..\..\..\src\intl\cv_big5.h" /> - <ClInclude Include="..\..\..\src\intl\cv_gb2312.h" /> - <ClInclude Include="..\..\..\src\intl\cv_icu.h" /> - <ClInclude Include="..\..\..\src\intl\cv_jis.h" /> - <ClInclude Include="..\..\..\src\intl\cv_ksc.h" /> - <ClInclude Include="..\..\..\src\intl\cv_narrow.h" /> - <ClInclude Include="..\..\..\src\intl\cv_unicode_fss.h" /> - <ClInclude Include="..\..\..\src\intl\kanji.h" /> - <ClInclude Include="..\..\..\src\intl\kanji_proto.h" /> - <ClInclude Include="..\..\..\src\intl\lc_ascii.h" /> - <ClInclude Include="..\..\..\src\intl\lc_big5.h" /> - <ClInclude Include="..\..\..\src\intl\lc_dos.h" /> - <ClInclude Include="..\..\..\src\intl\lc_icu.h" /> - <ClInclude Include="..\..\..\src\intl\lc_narrow.h" /> <ClInclude Include="..\..\..\src\intl\ld.h" /> <ClInclude Include="..\..\..\src\intl\ldcommon.h" /> <ClInclude Include="..\..\..\src\intl\ld_proto.h" /> Modified: firebird/trunk/builds/win32/msvc10/intl.vcxproj.filters =================================================================== --- firebird/trunk/builds/win32/msvc10/intl.vcxproj.filters 2013-03-17 14:41:13 UTC (rev 57796) +++ firebird/trunk/builds/win32/msvc10/intl.vcxproj.filters 2013-03-17 17:09:26 UTC (rev 57797) @@ -117,447 +117,12 @@ <ClInclude Include="..\..\..\src\intl\country_codes.h"> <Filter>Header files</Filter> </ClInclude> - <ClInclude Include="..\..\..\src\intl\cs_icu.h"> - <Filter>Header files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\intl\cv_big5.h"> - <Filter>Header files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\intl\cv_gb2312.h"> - <Filter>Header files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\intl\cv_icu.h"> - <Filter>Header files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\intl\cv_jis.h"> - <Filter>Header files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\intl\cv_ksc.h"> - <Filter>Header files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\intl\cv_narrow.h"> - <Filter>Header files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\intl\cv_unicode_fss.h"> - <Filter>Header files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\intl\kanji.h"> - <Filter>Header files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\intl\kanji_proto.h"> - <Filter>Header files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\intl\lc_ascii.h"> - <Filter>Header files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\intl\lc_big5.h"> - <Filter>Header files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\intl\lc_dos.h"> - <Filter>Header files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\intl\lc_icu.h"> - <Filter>Header files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\intl\lc_narrow.h"> - <Filter>Header files</Filter> - </ClInclude> <ClInclude Include="..\..\..\src\intl\ld.h"> <Filter>Header files</Filter> </ClInclude> <ClInclude Include="..\..\..\src\intl\ld_proto.h"> <Filter>Header files</Filter> </ClInclude> - <ClInclude Include="..\..\..\src\intl\charsets\cs_w1258.h"> - <Filter>Header files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\intl\charsets\cs_437.h"> - <Filter>Header files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\intl\charsets\cs_737.h"> - <Filter>Header files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\intl\charsets\cs_775.h"> - <Filter>Header files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\intl\charsets\cs_850.h"> - <Filter>Header files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\intl\charsets\cs_852.h"> - <Filter>Header files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\intl\charsets\cs_857.h"> - <Filter>Header files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\intl\charsets\cs_858.h"> - <Filter>Header files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\intl\charsets\cs_860.h"> - <Filter>Header files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\intl\charsets\cs_861.h"> - <Filter>Header files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\intl\charsets\cs_862.h"> - <Filter>Header files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\intl\charsets\cs_863.h"> - <Filter>Header files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\intl\charsets\cs_864.h"> - <Filter>Header files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\intl\charsets\cs_865.h"> - <Filter>Header files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\intl\charsets\cs_866.h"> - <Filter>Header files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\intl\charsets\cs_869.h"> - <Filter>Header files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\intl\charsets\cs_big5.h"> - <Filter>Header files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\intl\charsets\cs_cyrl.h"> - <Filter>Header files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\intl\charsets\cs_gb2312.h"> - <Filter>Header files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\intl\charsets\cs_iso8859_1.h"> - <Filter>Header files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\intl\charsets\cs_iso8859_2.h"> - <Filter>Header files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\intl\charsets\cs_iso8859_3.h"> - <Filter>Header files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\intl\charsets\cs_iso8859_4.h"> - <Filter>Header files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\intl\charsets\cs_iso8859_5.h"> - <Filter>Header files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\intl\charsets\cs_iso8859_6.h"> - <Filter>Header files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\intl\charsets\cs_iso8859_7.h"> - <Filter>Header files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\intl\charsets\cs_iso8859_8.h"> - <Filter>Header files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\intl\charsets\cs_iso8859_9.h"> - <Filter>Header files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\intl\charsets\cs_iso8859_13.h"> - <Filter>Header files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\intl\charsets\cs_jis_0208_1990.h"> - <Filter>Header files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\intl\charsets\cs_koi8r.h"> - <Filter>Header files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\intl\charsets\cs_koi8u.h"> - <Filter>Header files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\intl\charsets\cs_ksc5601.h"> - <Filter>Header files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\intl\charsets\cs_next.h"> - <Filter>Header files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\intl\charsets\cs_sjis.h"> - <Filter>Header files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\intl\charsets\cs_w1250.h"> - <Filter>Header files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\intl\charsets\cs_w1251.h"> - <Filter>Header files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\intl\charsets\cs_w1252.h"> - <Filter>Header files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\intl\charsets\cs_w1253.h"> - <Filter>Header files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\intl\charsets\cs_w1254.h"> - <Filter>Header files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\intl\charsets\cs_w1255.h"> - <Filter>Header files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\intl\charsets\cs_w1256.h"> - <Filter>Header files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\intl\charsets\cs_w1257.h"> - <Filter>Header files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\intl\collations\xx885913lt.h"> - <Filter>Header files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\intl\collations\bl88591ca0.h"> - <Filter>Header files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\intl\collations\bl88591da0.h"> - <Filter>Header files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\intl\collations\bl88591de0.h"> - <Filter>Header files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\intl\collations\bl88591es0.h"> - <Filter>Header files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\intl\collations\bl88591fi0.h"> - <Filter>Header files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\intl\collations\bl88591fr0.h"> - <Filter>Header files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\intl\collations\bl88591is0.h"> - <Filter>Header files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\intl\collations\bl88591it0.h"> - <Filter>Header files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\intl\collations\bl88591nl0.h"> - <Filter>Header files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\intl\collations\bl88591no0.h"> - <Filter>Header files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\intl\collations\bl88591pt0.h"> - <Filter>Header files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\intl\collations\bl88591ptbr0.h"> - <Filter>Header files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\intl\collations\bl88591sv0.h"> - <Filter>Header files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\intl\collations\bl88591uk0.h"> - <Filter>Header files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\intl\collations\bl88591us0.h"> - <Filter>Header files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\intl\collations\blNEXTde0.h"> - <Filter>Header files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\intl\collations\blNEXTes0.h"> - <Filter>Header files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\intl\collations\blNEXTfr0.h"> - <Filter>Header files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\intl\collations\blNEXTit0.h"> - <Filter>Header files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\intl\collations\blNEXTus0.h"> - <Filter>Header files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\intl\collations\db437de0.h"> - <Filter>Header files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\intl\collations\db437es1.h"> - <Filter>Header files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\intl\collations\db437fi0.h"> - <Filter>Header files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\intl\collations\db437fr0.h"> - <Filter>Header files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\intl\collations\db437it0.h"> - <Filter>Header files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\intl\collations\db437nl0.h"> - <Filter>Header files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\intl\collations\db437sv0.h"> - <Filter>Header files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\intl\collations\db437uk0.h"> - <Filter>Header files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\intl\collations\db437us0.h"> - <Filter>Header files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\intl\collations\db850cf0.h"> - <Filter>Header files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\intl\collations\db850de0.h"> - <Filter>Header files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\intl\collations\db850es0.h"> - <Filter>Header files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\intl\collations\db850fr0.h"> - <Filter>Header files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\intl\collations\db850it1.h"> - <Filter>Header files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\intl\collations\db850nl0.h"> - <Filter>Header files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\intl\collations\db850pt0.h"> - <Filter>Header files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\intl\collations\db850sv1.h"> - <Filter>Header files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\intl\collations\db850uk0.h"> - <Filter>Header files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\intl\collations\db850us0.h"> - <Filter>Header files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\intl\collations\db852cz0.h"> - <Filter>Header files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\intl\collations\db852po0.h"> - <Filter>Header files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\intl\collations\db852sl0.h"> - <Filter>Header files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\intl\collations\db857tr0.h"> - <Filter>Header files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\intl\collations\db860pt0.h"> - <Filter>Header files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\intl\collations\db863cf1.h"> - <Filter>Header files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\intl\collations\db865da0.h"> - <Filter>Header files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\intl\collations\db865no0.h"> - <Filter>Header files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\intl\collations\db866ru0.h"> - <Filter>Header files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\intl\collations\koi8r_ru.h"> - <Filter>Header files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\intl\collations\koi8u_ua.h"> - <Filter>Header files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\intl\collations\pd437intl.h"> - <Filter>Header files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\intl\collations\pd437swedfin.h"> - <Filter>Header files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\intl\collations\pd852czech.h"> - <Filter>Header files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\intl\collations\pd852hundc.h"> - <Filter>Header files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\intl\collations\pd852polish.h"> - <Filter>Header files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\intl\collations\pd852slovene.h"> - <Filter>Header files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\intl\collations\pd861iceland.h"> - <Filter>Header files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\intl\collations\pd865nordan40.h"> - <Filter>Header files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\intl\collations\pd866cyrr.h"> - <Filter>Header files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\intl\collations\pw1250czech.h"> - <Filter>Header files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\intl\collations\pw1250hun.h"> - <Filter>Header files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\intl\collations\pw1250hundc.h"> - <Filter>Header files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\intl\collations\pw1250polish.h"> - <Filter>Header files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\intl\collations\pw1250slov.h"> - <Filter>Header files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\intl\collations\pw1251cyrr.h"> - <Filter>Header files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\intl\collations\pw1252i850.h"> - <Filter>Header files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\intl\collations\pw1252intl.h"> - <Filter>Header files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\intl\collations\pw1252nor4.h"> - <Filter>Header files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\intl\collations\pw1252ptbr.h"> - <Filter>Header files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\intl\collations\pw1252span.h"> - <Filter>Header files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\intl\collations\pw1252swfn.h"> - <Filter>Header files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\intl\collations\pw1253greek1.h"> - <Filter>Header files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\intl\collations\pw1254turk.h"> - <Filter>Header files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\intl\collations\win1250bsba.h"> - <Filter>Header files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\intl\collations\win1257_ee.h"> - <Filter>Header files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\intl\collations\win1257_lt.h"> - <Filter>Header files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\intl\collations\win1257_lv.h"> - <Filter>Header files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\intl\collations\win_cz.h"> - <Filter>Header files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\intl\collations\win_cz_ci_ai.h"> - <Filter>Header files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\intl\collations\xx1251_ua.h"> - <Filter>Header files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\intl\collations\xx88592czech.h"> - <Filter>Header files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\intl\collations\xx88592hun.h"> - <Filter>Header files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\intl\collations\xx88592plk.h"> - <Filter>Header files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\intl\conversions\tx437_865.h"> - <Filter>Header files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\intl\conversions\tx437_lat1.h"> - <Filter>Header files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\intl\conversions\tx865_lat1.h"> - <Filter>Header files</Filter> - </ClInclude> </ItemGroup> <ItemGroup> <None Include="..\defs\intl.def" /> Modified: firebird/trunk/builds/win32/msvc10/udr_engine.vcxproj =================================================================== --- firebird/trunk/builds/win32/msvc10/udr_engine.vcxproj 2013-03-17 14:41:13 UTC (rev 57796) +++ firebird/trunk/builds/win32/msvc10/udr_engine.vcxproj 2013-03-17 17:09:26 UTC (rev 57797) @@ -205,9 +205,6 @@ <ClCompile Include="..\..\..\src\plugins\udr_engine\UdrEngine.cpp" /> </ItemGroup> <ItemGroup> - <ClInclude Include="..\..\..\src\include\FirebirdUdr.h" /> - </ItemGroup> - <ItemGroup> <ResourceCompile Include="..\..\..\src\jrd\version.rc"> <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\src\jrd</AdditionalIncludeDirectories> <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\src\jrd</AdditionalIncludeDirectories> Modified: firebird/trunk/builds/win32/msvc10/udr_engine.vcxproj.filters =================================================================== --- firebird/trunk/builds/win32/msvc10/udr_engine.vcxproj.filters 2013-03-17 14:41:13 UTC (rev 57796) +++ firebird/trunk/builds/win32/msvc10/udr_engine.vcxproj.filters 2013-03-17 17:09:26 UTC (rev 57797) @@ -19,11 +19,6 @@ </ClCompile> </ItemGroup> <ItemGroup> - <ClInclude Include="..\..\..\src\include\FirebirdUdr.h"> - <Filter>Header files</Filter> - </ClInclude> - </ItemGroup> - <ItemGroup> <ResourceCompile Include="..\..\..\src\jrd\version.rc"> <Filter>Resource files</Filter> </ResourceCompile> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <hv...@us...> - 2014-04-30 11:09:35
|
Revision: 59506 http://sourceforge.net/p/firebird/code/59506 Author: hvlad Date: 2014-04-30 11:09:32 +0000 (Wed, 30 Apr 2014) Log Message: ----------- Fixed VC10 build - make all project use the same set of include directories. Modified Paths: -------------- firebird/trunk/builds/win32/msvc10/common.vcxproj firebird/trunk/builds/win32/msvc10/engine.vcxproj firebird/trunk/builds/win32/msvc10/fbtrace.vcxproj firebird/trunk/builds/win32/msvc10/firebird2.props firebird/trunk/builds/win32/msvc10/gpre.vcxproj firebird/trunk/builds/win32/msvc10/gpre_common.vcxproj firebird/trunk/builds/win32/msvc10/intl.vcxproj firebird/trunk/builds/win32/msvc10/isql.vcxproj firebird/trunk/builds/win32/msvc10/legacy_auth.vcxproj firebird/trunk/builds/win32/msvc10/legacy_usermanager.vcxproj firebird/trunk/builds/win32/msvc10/srp.vcxproj firebird/trunk/builds/win32/msvc10/udr_engine.vcxproj firebird/trunk/builds/win32/msvc10/yvalve.vcxproj Modified: firebird/trunk/builds/win32/msvc10/common.vcxproj =================================================================== --- firebird/trunk/builds/win32/msvc10/common.vcxproj 2014-04-30 09:20:30 UTC (rev 59505) +++ firebird/trunk/builds/win32/msvc10/common.vcxproj 2014-04-30 11:09:32 UTC (rev 59506) @@ -265,7 +265,6 @@ <IntrinsicFunctions>true</IntrinsicFunctions> <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;SUPERSERVER;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>../../../extern/icu/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <ResourceCompile> <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> @@ -281,7 +280,6 @@ <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;DEV_BUILD;SUPERSERVER;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PrecompiledHeader> </PrecompiledHeader> - <AdditionalIncludeDirectories>../../../extern/icu/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <ResourceCompile> <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> @@ -301,7 +299,6 @@ <IntrinsicFunctions>true</IntrinsicFunctions> <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;SUPERSERVER;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>../../../extern/icu/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <ResourceCompile> <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> @@ -320,7 +317,6 @@ <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;DEV_BUILD;SUPERSERVER;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PrecompiledHeader> </PrecompiledHeader> - <AdditionalIncludeDirectories>../../../extern/icu/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <ResourceCompile> <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> Modified: firebird/trunk/builds/win32/msvc10/engine.vcxproj =================================================================== --- firebird/trunk/builds/win32/msvc10/engine.vcxproj 2014-04-30 09:20:30 UTC (rev 59505) +++ firebird/trunk/builds/win32/msvc10/engine.vcxproj 2014-04-30 11:09:32 UTC (rev 59506) @@ -467,7 +467,6 @@ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> <Optimization>Disabled</Optimization> - <AdditionalIncludeDirectories>../../../src/include;../../../src/include/gen;../../../extern/icu/include;../../../src/vulcan;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_LIB;SUPERSERVER;DEV_BUILD;NAMESPACE=Vulcan;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <ResourceCompile> @@ -505,7 +504,6 @@ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> <IntrinsicFunctions>true</IntrinsicFunctions> <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> - <AdditionalIncludeDirectories>../../../src/include;../../../src/include/gen;../../../extern/icu/include;../../../src/vulcan;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_LIB;SUPERSERVER;NAMESPACE=Vulcan;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PrecompiledHeader> </PrecompiledHeader> Modified: firebird/trunk/builds/win32/msvc10/fbtrace.vcxproj =================================================================== --- firebird/trunk/builds/win32/msvc10/fbtrace.vcxproj 2014-04-30 09:20:30 UTC (rev 59505) +++ firebird/trunk/builds/win32/msvc10/fbtrace.vcxproj 2014-04-30 11:09:32 UTC (rev 59506) @@ -96,7 +96,6 @@ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> <Optimization>Disabled</Optimization> - <AdditionalIncludeDirectories>..\..\..\src\include;..\..\..\src\include\gen;..\..\..\src\common\classes;..\..\..\extern\icu\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>WIN32;_DEBUG;DEV_BUILD;_WINDOWS;_USRDLL;SUPERCLIENT;FBTRACE_EXPORTS;NAMESPACE=Vulcan;%(PreprocessorDefinitions)</PreprocessorDefinitions> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> </ClCompile> @@ -115,7 +114,6 @@ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> <IntrinsicFunctions>true</IntrinsicFunctions> <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> - <AdditionalIncludeDirectories>..\..\..\src\include\gen;..\..\..\src\include;..\..\..\src\common\classes;..\..\..\extern\icu\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;FBTRACE_EXPORTS;SUPERCLIENT;NAMESPACE=Vulcan;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PrecompiledHeader> </PrecompiledHeader> @@ -135,7 +133,6 @@ </Midl> <ClCompile> <Optimization>Disabled</Optimization> - <AdditionalIncludeDirectories>..\..\..\src\include;..\..\..\src\include\gen;..\..\..\src\common\classes;..\..\..\extern\icu\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>WIN32;_DEBUG;DEV_BUILD;_WINDOWS;_USRDLL;SUPERCLIENT;FBTRACE_EXPORTS;NAMESPACE=Vulcan;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> @@ -157,7 +154,6 @@ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> <IntrinsicFunctions>true</IntrinsicFunctions> <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> - <AdditionalIncludeDirectories>..\..\..\src\include\gen;..\..\..\src\include;..\..\..\src\common\classes;..\..\..\extern\icu\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;FBTRACE_EXPORTS;SUPERCLIENT;NAMESPACE=Vulcan;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PrecompiledHeader> </PrecompiledHeader> Modified: firebird/trunk/builds/win32/msvc10/firebird2.props =================================================================== --- firebird/trunk/builds/win32/msvc10/firebird2.props 2014-04-30 09:20:30 UTC (rev 59505) +++ firebird/trunk/builds/win32/msvc10/firebird2.props 2014-04-30 11:09:32 UTC (rev 59506) @@ -10,7 +10,7 @@ <ClCompile> <AdditionalOptions>/EHsc- %(AdditionalOptions)</AdditionalOptions> <OmitFramePointers>true</OmitFramePointers> - <AdditionalIncludeDirectories>../../../src/include;../../../src/include/gen;../../../extern/libtommath;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>../../../src/include;../../../src/include/gen;../../../extern/libtommath;../../../extern/icu/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <ExceptionHandling> </ExceptionHandling> <RuntimeTypeInfo>false</RuntimeTypeInfo> Modified: firebird/trunk/builds/win32/msvc10/gpre.vcxproj =================================================================== --- firebird/trunk/builds/win32/msvc10/gpre.vcxproj 2014-04-30 09:20:30 UTC (rev 59505) +++ firebird/trunk/builds/win32/msvc10/gpre.vcxproj 2014-04-30 11:09:32 UTC (rev 59506) @@ -100,7 +100,6 @@ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> <IntrinsicFunctions>true</IntrinsicFunctions> <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> - <AdditionalIncludeDirectories>../../../src/include;../../../src/include/gen;../../../src/jrd;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>GPRE_FORTRAN;GPRE_PASCAL;GPRE_COBOL;GPRE_ADA;NDEBUG;_CONSOLE;SUPERCLIENT;WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions> <BrowseInformation>true</BrowseInformation> </ClCompile> @@ -145,7 +144,6 @@ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> <Optimization>Disabled</Optimization> - <AdditionalIncludeDirectories>../../../src/include;../../../src/include/gen;../../../src/jrd;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>GPRE_FORTRAN;GPRE_PASCAL;GPRE_COBOL;GPRE_ADA;_DEBUG;_CONSOLE;SUPERCLIENT;WIN32;DEV_BUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions> <BrowseInformation>true</BrowseInformation> </ClCompile> Modified: firebird/trunk/builds/win32/msvc10/gpre_common.vcxproj =================================================================== --- firebird/trunk/builds/win32/msvc10/gpre_common.vcxproj 2014-04-30 09:20:30 UTC (rev 59505) +++ firebird/trunk/builds/win32/msvc10/gpre_common.vcxproj 2014-04-30 11:09:32 UTC (rev 59506) @@ -96,7 +96,6 @@ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> <IntrinsicFunctions>true</IntrinsicFunctions> <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> - <AdditionalIncludeDirectories>../../../src/include;../../../src/include/gen;../../../src/jrd;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>GPRE_FORTRAN;GPRE_PASCAL;GPRE_COBOL;GPRE_ADA;NDEBUG;_CONSOLE;SUPERCLIENT;WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions> <BrowseInformation>true</BrowseInformation> </ClCompile> @@ -143,7 +142,6 @@ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> <Optimization>Disabled</Optimization> - <AdditionalIncludeDirectories>../../../src/include;../../../src/include/gen;../../../src/jrd;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>GPRE_FORTRAN;GPRE_PASCAL;GPRE_COBOL;GPRE_ADA;_DEBUG;_CONSOLE;SUPERCLIENT;WIN32;DEV_BUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions> <BrowseInformation>true</BrowseInformation> </ClCompile> Modified: firebird/trunk/builds/win32/msvc10/intl.vcxproj =================================================================== --- firebird/trunk/builds/win32/msvc10/intl.vcxproj 2014-04-30 09:20:30 UTC (rev 59505) +++ firebird/trunk/builds/win32/msvc10/intl.vcxproj 2014-04-30 11:09:32 UTC (rev 59506) @@ -112,7 +112,6 @@ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> <IntrinsicFunctions>true</IntrinsicFunctions> <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> - <AdditionalIncludeDirectories>../../../src/include;../../../src/include/gen;../../../extern/icu/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;INTL_EXPORTS;WINDOWS_ONLY;SUPERCLIENT;WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions> <BrowseInformation>true</BrowseInformation> </ClCompile> @@ -140,7 +139,6 @@ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> <IntrinsicFunctions>true</IntrinsicFunctions> <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> - <AdditionalIncludeDirectories>../../../src/include;../../../src/include/gen;../../../extern/icu/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;INTL_EXPORTS;WINDOWS_ONLY;SUPERCLIENT;WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions> <BrowseInformation>true</BrowseInformation> </ClCompile> @@ -166,7 +164,6 @@ </Midl> <ClCompile> <Optimization>Disabled</Optimization> - <AdditionalIncludeDirectories>../../../src/include;../../../src/include/gen;../../../extern/icu/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>_DEBUG;_WINDOWS;_USRDLL;WINDOWS_ONLY;SUPERCLIENT;WIN32;DEV_BUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions> <BrowseInformation>true</BrowseInformation> </ClCompile> @@ -191,7 +188,6 @@ </Midl> <ClCompile> <Optimization>Disabled</Optimization> - <AdditionalIncludeDirectories>../../../src/include;../../../src/include/gen;../../../extern/icu/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>_DEBUG;_WINDOWS;_USRDLL;WINDOWS_ONLY;SUPERCLIENT;WIN32;DEV_BUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions> <BrowseInformation>true</BrowseInformation> </ClCompile> Modified: firebird/trunk/builds/win32/msvc10/isql.vcxproj =================================================================== --- firebird/trunk/builds/win32/msvc10/isql.vcxproj 2014-04-30 09:20:30 UTC (rev 59505) +++ firebird/trunk/builds/win32/msvc10/isql.vcxproj 2014-04-30 11:09:32 UTC (rev 59506) @@ -99,7 +99,6 @@ <Optimization>Disabled</Optimization> <PreprocessorDefinitions>_DEBUG;_CONSOLE;SUPERCLIENT;DEV_BUILD;WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions> <BrowseInformation>true</BrowseInformation> - <AdditionalIncludeDirectories>../../../extern/icu/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <ResourceCompile> <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> @@ -121,7 +120,6 @@ <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> <PreprocessorDefinitions>NDEBUG;_CONSOLE;SUPERCLIENT;WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions> <BrowseInformation>true</BrowseInformation> - <AdditionalIncludeDirectories>../../../extern/icu/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <ResourceCompile> <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> @@ -143,7 +141,6 @@ <Optimization>Disabled</Optimization> <PreprocessorDefinitions>_DEBUG;_CONSOLE;SUPERCLIENT;DEV_BUILD;WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions> <BrowseInformation>true</BrowseInformation> - <AdditionalIncludeDirectories>../../../extern/icu/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <ResourceCompile> <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> @@ -169,7 +166,6 @@ <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> <PreprocessorDefinitions>NDEBUG;_CONSOLE;SUPERCLIENT;WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions> <BrowseInformation>true</BrowseInformation> - <AdditionalIncludeDirectories>../../../extern/icu/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <ResourceCompile> <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> Modified: firebird/trunk/builds/win32/msvc10/legacy_auth.vcxproj =================================================================== --- firebird/trunk/builds/win32/msvc10/legacy_auth.vcxproj 2014-04-30 09:20:30 UTC (rev 59505) +++ firebird/trunk/builds/win32/msvc10/legacy_auth.vcxproj 2014-04-30 11:09:32 UTC (rev 59506) @@ -96,7 +96,6 @@ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> <Optimization>Disabled</Optimization> - <AdditionalIncludeDirectories>..\..\..\src\include;..\..\..\src\include\gen;..\..\..\src\common\classes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>WIN32;_DEBUG;DEV_BUILD;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> @@ -112,7 +111,6 @@ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> <IntrinsicFunctions>true</IntrinsicFunctions> <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> - <AdditionalIncludeDirectories>..\..\..\src\include\gen;..\..\..\src\include;..\..\..\src\common\classes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PrecompiledHeader> </PrecompiledHeader> @@ -130,7 +128,6 @@ </Midl> <ClCompile> <Optimization>Disabled</Optimization> - <AdditionalIncludeDirectories>..\..\..\src\include;..\..\..\src\include\gen;..\..\..\src\common\classes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>WIN32;_DEBUG;DEV_BUILD;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> @@ -150,7 +147,6 @@ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> <IntrinsicFunctions>true</IntrinsicFunctions> <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> - <AdditionalIncludeDirectories>..\..\..\src\include\gen;..\..\..\src\include;..\..\..\src\common\classes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PrecompiledHeader> </PrecompiledHeader> Modified: firebird/trunk/builds/win32/msvc10/legacy_usermanager.vcxproj =================================================================== --- firebird/trunk/builds/win32/msvc10/legacy_usermanager.vcxproj 2014-04-30 09:20:30 UTC (rev 59505) +++ firebird/trunk/builds/win32/msvc10/legacy_usermanager.vcxproj 2014-04-30 11:09:32 UTC (rev 59506) @@ -96,7 +96,6 @@ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> <Optimization>Disabled</Optimization> - <AdditionalIncludeDirectories>..\..\..\src\include;..\..\..\src\include\gen;..\..\..\src\common\classes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>WIN32;_DEBUG;DEV_BUILD;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> @@ -112,7 +111,6 @@ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> <IntrinsicFunctions>true</IntrinsicFunctions> <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> - <AdditionalIncludeDirectories>..\..\..\src\include\gen;..\..\..\src\include;..\..\..\src\common\classes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PrecompiledHeader> </PrecompiledHeader> @@ -130,7 +128,6 @@ </Midl> <ClCompile> <Optimization>Disabled</Optimization> - <AdditionalIncludeDirectories>..\..\..\src\include;..\..\..\src\include\gen;..\..\..\src\common\classes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>WIN32;_DEBUG;DEV_BUILD;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> @@ -150,7 +147,6 @@ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> <IntrinsicFunctions>true</IntrinsicFunctions> <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> - <AdditionalIncludeDirectories>..\..\..\src\include\gen;..\..\..\src\include;..\..\..\src\common\classes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PrecompiledHeader> </PrecompiledHeader> Modified: firebird/trunk/builds/win32/msvc10/srp.vcxproj =================================================================== --- firebird/trunk/builds/win32/msvc10/srp.vcxproj 2014-04-30 09:20:30 UTC (rev 59505) +++ firebird/trunk/builds/win32/msvc10/srp.vcxproj 2014-04-30 11:09:32 UTC (rev 59506) @@ -97,7 +97,6 @@ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> <Optimization>Disabled</Optimization> - <AdditionalIncludeDirectories>..\..\..\src\include;..\..\..\src\include\gen;..\..\..\src\common\classes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>WIN32;_DEBUG;DEV_BUILD;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> @@ -113,7 +112,6 @@ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> <IntrinsicFunctions>true</IntrinsicFunctions> <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> - <AdditionalIncludeDirectories>..\..\..\src\include\gen;..\..\..\src\include;..\..\..\src\common\classes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PrecompiledHeader> </PrecompiledHeader> @@ -131,7 +129,6 @@ </Midl> <ClCompile> <Optimization>Disabled</Optimization> - <AdditionalIncludeDirectories>..\..\..\src\include;..\..\..\src\include\gen;..\..\..\src\common\classes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>WIN32;_DEBUG;DEV_BUILD;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> @@ -151,7 +148,6 @@ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> <IntrinsicFunctions>true</IntrinsicFunctions> <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> - <AdditionalIncludeDirectories>..\..\..\src\include\gen;..\..\..\src\include;..\..\..\src\common\classes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PrecompiledHeader> </PrecompiledHeader> Modified: firebird/trunk/builds/win32/msvc10/udr_engine.vcxproj =================================================================== --- firebird/trunk/builds/win32/msvc10/udr_engine.vcxproj 2014-04-30 09:20:30 UTC (rev 59505) +++ firebird/trunk/builds/win32/msvc10/udr_engine.vcxproj 2014-04-30 11:09:32 UTC (rev 59506) @@ -105,7 +105,6 @@ </Midl> <ClCompile> <Optimization>Disabled</Optimization> - <AdditionalIncludeDirectories>../../../src/include;../../../src/include/gen;../../../src/jrd;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>_DEBUG;_WINDOWS;_USRDLL;WINDOWS_ONLY;SUPERCLIENT;WIN32;DEV_BUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <ResourceCompile> @@ -129,7 +128,6 @@ </Midl> <ClCompile> <Optimization>Disabled</Optimization> - <AdditionalIncludeDirectories>../../../src/include;../../../src/include/gen;../../../src/jrd;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>_DEBUG;_WINDOWS;_USRDLL;WINDOWS_ONLY;SUPERCLIENT;WIN32;DEV_BUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <ResourceCompile> @@ -157,7 +155,6 @@ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> <IntrinsicFunctions>true</IntrinsicFunctions> <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> - <AdditionalIncludeDirectories>../../../src/include;../../../src/include/gen;../../../src/jrd;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;WINDOWS_ONLY;SUPERCLIENT;WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <ResourceCompile> @@ -184,7 +181,6 @@ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> <IntrinsicFunctions>true</IntrinsicFunctions> <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> - <AdditionalIncludeDirectories>../../../src/include;../../../src/include/gen;../../../src/jrd;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;WINDOWS_ONLY;SUPERCLIENT;WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <ResourceCompile> Modified: firebird/trunk/builds/win32/msvc10/yvalve.vcxproj =================================================================== --- firebird/trunk/builds/win32/msvc10/yvalve.vcxproj 2014-04-30 09:20:30 UTC (rev 59505) +++ firebird/trunk/builds/win32/msvc10/yvalve.vcxproj 2014-04-30 11:09:32 UTC (rev 59506) @@ -183,7 +183,6 @@ <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;DEV_BUILD;SUPERSERVER;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PrecompiledHeader> </PrecompiledHeader> - <AdditionalIncludeDirectories>../../../extern/icu/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <ResourceCompile> <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ro...@us...> - 2015-03-21 03:01:56
|
Revision: 61036 http://sourceforge.net/p/firebird/code/61036 Author: robocop Date: 2015-03-21 03:01:48 +0000 (Sat, 21 Mar 2015) Log Message: ----------- Modified the MSVC10 build according to Alex's changes but still can't compile. Modified Paths: -------------- firebird/trunk/builds/win32/msvc10/common.vcxproj firebird/trunk/builds/win32/msvc10/common.vcxproj.filters firebird/trunk/builds/win32/msvc10/engine.vcxproj firebird/trunk/builds/win32/msvc10/engine.vcxproj.filters Modified: firebird/trunk/builds/win32/msvc10/common.vcxproj =================================================================== --- firebird/trunk/builds/win32/msvc10/common.vcxproj 2015-03-21 00:15:33 UTC (rev 61035) +++ firebird/trunk/builds/win32/msvc10/common.vcxproj 2015-03-21 03:01:48 UTC (rev 61036) @@ -53,6 +53,7 @@ <ClCompile Include="..\..\..\src\common\db_alias.cpp" /> <ClCompile Include="..\..\..\src\common\dllinst.cpp" /> <ClCompile Include="..\..\..\src\common\dsc.cpp" /> + <ClCompile Include="..\..\..\src\common\DynamicStrings.cpp" /> <ClCompile Include="..\..\..\src\common\enc.cpp" /> <ClCompile Include="..\..\..\src\common\fb_exception.cpp" /> <ClCompile Include="..\..\..\src\common\IntlParametersBlock.cpp" /> @@ -149,6 +150,7 @@ <ClInclude Include="..\..\..\src\common\dsc.h" /> <ClInclude Include="..\..\..\src\common\dsc_proto.h" /> <ClInclude Include="..\..\..\src\common\dsc_pub.h" /> + <ClInclude Include="..\..\..\src\common\DynamicStrings.h" /> <ClInclude Include="..\..\..\src\common\dyntable.h" /> <ClInclude Include="..\..\..\src\common\enc_proto.h" /> <ClInclude Include="..\..\..\src\common\file_params.h" /> @@ -173,6 +175,7 @@ <ClInclude Include="..\..\..\src\common\sdltable.h" /> <ClInclude Include="..\..\..\src\common\sdl_proto.h" /> <ClInclude Include="..\..\..\src\common\sha.h" /> + <ClInclude Include="..\..\..\src\common\SimpleStatusVector.h" /> <ClInclude Include="..\..\..\src\common\StatementMetadata.h" /> <ClInclude Include="..\..\..\src\common\StatusArg.h" /> <ClInclude Include="..\..\..\src\common\StatusHolder.h" /> Modified: firebird/trunk/builds/win32/msvc10/common.vcxproj.filters =================================================================== --- firebird/trunk/builds/win32/msvc10/common.vcxproj.filters 2015-03-21 00:15:33 UTC (rev 61035) +++ firebird/trunk/builds/win32/msvc10/common.vcxproj.filters 2015-03-21 03:01:48 UTC (rev 61036) @@ -204,6 +204,9 @@ <ClCompile Include="..\..\..\src\common\MsgMetadata.cpp"> <Filter>common</Filter> </ClCompile> + <ClCompile Include="..\..\..\src\common\DynamicStrings.cpp"> + <Filter>common</Filter> + </ClCompile> </ItemGroup> <ItemGroup> <ClInclude Include="..\..\..\src\common\xdr_proto.h"> @@ -509,5 +512,11 @@ <ClInclude Include="..\..\..\src\common\MsgMetadata.h"> <Filter>headers</Filter> </ClInclude> + <ClInclude Include="..\..\..\src\common\DynamicStrings.h"> + <Filter>headers</Filter> + </ClInclude> + <ClInclude Include="..\..\..\src\common\SimpleStatusVector.h"> + <Filter>headers</Filter> + </ClInclude> </ItemGroup> </Project> \ No newline at end of file Modified: firebird/trunk/builds/win32/msvc10/engine.vcxproj =================================================================== --- firebird/trunk/builds/win32/msvc10/engine.vcxproj 2015-03-21 00:15:33 UTC (rev 61035) +++ firebird/trunk/builds/win32/msvc10/engine.vcxproj 2015-03-21 03:01:48 UTC (rev 61036) @@ -138,7 +138,6 @@ <ClCompile Include="..\..\..\src\jrd\shut.cpp" /> <ClCompile Include="..\..\..\src\jrd\sort.cpp" /> <ClCompile Include="..\..\..\src\jrd\sqz.cpp" /> - <ClCompile Include="..\..\..\src\jrd\status.cpp" /> <ClCompile Include="..\..\..\src\jrd\svc.cpp" /> <ClCompile Include="..\..\..\src\jrd\svc_tab.cpp" /> <ClCompile Include="..\..\..\src\jrd\SysFunction.cpp" /> @@ -266,9 +265,9 @@ <ClInclude Include="..\..\..\src\jrd\license.h" /> <ClInclude Include="..\..\..\src\jrd\lls.h" /> <ClInclude Include="..\..\..\src\jrd\Mapping.h" /> - <ClInclude Include="..\..\..\src\jrd\Monitoring.h" /> <ClInclude Include="..\..\..\src\jrd\met.h" /> <ClInclude Include="..\..\..\src\jrd\met_proto.h" /> + <ClInclude Include="..\..\..\src\jrd\Monitoring.h" /> <ClInclude Include="..\..\..\src\jrd\mov_proto.h" /> <ClInclude Include="..\..\..\src\jrd\msg.h" /> <ClInclude Include="..\..\..\src\jrd\msg_encode.h" /> Modified: firebird/trunk/builds/win32/msvc10/engine.vcxproj.filters =================================================================== --- firebird/trunk/builds/win32/msvc10/engine.vcxproj.filters 2015-03-21 00:15:33 UTC (rev 61035) +++ firebird/trunk/builds/win32/msvc10/engine.vcxproj.filters 2015-03-21 03:01:48 UTC (rev 61036) @@ -351,9 +351,6 @@ <ClCompile Include="..\..\..\src\jrd\sqz.cpp"> <Filter>JRD files</Filter> </ClCompile> - <ClCompile Include="..\..\..\src\jrd\status.cpp"> - <Filter>JRD files</Filter> - </ClCompile> <ClCompile Include="..\..\..\src\jrd\svc.cpp"> <Filter>JRD files</Filter> </ClCompile> @@ -456,7 +453,12 @@ <ClCompile Include="..\..\..\src\jrd\Mapping.cpp"> <Filter>JRD files</Filter> </ClCompile> - <ClCompile Include="..\..\..\src\jrd\DbCreators.cpp" /> + <ClCompile Include="..\..\..\src\jrd\DbCreators.cpp"> + <Filter>JRD files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\dsql\DsqlCursor.cpp"> + <Filter>DSQL</Filter> + </ClCompile> </ItemGroup> <ItemGroup> <ClInclude Include="..\..\..\src\jrd\recsrc\RecordSource.h"> @@ -978,7 +980,12 @@ <ClInclude Include="..\..\..\src\jrd\Mapping.h"> <Filter>Header files</Filter> </ClInclude> - <ClInclude Include="..\..\..\src\jrd\Monitoring.h" /> + <ClInclude Include="..\..\..\src\dsql\DsqlCursor.h"> + <Filter>Header files</Filter> + </ClInclude> + <ClInclude Include="..\..\..\src\jrd\Monitoring.h"> + <Filter>Header files</Filter> + </ClInclude> </ItemGroup> <ItemGroup> <None Include="..\..\..\src\dsql\DdlNodes.epp"> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <hv...@us...> - 2015-03-22 22:42:26
|
Revision: 61055 http://sourceforge.net/p/firebird/code/61055 Author: hvlad Date: 2015-03-22 22:42:23 +0000 (Sun, 22 Mar 2015) Log Message: ----------- Update MSVC10 build after recent changes Modified Paths: -------------- firebird/trunk/builds/win32/msvc10/qli.vcxproj firebird/trunk/builds/win32/msvc10/qli.vcxproj.filters Modified: firebird/trunk/builds/win32/msvc10/qli.vcxproj =================================================================== --- firebird/trunk/builds/win32/msvc10/qli.vcxproj 2015-03-22 22:40:34 UTC (rev 61054) +++ firebird/trunk/builds/win32/msvc10/qli.vcxproj 2015-03-22 22:42:23 UTC (rev 61055) @@ -199,7 +199,6 @@ <ClCompile Include="..\..\..\gen\qli\meta.cpp" /> <ClCompile Include="..\..\..\gen\qli\proc.cpp" /> <ClCompile Include="..\..\..\gen\qli\show.cpp" /> - <ClCompile Include="..\..\..\src\jrd\status.cpp" /> </ItemGroup> <ItemGroup> <None Include="..\..\..\src\qli\help.epp" /> Modified: firebird/trunk/builds/win32/msvc10/qli.vcxproj.filters =================================================================== --- firebird/trunk/builds/win32/msvc10/qli.vcxproj.filters 2015-03-22 22:40:34 UTC (rev 61054) +++ firebird/trunk/builds/win32/msvc10/qli.vcxproj.filters 2015-03-22 22:42:23 UTC (rev 61055) @@ -4,9 +4,6 @@ <Filter Include="QLI files"> <UniqueIdentifier>{da3cf9eb-a5b6-4478-87a3-3da5fa0c95a8}</UniqueIdentifier> </Filter> - <Filter Include="JRD files"> - <UniqueIdentifier>{f6c663b8-6259-4bf6-b108-0d891c74d097}</UniqueIdentifier> - </Filter> <Filter Include="Header files"> <UniqueIdentifier>{ea691fcc-ce86-44c7-b53b-40b660c82329}</UniqueIdentifier> <Extensions>h;hpp;hxx;hm;inl</Extensions> @@ -70,9 +67,6 @@ <ClCompile Include="..\..\..\src\qli\report.cpp"> <Filter>QLI files</Filter> </ClCompile> - <ClCompile Include="..\..\..\src\jrd\status.cpp"> - <Filter>JRD files</Filter> - </ClCompile> <ClCompile Include="..\..\..\gen\qli\help.cpp"> <Filter>QLI files\GPRE cpp</Filter> </ClCompile> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |