2010-11-18 Steve Falkenburg <sfalken@apple.com>
authorsfalken@apple.com <sfalken@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 19 Nov 2010 18:37:11 +0000 (18:37 +0000)
committersfalken@apple.com <sfalken@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 19 Nov 2010 18:37:11 +0000 (18:37 +0000)
        Reviewed by Adam Roben.

        Windows vcproj configuration names should be normalized across projects
        https://bugs.webkit.org/show_bug.cgi?id=49776

        * JavaScriptCore.vcproj/JavaScriptCore.sln:
        * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreGenerated.vcproj:
        * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreGeneratedCommon.vsprops: Added.
        * JavaScriptCore.vcproj/JavaScriptCoreSubmit.sln:
2010-11-18  Steve Falkenburg  <sfalken@apple.com>

        Reviewed by Adam Roben.

        Windows vcproj configuration names should be normalized across projects
        https://bugs.webkit.org/show_bug.cgi?id=49776

        * WebKit.vcproj/Interfaces.vcproj:
        * WebKit.vcproj/WebKit.sln:
2010-11-18  Steve Falkenburg  <sfalken@apple.com>

        Reviewed by Adam Roben.

        Windows vcproj configuration names should be normalized across projects
        https://bugs.webkit.org/show_bug.cgi?id=49776

        * WebCore.vcproj/WebCore.sln:
        * WebCore.vcproj/WebCore.submit.sln:
        * WebCore.vcproj/WebCoreGenerated.vcproj:
        * WebCore.vcproj/WebCoreGeneratedCairo.vsprops: Added.
        * WebCore.vcproj/WebCoreGeneratedCommon.vsprops: Added.
2010-11-18  Steve Falkenburg  <sfalken@apple.com>

        Reviewed by Adam Roben.

        Windows vcproj configuration names should be normalized across projects
        https://bugs.webkit.org/show_bug.cgi?id=49776

        * DumpRenderTree/DumpRenderTree.sln:
        * FindSafari/FindSafari.vcproj:
        * TestWebKitAPI/win/TestWebKitAPI.sln:
        * TestWebKitAPI/win/TestWebKitAPIGenerated.vcproj:
        * TestWebKitAPI/win/TestWebKitAPIGeneratedCommon.vsprops: Added.
        * WebKitAPITest/WebKitAPITest.vcproj:
        * WebKitAPITest/WebKitAPITestCommon.vsprops:
        * WebKitLauncherWin/WebKitLauncherWin.vcproj:
        * WebKitTestRunner/WebKitTestRunner.sln:
        * WebKitTestRunner/win/InjectedBundleGenerated.vcproj:
        * WebKitTestRunner/win/InjectedBundleGeneratedCommon.vsprops: Added.
        * record-memory-win/record-memory-win.vcproj:
2010-11-18  Steve Falkenburg  <sfalken@apple.com>

        Reviewed by Adam Roben.

        Windows vcproj configuration names should be normalized across projects
        https://bugs.webkit.org/show_bug.cgi?id=49776

        * win/WebKit2.submit.sln:
        * win/WebKit2Generated.vcproj:
        * win/WebKit2GeneratedCommon.vsprops: Added.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@72418 268f45cc-cd09-0410-ab3c-d52691b4dbfc

32 files changed:
JavaScriptCore/ChangeLog
JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore.sln
JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreGenerated.vcproj
JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreGeneratedCommon.vsprops [new file with mode: 0644]
JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCoreSubmit.sln
WebCore/ChangeLog
WebCore/WebCore.vcproj/WebCore.sln
WebCore/WebCore.vcproj/WebCore.submit.sln
WebCore/WebCore.vcproj/WebCoreGenerated.vcproj
WebCore/WebCore.vcproj/WebCoreGeneratedCairo.vsprops [new file with mode: 0644]
WebCore/WebCore.vcproj/WebCoreGeneratedCommon.vsprops [new file with mode: 0644]
WebKit/win/ChangeLog
WebKit/win/WebKit.vcproj/Interfaces.vcproj
WebKit/win/WebKit.vcproj/WebKit.sln
WebKit2/ChangeLog
WebKit2/win/WebKit2.submit.sln
WebKit2/win/WebKit2.vcproj
WebKit2/win/WebKit2Generated.vcproj
WebKit2/win/WebKit2GeneratedCommon.vsprops [new file with mode: 0644]
WebKitTools/ChangeLog
WebKitTools/DumpRenderTree/DumpRenderTree.sln
WebKitTools/FindSafari/FindSafari.vcproj
WebKitTools/TestWebKitAPI/win/TestWebKitAPI.sln
WebKitTools/TestWebKitAPI/win/TestWebKitAPIGenerated.vcproj
WebKitTools/TestWebKitAPI/win/TestWebKitAPIGeneratedCommon.vsprops [new file with mode: 0644]
WebKitTools/WebKitAPITest/WebKitAPITest.vcproj
WebKitTools/WebKitAPITest/WebKitAPITestCommon.vsprops
WebKitTools/WebKitLauncherWin/WebKitLauncherWin.vcproj
WebKitTools/WebKitTestRunner/WebKitTestRunner.sln
WebKitTools/WebKitTestRunner/win/InjectedBundleGenerated.vcproj
WebKitTools/WebKitTestRunner/win/InjectedBundleGeneratedCommon.vsprops [new file with mode: 0644]
WebKitTools/record-memory-win/record-memory-win.vcproj

index 1ba8606..009811a 100644 (file)
@@ -1,3 +1,15 @@
+2010-11-18  Steve Falkenburg  <sfalken@apple.com>
+
+        Reviewed by Adam Roben.
+
+        Windows vcproj configuration names should be normalized across projects
+        https://bugs.webkit.org/show_bug.cgi?id=49776
+
+        * JavaScriptCore.vcproj/JavaScriptCore.sln:
+        * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreGenerated.vcproj:
+        * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreGeneratedCommon.vsprops: Added.
+        * JavaScriptCore.vcproj/JavaScriptCoreSubmit.sln:
+
 2010-11-19  Patrick Gansterer  <paroga@webkit.org>
 
         Unreviewed, build fix after r72360.
index e726891..47371c5 100644 (file)
@@ -22,6 +22,7 @@ Global
        GlobalSection(SolutionConfigurationPlatforms) = preSolution\r
                Debug_All|Win32 = Debug_All|Win32\r
                Debug|Win32 = Debug|Win32\r
+               Release_LTCG|Win32 = Release_LTCG|Win32\r
                Release_PGOInstrument|Win32 = Release_PGOInstrument|Win32\r
                Release_PGOOptimize|Win32 = Release_PGOOptimize|Win32\r
                Release|Win32 = Release|Win32\r
@@ -31,6 +32,8 @@ Global
                {011D10F1-B656-4A1B-A0C3-3842F02122C5}.Debug_All|Win32.Build.0 = Debug_All|Win32\r
                {011D10F1-B656-4A1B-A0C3-3842F02122C5}.Debug|Win32.ActiveCfg = Debug|Win32\r
                {011D10F1-B656-4A1B-A0C3-3842F02122C5}.Debug|Win32.Build.0 = Debug|Win32\r
+               {011D10F1-B656-4A1B-A0C3-3842F02122C5}.Release_LTCG|Win32.ActiveCfg = Release_LTCG|Win32\r
+               {011D10F1-B656-4A1B-A0C3-3842F02122C5}.Release_LTCG|Win32.Build.0 = Release_LTCG|Win32\r
                {011D10F1-B656-4A1B-A0C3-3842F02122C5}.Release_PGOInstrument|Win32.ActiveCfg = Release_PGOInstrument|Win32\r
                {011D10F1-B656-4A1B-A0C3-3842F02122C5}.Release_PGOInstrument|Win32.Build.0 = Release_PGOInstrument|Win32\r
                {011D10F1-B656-4A1B-A0C3-3842F02122C5}.Release_PGOOptimize|Win32.ActiveCfg = Release_PGOOptimize|Win32\r
@@ -41,6 +44,8 @@ Global
                {C59E5129-B453-49B7-A52B-1E104715F76E}.Debug_All|Win32.Build.0 = Debug_All|Win32\r
                {C59E5129-B453-49B7-A52B-1E104715F76E}.Debug|Win32.ActiveCfg = Debug|Win32\r
                {C59E5129-B453-49B7-A52B-1E104715F76E}.Debug|Win32.Build.0 = Debug|Win32\r
+               {C59E5129-B453-49B7-A52B-1E104715F76E}.Release_LTCG|Win32.ActiveCfg = Release_LTCG|Win32\r
+               {C59E5129-B453-49B7-A52B-1E104715F76E}.Release_LTCG|Win32.Build.0 = Release_LTCG|Win32\r
                {C59E5129-B453-49B7-A52B-1E104715F76E}.Release_PGOInstrument|Win32.ActiveCfg = Release|Win32\r
                {C59E5129-B453-49B7-A52B-1E104715F76E}.Release_PGOInstrument|Win32.Build.0 = Release|Win32\r
                {C59E5129-B453-49B7-A52B-1E104715F76E}.Release_PGOOptimize|Win32.ActiveCfg = Release|Win32\r
@@ -51,32 +56,38 @@ Global
                {AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Debug_All|Win32.Build.0 = Debug_All|Win32\r
                {AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Debug|Win32.ActiveCfg = Debug|Win32\r
                {AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Debug|Win32.Build.0 = Debug|Win32\r
+               {AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Release_LTCG|Win32.ActiveCfg = Release_LTCG|Win32\r
+               {AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Release_LTCG|Win32.Build.0 = Release_LTCG|Win32\r
                {AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Release_PGOInstrument|Win32.ActiveCfg = Release|Win32\r
                {AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Release_PGOInstrument|Win32.Build.0 = Release|Win32\r
                {AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Release_PGOOptimize|Win32.ActiveCfg = Release|Win32\r
                {AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Release_PGOOptimize|Win32.Build.0 = Release|Win32\r
                {AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Release|Win32.ActiveCfg = Release|Win32\r
                {AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Release|Win32.Build.0 = Release|Win32\r
-               {DA31DA52-6675-48D4-89E0-333A7144397C}.Debug_All|Win32.ActiveCfg = all|Win32\r
-               {DA31DA52-6675-48D4-89E0-333A7144397C}.Debug_All|Win32.Build.0 = all|Win32\r
-               {DA31DA52-6675-48D4-89E0-333A7144397C}.Debug|Win32.ActiveCfg = all|Win32\r
-               {DA31DA52-6675-48D4-89E0-333A7144397C}.Debug|Win32.Build.0 = all|Win32\r
-               {DA31DA52-6675-48D4-89E0-333A7144397C}.Release_PGOInstrument|Win32.ActiveCfg = all|Win32\r
-               {DA31DA52-6675-48D4-89E0-333A7144397C}.Release_PGOInstrument|Win32.Build.0 = all|Win32\r
-               {DA31DA52-6675-48D4-89E0-333A7144397C}.Release_PGOOptimize|Win32.ActiveCfg = all|Win32\r
-               {DA31DA52-6675-48D4-89E0-333A7144397C}.Release_PGOOptimize|Win32.Build.0 = all|Win32\r
-               {DA31DA52-6675-48D4-89E0-333A7144397C}.Release|Win32.ActiveCfg = all|Win32\r
-               {DA31DA52-6675-48D4-89E0-333A7144397C}.Release|Win32.Build.0 = all|Win32\r
-               {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Debug_All|Win32.ActiveCfg = all|Win32\r
-               {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Debug_All|Win32.Build.0 = all|Win32\r
-               {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Debug|Win32.ActiveCfg = all|Win32\r
-               {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Debug|Win32.Build.0 = all|Win32\r
-               {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Release_PGOInstrument|Win32.ActiveCfg = all|Win32\r
-               {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Release_PGOInstrument|Win32.Build.0 = all|Win32\r
-               {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Release_PGOOptimize|Win32.ActiveCfg = all|Win32\r
-               {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Release_PGOOptimize|Win32.Build.0 = all|Win32\r
-               {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Release|Win32.ActiveCfg = all|Win32\r
-               {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Release|Win32.Build.0 = all|Win32\r
+               {DA31DA52-6675-48D4-89E0-333A7144397C}.Debug_All|Win32.ActiveCfg = Debug_All|Win32\r
+               {DA31DA52-6675-48D4-89E0-333A7144397C}.Debug_All|Win32.Build.0 = Debug_All|Win32\r
+               {DA31DA52-6675-48D4-89E0-333A7144397C}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {DA31DA52-6675-48D4-89E0-333A7144397C}.Debug|Win32.Build.0 = Debug|Win32\r
+               {DA31DA52-6675-48D4-89E0-333A7144397C}.Release_LTCG|Win32.ActiveCfg = Release_LTCG|Win32\r
+               {DA31DA52-6675-48D4-89E0-333A7144397C}.Release_LTCG|Win32.Build.0 = Release_LTCG|Win32\r
+               {DA31DA52-6675-48D4-89E0-333A7144397C}.Release_PGOInstrument|Win32.ActiveCfg = Release|Win32\r
+               {DA31DA52-6675-48D4-89E0-333A7144397C}.Release_PGOInstrument|Win32.Build.0 = Release|Win32\r
+               {DA31DA52-6675-48D4-89E0-333A7144397C}.Release_PGOOptimize|Win32.ActiveCfg = Release|Win32\r
+               {DA31DA52-6675-48D4-89E0-333A7144397C}.Release_PGOOptimize|Win32.Build.0 = Release|Win32\r
+               {DA31DA52-6675-48D4-89E0-333A7144397C}.Release|Win32.ActiveCfg = Release|Win32\r
+               {DA31DA52-6675-48D4-89E0-333A7144397C}.Release|Win32.Build.0 = Release|Win32\r
+               {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Debug_All|Win32.ActiveCfg = Debug_All|Win32\r
+               {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Debug_All|Win32.Build.0 = Debug_All|Win32\r
+               {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Debug|Win32.Build.0 = Debug|Win32\r
+               {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Release_LTCG|Win32.ActiveCfg = Release_LTCG|Win32\r
+               {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Release_LTCG|Win32.Build.0 = Release_LTCG|Win32\r
+               {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Release_PGOInstrument|Win32.ActiveCfg = Release|Win32\r
+               {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Release_PGOInstrument|Win32.Build.0 = Release|Win32\r
+               {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Release_PGOOptimize|Win32.ActiveCfg = Release|Win32\r
+               {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Release_PGOOptimize|Win32.Build.0 = Release|Win32\r
+               {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Release|Win32.ActiveCfg = Release|Win32\r
+               {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Release|Win32.Build.0 = Release|Win32\r
        EndGlobalSection\r
        GlobalSection(SolutionProperties) = preSolution\r
                HideSolutionNode = FALSE\r
index 8ab47da..b5f3a9e 100644 (file)
        </ToolFiles>\r
        <Configurations>\r
                <Configuration\r
-                       Name="all|Win32"\r
-                       OutputDirectory="$(WebKitOutputDir)\lib"\r
-                       IntermediateDirectory="$(WebKitOutputDir)\obj\$(ProjectName)\$(ConfigurationName)"\r
+                       Name="Debug|Win32"\r
                        ConfigurationType="0"\r
+                       InheritedPropertySheets=".\JavaScriptCoreGeneratedCommon.vsprops"\r
+                       >\r
+                       <Tool\r
+                               Name="VCNMakeTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Debug_All|Win32"\r
+                       ConfigurationType="0"\r
+                       InheritedPropertySheets=".\JavaScriptCoreGeneratedCommon.vsprops"\r
+                       >\r
+                       <Tool\r
+                               Name="VCNMakeTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Release|Win32"\r
+                       ConfigurationType="0"\r
+                       InheritedPropertySheets=".\JavaScriptCoreGeneratedCommon.vsprops"\r
+                       >\r
+                       <Tool\r
+                               Name="VCNMakeTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Release_LTCG|Win32"\r
+                       ConfigurationType="0"\r
+                       InheritedPropertySheets=".\JavaScriptCoreGeneratedCommon.vsprops"\r
                        >\r
                        <Tool\r
                                Name="VCNMakeTool"\r
-                               BuildCommandLine="%SystemDrive%\cygwin\bin\which.exe bash&#x0D;&#x0A;if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%&#x0D;&#x0A;cmd /c&#x0D;&#x0A;&#x0D;&#x0A;nmake /nologo -f JavaScriptCoreGenerated.make"\r
-                               ReBuildCommandLine="%SystemDrive%\cygwin\bin\which.exe bash&#x0D;&#x0A;if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%&#x0D;&#x0A;cmd /c&#x0D;&#x0A;&#x0D;&#x0A;nmake /nologo -f JavaScriptCoreGenerated.make clean&#x0D;&#x0A;nmake -f JavaScriptCoreGenerated.make"\r
-                               CleanCommandLine="%SystemDrive%\cygwin\bin\which.exe bash&#x0D;&#x0A;if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%&#x0D;&#x0A;cmd /c&#x0D;&#x0A;&#x0D;&#x0A;nmake /nologo -f JavaScriptCoreGenerated.make clean"\r
-                               Output=""\r
-                               PreprocessorDefinitions="WIN32;NDEBUG"\r
-                               IncludeSearchPath=""\r
-                               ForcedIncludes=""\r
-                               AssemblySearchPath=""\r
-                               ForcedUsingAssemblies=""\r
-                               CompileAsManaged=""\r
                        />\r
                </Configuration>\r
        </Configurations>\r
diff --git a/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreGeneratedCommon.vsprops b/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreGeneratedCommon.vsprops
new file mode 100644 (file)
index 0000000..44ae1d9
--- /dev/null
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="Windows-1252"?>\r
+<VisualStudioPropertySheet\r
+       ProjectType="Visual C++"\r
+       Version="8.00"\r
+       Name="JavaScriptCoreGeneratedCommon"\r
+       OutputDirectory="$(WebKitOutputDir)\lib"\r
+       IntermediateDirectory="$(WebKitOutputDir)\obj\$(ProjectName)\$(ConfigurationName)"\r
+       >\r
+       <Tool\r
+               Name="VCNMakeTool"\r
+               BuildCommandLine="%SystemDrive%\cygwin\bin\which.exe bash&#x0D;&#x0A;if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%&#x0D;&#x0A;cmd /c&#x0D;&#x0A;&#x0D;&#x0A;nmake /nologo -f JavaScriptCoreGenerated.make"\r
+               ReBuildCommandLine="%SystemDrive%\cygwin\bin\which.exe bash&#x0D;&#x0A;if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%&#x0D;&#x0A;cmd /c&#x0D;&#x0A;&#x0D;&#x0A;nmake /nologo -f JavaScriptCoreGenerated.make clean&#x0D;&#x0A;nmake -f JavaScriptCoreGenerated.make"\r
+               CleanCommandLine="%SystemDrive%\cygwin\bin\which.exe bash&#x0D;&#x0A;if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%&#x0D;&#x0A;cmd /c&#x0D;&#x0A;&#x0D;&#x0A;nmake /nologo -f JavaScriptCoreGenerated.make clean"\r
+       />\r
+</VisualStudioPropertySheet>\r
index 5cd2ff4..e85ff9d 100644 (file)
@@ -22,6 +22,7 @@ Global
        GlobalSection(SolutionConfigurationPlatforms) = preSolution\r
                Debug_All|Win32 = Debug_All|Win32\r
                Debug|Win32 = Debug|Win32\r
+               Release_LTCG|Win32 = Release_LTCG|Win32\r
                Release_PGOInstrument|Win32 = Release_PGOInstrument|Win32\r
                Release_PGOOptimize|Win32 = Release_PGOOptimize|Win32\r
                Release|Win32 = Release|Win32\r
@@ -31,6 +32,8 @@ Global
                {011D10F1-B656-4A1B-A0C3-3842F02122C5}.Debug_All|Win32.Build.0 = Debug_All|Win32\r
                {011D10F1-B656-4A1B-A0C3-3842F02122C5}.Debug|Win32.ActiveCfg = Debug|Win32\r
                {011D10F1-B656-4A1B-A0C3-3842F02122C5}.Debug|Win32.Build.0 = Debug|Win32\r
+               {011D10F1-B656-4A1B-A0C3-3842F02122C5}.Release_LTCG|Win32.ActiveCfg = Release_LTCG|Win32\r
+               {011D10F1-B656-4A1B-A0C3-3842F02122C5}.Release_LTCG|Win32.Build.0 = Release_LTCG|Win32\r
                {011D10F1-B656-4A1B-A0C3-3842F02122C5}.Release_PGOInstrument|Win32.ActiveCfg = Release_PGOInstrument|Win32\r
                {011D10F1-B656-4A1B-A0C3-3842F02122C5}.Release_PGOInstrument|Win32.Build.0 = Release_PGOInstrument|Win32\r
                {011D10F1-B656-4A1B-A0C3-3842F02122C5}.Release_PGOOptimize|Win32.ActiveCfg = Release_PGOOptimize|Win32\r
@@ -41,26 +44,32 @@ Global
                {AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Debug_All|Win32.Build.0 = Debug_All|Win32\r
                {AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Debug|Win32.ActiveCfg = Debug|Win32\r
                {AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Debug|Win32.Build.0 = Debug|Win32\r
+               {AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Release_LTCG|Win32.ActiveCfg = Release_LTCG|Win32\r
+               {AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Release_LTCG|Win32.Build.0 = Release_LTCG|Win32\r
                {AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Release_PGOInstrument|Win32.ActiveCfg = Release|Win32\r
                {AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Release_PGOInstrument|Win32.Build.0 = Release|Win32\r
                {AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Release_PGOOptimize|Win32.ActiveCfg = Release|Win32\r
                {AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Release_PGOOptimize|Win32.Build.0 = Release|Win32\r
                {AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Release|Win32.ActiveCfg = Release|Win32\r
                {AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Release|Win32.Build.0 = Release|Win32\r
-               {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Debug_All|Win32.ActiveCfg = all|Win32\r
-               {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Debug_All|Win32.Build.0 = all|Win32\r
-               {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Debug|Win32.ActiveCfg = all|Win32\r
-               {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Debug|Win32.Build.0 = all|Win32\r
-               {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Release_PGOInstrument|Win32.ActiveCfg = all|Win32\r
-               {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Release_PGOInstrument|Win32.Build.0 = all|Win32\r
-               {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Release_PGOOptimize|Win32.ActiveCfg = all|Win32\r
-               {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Release_PGOOptimize|Win32.Build.0 = all|Win32\r
-               {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Release|Win32.ActiveCfg = all|Win32\r
-               {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Release|Win32.Build.0 = all|Win32\r
+               {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Debug_All|Win32.ActiveCfg = Debug_All|Win32\r
+               {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Debug_All|Win32.Build.0 = Debug_All|Win32\r
+               {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Debug|Win32.Build.0 = Debug|Win32\r
+               {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Release_LTCG|Win32.ActiveCfg = Release_LTCG|Win32\r
+               {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Release_LTCG|Win32.Build.0 = Release_LTCG|Win32\r
+               {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Release_PGOInstrument|Win32.ActiveCfg = Release|Win32\r
+               {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Release_PGOInstrument|Win32.Build.0 = Release|Win32\r
+               {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Release_PGOOptimize|Win32.ActiveCfg = Release|Win32\r
+               {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Release_PGOOptimize|Win32.Build.0 = Release|Win32\r
+               {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Release|Win32.ActiveCfg = Release|Win32\r
+               {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Release|Win32.Build.0 = Release|Win32\r
                {C59E5129-B453-49B7-A52B-1E104715F76E}.Debug_All|Win32.ActiveCfg = Debug_All|Win32\r
                {C59E5129-B453-49B7-A52B-1E104715F76E}.Debug_All|Win32.Build.0 = Debug_All|Win32\r
                {C59E5129-B453-49B7-A52B-1E104715F76E}.Debug|Win32.ActiveCfg = Debug|Win32\r
                {C59E5129-B453-49B7-A52B-1E104715F76E}.Debug|Win32.Build.0 = Debug|Win32\r
+               {C59E5129-B453-49B7-A52B-1E104715F76E}.Release_LTCG|Win32.ActiveCfg = Release_LTCG|Win32\r
+               {C59E5129-B453-49B7-A52B-1E104715F76E}.Release_LTCG|Win32.Build.0 = Release_LTCG|Win32\r
                {C59E5129-B453-49B7-A52B-1E104715F76E}.Release_PGOInstrument|Win32.ActiveCfg = Release|Win32\r
                {C59E5129-B453-49B7-A52B-1E104715F76E}.Release_PGOInstrument|Win32.Build.0 = Release|Win32\r
                {C59E5129-B453-49B7-A52B-1E104715F76E}.Release_PGOOptimize|Win32.ActiveCfg = Release|Win32\r
index 997d6bc..d2de1c3 100644 (file)
@@ -1,3 +1,16 @@
+2010-11-18  Steve Falkenburg  <sfalken@apple.com>
+
+        Reviewed by Adam Roben.
+
+        Windows vcproj configuration names should be normalized across projects
+        https://bugs.webkit.org/show_bug.cgi?id=49776
+
+        * WebCore.vcproj/WebCore.sln:
+        * WebCore.vcproj/WebCore.submit.sln:
+        * WebCore.vcproj/WebCoreGenerated.vcproj:
+        * WebCore.vcproj/WebCoreGeneratedCairo.vsprops: Added.
+        * WebCore.vcproj/WebCoreGeneratedCommon.vsprops: Added.
+
 2010-11-19  James Simonsen  <simonjam@chromium.org>
 
         Reviewed by Darin Fisher.
index 8bde219..427ecec 100644 (file)
@@ -27,14 +27,14 @@ Global
                {1C16337B-ACF3-4D03-AA90-851C5B5EADA6}.Release_LTCG|Win32.Build.0 = Release_LTCG|Win32\r
                {1C16337B-ACF3-4D03-AA90-851C5B5EADA6}.Release|Win32.ActiveCfg = Release|Win32\r
                {1C16337B-ACF3-4D03-AA90-851C5B5EADA6}.Release|Win32.Build.0 = Release|Win32\r
-               {0A324352-B3B6-496C-9E5B-4C7E923E628B}.Debug_All|Win32.ActiveCfg = all|Win32\r
-               {0A324352-B3B6-496C-9E5B-4C7E923E628B}.Debug_All|Win32.Build.0 = all|Win32\r
-               {0A324352-B3B6-496C-9E5B-4C7E923E628B}.Debug|Win32.ActiveCfg = all|Win32\r
-               {0A324352-B3B6-496C-9E5B-4C7E923E628B}.Debug|Win32.Build.0 = all|Win32\r
-               {0A324352-B3B6-496C-9E5B-4C7E923E628B}.Release_LTCG|Win32.ActiveCfg = all|Win32\r
-               {0A324352-B3B6-496C-9E5B-4C7E923E628B}.Release_LTCG|Win32.Build.0 = all|Win32\r
-               {0A324352-B3B6-496C-9E5B-4C7E923E628B}.Release|Win32.ActiveCfg = all|Win32\r
-               {0A324352-B3B6-496C-9E5B-4C7E923E628B}.Release|Win32.Build.0 = all|Win32\r
+               {0A324352-B3B6-496C-9E5B-4C7E923E628B}.Debug_All|Win32.ActiveCfg = Debug_All|Win32\r
+               {0A324352-B3B6-496C-9E5B-4C7E923E628B}.Debug_All|Win32.Build.0 = Debug_All|Win32\r
+               {0A324352-B3B6-496C-9E5B-4C7E923E628B}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {0A324352-B3B6-496C-9E5B-4C7E923E628B}.Debug|Win32.Build.0 = Debug|Win32\r
+               {0A324352-B3B6-496C-9E5B-4C7E923E628B}.Release_LTCG|Win32.ActiveCfg = Release_LTCG|Win32\r
+               {0A324352-B3B6-496C-9E5B-4C7E923E628B}.Release_LTCG|Win32.Build.0 = Release_LTCG|Win32\r
+               {0A324352-B3B6-496C-9E5B-4C7E923E628B}.Release|Win32.ActiveCfg = Release|Win32\r
+               {0A324352-B3B6-496C-9E5B-4C7E923E628B}.Release|Win32.Build.0 = Release|Win32\r
                {E498CA9D-3BD2-4D52-8E37-C8DC76526325}.Debug_All|Win32.ActiveCfg = Debug_All|Win32\r
                {E498CA9D-3BD2-4D52-8E37-C8DC76526325}.Debug_All|Win32.Build.0 = Debug_All|Win32\r
                {E498CA9D-3BD2-4D52-8E37-C8DC76526325}.Debug|Win32.ActiveCfg = Debug|Win32\r
index bce94e9..dff0c5a 100644 (file)
@@ -17,6 +17,7 @@ Global
        GlobalSection(SolutionConfigurationPlatforms) = preSolution\r
                Debug_All|Win32 = Debug_All|Win32\r
                Debug|Win32 = Debug|Win32\r
+               Release_LTCG|Win32 = Release_LTCG|Win32\r
                Release|Win32 = Release|Win32\r
        EndGlobalSection\r
        GlobalSection(ProjectConfigurationPlatforms) = postSolution\r
@@ -24,18 +25,24 @@ Global
                {1C16337B-ACF3-4D03-AA90-851C5B5EADA6}.Debug_All|Win32.Build.0 = Debug_All|Win32\r
                {1C16337B-ACF3-4D03-AA90-851C5B5EADA6}.Debug|Win32.ActiveCfg = Debug|Win32\r
                {1C16337B-ACF3-4D03-AA90-851C5B5EADA6}.Debug|Win32.Build.0 = Debug|Win32\r
+               {1C16337B-ACF3-4D03-AA90-851C5B5EADA6}.Release_LTCG|Win32.ActiveCfg = Release_LTCG|Win32\r
+               {1C16337B-ACF3-4D03-AA90-851C5B5EADA6}.Release_LTCG|Win32.Build.0 = Release_LTCG|Win32\r
                {1C16337B-ACF3-4D03-AA90-851C5B5EADA6}.Release|Win32.ActiveCfg = Release|Win32\r
                {1C16337B-ACF3-4D03-AA90-851C5B5EADA6}.Release|Win32.Build.0 = Release|Win32\r
-               {0A324352-B3B6-496C-9E5B-4C7E923E628B}.Debug_All|Win32.ActiveCfg = all|Win32\r
-               {0A324352-B3B6-496C-9E5B-4C7E923E628B}.Debug_All|Win32.Build.0 = all|Win32\r
-               {0A324352-B3B6-496C-9E5B-4C7E923E628B}.Debug|Win32.ActiveCfg = all|Win32\r
-               {0A324352-B3B6-496C-9E5B-4C7E923E628B}.Debug|Win32.Build.0 = all|Win32\r
-               {0A324352-B3B6-496C-9E5B-4C7E923E628B}.Release|Win32.ActiveCfg = all|Win32\r
-               {0A324352-B3B6-496C-9E5B-4C7E923E628B}.Release|Win32.Build.0 = all|Win32\r
+               {0A324352-B3B6-496C-9E5B-4C7E923E628B}.Debug_All|Win32.ActiveCfg = Debug_All|Win32\r
+               {0A324352-B3B6-496C-9E5B-4C7E923E628B}.Debug_All|Win32.Build.0 = Debug_All|Win32\r
+               {0A324352-B3B6-496C-9E5B-4C7E923E628B}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {0A324352-B3B6-496C-9E5B-4C7E923E628B}.Debug|Win32.Build.0 = Debug|Win32\r
+               {0A324352-B3B6-496C-9E5B-4C7E923E628B}.Release_LTCG|Win32.ActiveCfg = Release_LTCG|Win32\r
+               {0A324352-B3B6-496C-9E5B-4C7E923E628B}.Release_LTCG|Win32.Build.0 = Release_LTCG|Win32\r
+               {0A324352-B3B6-496C-9E5B-4C7E923E628B}.Release|Win32.ActiveCfg = Release|Win32\r
+               {0A324352-B3B6-496C-9E5B-4C7E923E628B}.Release|Win32.Build.0 = Release|Win32\r
                {E498CA9D-3BD2-4D52-8E37-C8DC76526325}.Debug_All|Win32.ActiveCfg = Debug_All|Win32\r
                {E498CA9D-3BD2-4D52-8E37-C8DC76526325}.Debug_All|Win32.Build.0 = Debug_All|Win32\r
                {E498CA9D-3BD2-4D52-8E37-C8DC76526325}.Debug|Win32.ActiveCfg = Debug|Win32\r
                {E498CA9D-3BD2-4D52-8E37-C8DC76526325}.Debug|Win32.Build.0 = Debug|Win32\r
+               {E498CA9D-3BD2-4D52-8E37-C8DC76526325}.Release_LTCG|Win32.ActiveCfg = Release_LTCG|Win32\r
+               {E498CA9D-3BD2-4D52-8E37-C8DC76526325}.Release_LTCG|Win32.Build.0 = Release_LTCG|Win32\r
                {E498CA9D-3BD2-4D52-8E37-C8DC76526325}.Release|Win32.ActiveCfg = Release|Win32\r
                {E498CA9D-3BD2-4D52-8E37-C8DC76526325}.Release|Win32.Build.0 = Release|Win32\r
        EndGlobalSection\r
index 9b891cd..374c1ec 100644 (file)
        </ToolFiles>\r
        <Configurations>\r
                <Configuration\r
-                       Name="all|Win32"\r
-                       OutputDirectory="$(WebKitOutputDir)\lib"\r
-                       IntermediateDirectory="$(WebKitOutputDir)\obj\$(ProjectName)\$(ConfigurationName)"\r
+                       Name="Debug_All|Win32"\r
                        ConfigurationType="0"\r
+                       InheritedPropertySheets=".\WebCoreGeneratedCommon.vsprops"\r
                        >\r
                        <Tool\r
                                Name="VCNMakeTool"\r
-                               BuildCommandLine="%SystemDrive%\cygwin\bin\which.exe bash&#x0D;&#x0A;if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%&#x0D;&#x0A;cmd /c&#x0D;&#x0A;if exist &quot;$(WebKitOutputDir)\buildfailed&quot; grep XX$(ProjectName)XX &quot;$(WebKitOutputDir)\buildfailed&quot;&#x0D;&#x0A;if errorlevel 1 exit 1&#x0D;&#x0A;echo XX$(ProjectName)XX &gt; &quot;$(WebKitOutputDir)\buildfailed&quot;&#x0D;&#x0A;&#x0D;&#x0A;bash build-generated-files.sh &quot;$(WebKitOutputDir)&quot; &quot;$(WebKitLibrariesDir)&quot; windows&#x0D;&#x0A;bash migrate-scripts.sh &quot;$(WebKitOutputDir)/obj/WebCore/scripts&quot;&#x0D;&#x0A;cmd /C copyForwardingHeaders.cmd cg cf&#x0D;&#x0A;cmd /C copyInspectorFiles.cmd&#x0D;&#x0A;&#x0D;&#x0A;if exist &quot;$(WebKitOutputDir)\buildfailed&quot; del &quot;$(WebKitOutputDir)\buildfailed&quot;&#x0D;&#x0A;"\r
-                               ReBuildCommandLine="echo XX$(ProjectName)XX &gt; &quot;$(WebKitOutputDir)\buildfailed&quot;&#x0D;&#x0A;&#x0D;&#x0A;del /s /q &quot;$(WebKitOutputDir)\obj\WebCore\DerivedSources&quot;&#x0D;&#x0A;del /s /q &quot;$(WebKitOutputDir)\obj\WebCore\scripts&quot;&#x0D;&#x0A;%SystemDrive%\cygwin\bin\which.exe bash&#x0D;&#x0A;if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%&#x0D;&#x0A;cmd /c&#x0D;&#x0A;bash build-generated-files.sh &quot;$(WebKitOutputDir)&quot; &quot;$(WebKitLibrariesDir)&quot; windows&#x0D;&#x0A;bash migrate-scripts.sh &quot;$(WebKitOutputDir)/obj/WebCore/scripts&quot;&#x0D;&#x0A;cmd /C copyForwardingHeaders.cmd cg cf&#x0D;&#x0A;cmd /C copyInspectorFiles.cmd&#x0D;&#x0A;&#x0D;&#x0A;if exist &quot;$(WebKitOutputDir)\buildfailed&quot; del &quot;$(WebKitOutputDir)\buildfailed&quot;&#x0D;&#x0A;"\r
-                               CleanCommandLine="del /s /q &quot;$(WebKitOutputDir)\obj\WebCore\DerivedSources&quot;&#x0D;&#x0A;del /s /q &quot;$(WebKitOutputDir)\obj\WebCore\scripts&quot;&#x0D;&#x0A;if exist &quot;$(WebKitOutputDir)\buildfailed&quot; del &quot;$(WebKitOutputDir)\buildfailed&quot;&#x0D;&#x0A;"\r
-                               Output=""\r
-                               PreprocessorDefinitions=""\r
-                               IncludeSearchPath=""\r
-                               ForcedIncludes=""\r
-                               AssemblySearchPath=""\r
-                               ForcedUsingAssemblies=""\r
-                               CompileAsManaged=""\r
                        />\r
                </Configuration>\r
                <Configuration\r
                        Name="cairo|Win32"\r
-                       OutputDirectory="$(WebKitOutputDir)\lib"\r
-                       IntermediateDirectory="$(WebKitOutputDir)\obj\$(ProjectName)\$(ConfigurationName)"\r
                        ConfigurationType="0"\r
+                       InheritedPropertySheets=".\WebCoreGeneratedCommon.vsprops;.\WebCoreGeneratedCairo.vsprops"\r
+                       >\r
+                       <Tool\r
+                               Name="VCNMakeTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Debug|Win32"\r
+                       ConfigurationType="0"\r
+                       InheritedPropertySheets=".\WebCoreGeneratedCommon.vsprops"\r
+                       >\r
+                       <Tool\r
+                               Name="VCNMakeTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Release|Win32"\r
+                       ConfigurationType="0"\r
+                       InheritedPropertySheets=".\WebCoreGeneratedCommon.vsprops"\r
+                       >\r
+                       <Tool\r
+                               Name="VCNMakeTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Release_LTCG|Win32"\r
+                       ConfigurationType="0"\r
+                       InheritedPropertySheets=".\WebCoreGeneratedCommon.vsprops"\r
                        >\r
                        <Tool\r
                                Name="VCNMakeTool"\r
-                               BuildCommandLine="%SystemDrive%\cygwin\bin\which.exe bash&#x0D;&#x0A;if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%&#x0D;&#x0A;cmd /c&#x0D;&#x0A;if exist &quot;$(WebKitOutputDir)\buildfailed&quot; grep XX$(ProjectName)XX &quot;$(WebKitOutputDir)\buildfailed&quot;&#x0D;&#x0A;if errorlevel 1 exit 1&#x0D;&#x0A;echo XX$(ProjectName)XX &gt; &quot;$(WebKitOutputDir)\buildfailed&quot;&#x0D;&#x0A;&#x0D;&#x0A;bash build-generated-files.sh &quot;$(WebKitOutputDir)&quot; &quot;$(WebKitLibrariesDir)&quot; cairo&#x0D;&#x0A;bash migrate-scripts.sh &quot;$(WebKitOutputDir)/obj/WebCore/scripts&quot;&#x0D;&#x0A;cmd /C copyForwardingHeaders.cmd cairo curl&#x0D;&#x0A;cmd /C copyInspectorFiles.cmd&#x0D;&#x0A;&#x0D;&#x0A;if exist &quot;$(WebKitOutputDir)\buildfailed&quot; del &quot;$(WebKitOutputDir)\buildfailed&quot;&#x0D;&#x0A;"\r
-                               ReBuildCommandLine="echo XX$(ProjectName)XX &gt; &quot;$(WebKitOutputDir)\buildfailed&quot;&#x0D;&#x0A;&#x0D;&#x0A;del /s /q &quot;$(WebKitOutputDir)\obj\WebCore\DerivedSources&quot;&#x0D;&#x0A;del /s /q &quot;$(WebKitOutputDir)\obj\WebCore\scripts&quot;&#x0D;&#x0A;%SystemDrive%\cygwin\bin\which.exe bash&#x0D;&#x0A;if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%&#x0D;&#x0A;cmd /c&#x0D;&#x0A;bash build-generated-files.sh &quot;$(WebKitOutputDir)&quot; &quot;$(WebKitLibrariesDir)&quot; cairo&#x0D;&#x0A;bash migrate-scripts.sh &quot;$(WebKitOutputDir)/obj/WebCore/scripts&quot;&#x0D;&#x0A;cmd /C copyForwardingHeaders.cmd cairo curl&#x0D;&#x0A;cmd /C copyInspectorFiles.cmd&#x0D;&#x0A;&#x0D;&#x0A;if exist &quot;$(WebKitOutputDir)\buildfailed&quot; del &quot;$(WebKitOutputDir)\buildfailed&quot;&#x0D;&#x0A;"\r
-                               CleanCommandLine="del /s /q &quot;$(WebKitOutputDir)\obj\WebCore\DerivedSources&quot;&#x0D;&#x0A;del /s /q &quot;$(WebKitOutputDir)\obj\WebCore\scripts&quot;&#x0D;&#x0A;if exist &quot;$(WebKitOutputDir)\buildfailed&quot; del &quot;$(WebKitOutputDir)\buildfailed&quot;&#x0D;&#x0A;"\r
-                               Output=""\r
-                               PreprocessorDefinitions=""\r
-                               IncludeSearchPath=""\r
-                               ForcedIncludes=""\r
-                               AssemblySearchPath=""\r
-                               ForcedUsingAssemblies=""\r
-                               CompileAsManaged=""\r
                        />\r
                </Configuration>\r
        </Configurations>\r
diff --git a/WebCore/WebCore.vcproj/WebCoreGeneratedCairo.vsprops b/WebCore/WebCore.vcproj/WebCoreGeneratedCairo.vsprops
new file mode 100644 (file)
index 0000000..39e9a8a
--- /dev/null
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="Windows-1252"?>\r
+<VisualStudioPropertySheet\r
+       ProjectType="Visual C++"\r
+       Version="8.00"\r
+       Name="WebCoreGeneratedCairo"\r
+       >\r
+       <Tool\r
+               Name="VCNMakeTool"\r
+               BuildCommandLine="%SystemDrive%\cygwin\bin\which.exe bash&#x0D;&#x0A;if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%&#x0D;&#x0A;cmd /c&#x0D;&#x0A;if exist &quot;$(WebKitOutputDir)\buildfailed&quot; grep XX$(ProjectName)XX &quot;$(WebKitOutputDir)\buildfailed&quot;&#x0D;&#x0A;if errorlevel 1 exit 1&#x0D;&#x0A;echo XX$(ProjectName)XX &gt; &quot;$(WebKitOutputDir)\buildfailed&quot;&#x0D;&#x0A;&#x0D;&#x0A;bash build-generated-files.sh &quot;$(WebKitOutputDir)&quot; &quot;$(WebKitLibrariesDir)&quot; cairo&#x0D;&#x0A;bash migrate-scripts.sh &quot;$(WebKitOutputDir)/obj/WebCore/scripts&quot;&#x0D;&#x0A;cmd /C copyForwardingHeaders.cmd cairo curl&#x0D;&#x0A;cmd /C copyInspectorFiles.cmd&#x0D;&#x0A;&#x0D;&#x0A;if exist &quot;$(WebKitOutputDir)\buildfailed&quot; del &quot;$(WebKitOutputDir)\buildfailed&quot;&#x0D;&#x0A;"\r
+               ReBuildCommandLine="echo XX$(ProjectName)XX &gt; &quot;$(WebKitOutputDir)\buildfailed&quot;&#x0D;&#x0A;&#x0D;&#x0A;del /s /q &quot;$(WebKitOutputDir)\obj\WebCore\DerivedSources&quot;&#x0D;&#x0A;del /s /q &quot;$(WebKitOutputDir)\obj\WebCore\scripts&quot;&#x0D;&#x0A;%SystemDrive%\cygwin\bin\which.exe bash&#x0D;&#x0A;if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%&#x0D;&#x0A;cmd /c&#x0D;&#x0A;bash build-generated-files.sh &quot;$(WebKitOutputDir)&quot; &quot;$(WebKitLibrariesDir)&quot; cairo&#x0D;&#x0A;bash migrate-scripts.sh &quot;$(WebKitOutputDir)/obj/WebCore/scripts&quot;&#x0D;&#x0A;cmd /C copyForwardingHeaders.cmd cairo curl&#x0D;&#x0A;cmd /C copyInspectorFiles.cmd&#x0D;&#x0A;&#x0D;&#x0A;if exist &quot;$(WebKitOutputDir)\buildfailed&quot; del &quot;$(WebKitOutputDir)\buildfailed&quot;&#x0D;&#x0A;"\r
+       />\r
+</VisualStudioPropertySheet>\r
diff --git a/WebCore/WebCore.vcproj/WebCoreGeneratedCommon.vsprops b/WebCore/WebCore.vcproj/WebCoreGeneratedCommon.vsprops
new file mode 100644 (file)
index 0000000..4a03277
--- /dev/null
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="Windows-1252"?>\r
+<VisualStudioPropertySheet\r
+       ProjectType="Visual C++"\r
+       Version="8.00"\r
+       Name="WebCoreGeneratedCommon"\r
+       OutputDirectory="$(WebKitOutputDir)\lib"\r
+       IntermediateDirectory="$(WebKitOutputDir)\obj\$(ProjectName)\$(ConfigurationName)"\r
+       >\r
+       <Tool\r
+               Name="VCNMakeTool"\r
+               BuildCommandLine="%SystemDrive%\cygwin\bin\which.exe bash&#x0D;&#x0A;if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%&#x0D;&#x0A;cmd /c&#x0D;&#x0A;if exist &quot;$(WebKitOutputDir)\buildfailed&quot; grep XX$(ProjectName)XX &quot;$(WebKitOutputDir)\buildfailed&quot;&#x0D;&#x0A;if errorlevel 1 exit 1&#x0D;&#x0A;echo XX$(ProjectName)XX &gt; &quot;$(WebKitOutputDir)\buildfailed&quot;&#x0D;&#x0A;&#x0D;&#x0A;bash build-generated-files.sh &quot;$(WebKitOutputDir)&quot; &quot;$(WebKitLibrariesDir)&quot; windows&#x0D;&#x0A;bash migrate-scripts.sh &quot;$(WebKitOutputDir)/obj/WebCore/scripts&quot;&#x0D;&#x0A;cmd /C copyForwardingHeaders.cmd cg cf&#x0D;&#x0A;cmd /C copyInspectorFiles.cmd&#x0D;&#x0A;&#x0D;&#x0A;if exist &quot;$(WebKitOutputDir)\buildfailed&quot; del &quot;$(WebKitOutputDir)\buildfailed&quot;&#x0D;&#x0A;"\r
+               ReBuildCommandLine="echo XX$(ProjectName)XX &gt; &quot;$(WebKitOutputDir)\buildfailed&quot;&#x0D;&#x0A;&#x0D;&#x0A;del /s /q &quot;$(WebKitOutputDir)\obj\WebCore\DerivedSources&quot;&#x0D;&#x0A;del /s /q &quot;$(WebKitOutputDir)\obj\WebCore\scripts&quot;&#x0D;&#x0A;%SystemDrive%\cygwin\bin\which.exe bash&#x0D;&#x0A;if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%&#x0D;&#x0A;cmd /c&#x0D;&#x0A;bash build-generated-files.sh &quot;$(WebKitOutputDir)&quot; &quot;$(WebKitLibrariesDir)&quot; windows&#x0D;&#x0A;bash migrate-scripts.sh &quot;$(WebKitOutputDir)/obj/WebCore/scripts&quot;&#x0D;&#x0A;cmd /C copyForwardingHeaders.cmd cg cf&#x0D;&#x0A;cmd /C copyInspectorFiles.cmd&#x0D;&#x0A;&#x0D;&#x0A;if exist &quot;$(WebKitOutputDir)\buildfailed&quot; del &quot;$(WebKitOutputDir)\buildfailed&quot;&#x0D;&#x0A;"\r
+               CleanCommandLine="del /s /q &quot;$(WebKitOutputDir)\obj\WebCore\DerivedSources&quot;&#x0D;&#x0A;del /s /q &quot;$(WebKitOutputDir)\obj\WebCore\scripts&quot;&#x0D;&#x0A;if exist &quot;$(WebKitOutputDir)\buildfailed&quot; del &quot;$(WebKitOutputDir)\buildfailed&quot;&#x0D;&#x0A;"\r
+       />\r
+</VisualStudioPropertySheet>\r
index 2a6dc1b..3303ea7 100644 (file)
@@ -2,6 +2,16 @@
 
         Reviewed by Adam Roben.
 
+        Windows vcproj configuration names should be normalized across projects
+        https://bugs.webkit.org/show_bug.cgi?id=49776
+
+        * WebKit.vcproj/Interfaces.vcproj:
+        * WebKit.vcproj/WebKit.sln:
+
+2010-11-18  Steve Falkenburg  <sfalken@apple.com>
+
+        Reviewed by Adam Roben.
+
         Remove leftover Windows Debug_Internal configurations
         https://bugs.webkit.org/show_bug.cgi?id=49758
 
index 5b6c4af..746725b 100644 (file)
                                Name="VCPostBuildEventTool"\r
                        />\r
                </Configuration>\r
+               <Configuration\r
+                       Name="Debug_All|Win32"\r
+                       ConfigurationType="4"\r
+                       InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsprops\FeatureDefines.vsprops;$(WebKitLibrariesDir)\tools\vsprops\common.vsprops;$(WebKitLibrariesDir)\tools\vsprops\debug.vsprops;.\InterfacesCommon.vsprops"\r
+                       CharacterSet="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLibrarianTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
        </Configurations>\r
        <References>\r
        </References>\r
                                        Name="VCMIDLTool"\r
                                />\r
                        </FileConfiguration>\r
+                       <FileConfiguration\r
+                               Name="Debug_All|Win32"\r
+                               ExcludedFromBuild="true"\r
+                               >\r
+                               <Tool\r
+                                       Name="VCMIDLTool"\r
+                               />\r
+                       </FileConfiguration>\r
                </File>\r
                <File\r
                        RelativePath="..\Interfaces\DOMCore.idl"\r
                                        Name="VCMIDLTool"\r
                                />\r
                        </FileConfiguration>\r
+                       <FileConfiguration\r
+                               Name="Debug_All|Win32"\r
+                               ExcludedFromBuild="true"\r
+                               >\r
+                               <Tool\r
+                                       Name="VCMIDLTool"\r
+                               />\r
+                       </FileConfiguration>\r
                </File>\r
                <File\r
                        RelativePath="..\Interfaces\DOMCSS.idl"\r
                                        Name="VCMIDLTool"\r
                                />\r
                        </FileConfiguration>\r
+                       <FileConfiguration\r
+                               Name="Debug_All|Win32"\r
+                               ExcludedFromBuild="true"\r
+                               >\r
+                               <Tool\r
+                                       Name="VCMIDLTool"\r
+                               />\r
+                       </FileConfiguration>\r
                </File>\r
                <File\r
                        RelativePath="..\Interfaces\DOMEvents.idl"\r
                                        Name="VCMIDLTool"\r
                                />\r
                        </FileConfiguration>\r
+                       <FileConfiguration\r
+                               Name="Debug_All|Win32"\r
+                               ExcludedFromBuild="true"\r
+                               >\r
+                               <Tool\r
+                                       Name="VCMIDLTool"\r
+                               />\r
+                       </FileConfiguration>\r
                </File>\r
                <File\r
                        RelativePath="..\Interfaces\DOMExtensions.idl"\r
                                        Name="VCMIDLTool"\r
                                />\r
                        </FileConfiguration>\r
+                       <FileConfiguration\r
+                               Name="Debug_All|Win32"\r
+                               ExcludedFromBuild="true"\r
+                               >\r
+                               <Tool\r
+                                       Name="VCMIDLTool"\r
+                               />\r
+                       </FileConfiguration>\r
                </File>\r
                <File\r
                        RelativePath="..\Interfaces\DOMHTML.idl"\r
                                        Name="VCMIDLTool"\r
                                />\r
                        </FileConfiguration>\r
+                       <FileConfiguration\r
+                               Name="Debug_All|Win32"\r
+                               ExcludedFromBuild="true"\r
+                               >\r
+                               <Tool\r
+                                       Name="VCMIDLTool"\r
+                               />\r
+                       </FileConfiguration>\r
                </File>\r
                <File\r
                        RelativePath="..\Interfaces\DOMPrivate.idl"\r
                                        Name="VCMIDLTool"\r
                                />\r
                        </FileConfiguration>\r
+                       <FileConfiguration\r
+                               Name="Debug_All|Win32"\r
+                               ExcludedFromBuild="true"\r
+                               >\r
+                               <Tool\r
+                                       Name="VCMIDLTool"\r
+                               />\r
+                       </FileConfiguration>\r
                </File>\r
                <File\r
                        RelativePath="..\Interfaces\DOMRange.idl"\r
                                        Name="VCMIDLTool"\r
                                />\r
                        </FileConfiguration>\r
+                       <FileConfiguration\r
+                               Name="Debug_All|Win32"\r
+                               ExcludedFromBuild="true"\r
+                               >\r
+                               <Tool\r
+                                       Name="VCMIDLTool"\r
+                               />\r
+                       </FileConfiguration>\r
                </File>\r
                <File\r
                        RelativePath="..\Interfaces\DOMWindow.idl"\r
                                        Name="VCMIDLTool"\r
                                />\r
                        </FileConfiguration>\r
+                       <FileConfiguration\r
+                               Name="Debug_All|Win32"\r
+                               ExcludedFromBuild="true"\r
+                               >\r
+                               <Tool\r
+                                       Name="VCMIDLTool"\r
+                               />\r
+                       </FileConfiguration>\r
                </File>\r
                <File\r
                        RelativePath="..\Interfaces\IGEN_DOMObject.idl"\r
                                        Name="VCMIDLTool"\r
                                />\r
                        </FileConfiguration>\r
+                       <FileConfiguration\r
+                               Name="Debug_All|Win32"\r
+                               ExcludedFromBuild="true"\r
+                               >\r
+                               <Tool\r
+                                       Name="VCMIDLTool"\r
+                               />\r
+                       </FileConfiguration>\r
                </File>\r
                <File\r
                        RelativePath="..\Interfaces\IWebArchive.idl"\r
                                        Name="VCMIDLTool"\r
                                />\r
                        </FileConfiguration>\r
+                       <FileConfiguration\r
+                               Name="Debug_All|Win32"\r
+                               ExcludedFromBuild="true"\r
+                               >\r
+                               <Tool\r
+                                       Name="VCMIDLTool"\r
+                               />\r
+                       </FileConfiguration>\r
                </File>\r
                <File\r
                        RelativePath="..\Interfaces\IWebBackForwardList.idl"\r
                                        Name="VCMIDLTool"\r
                                />\r
                        </FileConfiguration>\r
+                       <FileConfiguration\r
+                               Name="Debug_All|Win32"\r
+                               ExcludedFromBuild="true"\r
+                               >\r
+                               <Tool\r
+                                       Name="VCMIDLTool"\r
+                               />\r
+                       </FileConfiguration>\r
                </File>\r
                <File\r
                        RelativePath="..\Interfaces\IWebBackForwardListPrivate.idl"\r
                                        Name="VCMIDLTool"\r
                                />\r
                        </FileConfiguration>\r
+                       <FileConfiguration\r
+                               Name="Debug_All|Win32"\r
+                               ExcludedFromBuild="true"\r
+                               >\r
+                               <Tool\r
+                                       Name="VCMIDLTool"\r
+                               />\r
+                       </FileConfiguration>\r
                </File>\r
                <File\r
                        RelativePath="..\Interfaces\IWebCache.idl"\r
                                        Name="VCMIDLTool"\r
                                />\r
                        </FileConfiguration>\r
+                       <FileConfiguration\r
+                               Name="Debug_All|Win32"\r
+                               ExcludedFromBuild="true"\r
+                               >\r
+                               <Tool\r
+                                       Name="VCMIDLTool"\r
+                               />\r
+                       </FileConfiguration>\r
                </File>\r
                <File\r
                        RelativePath="..\Interfaces\IWebCookieManager.idl"\r
                                        Name="VCMIDLTool"\r
                                />\r
                        </FileConfiguration>\r
+                       <FileConfiguration\r
+                               Name="Debug_All|Win32"\r
+                               ExcludedFromBuild="true"\r
+                               >\r
+                               <Tool\r
+                                       Name="VCMIDLTool"\r
+                               />\r
+                       </FileConfiguration>\r
                </File>\r
                <File\r
                        RelativePath="..\Interfaces\IWebCoreStatistics.idl"\r
                                        Name="VCMIDLTool"\r
                                />\r
                        </FileConfiguration>\r
+                       <FileConfiguration\r
+                               Name="Debug_All|Win32"\r
+                               ExcludedFromBuild="true"\r
+                               >\r
+                               <Tool\r
+                                       Name="VCMIDLTool"\r
+                               />\r
+                       </FileConfiguration>\r
                </File>\r
                <File\r
                        RelativePath="..\Interfaces\IWebDatabaseManager.idl"\r
                                        Name="VCMIDLTool"\r
                                />\r
                        </FileConfiguration>\r
+                       <FileConfiguration\r
+                               Name="Debug_All|Win32"\r
+                               ExcludedFromBuild="true"\r
+                               >\r
+                               <Tool\r
+                                       Name="VCMIDLTool"\r
+                               />\r
+                       </FileConfiguration>\r
                </File>\r
                <File\r
                        RelativePath="..\Interfaces\IWebDataSource.idl"\r
                                        Name="VCMIDLTool"\r
                                />\r
                        </FileConfiguration>\r
+                       <FileConfiguration\r
+                               Name="Debug_All|Win32"\r
+                               ExcludedFromBuild="true"\r
+                               >\r
+                               <Tool\r
+                                       Name="VCMIDLTool"\r
+                               />\r
+                       </FileConfiguration>\r
                </File>\r
                <File\r
                        RelativePath="..\Interfaces\IWebDesktopNotificationsDelegate.idl"\r
                                        Name="VCMIDLTool"\r
                                />\r
                        </FileConfiguration>\r
+                       <FileConfiguration\r
+                               Name="Debug_All|Win32"\r
+                               ExcludedFromBuild="true"\r
+                               >\r
+                               <Tool\r
+                                       Name="VCMIDLTool"\r
+                               />\r
+                       </FileConfiguration>\r
                </File>\r
                <File\r
                        RelativePath="..\Interfaces\IWebDocument.idl"\r
                                        Name="VCMIDLTool"\r
                                />\r
                        </FileConfiguration>\r
+                       <FileConfiguration\r
+                               Name="Debug_All|Win32"\r
+                               ExcludedFromBuild="true"\r
+                               >\r
+                               <Tool\r
+                                       Name="VCMIDLTool"\r
+                               />\r
+                       </FileConfiguration>\r
                </File>\r
                <File\r
                        RelativePath="..\Interfaces\IWebDownload.idl"\r
                                        Name="VCMIDLTool"\r
                                />\r
                        </FileConfiguration>\r
+                       <FileConfiguration\r
+                               Name="Debug_All|Win32"\r
+                               ExcludedFromBuild="true"\r
+                               >\r
+                               <Tool\r
+                                       Name="VCMIDLTool"\r
+                               />\r
+                       </FileConfiguration>\r
                </File>\r
                <File\r
                        RelativePath="..\Interfaces\IWebEditingDelegate.idl"\r
                                        Name="VCMIDLTool"\r
                                />\r
                        </FileConfiguration>\r
+                       <FileConfiguration\r
+                               Name="Debug_All|Win32"\r
+                               ExcludedFromBuild="true"\r
+                               >\r
+                               <Tool\r
+                                       Name="VCMIDLTool"\r
+                               />\r
+                       </FileConfiguration>\r
                </File>\r
                <File\r
                        RelativePath="..\Interfaces\IWebEmbeddedView.idl"\r
                                        Name="VCMIDLTool"\r
                                />\r
                        </FileConfiguration>\r
+                       <FileConfiguration\r
+                               Name="Debug_All|Win32"\r
+                               ExcludedFromBuild="true"\r
+                               >\r
+                               <Tool\r
+                                       Name="VCMIDLTool"\r
+                               />\r
+                       </FileConfiguration>\r
                </File>\r
                <File\r
                        RelativePath="..\Interfaces\IWebError.idl"\r
                                        Name="VCMIDLTool"\r
                                />\r
                        </FileConfiguration>\r
+                       <FileConfiguration\r
+                               Name="Debug_All|Win32"\r
+                               ExcludedFromBuild="true"\r
+                               >\r
+                               <Tool\r
+                                       Name="VCMIDLTool"\r
+                               />\r
+                       </FileConfiguration>\r
                </File>\r
                <File\r
                        RelativePath="..\Interfaces\IWebErrorPrivate.idl"\r
                                        Name="VCMIDLTool"\r
                                />\r
                        </FileConfiguration>\r
+                       <FileConfiguration\r
+                               Name="Debug_All|Win32"\r
+                               ExcludedFromBuild="true"\r
+                               >\r
+                               <Tool\r
+                                       Name="VCMIDLTool"\r
+                               />\r
+                       </FileConfiguration>\r
                </File>\r
                <File\r
                        RelativePath="..\Interfaces\IWebFormDelegate.idl"\r
                                        Name="VCMIDLTool"\r
                                />\r
                        </FileConfiguration>\r
+                       <FileConfiguration\r
+                               Name="Debug_All|Win32"\r
+                               ExcludedFromBuild="true"\r
+                               >\r
+                               <Tool\r
+                                       Name="VCMIDLTool"\r
+                               />\r
+                       </FileConfiguration>\r
                </File>\r
                <File\r
                        RelativePath="..\Interfaces\IWebFrame.idl"\r
                                        Name="VCMIDLTool"\r
                                />\r
                        </FileConfiguration>\r
+                       <FileConfiguration\r
+                               Name="Debug_All|Win32"\r
+                               ExcludedFromBuild="true"\r
+                               >\r
+                               <Tool\r
+                                       Name="VCMIDLTool"\r
+                               />\r
+                       </FileConfiguration>\r
                </File>\r
                <File\r
                        RelativePath="..\Interfaces\IWebFrameLoadDelegate.idl"\r
                                        Name="VCMIDLTool"\r
                                />\r
                        </FileConfiguration>\r
+                       <FileConfiguration\r
+                               Name="Debug_All|Win32"\r
+                               ExcludedFromBuild="true"\r
+                               >\r
+                               <Tool\r
+                                       Name="VCMIDLTool"\r
+                               />\r
+                       </FileConfiguration>\r
                </File>\r
                <File\r
                        RelativePath="..\Interfaces\IWebFrameLoadDelegatePrivate.idl"\r
                                        Name="VCMIDLTool"\r
                                />\r
                        </FileConfiguration>\r
+                       <FileConfiguration\r
+                               Name="Debug_All|Win32"\r
+                               ExcludedFromBuild="true"\r
+                               >\r
+                               <Tool\r
+                                       Name="VCMIDLTool"\r
+                               />\r
+                       </FileConfiguration>\r
                </File>\r
                <File\r
                        RelativePath="..\Interfaces\IWebFrameLoadDelegatePrivate2.idl"\r
                                        Name="VCMIDLTool"\r
                                />\r
                        </FileConfiguration>\r
+                       <FileConfiguration\r
+                               Name="Debug_All|Win32"\r
+                               ExcludedFromBuild="true"\r
+                               >\r
+                               <Tool\r
+                                       Name="VCMIDLTool"\r
+                               />\r
+                       </FileConfiguration>\r
                </File>\r
                <File\r
                        RelativePath="..\Interfaces\IWebFramePrivate.idl"\r
                                        Name="VCMIDLTool"\r
                                />\r
                        </FileConfiguration>\r
+                       <FileConfiguration\r
+                               Name="Debug_All|Win32"\r
+                               ExcludedFromBuild="true"\r
+                               >\r
+                               <Tool\r
+                                       Name="VCMIDLTool"\r
+                               />\r
+                       </FileConfiguration>\r
                </File>\r
                <File\r
                        RelativePath="..\Interfaces\IWebFrameView.idl"\r
                                        Name="VCMIDLTool"\r
                                />\r
                        </FileConfiguration>\r
+                       <FileConfiguration\r
+                               Name="Debug_All|Win32"\r
+                               ExcludedFromBuild="true"\r
+                               >\r
+                               <Tool\r
+                                       Name="VCMIDLTool"\r
+                               />\r
+                       </FileConfiguration>\r
                </File>\r
                <File\r
                        RelativePath="..\Interfaces\IWebGeolocationPolicyListener.idl"\r
                                        Name="VCMIDLTool"\r
                                />\r
                        </FileConfiguration>\r
+                       <FileConfiguration\r
+                               Name="Debug_All|Win32"\r
+                               ExcludedFromBuild="true"\r
+                               >\r
+                               <Tool\r
+                                       Name="VCMIDLTool"\r
+                               />\r
+                       </FileConfiguration>\r
                </File>\r
                <File\r
                        RelativePath="..\Interfaces\IWebGeolocationPosition.idl"\r
                                        Name="VCMIDLTool"\r
                                />\r
                        </FileConfiguration>\r
+                       <FileConfiguration\r
+                               Name="Debug_All|Win32"\r
+                               ExcludedFromBuild="true"\r
+                               >\r
+                               <Tool\r
+                                       Name="VCMIDLTool"\r
+                               />\r
+                       </FileConfiguration>\r
                </File>\r
                <File\r
                        RelativePath="..\Interfaces\IWebGeolocationProvider.idl"\r
                                        Name="VCMIDLTool"\r
                                />\r
                        </FileConfiguration>\r
+                       <FileConfiguration\r
+                               Name="Debug_All|Win32"\r
+                               ExcludedFromBuild="true"\r
+                               >\r
+                               <Tool\r
+                                       Name="VCMIDLTool"\r
+                               />\r
+                       </FileConfiguration>\r
                </File>\r
                <File\r
                        RelativePath="..\Interfaces\IWebHistory.idl"\r
                                        Name="VCMIDLTool"\r
                                />\r
                        </FileConfiguration>\r
+                       <FileConfiguration\r
+                               Name="Debug_All|Win32"\r
+                               ExcludedFromBuild="true"\r
+                               >\r
+                               <Tool\r
+                                       Name="VCMIDLTool"\r
+                               />\r
+                       </FileConfiguration>\r
                </File>\r
                <File\r
                        RelativePath="..\Interfaces\IWebHistoryDelegate.idl"\r
                                        Name="VCMIDLTool"\r
                                />\r
                        </FileConfiguration>\r
+                       <FileConfiguration\r
+                               Name="Debug_All|Win32"\r
+                               ExcludedFromBuild="true"\r
+                               >\r
+                               <Tool\r
+                                       Name="VCMIDLTool"\r
+                               />\r
+                       </FileConfiguration>\r
                </File>\r
                <File\r
                        RelativePath="..\Interfaces\IWebHistoryItem.idl"\r
                                        Name="VCMIDLTool"\r
                                />\r
                        </FileConfiguration>\r
+                       <FileConfiguration\r
+                               Name="Debug_All|Win32"\r
+                               ExcludedFromBuild="true"\r
+                               >\r
+                               <Tool\r
+                                       Name="VCMIDLTool"\r
+                               />\r
+                       </FileConfiguration>\r
                </File>\r
                <File\r
                        RelativePath="..\Interfaces\IWebHistoryItemPrivate.idl"\r
                                        Name="VCMIDLTool"\r
                                />\r
                        </FileConfiguration>\r
+                       <FileConfiguration\r
+                               Name="Debug_All|Win32"\r
+                               ExcludedFromBuild="true"\r
+                               >\r
+                               <Tool\r
+                                       Name="VCMIDLTool"\r
+                               />\r
+                       </FileConfiguration>\r
                </File>\r
                <File\r
                        RelativePath="..\Interfaces\IWebHistoryPrivate.idl"\r
                                        Name="VCMIDLTool"\r
                                />\r
                        </FileConfiguration>\r
+                       <FileConfiguration\r
+                               Name="Debug_All|Win32"\r
+                               ExcludedFromBuild="true"\r
+                               >\r
+                               <Tool\r
+                                       Name="VCMIDLTool"\r
+                               />\r
+                       </FileConfiguration>\r
                </File>\r
                <File\r
                        RelativePath="..\Interfaces\IWebHTMLRepresentation.idl"\r
                                        Name="VCMIDLTool"\r
                                />\r
                        </FileConfiguration>\r
+                       <FileConfiguration\r
+                               Name="Debug_All|Win32"\r
+                               ExcludedFromBuild="true"\r
+                               >\r
+                               <Tool\r
+                                       Name="VCMIDLTool"\r
+                               />\r
+                       </FileConfiguration>\r
                </File>\r
                <File\r
                        RelativePath="..\Interfaces\IWebHTTPURLResponse.idl"\r
                                        Name="VCMIDLTool"\r
                                />\r
                        </FileConfiguration>\r
+                       <FileConfiguration\r
+                               Name="Debug_All|Win32"\r
+                               ExcludedFromBuild="true"\r
+                               >\r
+                               <Tool\r
+                                       Name="VCMIDLTool"\r
+                               />\r
+                       </FileConfiguration>\r
                </File>\r
                <File\r
                        RelativePath="..\Interfaces\IWebIconDatabase.idl"\r
                                        Name="VCMIDLTool"\r
                                />\r
                        </FileConfiguration>\r
+                       <FileConfiguration\r
+                               Name="Debug_All|Win32"\r
+                               ExcludedFromBuild="true"\r
+                               >\r
+                               <Tool\r
+                                       Name="VCMIDLTool"\r
+                               />\r
+                       </FileConfiguration>\r
                </File>\r
                <File\r
                        RelativePath="..\Interfaces\IWebInspector.idl"\r
                                        Name="VCMIDLTool"\r
                                />\r
                        </FileConfiguration>\r
+                       <FileConfiguration\r
+                               Name="Debug_All|Win32"\r
+                               ExcludedFromBuild="true"\r
+                               >\r
+                               <Tool\r
+                                       Name="VCMIDLTool"\r
+                               />\r
+                       </FileConfiguration>\r
                </File>\r
                <File\r
                        RelativePath="..\Interfaces\IWebInspectorPrivate.idl"\r
                                        Name="VCMIDLTool"\r
                                />\r
                        </FileConfiguration>\r
+                       <FileConfiguration\r
+                               Name="Debug_All|Win32"\r
+                               ExcludedFromBuild="true"\r
+                               >\r
+                               <Tool\r
+                                       Name="VCMIDLTool"\r
+                               />\r
+                       </FileConfiguration>\r
                </File>\r
                <File\r
                        RelativePath="..\Interfaces\IWebJavaScriptCollector.idl"\r
                                        Name="VCMIDLTool"\r
                                />\r
                        </FileConfiguration>\r
+                       <FileConfiguration\r
+                               Name="Debug_All|Win32"\r
+                               ExcludedFromBuild="true"\r
+                               >\r
+                               <Tool\r
+                                       Name="VCMIDLTool"\r
+                               />\r
+                       </FileConfiguration>\r
                </File>\r
                <File\r
                        RelativePath="..\Interfaces\IWebKitStatistics.idl"\r
                                        Name="VCMIDLTool"\r
                                />\r
                        </FileConfiguration>\r
+                       <FileConfiguration\r
+                               Name="Debug_All|Win32"\r
+                               ExcludedFromBuild="true"\r
+                               >\r
+                               <Tool\r
+                                       Name="VCMIDLTool"\r
+                               />\r
+                       </FileConfiguration>\r
                </File>\r
                <File\r
                        RelativePath="..\Interfaces\IWebMutableURLRequest.idl"\r
                                />\r
                        </FileConfiguration>\r
                        <FileConfiguration\r
-                               Name="Release|Win32"\r
+                               Name="Release|Win32"\r
+                               ExcludedFromBuild="true"\r
+                               >\r
+                               <Tool\r
+                                       Name="VCMIDLTool"\r
+                               />\r
+                       </FileConfiguration>\r
+                       <FileConfiguration\r
+                               Name="Release_LTCG|Win32"\r
                                ExcludedFromBuild="true"\r
                                >\r
                                <Tool\r
                                />\r
                        </FileConfiguration>\r
                        <FileConfiguration\r
-                               Name="Release_LTCG|Win32"\r
+                               Name="Debug_All|Win32"\r
                                ExcludedFromBuild="true"\r
                                >\r
                                <Tool\r
                                        Name="VCMIDLTool"\r
                                />\r
                        </FileConfiguration>\r
+                       <FileConfiguration\r
+                               Name="Debug_All|Win32"\r
+                               ExcludedFromBuild="true"\r
+                               >\r
+                               <Tool\r
+                                       Name="VCMIDLTool"\r
+                               />\r
+                       </FileConfiguration>\r
                </File>\r
                <File\r
                        RelativePath="..\Interfaces\IWebNavigationData.idl"\r
                                        Name="VCMIDLTool"\r
                                />\r
                        </FileConfiguration>\r
+                       <FileConfiguration\r
+                               Name="Debug_All|Win32"\r
+                               ExcludedFromBuild="true"\r
+                               >\r
+                               <Tool\r
+                                       Name="VCMIDLTool"\r
+                               />\r
+                       </FileConfiguration>\r
                </File>\r
                <File\r
                        RelativePath="..\Interfaces\IWebNotification.idl"\r
                                        Name="VCMIDLTool"\r
                                />\r
                        </FileConfiguration>\r
+                       <FileConfiguration\r
+                               Name="Debug_All|Win32"\r
+                               ExcludedFromBuild="true"\r
+                               >\r
+                               <Tool\r
+                                       Name="VCMIDLTool"\r
+                               />\r
+                       </FileConfiguration>\r
                </File>\r
                <File\r
                        RelativePath="..\Interfaces\IWebNotificationCenter.idl"\r
                                        Name="VCMIDLTool"\r
                                />\r
                        </FileConfiguration>\r
+                       <FileConfiguration\r
+                               Name="Debug_All|Win32"\r
+                               ExcludedFromBuild="true"\r
+                               >\r
+                               <Tool\r
+                                       Name="VCMIDLTool"\r
+                               />\r
+                       </FileConfiguration>\r
                </File>\r
                <File\r
                        RelativePath="..\Interfaces\IWebNotificationObserver.idl"\r
                                        Name="VCMIDLTool"\r
                                />\r
                        </FileConfiguration>\r
+                       <FileConfiguration\r
+                               Name="Debug_All|Win32"\r
+                               ExcludedFromBuild="true"\r
+                               >\r
+                               <Tool\r
+                                       Name="VCMIDLTool"\r
+                               />\r
+                       </FileConfiguration>\r
                </File>\r
                <File\r
                        RelativePath="..\Interfaces\IWebPluginHalterDelegate.idl"\r
                                        Name="VCMIDLTool"\r
                                />\r
                        </FileConfiguration>\r
+                       <FileConfiguration\r
+                               Name="Debug_All|Win32"\r
+                               ExcludedFromBuild="true"\r
+                               >\r
+                               <Tool\r
+                                       Name="VCMIDLTool"\r
+                               />\r
+                       </FileConfiguration>\r
                </File>\r
                <File\r
                        RelativePath="..\Interfaces\IWebPolicyDelegate.idl"\r
                                        Name="VCMIDLTool"\r
                                />\r
                        </FileConfiguration>\r
+                       <FileConfiguration\r
+                               Name="Debug_All|Win32"\r
+                               ExcludedFromBuild="true"\r
+                               >\r
+                               <Tool\r
+                                       Name="VCMIDLTool"\r
+                               />\r
+                       </FileConfiguration>\r
                </File>\r
                <File\r
                        RelativePath="..\Interfaces\IWebPolicyDelegatePrivate.idl"\r
                                        Name="VCMIDLTool"\r
                                />\r
                        </FileConfiguration>\r
+                       <FileConfiguration\r
+                               Name="Debug_All|Win32"\r
+                               ExcludedFromBuild="true"\r
+                               >\r
+                               <Tool\r
+                                       Name="VCMIDLTool"\r
+                               />\r
+                       </FileConfiguration>\r
                </File>\r
                <File\r
                        RelativePath="..\Interfaces\IWebPreferences.idl"\r
                                        Name="VCMIDLTool"\r
                                />\r
                        </FileConfiguration>\r
+                       <FileConfiguration\r
+                               Name="Debug_All|Win32"\r
+                               ExcludedFromBuild="true"\r
+                               >\r
+                               <Tool\r
+                                       Name="VCMIDLTool"\r
+                               />\r
+                       </FileConfiguration>\r
                </File>\r
                <File\r
                        RelativePath="..\Interfaces\IWebPreferencesPrivate.idl"\r
                                        Name="VCMIDLTool"\r
                                />\r
                        </FileConfiguration>\r
+                       <FileConfiguration\r
+                               Name="Debug_All|Win32"\r
+                               ExcludedFromBuild="true"\r
+                               >\r
+                               <Tool\r
+                                       Name="VCMIDLTool"\r
+                               />\r
+                       </FileConfiguration>\r
                </File>\r
                <File\r
                        RelativePath="..\Interfaces\IWebResource.idl"\r
                                        Name="VCMIDLTool"\r
                                />\r
                        </FileConfiguration>\r
+                       <FileConfiguration\r
+                               Name="Debug_All|Win32"\r
+                               ExcludedFromBuild="true"\r
+                               >\r
+                               <Tool\r
+                                       Name="VCMIDLTool"\r
+                               />\r
+                       </FileConfiguration>\r
                </File>\r
                <File\r
                        RelativePath="..\Interfaces\IWebResourceLoadDelegate.idl"\r
                                        Name="VCMIDLTool"\r
                                />\r
                        </FileConfiguration>\r
+                       <FileConfiguration\r
+                               Name="Debug_All|Win32"\r
+                               ExcludedFromBuild="true"\r
+                               >\r
+                               <Tool\r
+                                       Name="VCMIDLTool"\r
+                               />\r
+                       </FileConfiguration>\r
                </File>\r
                <File\r
                        RelativePath="..\Interfaces\IWebResourceLoadDelegatePrivate.idl"\r
                                        Name="VCMIDLTool"\r
                                />\r
                        </FileConfiguration>\r
+                       <FileConfiguration\r
+                               Name="Debug_All|Win32"\r
+                               ExcludedFromBuild="true"\r
+                               >\r
+                               <Tool\r
+                                       Name="VCMIDLTool"\r
+                               />\r
+                       </FileConfiguration>\r
                </File>\r
                <File\r
                        RelativePath="..\Interfaces\IWebScriptObject.idl"\r
                                        Name="VCMIDLTool"\r
                                />\r
                        </FileConfiguration>\r
+                       <FileConfiguration\r
+                               Name="Debug_All|Win32"\r
+                               ExcludedFromBuild="true"\r
+                               >\r
+                               <Tool\r
+                                       Name="VCMIDLTool"\r
+                               />\r
+                       </FileConfiguration>\r
                </File>\r
                <File\r
                        RelativePath="..\Interfaces\IWebScriptWorld.idl"\r
                                        Name="VCMIDLTool"\r
                                />\r
                        </FileConfiguration>\r
+                       <FileConfiguration\r
+                               Name="Debug_All|Win32"\r
+                               ExcludedFromBuild="true"\r
+                               >\r
+                               <Tool\r
+                                       Name="VCMIDLTool"\r
+                               />\r
+                       </FileConfiguration>\r
                </File>\r
                <File\r
                        RelativePath="..\Interfaces\IWebScrollBarDelegatePrivate.idl"\r
                                        Name="VCMIDLTool"\r
                                />\r
                        </FileConfiguration>\r
+                       <FileConfiguration\r
+                               Name="Debug_All|Win32"\r
+                               ExcludedFromBuild="true"\r
+                               >\r
+                               <Tool\r
+                                       Name="VCMIDLTool"\r
+                               />\r
+                       </FileConfiguration>\r
                </File>\r
                <File\r
                        RelativePath="..\Interfaces\IWebScrollBarPrivate.idl"\r
                                        Name="VCMIDLTool"\r
                                />\r
                        </FileConfiguration>\r
+                       <FileConfiguration\r
+                               Name="Debug_All|Win32"\r
+                               ExcludedFromBuild="true"\r
+                               >\r
+                               <Tool\r
+                                       Name="VCMIDLTool"\r
+                               />\r
+                       </FileConfiguration>\r
                </File>\r
                <File\r
                        RelativePath="..\Interfaces\IWebSecurityOrigin.idl"\r
                                        Name="VCMIDLTool"\r
                                />\r
                        </FileConfiguration>\r
+                       <FileConfiguration\r
+                               Name="Debug_All|Win32"\r
+                               ExcludedFromBuild="true"\r
+                               >\r
+                               <Tool\r
+                                       Name="VCMIDLTool"\r
+                               />\r
+                       </FileConfiguration>\r
                </File>\r
                <File\r
                        RelativePath="..\Interfaces\IWebSerializedJSValue.idl"\r
                                        Name="VCMIDLTool"\r
                                />\r
                        </FileConfiguration>\r
+                       <FileConfiguration\r
+                               Name="Debug_All|Win32"\r
+                               ExcludedFromBuild="true"\r
+                               >\r
+                               <Tool\r
+                                       Name="VCMIDLTool"\r
+                               />\r
+                       </FileConfiguration>\r
                </File>\r
                <File\r
                        RelativePath="..\Interfaces\IWebSerializedJSValuePrivate.idl"\r
                                        Name="VCMIDLTool"\r
                                />\r
                        </FileConfiguration>\r
+                       <FileConfiguration\r
+                               Name="Debug_All|Win32"\r
+                               ExcludedFromBuild="true"\r
+                               >\r
+                               <Tool\r
+                                       Name="VCMIDLTool"\r
+                               />\r
+                       </FileConfiguration>\r
                </File>\r
                <File\r
                        RelativePath="..\Interfaces\IWebTextRenderer.idl"\r
                                        Name="VCMIDLTool"\r
                                />\r
                        </FileConfiguration>\r
+                       <FileConfiguration\r
+                               Name="Debug_All|Win32"\r
+                               ExcludedFromBuild="true"\r
+                               >\r
+                               <Tool\r
+                                       Name="VCMIDLTool"\r
+                               />\r
+                       </FileConfiguration>\r
                </File>\r
                <File\r
                        RelativePath="..\Interfaces\IWebUIDelegate.idl"\r
                                        Name="VCMIDLTool"\r
                                />\r
                        </FileConfiguration>\r
+                       <FileConfiguration\r
+                               Name="Debug_All|Win32"\r
+                               ExcludedFromBuild="true"\r
+                               >\r
+                               <Tool\r
+                                       Name="VCMIDLTool"\r
+                               />\r
+                       </FileConfiguration>\r
                </File>\r
                <File\r
                        RelativePath="..\Interfaces\IWebUIDelegatePrivate.idl"\r
                                        Name="VCMIDLTool"\r
                                />\r
                        </FileConfiguration>\r
+                       <FileConfiguration\r
+                               Name="Debug_All|Win32"\r
+                               ExcludedFromBuild="true"\r
+                               >\r
+                               <Tool\r
+                                       Name="VCMIDLTool"\r
+                               />\r
+                       </FileConfiguration>\r
                </File>\r
                <File\r
                        RelativePath="..\Interfaces\IWebUndoManager.idl"\r
                                        Name="VCMIDLTool"\r
                                />\r
                        </FileConfiguration>\r
+                       <FileConfiguration\r
+                               Name="Debug_All|Win32"\r
+                               ExcludedFromBuild="true"\r
+                               >\r
+                               <Tool\r
+                                       Name="VCMIDLTool"\r
+                               />\r
+                       </FileConfiguration>\r
                </File>\r
                <File\r
                        RelativePath="..\Interfaces\IWebUndoTarget.idl"\r
                                        Name="VCMIDLTool"\r
                                />\r
                        </FileConfiguration>\r
+                       <FileConfiguration\r
+                               Name="Debug_All|Win32"\r
+                               ExcludedFromBuild="true"\r
+                               >\r
+                               <Tool\r
+                                       Name="VCMIDLTool"\r
+                               />\r
+                       </FileConfiguration>\r
                </File>\r
                <File\r
                        RelativePath="..\Interfaces\IWebURLAuthenticationChallenge.idl"\r
                                        Name="VCMIDLTool"\r
                                />\r
                        </FileConfiguration>\r
+                       <FileConfiguration\r
+                               Name="Debug_All|Win32"\r
+                               ExcludedFromBuild="true"\r
+                               >\r
+                               <Tool\r
+                                       Name="VCMIDLTool"\r
+                               />\r
+                       </FileConfiguration>\r
                </File>\r
                <File\r
                        RelativePath="..\Interfaces\IWebURLRequest.idl"\r
                                        Name="VCMIDLTool"\r
                                />\r
                        </FileConfiguration>\r
+                       <FileConfiguration\r
+                               Name="Debug_All|Win32"\r
+                               ExcludedFromBuild="true"\r
+                               >\r
+                               <Tool\r
+                                       Name="VCMIDLTool"\r
+                               />\r
+                       </FileConfiguration>\r
                </File>\r
                <File\r
                        RelativePath="..\Interfaces\IWebURLResponse.idl"\r
                                        Name="VCMIDLTool"\r
                                />\r
                        </FileConfiguration>\r
+                       <FileConfiguration\r
+                               Name="Debug_All|Win32"\r
+                               ExcludedFromBuild="true"\r
+                               >\r
+                               <Tool\r
+                                       Name="VCMIDLTool"\r
+                               />\r
+                       </FileConfiguration>\r
                </File>\r
                <File\r
                        RelativePath="..\Interfaces\IWebURLResponsePrivate.idl"\r
                                        Name="VCMIDLTool"\r
                                />\r
                        </FileConfiguration>\r
+                       <FileConfiguration\r
+                               Name="Debug_All|Win32"\r
+                               ExcludedFromBuild="true"\r
+                               >\r
+                               <Tool\r
+                                       Name="VCMIDLTool"\r
+                               />\r
+                       </FileConfiguration>\r
                </File>\r
                <File\r
                        RelativePath="..\Interfaces\IWebUserContentURLPattern.idl"\r
                                        Name="VCMIDLTool"\r
                                />\r
                        </FileConfiguration>\r
+                       <FileConfiguration\r
+                               Name="Debug_All|Win32"\r
+                               ExcludedFromBuild="true"\r
+                               >\r
+                               <Tool\r
+                                       Name="VCMIDLTool"\r
+                               />\r
+                       </FileConfiguration>\r
                </File>\r
                <File\r
                        RelativePath="..\Interfaces\IWebView.idl"\r
                                        Name="VCMIDLTool"\r
                                />\r
                        </FileConfiguration>\r
+                       <FileConfiguration\r
+                               Name="Debug_All|Win32"\r
+                               ExcludedFromBuild="true"\r
+                               >\r
+                               <Tool\r
+                                       Name="VCMIDLTool"\r
+                               />\r
+                       </FileConfiguration>\r
                </File>\r
                <File\r
                        RelativePath="..\Interfaces\IWebViewPrivate.idl"\r
                                        Name="VCMIDLTool"\r
                                />\r
                        </FileConfiguration>\r
+                       <FileConfiguration\r
+                               Name="Debug_All|Win32"\r
+                               ExcludedFromBuild="true"\r
+                               >\r
+                               <Tool\r
+                                       Name="VCMIDLTool"\r
+                               />\r
+                       </FileConfiguration>\r
                </File>\r
                <File\r
                        RelativePath="..\Interfaces\IWebWorkersPrivate.idl"\r
                                        Name="VCMIDLTool"\r
                                />\r
                        </FileConfiguration>\r
+                       <FileConfiguration\r
+                               Name="Debug_All|Win32"\r
+                               ExcludedFromBuild="true"\r
+                               >\r
+                               <Tool\r
+                                       Name="VCMIDLTool"\r
+                               />\r
+                       </FileConfiguration>\r
                </File>\r
                <File\r
                        RelativePath="..\Interfaces\JavaScriptCoreAPITypes.idl"\r
                                        Name="VCMIDLTool"\r
                                />\r
                        </FileConfiguration>\r
+                       <FileConfiguration\r
+                               Name="Debug_All|Win32"\r
+                               ExcludedFromBuild="true"\r
+                               >\r
+                               <Tool\r
+                                       Name="VCMIDLTool"\r
+                               />\r
+                       </FileConfiguration>\r
                </File>\r
                <File\r
                        RelativePath="..\Interfaces\WebKit.idl"\r
                                        GenerateTypeLibrary="true"\r
                                />\r
                        </FileConfiguration>\r
+                       <FileConfiguration\r
+                               Name="Debug_All|Win32"\r
+                               >\r
+                               <Tool\r
+                                       Name="VCMIDLTool"\r
+                                       GenerateTypeLibrary="true"\r
+                               />\r
+                       </FileConfiguration>\r
                </File>\r
                <File\r
                        RelativePath="..\Interfaces\WebScrollbarTypes.idl"\r
                                        Name="VCMIDLTool"\r
                                />\r
                        </FileConfiguration>\r
+                       <FileConfiguration\r
+                               Name="Debug_All|Win32"\r
+                               ExcludedFromBuild="true"\r
+                               >\r
+                               <Tool\r
+                                       Name="VCMIDLTool"\r
+                               />\r
+                       </FileConfiguration>\r
                </File>\r
        </Files>\r
        <Globals>\r
index 53ade97..d294e87 100644 (file)
@@ -188,22 +188,22 @@ Global
                {C59E5129-B453-49B7-A52B-1E104715F76E}.Release_Cairo|Win32.Build.0 = Release|Win32\r
                {C59E5129-B453-49B7-A52B-1E104715F76E}.Release|Win32.ActiveCfg = Release|Win32\r
                {C59E5129-B453-49B7-A52B-1E104715F76E}.Release|Win32.Build.0 = Release|Win32\r
-               {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Debug_Cairo|Win32.ActiveCfg = all|Win32\r
-               {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Debug_Cairo|Win32.Build.0 = all|Win32\r
-               {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Debug|Win32.ActiveCfg = all|Win32\r
-               {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Debug|Win32.Build.0 = all|Win32\r
-               {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Release_Cairo|Win32.ActiveCfg = all|Win32\r
-               {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Release_Cairo|Win32.Build.0 = all|Win32\r
-               {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Release|Win32.ActiveCfg = all|Win32\r
-               {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Release|Win32.Build.0 = all|Win32\r
-               {0A324352-B3B6-496C-9E5B-4C7E923E628B}.Debug_Cairo|Win32.ActiveCfg = cairo|Win32\r
-               {0A324352-B3B6-496C-9E5B-4C7E923E628B}.Debug_Cairo|Win32.Build.0 = cairo|Win32\r
-               {0A324352-B3B6-496C-9E5B-4C7E923E628B}.Debug|Win32.ActiveCfg = all|Win32\r
-               {0A324352-B3B6-496C-9E5B-4C7E923E628B}.Debug|Win32.Build.0 = all|Win32\r
+               {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Debug_Cairo|Win32.ActiveCfg = Debug|Win32\r
+               {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Debug_Cairo|Win32.Build.0 = Debug|Win32\r
+               {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Debug|Win32.Build.0 = Debug|Win32\r
+               {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Release_Cairo|Win32.ActiveCfg = Release|Win32\r
+               {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Release_Cairo|Win32.Build.0 = Release|Win32\r
+               {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Release|Win32.ActiveCfg = Release|Win32\r
+               {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Release|Win32.Build.0 = Release|Win32\r
+               {0A324352-B3B6-496C-9E5B-4C7E923E628B}.Debug_Cairo|Win32.ActiveCfg = Debug|Win32\r
+               {0A324352-B3B6-496C-9E5B-4C7E923E628B}.Debug_Cairo|Win32.Build.0 = Debug|Win32\r
+               {0A324352-B3B6-496C-9E5B-4C7E923E628B}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {0A324352-B3B6-496C-9E5B-4C7E923E628B}.Debug|Win32.Build.0 = Debug|Win32\r
                {0A324352-B3B6-496C-9E5B-4C7E923E628B}.Release_Cairo|Win32.ActiveCfg = cairo|Win32\r
                {0A324352-B3B6-496C-9E5B-4C7E923E628B}.Release_Cairo|Win32.Build.0 = cairo|Win32\r
-               {0A324352-B3B6-496C-9E5B-4C7E923E628B}.Release|Win32.ActiveCfg = all|Win32\r
-               {0A324352-B3B6-496C-9E5B-4C7E923E628B}.Release|Win32.Build.0 = all|Win32\r
+               {0A324352-B3B6-496C-9E5B-4C7E923E628B}.Release|Win32.ActiveCfg = Release|Win32\r
+               {0A324352-B3B6-496C-9E5B-4C7E923E628B}.Release|Win32.Build.0 = Release|Win32\r
                {E498CA9D-3BD2-4D52-8E37-C8DC76526325}.Debug_Cairo|Win32.ActiveCfg = Debug|Win32\r
                {E498CA9D-3BD2-4D52-8E37-C8DC76526325}.Debug|Win32.ActiveCfg = Debug|Win32\r
                {E498CA9D-3BD2-4D52-8E37-C8DC76526325}.Debug|Win32.Build.0 = Debug|Win32\r
@@ -226,14 +226,14 @@ Global
                {2E51ABE8-76CB-485B-A66C-46AEF4DF8ACD}.Release_Cairo|Win32.Build.0 = Release_Cairo|Win32\r
                {2E51ABE8-76CB-485B-A66C-46AEF4DF8ACD}.Release|Win32.ActiveCfg = Release|Win32\r
                {2E51ABE8-76CB-485B-A66C-46AEF4DF8ACD}.Release|Win32.Build.0 = Release|Win32\r
-               {2EDAD637-CBA8-4E55-97ED-7D2BBC336FDB}.Debug_Cairo|Win32.ActiveCfg = all|Win32\r
-               {2EDAD637-CBA8-4E55-97ED-7D2BBC336FDB}.Debug_Cairo|Win32.Build.0 = all|Win32\r
-               {2EDAD637-CBA8-4E55-97ED-7D2BBC336FDB}.Debug|Win32.ActiveCfg = all|Win32\r
-               {2EDAD637-CBA8-4E55-97ED-7D2BBC336FDB}.Debug|Win32.Build.0 = all|Win32\r
-               {2EDAD637-CBA8-4E55-97ED-7D2BBC336FDB}.Release_Cairo|Win32.ActiveCfg = all|Win32\r
-               {2EDAD637-CBA8-4E55-97ED-7D2BBC336FDB}.Release_Cairo|Win32.Build.0 = all|Win32\r
-               {2EDAD637-CBA8-4E55-97ED-7D2BBC336FDB}.Release|Win32.ActiveCfg = all|Win32\r
-               {2EDAD637-CBA8-4E55-97ED-7D2BBC336FDB}.Release|Win32.Build.0 = all|Win32\r
+               {2EDAD637-CBA8-4E55-97ED-7D2BBC336FDB}.Debug_Cairo|Win32.ActiveCfg = Debug|Win32\r
+               {2EDAD637-CBA8-4E55-97ED-7D2BBC336FDB}.Debug_Cairo|Win32.Build.0 = Debug|Win32\r
+               {2EDAD637-CBA8-4E55-97ED-7D2BBC336FDB}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {2EDAD637-CBA8-4E55-97ED-7D2BBC336FDB}.Debug|Win32.Build.0 = Debug|Win32\r
+               {2EDAD637-CBA8-4E55-97ED-7D2BBC336FDB}.Release_Cairo|Win32.ActiveCfg = Release|Win32\r
+               {2EDAD637-CBA8-4E55-97ED-7D2BBC336FDB}.Release_Cairo|Win32.Build.0 = Release|Win32\r
+               {2EDAD637-CBA8-4E55-97ED-7D2BBC336FDB}.Release|Win32.ActiveCfg = Release|Win32\r
+               {2EDAD637-CBA8-4E55-97ED-7D2BBC336FDB}.Release|Win32.Build.0 = Release|Win32\r
                {AAE88FEF-509E-4D49-870B-7357922C276F}.Debug_Cairo|Win32.ActiveCfg = Debug_CFLite|Win32\r
                {AAE88FEF-509E-4D49-870B-7357922C276F}.Debug_Cairo|Win32.Build.0 = Debug_CFLite|Win32\r
                {AAE88FEF-509E-4D49-870B-7357922C276F}.Debug|Win32.ActiveCfg = Debug|Win32\r
@@ -282,18 +282,18 @@ Global
                {59CC0547-70AC-499C-9B19-EC01C6F61137}.Release_Cairo|Win32.Build.0 = Release|Win32\r
                {59CC0547-70AC-499C-9B19-EC01C6F61137}.Release|Win32.ActiveCfg = Release|Win32\r
                {59CC0547-70AC-499C-9B19-EC01C6F61137}.Release|Win32.Build.0 = Release|Win32\r
-               {DA31DA52-6675-48D4-89E0-333A7144397C}.Debug_Cairo|Win32.ActiveCfg = all|Win32\r
-               {DA31DA52-6675-48D4-89E0-333A7144397C}.Debug_Cairo|Win32.Build.0 = all|Win32\r
-               {DA31DA52-6675-48D4-89E0-333A7144397C}.Debug|Win32.ActiveCfg = all|Win32\r
-               {DA31DA52-6675-48D4-89E0-333A7144397C}.Debug|Win32.Build.0 = all|Win32\r
-               {DA31DA52-6675-48D4-89E0-333A7144397C}.Release_Cairo|Win32.ActiveCfg = all|Win32\r
-               {DA31DA52-6675-48D4-89E0-333A7144397C}.Release_Cairo|Win32.Build.0 = all|Win32\r
-               {DA31DA52-6675-48D4-89E0-333A7144397C}.Release|Win32.ActiveCfg = all|Win32\r
-               {DA31DA52-6675-48D4-89E0-333A7144397C}.Release|Win32.Build.0 = all|Win32\r
-               {44B9C152-1870-4035-B94D-7B3285AA0C12}.Debug_Cairo|Win32.ActiveCfg = Release|Win32\r
-               {44B9C152-1870-4035-B94D-7B3285AA0C12}.Debug_Cairo|Win32.Build.0 = Release|Win32\r
-               {44B9C152-1870-4035-B94D-7B3285AA0C12}.Debug|Win32.ActiveCfg = Release|Win32\r
-               {44B9C152-1870-4035-B94D-7B3285AA0C12}.Debug|Win32.Build.0 = Release|Win32\r
+               {DA31DA52-6675-48D4-89E0-333A7144397C}.Debug_Cairo|Win32.ActiveCfg = Debug|Win32\r
+               {DA31DA52-6675-48D4-89E0-333A7144397C}.Debug_Cairo|Win32.Build.0 = Debug|Win32\r
+               {DA31DA52-6675-48D4-89E0-333A7144397C}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {DA31DA52-6675-48D4-89E0-333A7144397C}.Debug|Win32.Build.0 = Debug|Win32\r
+               {DA31DA52-6675-48D4-89E0-333A7144397C}.Release_Cairo|Win32.ActiveCfg = Release|Win32\r
+               {DA31DA52-6675-48D4-89E0-333A7144397C}.Release_Cairo|Win32.Build.0 = Release|Win32\r
+               {DA31DA52-6675-48D4-89E0-333A7144397C}.Release|Win32.ActiveCfg = Release|Win32\r
+               {DA31DA52-6675-48D4-89E0-333A7144397C}.Release|Win32.Build.0 = Release|Win32\r
+               {44B9C152-1870-4035-B94D-7B3285AA0C12}.Debug_Cairo|Win32.ActiveCfg = Debug|Win32\r
+               {44B9C152-1870-4035-B94D-7B3285AA0C12}.Debug_Cairo|Win32.Build.0 = Debug|Win32\r
+               {44B9C152-1870-4035-B94D-7B3285AA0C12}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {44B9C152-1870-4035-B94D-7B3285AA0C12}.Debug|Win32.Build.0 = Debug|Win32\r
                {44B9C152-1870-4035-B94D-7B3285AA0C12}.Release_Cairo|Win32.ActiveCfg = Release|Win32\r
                {44B9C152-1870-4035-B94D-7B3285AA0C12}.Release_Cairo|Win32.Build.0 = Release|Win32\r
                {44B9C152-1870-4035-B94D-7B3285AA0C12}.Release|Win32.ActiveCfg = Release|Win32\r
@@ -312,12 +312,12 @@ Global
                {626089A3-25D3-4883-A96C-B8C66E036397}.Debug|Win32.Build.0 = Debug|Win32\r
                {626089A3-25D3-4883-A96C-B8C66E036397}.Release_Cairo|Win32.ActiveCfg = Debug_Cairo|Win32\r
                {626089A3-25D3-4883-A96C-B8C66E036397}.Release_Cairo|Win32.Build.0 = Debug_Cairo|Win32\r
-               {626089A3-25D3-4883-A96C-B8C66E036397}.Release|Win32.ActiveCfg = Debug|Win32\r
-               {626089A3-25D3-4883-A96C-B8C66E036397}.Release|Win32.Build.0 = Debug|Win32\r
-               {D09806DB-E58B-4646-8C9B-61101906C1E2}.Debug_Cairo|Win32.ActiveCfg = Release|Win32\r
-               {D09806DB-E58B-4646-8C9B-61101906C1E2}.Debug_Cairo|Win32.Build.0 = Release|Win32\r
-               {D09806DB-E58B-4646-8C9B-61101906C1E2}.Debug|Win32.ActiveCfg = Release|Win32\r
-               {D09806DB-E58B-4646-8C9B-61101906C1E2}.Debug|Win32.Build.0 = Release|Win32\r
+               {626089A3-25D3-4883-A96C-B8C66E036397}.Release|Win32.ActiveCfg = Release|Win32\r
+               {626089A3-25D3-4883-A96C-B8C66E036397}.Release|Win32.Build.0 = Release|Win32\r
+               {D09806DB-E58B-4646-8C9B-61101906C1E2}.Debug_Cairo|Win32.ActiveCfg = Debug|Win32\r
+               {D09806DB-E58B-4646-8C9B-61101906C1E2}.Debug_Cairo|Win32.Build.0 = Debug|Win32\r
+               {D09806DB-E58B-4646-8C9B-61101906C1E2}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {D09806DB-E58B-4646-8C9B-61101906C1E2}.Debug|Win32.Build.0 = Debug|Win32\r
                {D09806DB-E58B-4646-8C9B-61101906C1E2}.Release_Cairo|Win32.ActiveCfg = Release|Win32\r
                {D09806DB-E58B-4646-8C9B-61101906C1E2}.Release_Cairo|Win32.Build.0 = Release|Win32\r
                {D09806DB-E58B-4646-8C9B-61101906C1E2}.Release|Win32.ActiveCfg = Release|Win32\r
@@ -338,14 +338,14 @@ Global
                {CBC3391C-F060-4BF5-A66E-81404168816B}.Release_Cairo|Win32.Build.0 = Release_CFLite|Win32\r
                {CBC3391C-F060-4BF5-A66E-81404168816B}.Release|Win32.ActiveCfg = Release|Win32\r
                {CBC3391C-F060-4BF5-A66E-81404168816B}.Release|Win32.Build.0 = Release|Win32\r
-               {4343BC0B-A2E0-4B48-8277-F33CFBFA83CD}.Debug_Cairo|Win32.ActiveCfg = all|Win32\r
-               {4343BC0B-A2E0-4B48-8277-F33CFBFA83CD}.Debug_Cairo|Win32.Build.0 = all|Win32\r
-               {4343BC0B-A2E0-4B48-8277-F33CFBFA83CD}.Debug|Win32.ActiveCfg = all|Win32\r
-               {4343BC0B-A2E0-4B48-8277-F33CFBFA83CD}.Debug|Win32.Build.0 = all|Win32\r
-               {4343BC0B-A2E0-4B48-8277-F33CFBFA83CD}.Release_Cairo|Win32.ActiveCfg = all|Win32\r
-               {4343BC0B-A2E0-4B48-8277-F33CFBFA83CD}.Release_Cairo|Win32.Build.0 = all|Win32\r
-               {4343BC0B-A2E0-4B48-8277-F33CFBFA83CD}.Release|Win32.ActiveCfg = all|Win32\r
-               {4343BC0B-A2E0-4B48-8277-F33CFBFA83CD}.Release|Win32.Build.0 = all|Win32\r
+               {4343BC0B-A2E0-4B48-8277-F33CFBFA83CD}.Debug_Cairo|Win32.ActiveCfg = Debug|Win32\r
+               {4343BC0B-A2E0-4B48-8277-F33CFBFA83CD}.Debug_Cairo|Win32.Build.0 = Debug|Win32\r
+               {4343BC0B-A2E0-4B48-8277-F33CFBFA83CD}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {4343BC0B-A2E0-4B48-8277-F33CFBFA83CD}.Debug|Win32.Build.0 = Debug|Win32\r
+               {4343BC0B-A2E0-4B48-8277-F33CFBFA83CD}.Release_Cairo|Win32.ActiveCfg = Release|Win32\r
+               {4343BC0B-A2E0-4B48-8277-F33CFBFA83CD}.Release_Cairo|Win32.Build.0 = Release|Win32\r
+               {4343BC0B-A2E0-4B48-8277-F33CFBFA83CD}.Release|Win32.ActiveCfg = Release|Win32\r
+               {4343BC0B-A2E0-4B48-8277-F33CFBFA83CD}.Release|Win32.Build.0 = Release|Win32\r
                {3B99669B-1817-443B-BCBE-835580146668}.Debug_Cairo|Win32.ActiveCfg = Debug_CFLite|Win32\r
                {3B99669B-1817-443B-BCBE-835580146668}.Debug_Cairo|Win32.Build.0 = Debug_CFLite|Win32\r
                {3B99669B-1817-443B-BCBE-835580146668}.Debug|Win32.ActiveCfg = Debug|Win32\r
@@ -370,14 +370,14 @@ Global
                {3E48AB23-D249-488F-A1C4-43CDF52FBD28}.Release_Cairo|Win32.Build.0 = Release_CFLite|Win32\r
                {3E48AB23-D249-488F-A1C4-43CDF52FBD28}.Release|Win32.ActiveCfg = Release|Win32\r
                {3E48AB23-D249-488F-A1C4-43CDF52FBD28}.Release|Win32.Build.0 = Release|Win32\r
-               {45C45411-7F0E-404D-919A-4EE9BB60BE86}.Debug_Cairo|Win32.ActiveCfg = all|Win32\r
-               {45C45411-7F0E-404D-919A-4EE9BB60BE86}.Debug_Cairo|Win32.Build.0 = all|Win32\r
-               {45C45411-7F0E-404D-919A-4EE9BB60BE86}.Debug|Win32.ActiveCfg = all|Win32\r
-               {45C45411-7F0E-404D-919A-4EE9BB60BE86}.Debug|Win32.Build.0 = all|Win32\r
-               {45C45411-7F0E-404D-919A-4EE9BB60BE86}.Release_Cairo|Win32.ActiveCfg = all|Win32\r
-               {45C45411-7F0E-404D-919A-4EE9BB60BE86}.Release_Cairo|Win32.Build.0 = all|Win32\r
-               {45C45411-7F0E-404D-919A-4EE9BB60BE86}.Release|Win32.ActiveCfg = all|Win32\r
-               {45C45411-7F0E-404D-919A-4EE9BB60BE86}.Release|Win32.Build.0 = all|Win32\r
+               {45C45411-7F0E-404D-919A-4EE9BB60BE86}.Debug_Cairo|Win32.ActiveCfg = Debug|Win32\r
+               {45C45411-7F0E-404D-919A-4EE9BB60BE86}.Debug_Cairo|Win32.Build.0 = Debug|Win32\r
+               {45C45411-7F0E-404D-919A-4EE9BB60BE86}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {45C45411-7F0E-404D-919A-4EE9BB60BE86}.Debug|Win32.Build.0 = Debug|Win32\r
+               {45C45411-7F0E-404D-919A-4EE9BB60BE86}.Release_Cairo|Win32.ActiveCfg = Release|Win32\r
+               {45C45411-7F0E-404D-919A-4EE9BB60BE86}.Release_Cairo|Win32.Build.0 = Release|Win32\r
+               {45C45411-7F0E-404D-919A-4EE9BB60BE86}.Release|Win32.ActiveCfg = Release|Win32\r
+               {45C45411-7F0E-404D-919A-4EE9BB60BE86}.Release|Win32.Build.0 = Release|Win32\r
        EndGlobalSection\r
        GlobalSection(SolutionProperties) = preSolution\r
                HideSolutionNode = FALSE\r
index a626a77..146df17 100644 (file)
@@ -1,3 +1,14 @@
+2010-11-18  Steve Falkenburg  <sfalken@apple.com>
+
+        Reviewed by Adam Roben.
+
+        Windows vcproj configuration names should be normalized across projects
+        https://bugs.webkit.org/show_bug.cgi?id=49776
+
+        * win/WebKit2.submit.sln:
+        * win/WebKit2Generated.vcproj:
+        * win/WebKit2GeneratedCommon.vsprops: Added.
+
 2010-11-18  Anders Carlsson  <andersca@apple.com>
 
         Reviewed by Adam Roben.
index 0db36a3..6e4fdcd 100755 (executable)
@@ -29,14 +29,14 @@ Global
                {2E51ABE8-76CB-485B-A66C-46AEF4DF8ACD}.Release_LTCG|Win32.Build.0 = Release_LTCG|Win32\r
                {2E51ABE8-76CB-485B-A66C-46AEF4DF8ACD}.Release|Win32.ActiveCfg = Release|Win32\r
                {2E51ABE8-76CB-485B-A66C-46AEF4DF8ACD}.Release|Win32.Build.0 = Release|Win32\r
-               {2EDAD637-CBA8-4E55-97ED-7D2BBC336FDB}.Debug_All|Win32.ActiveCfg = all|Win32\r
-               {2EDAD637-CBA8-4E55-97ED-7D2BBC336FDB}.Debug_All|Win32.Build.0 = all|Win32\r
-               {2EDAD637-CBA8-4E55-97ED-7D2BBC336FDB}.Debug|Win32.ActiveCfg = all|Win32\r
-               {2EDAD637-CBA8-4E55-97ED-7D2BBC336FDB}.Debug|Win32.Build.0 = all|Win32\r
-               {2EDAD637-CBA8-4E55-97ED-7D2BBC336FDB}.Release_LTCG|Win32.ActiveCfg = all|Win32\r
-               {2EDAD637-CBA8-4E55-97ED-7D2BBC336FDB}.Release_LTCG|Win32.Build.0 = all|Win32\r
-               {2EDAD637-CBA8-4E55-97ED-7D2BBC336FDB}.Release|Win32.ActiveCfg = all|Win32\r
-               {2EDAD637-CBA8-4E55-97ED-7D2BBC336FDB}.Release|Win32.Build.0 = all|Win32\r
+               {2EDAD637-CBA8-4E55-97ED-7D2BBC336FDB}.Debug_All|Win32.ActiveCfg = Debug_All|Win32\r
+               {2EDAD637-CBA8-4E55-97ED-7D2BBC336FDB}.Debug_All|Win32.Build.0 = Debug_All|Win32\r
+               {2EDAD637-CBA8-4E55-97ED-7D2BBC336FDB}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {2EDAD637-CBA8-4E55-97ED-7D2BBC336FDB}.Debug|Win32.Build.0 = Debug|Win32\r
+               {2EDAD637-CBA8-4E55-97ED-7D2BBC336FDB}.Release_LTCG|Win32.ActiveCfg = Release_LTCG|Win32\r
+               {2EDAD637-CBA8-4E55-97ED-7D2BBC336FDB}.Release_LTCG|Win32.Build.0 = Release_LTCG|Win32\r
+               {2EDAD637-CBA8-4E55-97ED-7D2BBC336FDB}.Release|Win32.ActiveCfg = Release|Win32\r
+               {2EDAD637-CBA8-4E55-97ED-7D2BBC336FDB}.Release|Win32.Build.0 = Release|Win32\r
                {AAE88FEF-509E-4D49-870B-7357922C276F}.Debug_All|Win32.ActiveCfg = Debug_All|Win32\r
                {AAE88FEF-509E-4D49-870B-7357922C276F}.Debug_All|Win32.Build.0 = Debug_All|Win32\r
                {AAE88FEF-509E-4D49-870B-7357922C276F}.Debug|Win32.ActiveCfg = Debug|Win32\r
index c4ad31a..949e14e 100755 (executable)
                </Configuration>\r
                <Configuration\r
                        Name="Release_Cairo|Win32"\r
-                       OutputDirectory="$(WebKitOutputDir)\bin"\r
                        ConfigurationType="2"\r
                        InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsprops\FeatureDefinesCairo.vsprops;$(WebKitLibrariesDir)\tools\vsprops\common.vsprops;$(WebKitLibrariesDir)\tools\vsprops\release.vsprops;$(WebKitLibrariesDir)\tools\vsprops\WinCairo.vsprops;$(WebKitLibrariesDir)\tools\vsprops\cURL.vsprops;.\WebKit2Common.vsprops;.\WebKit2CFLite.vsprops"\r
                        CharacterSet="1"\r
index eaa47f4..b62809f 100755 (executable)
        </ToolFiles>\r
        <Configurations>\r
                <Configuration\r
-                       Name="all|Win32"\r
-                       OutputDirectory="$(WebKitOutputDir)\lib"\r
-                       IntermediateDirectory="$(WebKitOutputDir)\obj\$(ProjectName)\$(ConfigurationName)"\r
+                       Name="Debug|Win32"\r
                        ConfigurationType="0"\r
+                       InheritedPropertySheets=".\WebKit2GeneratedCommon.vsprops"\r
+                       >\r
+                       <Tool\r
+                               Name="VCNMakeTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Release|Win32"\r
+                       ConfigurationType="0"\r
+                       InheritedPropertySheets=".\WebKit2GeneratedCommon.vsprops"\r
+                       >\r
+                       <Tool\r
+                               Name="VCNMakeTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Debug_All|Win32"\r
+                       ConfigurationType="0"\r
+                       InheritedPropertySheets=".\WebKit2GeneratedCommon.vsprops"\r
+                       >\r
+                       <Tool\r
+                               Name="VCNMakeTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Release_LTCG|Win32"\r
+                       ConfigurationType="0"\r
+                       InheritedPropertySheets=".\WebKit2GeneratedCommon.vsprops"\r
                        >\r
                        <Tool\r
                                Name="VCNMakeTool"\r
-                               BuildCommandLine="%SystemDrive%\cygwin\bin\which.exe bash&#x0D;&#x0A;if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%&#x0D;&#x0A;cmd /c&#x0D;&#x0A;&#x0D;&#x0A;if exist &quot;$(WebKitOutputDir)\buildfailed&quot; grep XX$(ProjectName)XX &quot;$(WebKitOutputDir)\buildfailed&quot;&#x0D;&#x0A;if errorlevel 1 exit 1&#x0D;&#x0A;echo XX$(ProjectName)XX &gt; &quot;$(WebKitOutputDir)\buildfailed&quot;&#x0D;&#x0A;&#x0D;&#x0A;nmake /nologo -f WebKit2Generated.make&#x0D;&#x0A;&#x0D;&#x0A;if exist &quot;$(WebKitOutputDir)\buildfailed&quot; del &quot;$(WebKitOutputDir)\buildfailed&quot;&#x0D;&#x0A;"\r
-                               ReBuildCommandLine="echo XX$(ProjectName)XX &gt; &quot;$(WebKitOutputDir)\buildfailed&quot;&#x0D;&#x0A;&#x0D;&#x0A;%SystemDrive%\cygwin\bin\which.exe bash&#x0D;&#x0A;if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%&#x0D;&#x0A;cmd /c&#x0D;&#x0A;&#x0D;&#x0A;nmake /nologo -f WebKit2Generated.make clean&#x0D;&#x0A;nmake -f WebKit2Generated.make&#x0D;&#x0A;&#x0D;&#x0A;if exist &quot;$(WebKitOutputDir)\buildfailed&quot; del &quot;$(WebKitOutputDir)\buildfailed&quot;&#x0D;&#x0A;"\r
-                               CleanCommandLine="%SystemDrive%\cygwin\bin\which.exe bash&#x0D;&#x0A;if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%&#x0D;&#x0A;cmd /c&#x0D;&#x0A;&#x0D;&#x0A;nmake /nologo -f WebKit2Generated.make clean&#x0D;&#x0A;&#x0D;&#x0A;if exist &quot;$(WebKitOutputDir)\buildfailed&quot; del &quot;$(WebKitOutputDir)\buildfailed&quot;&#x0D;&#x0A;"\r
-                               Output=""\r
-                               PreprocessorDefinitions="WIN32;NDEBUG"\r
-                               IncludeSearchPath=""\r
-                               ForcedIncludes=""\r
-                               AssemblySearchPath=""\r
-                               ForcedUsingAssemblies=""\r
-                               CompileAsManaged=""\r
                        />\r
                </Configuration>\r
        </Configurations>\r
diff --git a/WebKit2/win/WebKit2GeneratedCommon.vsprops b/WebKit2/win/WebKit2GeneratedCommon.vsprops
new file mode 100644 (file)
index 0000000..096b022
--- /dev/null
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="Windows-1252"?>\r
+<VisualStudioPropertySheet\r
+       ProjectType="Visual C++"\r
+       Version="8.00"\r
+       Name="WebKit2GeneratedCommon"\r
+       OutputDirectory="$(WebKitOutputDir)\lib"\r
+       IntermediateDirectory="$(WebKitOutputDir)\obj\$(ProjectName)\$(ConfigurationName)"\r
+       >\r
+       <Tool\r
+               Name="VCNMakeTool"\r
+               BuildCommandLine="%SystemDrive%\cygwin\bin\which.exe bash&#x0D;&#x0A;if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%&#x0D;&#x0A;cmd /c&#x0D;&#x0A;&#x0D;&#x0A;if exist &quot;$(WebKitOutputDir)\buildfailed&quot; grep XX$(ProjectName)XX &quot;$(WebKitOutputDir)\buildfailed&quot;&#x0D;&#x0A;if errorlevel 1 exit 1&#x0D;&#x0A;echo XX$(ProjectName)XX &gt; &quot;$(WebKitOutputDir)\buildfailed&quot;&#x0D;&#x0A;&#x0D;&#x0A;nmake /nologo -f WebKit2Generated.make&#x0D;&#x0A;&#x0D;&#x0A;if exist &quot;$(WebKitOutputDir)\buildfailed&quot; del &quot;$(WebKitOutputDir)\buildfailed&quot;&#x0D;&#x0A;"\r
+               ReBuildCommandLine="echo XX$(ProjectName)XX &gt; &quot;$(WebKitOutputDir)\buildfailed&quot;&#x0D;&#x0A;&#x0D;&#x0A;%SystemDrive%\cygwin\bin\which.exe bash&#x0D;&#x0A;if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%&#x0D;&#x0A;cmd /c&#x0D;&#x0A;&#x0D;&#x0A;nmake /nologo -f WebKit2Generated.make clean&#x0D;&#x0A;nmake -f WebKit2Generated.make&#x0D;&#x0A;&#x0D;&#x0A;if exist &quot;$(WebKitOutputDir)\buildfailed&quot; del &quot;$(WebKitOutputDir)\buildfailed&quot;&#x0D;&#x0A;"\r
+               CleanCommandLine="%SystemDrive%\cygwin\bin\which.exe bash&#x0D;&#x0A;if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%&#x0D;&#x0A;cmd /c&#x0D;&#x0A;&#x0D;&#x0A;nmake /nologo -f WebKit2Generated.make clean&#x0D;&#x0A;&#x0D;&#x0A;if exist &quot;$(WebKitOutputDir)\buildfailed&quot; del &quot;$(WebKitOutputDir)\buildfailed&quot;&#x0D;&#x0A;"\r
+       />\r
+</VisualStudioPropertySheet>\r
index 3532c92..604dc10 100644 (file)
@@ -1,3 +1,23 @@
+2010-11-18  Steve Falkenburg  <sfalken@apple.com>
+
+        Reviewed by Adam Roben.
+
+        Windows vcproj configuration names should be normalized across projects
+        https://bugs.webkit.org/show_bug.cgi?id=49776
+
+        * DumpRenderTree/DumpRenderTree.sln:
+        * FindSafari/FindSafari.vcproj:
+        * TestWebKitAPI/win/TestWebKitAPI.sln:
+        * TestWebKitAPI/win/TestWebKitAPIGenerated.vcproj:
+        * TestWebKitAPI/win/TestWebKitAPIGeneratedCommon.vsprops: Added.
+        * WebKitAPITest/WebKitAPITest.vcproj:
+        * WebKitAPITest/WebKitAPITestCommon.vsprops:
+        * WebKitLauncherWin/WebKitLauncherWin.vcproj:
+        * WebKitTestRunner/WebKitTestRunner.sln:
+        * WebKitTestRunner/win/InjectedBundleGenerated.vcproj:
+        * WebKitTestRunner/win/InjectedBundleGeneratedCommon.vsprops: Added.
+        * record-memory-win/record-memory-win.vcproj:
+
 2010-11-18  Gavin Barraclough  <barraclough@apple.com>
 
         Build fix - as per DRT-mac, always enabled developer extras,
index d6f7d8c..c070609 100644 (file)
@@ -22,6 +22,7 @@ Global
        GlobalSection(SolutionConfigurationPlatforms) = preSolution\r
                Debug_All|Win32 = Debug_All|Win32\r
                Debug|Win32 = Debug|Win32\r
+               Release_LTCG|Win32 = Release_LTCG|Win32\r
                Release|Win32 = Release|Win32\r
        EndGlobalSection\r
        GlobalSection(ProjectConfigurationPlatforms) = postSolution\r
@@ -29,24 +30,32 @@ Global
                {6567DFD4-D6DE-4CD5-825D-17E353D160E1}.Debug_All|Win32.Build.0 = Debug_All|Win32\r
                {6567DFD4-D6DE-4CD5-825D-17E353D160E1}.Debug|Win32.ActiveCfg = Debug|Win32\r
                {6567DFD4-D6DE-4CD5-825D-17E353D160E1}.Debug|Win32.Build.0 = Debug|Win32\r
+               {6567DFD4-D6DE-4CD5-825D-17E353D160E1}.Release_LTCG|Win32.ActiveCfg = Release_LTCG|Win32\r
+               {6567DFD4-D6DE-4CD5-825D-17E353D160E1}.Release_LTCG|Win32.Build.0 = Release_LTCG|Win32\r
                {6567DFD4-D6DE-4CD5-825D-17E353D160E1}.Release|Win32.ActiveCfg = Release|Win32\r
                {6567DFD4-D6DE-4CD5-825D-17E353D160E1}.Release|Win32.Build.0 = Release|Win32\r
                {C0737398-3565-439E-A2B8-AB2BE4D5430C}.Debug_All|Win32.ActiveCfg = Debug_All|Win32\r
                {C0737398-3565-439E-A2B8-AB2BE4D5430C}.Debug_All|Win32.Build.0 = Debug_All|Win32\r
                {C0737398-3565-439E-A2B8-AB2BE4D5430C}.Debug|Win32.ActiveCfg = Debug|Win32\r
                {C0737398-3565-439E-A2B8-AB2BE4D5430C}.Debug|Win32.Build.0 = Debug|Win32\r
+               {C0737398-3565-439E-A2B8-AB2BE4D5430C}.Release_LTCG|Win32.ActiveCfg = Release_LTCG|Win32\r
+               {C0737398-3565-439E-A2B8-AB2BE4D5430C}.Release_LTCG|Win32.Build.0 = Release_LTCG|Win32\r
                {C0737398-3565-439E-A2B8-AB2BE4D5430C}.Release|Win32.ActiveCfg = Release|Win32\r
                {C0737398-3565-439E-A2B8-AB2BE4D5430C}.Release|Win32.Build.0 = Release|Win32\r
-               {DA31DA52-6675-48D4-89E0-333A7144397C}.Debug_All|Win32.ActiveCfg = all|Win32\r
-               {DA31DA52-6675-48D4-89E0-333A7144397C}.Debug_All|Win32.Build.0 = all|Win32\r
-               {DA31DA52-6675-48D4-89E0-333A7144397C}.Debug|Win32.ActiveCfg = all|Win32\r
-               {DA31DA52-6675-48D4-89E0-333A7144397C}.Debug|Win32.Build.0 = all|Win32\r
-               {DA31DA52-6675-48D4-89E0-333A7144397C}.Release|Win32.ActiveCfg = all|Win32\r
-               {DA31DA52-6675-48D4-89E0-333A7144397C}.Release|Win32.Build.0 = all|Win32\r
+               {DA31DA52-6675-48D4-89E0-333A7144397C}.Debug_All|Win32.ActiveCfg = Debug_All|Win32\r
+               {DA31DA52-6675-48D4-89E0-333A7144397C}.Debug_All|Win32.Build.0 = Debug_All|Win32\r
+               {DA31DA52-6675-48D4-89E0-333A7144397C}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {DA31DA52-6675-48D4-89E0-333A7144397C}.Debug|Win32.Build.0 = Debug|Win32\r
+               {DA31DA52-6675-48D4-89E0-333A7144397C}.Release_LTCG|Win32.ActiveCfg = Release_LTCG|Win32\r
+               {DA31DA52-6675-48D4-89E0-333A7144397C}.Release_LTCG|Win32.Build.0 = Release_LTCG|Win32\r
+               {DA31DA52-6675-48D4-89E0-333A7144397C}.Release|Win32.ActiveCfg = Release|Win32\r
+               {DA31DA52-6675-48D4-89E0-333A7144397C}.Release|Win32.Build.0 = Release|Win32\r
                {59CC0547-70AC-499C-9B19-EC01C6F61137}.Debug_All|Win32.ActiveCfg = Debug_All|Win32\r
                {59CC0547-70AC-499C-9B19-EC01C6F61137}.Debug_All|Win32.Build.0 = Debug_All|Win32\r
                {59CC0547-70AC-499C-9B19-EC01C6F61137}.Debug|Win32.ActiveCfg = Debug|Win32\r
                {59CC0547-70AC-499C-9B19-EC01C6F61137}.Debug|Win32.Build.0 = Debug|Win32\r
+               {59CC0547-70AC-499C-9B19-EC01C6F61137}.Release_LTCG|Win32.ActiveCfg = Release_LTCG|Win32\r
+               {59CC0547-70AC-499C-9B19-EC01C6F61137}.Release_LTCG|Win32.Build.0 = Release_LTCG|Win32\r
                {59CC0547-70AC-499C-9B19-EC01C6F61137}.Release|Win32.ActiveCfg = Release|Win32\r
                {59CC0547-70AC-499C-9B19-EC01C6F61137}.Release|Win32.Build.0 = Release|Win32\r
        EndGlobalSection\r
index 66f1454..d8433ed 100644 (file)
        </ToolFiles>\r
        <Configurations>\r
                <Configuration\r
-                       Name="all|Win32"\r
+                       Name="Debug|Win32"\r
+                       ConfigurationType="1"\r
+                       InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsprops\common.vsprops;$(WebKitLibrariesDir)\tools\vsprops\debug.vsprops;.\FindSafariCommon.vsprops"\r
+                       CharacterSet="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Release|Win32"\r
+                       ConfigurationType="1"\r
+                       InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsprops\common.vsprops;$(WebKitLibrariesDir)\tools\vsprops\release.vsprops;.\FindSafariCommon.vsprops"\r
+                       CharacterSet="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Debug_All|Win32"\r
+                       ConfigurationType="1"\r
+                       InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsprops\common.vsprops;$(WebKitLibrariesDir)\tools\vsprops\debug_all.vsprops;.\FindSafariCommon.vsprops"\r
+                       CharacterSet="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Release_LTCG|Win32"\r
                        ConfigurationType="1"\r
                        InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsprops\common.vsprops;$(WebKitLibrariesDir)\tools\vsprops\release.vsprops;.\FindSafariCommon.vsprops"\r
                        CharacterSet="1"\r
index 012627d..36c9993 100644 (file)
@@ -15,6 +15,7 @@ Global
                Debug_CFLite|Win32 = Debug_CFLite|Win32\r
                Debug|Win32 = Debug|Win32\r
                Release_CFLite|Win32 = Release_CFLite|Win32\r
+               Release_LTCG|Win32 = Release_LTCG|Win32\r
                Release|Win32 = Release|Win32\r
        EndGlobalSection\r
        GlobalSection(ProjectConfigurationPlatforms) = postSolution\r
@@ -28,20 +29,24 @@ Global
                {3E48AB23-D249-488F-A1C4-43CDF52FBD28}.Debug|Win32.Build.0 = Debug|Win32\r
                {3E48AB23-D249-488F-A1C4-43CDF52FBD28}.Release_CFLite|Win32.ActiveCfg = Release_CFLite|Win32\r
                {3E48AB23-D249-488F-A1C4-43CDF52FBD28}.Release_CFLite|Win32.Build.0 = Release_CFLite|Win32\r
+               {3E48AB23-D249-488F-A1C4-43CDF52FBD28}.Release_LTCG|Win32.ActiveCfg = Release_LTCG|Win32\r
+               {3E48AB23-D249-488F-A1C4-43CDF52FBD28}.Release_LTCG|Win32.Build.0 = Release_LTCG|Win32\r
                {3E48AB23-D249-488F-A1C4-43CDF52FBD28}.Release|Win32.ActiveCfg = Release|Win32\r
                {3E48AB23-D249-488F-A1C4-43CDF52FBD28}.Release|Win32.Build.0 = Release|Win32\r
                {45C45411-7F0E-404D-919A-4EE9BB60BE86}.all|Win32.ActiveCfg = all|Win32\r
                {45C45411-7F0E-404D-919A-4EE9BB60BE86}.all|Win32.Build.0 = all|Win32\r
-               {45C45411-7F0E-404D-919A-4EE9BB60BE86}.Debug_All|Win32.ActiveCfg = all|Win32\r
-               {45C45411-7F0E-404D-919A-4EE9BB60BE86}.Debug_All|Win32.Build.0 = all|Win32\r
-               {45C45411-7F0E-404D-919A-4EE9BB60BE86}.Debug_CFLite|Win32.ActiveCfg = all|Win32\r
-               {45C45411-7F0E-404D-919A-4EE9BB60BE86}.Debug_CFLite|Win32.Build.0 = all|Win32\r
-               {45C45411-7F0E-404D-919A-4EE9BB60BE86}.Debug|Win32.ActiveCfg = all|Win32\r
-               {45C45411-7F0E-404D-919A-4EE9BB60BE86}.Debug|Win32.Build.0 = all|Win32\r
-               {45C45411-7F0E-404D-919A-4EE9BB60BE86}.Release_CFLite|Win32.ActiveCfg = all|Win32\r
-               {45C45411-7F0E-404D-919A-4EE9BB60BE86}.Release_CFLite|Win32.Build.0 = all|Win32\r
-               {45C45411-7F0E-404D-919A-4EE9BB60BE86}.Release|Win32.ActiveCfg = all|Win32\r
-               {45C45411-7F0E-404D-919A-4EE9BB60BE86}.Release|Win32.Build.0 = all|Win32\r
+               {45C45411-7F0E-404D-919A-4EE9BB60BE86}.Debug_All|Win32.ActiveCfg = Debug_All|Win32\r
+               {45C45411-7F0E-404D-919A-4EE9BB60BE86}.Debug_All|Win32.Build.0 = Debug_All|Win32\r
+               {45C45411-7F0E-404D-919A-4EE9BB60BE86}.Debug_CFLite|Win32.ActiveCfg = Debug|Win32\r
+               {45C45411-7F0E-404D-919A-4EE9BB60BE86}.Debug_CFLite|Win32.Build.0 = Debug|Win32\r
+               {45C45411-7F0E-404D-919A-4EE9BB60BE86}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {45C45411-7F0E-404D-919A-4EE9BB60BE86}.Debug|Win32.Build.0 = Debug|Win32\r
+               {45C45411-7F0E-404D-919A-4EE9BB60BE86}.Release_CFLite|Win32.ActiveCfg = Release|Win32\r
+               {45C45411-7F0E-404D-919A-4EE9BB60BE86}.Release_CFLite|Win32.Build.0 = Release|Win32\r
+               {45C45411-7F0E-404D-919A-4EE9BB60BE86}.Release_LTCG|Win32.ActiveCfg = Release_LTCG|Win32\r
+               {45C45411-7F0E-404D-919A-4EE9BB60BE86}.Release_LTCG|Win32.Build.0 = Release_LTCG|Win32\r
+               {45C45411-7F0E-404D-919A-4EE9BB60BE86}.Release|Win32.ActiveCfg = Release|Win32\r
+               {45C45411-7F0E-404D-919A-4EE9BB60BE86}.Release|Win32.Build.0 = Release|Win32\r
        EndGlobalSection\r
        GlobalSection(SolutionProperties) = preSolution\r
                HideSolutionNode = FALSE\r
index ce5afeb..c28ddf1 100644 (file)
        </ToolFiles>\r
        <Configurations>\r
                <Configuration\r
-                       Name="all|Win32"\r
+                       Name="Debug|Win32"\r
                        ConfigurationType="0"\r
-                       InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsprops\common.vsprops"\r
+                       InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsprops\common.vsprops;.\TestWebKitAPIGeneratedCommon.vsprops"\r
+                       >\r
+                       <Tool\r
+                               Name="VCNMakeTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Release|Win32"\r
+                       ConfigurationType="0"\r
+                       InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsprops\common.vsprops;.\TestWebKitAPIGeneratedCommon.vsprops"\r
+                       >\r
+                       <Tool\r
+                               Name="VCNMakeTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Debug_All|Win32"\r
+                       ConfigurationType="0"\r
+                       InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsprops\common.vsprops;.\TestWebKitAPIGeneratedCommon.vsprops"\r
+                       >\r
+                       <Tool\r
+                               Name="VCNMakeTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Release_LTCG|Win32"\r
+                       ConfigurationType="0"\r
+                       InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsprops\common.vsprops;.\TestWebKitAPIGeneratedCommon.vsprops"\r
                        >\r
                        <Tool\r
                                Name="VCNMakeTool"\r
-                               BuildCommandLine="copy-resources.cmd"\r
-                               ReBuildCommandLine="copy-resources.cmd rebuild"\r
-                               CleanCommandLine="copy-resources.cmd clean"\r
-                               Output=""\r
-                               PreprocessorDefinitions=""\r
-                               IncludeSearchPath=""\r
-                               ForcedIncludes=""\r
-                               AssemblySearchPath=""\r
-                               ForcedUsingAssemblies=""\r
-                               CompileAsManaged=""\r
                        />\r
                </Configuration>\r
        </Configurations>\r
diff --git a/WebKitTools/TestWebKitAPI/win/TestWebKitAPIGeneratedCommon.vsprops b/WebKitTools/TestWebKitAPI/win/TestWebKitAPIGeneratedCommon.vsprops
new file mode 100644 (file)
index 0000000..0786d24
--- /dev/null
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="Windows-1252"?>\r
+<VisualStudioPropertySheet\r
+       ProjectType="Visual C++"\r
+       Version="8.00"\r
+       Name="TestWebKitAPIGeneratedCommon"\r
+       >\r
+       <Tool\r
+               Name="VCNMakeTool"\r
+               BuildCommandLine="copy-resources.cmd"\r
+               ReBuildCommandLine="copy-resources.cmd rebuild"\r
+               CleanCommandLine="copy-resources.cmd clean"\r
+       />\r
+</VisualStudioPropertySheet>\r
index 8456640..29d8bc4 100644 (file)
@@ -49,7 +49,6 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalOptions="/NXCOMPAT"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalOptions="/NXCOMPAT"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                <Configuration\r
                        Name="Debug_Cairo|Win32"\r
                        ConfigurationType="1"\r
-                       InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsprops\common.vsprops;$(WebKitLibrariesDir)\tools\vsprops\debug_all.vsprops;.\WebKitAPITestCommon.vsprops;$(WebKitLibrariesDir)\tools\vsprops\debug_wincairo.vsprops"\r
+                       InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsprops\common.vsprops;$(WebKitLibrariesDir)\tools\vsprops\debug.vsprops;.\WebKitAPITestCommon.vsprops;$(WebKitLibrariesDir)\tools\vsprops\debug_wincairo.vsprops"\r
+                       CharacterSet="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Release|Win32"\r
+                       ConfigurationType="1"\r
+                       InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsprops\common.vsprops;$(WebKitLibrariesDir)\tools\vsprops\release.vsprops;.\WebKitAPITestCommon.vsprops"\r
+                       CharacterSet="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Release_LTCG|Win32"\r
+                       ConfigurationType="1"\r
+                       InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsprops\common.vsprops;$(WebKitLibrariesDir)\tools\vsprops\release.vsprops;.\WebKitAPITestCommon.vsprops"\r
                        CharacterSet="1"\r
                        >\r
                        <Tool\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalOptions="/NXCOMPAT"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
index 1a2ae95..789ec7e 100644 (file)
@@ -22,4 +22,8 @@
                Name="VCPreBuildEventTool"\r
                CommandLine="%SystemDrive%\cygwin\bin\which.exe bash&#x0D;&#x0A;if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%&#x0D;&#x0A;cmd /c&#x0D;&#x0A;if exist &quot;$(WebKitOutputDir)\buildfailed&quot; grep XX$(ProjectName)XX &quot;$(WebKitOutputDir)\buildfailed&quot;&#x0D;&#x0A;if errorlevel 1 exit 1&#x0D;&#x0A;echo XX$(ProjectName)XX &gt; &quot;$(WebKitOutputDir)\buildfailed&quot;&#x0D;&#x0A;"\r
        />\r
+  <Tool\r
+    Name="VCLinkerTool"\r
+    AdditionalOptions="/NXCOMPAT"\r
+       />\r
 </VisualStudioPropertySheet>\r
index 792bfb3..16759b9 100644 (file)
                                Name="VCPostBuildEventTool"\r
                        />\r
                </Configuration>\r
+               <Configuration\r
+                       Name="Debug|Win32"\r
+                       ConfigurationType="1"\r
+                       InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsprops\common.vsprops;$(WebKitLibrariesDir)\tools\vsprops\debug.vsprops;.\WebKitLauncherWinCommon.vsprops"\r
+                       CharacterSet="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Debug_All|Win32"\r
+                       ConfigurationType="1"\r
+                       InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsprops\common.vsprops;$(WebKitLibrariesDir)\tools\vsprops\debug.vsprops;$(WebKitLibrariesDir)\tools\vsprops\debug_all.vsprops;.\WebKitLauncherWinCommon.vsprops"\r
+                       CharacterSet="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
        </Configurations>\r
        <References>\r
        </References>\r
index aeaabcc..1e3e633 100644 (file)
@@ -32,6 +32,7 @@ Global
        GlobalSection(SolutionConfigurationPlatforms) = preSolution\r
                Debug_All|Win32 = Debug_All|Win32\r
                Debug|Win32 = Debug|Win32\r
+               Release_LTCG|Win32 = Release_LTCG|Win32\r
                Release|Win32 = Release|Win32\r
        EndGlobalSection\r
        GlobalSection(ProjectConfigurationPlatforms) = postSolution\r
@@ -39,36 +40,48 @@ Global
                {3B99669B-1817-443B-BCBE-835580146668}.Debug_All|Win32.Build.0 = Debug_All|Win32\r
                {3B99669B-1817-443B-BCBE-835580146668}.Debug|Win32.ActiveCfg = Debug|Win32\r
                {3B99669B-1817-443B-BCBE-835580146668}.Debug|Win32.Build.0 = Debug|Win32\r
+               {3B99669B-1817-443B-BCBE-835580146668}.Release_LTCG|Win32.ActiveCfg = Release_LTCG|Win32\r
+               {3B99669B-1817-443B-BCBE-835580146668}.Release_LTCG|Win32.Build.0 = Release_LTCG|Win32\r
                {3B99669B-1817-443B-BCBE-835580146668}.Release|Win32.ActiveCfg = Release|Win32\r
                {3B99669B-1817-443B-BCBE-835580146668}.Release|Win32.Build.0 = Release|Win32\r
-               {4343BC0B-A2E0-4B48-8277-F33CFBFA83CD}.Debug_All|Win32.ActiveCfg = all|Win32\r
-               {4343BC0B-A2E0-4B48-8277-F33CFBFA83CD}.Debug_All|Win32.Build.0 = all|Win32\r
-               {4343BC0B-A2E0-4B48-8277-F33CFBFA83CD}.Debug|Win32.ActiveCfg = all|Win32\r
-               {4343BC0B-A2E0-4B48-8277-F33CFBFA83CD}.Debug|Win32.Build.0 = all|Win32\r
-               {4343BC0B-A2E0-4B48-8277-F33CFBFA83CD}.Release|Win32.ActiveCfg = all|Win32\r
-               {4343BC0B-A2E0-4B48-8277-F33CFBFA83CD}.Release|Win32.Build.0 = all|Win32\r
-               {DA31DA52-6675-48D4-89E0-333A7144397C}.Debug_All|Win32.ActiveCfg = all|Win32\r
-               {DA31DA52-6675-48D4-89E0-333A7144397C}.Debug_All|Win32.Build.0 = all|Win32\r
-               {DA31DA52-6675-48D4-89E0-333A7144397C}.Debug|Win32.ActiveCfg = all|Win32\r
-               {DA31DA52-6675-48D4-89E0-333A7144397C}.Debug|Win32.Build.0 = all|Win32\r
-               {DA31DA52-6675-48D4-89E0-333A7144397C}.Release|Win32.ActiveCfg = all|Win32\r
-               {DA31DA52-6675-48D4-89E0-333A7144397C}.Release|Win32.Build.0 = all|Win32\r
+               {4343BC0B-A2E0-4B48-8277-F33CFBFA83CD}.Debug_All|Win32.ActiveCfg = Debug_All|Win32\r
+               {4343BC0B-A2E0-4B48-8277-F33CFBFA83CD}.Debug_All|Win32.Build.0 = Debug_All|Win32\r
+               {4343BC0B-A2E0-4B48-8277-F33CFBFA83CD}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {4343BC0B-A2E0-4B48-8277-F33CFBFA83CD}.Debug|Win32.Build.0 = Debug|Win32\r
+               {4343BC0B-A2E0-4B48-8277-F33CFBFA83CD}.Release_LTCG|Win32.ActiveCfg = Release_LTCG|Win32\r
+               {4343BC0B-A2E0-4B48-8277-F33CFBFA83CD}.Release_LTCG|Win32.Build.0 = Release_LTCG|Win32\r
+               {4343BC0B-A2E0-4B48-8277-F33CFBFA83CD}.Release|Win32.ActiveCfg = Release|Win32\r
+               {4343BC0B-A2E0-4B48-8277-F33CFBFA83CD}.Release|Win32.Build.0 = Release|Win32\r
+               {DA31DA52-6675-48D4-89E0-333A7144397C}.Debug_All|Win32.ActiveCfg = Debug_All|Win32\r
+               {DA31DA52-6675-48D4-89E0-333A7144397C}.Debug_All|Win32.Build.0 = Debug_All|Win32\r
+               {DA31DA52-6675-48D4-89E0-333A7144397C}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {DA31DA52-6675-48D4-89E0-333A7144397C}.Debug|Win32.Build.0 = Debug|Win32\r
+               {DA31DA52-6675-48D4-89E0-333A7144397C}.Release_LTCG|Win32.ActiveCfg = Release_LTCG|Win32\r
+               {DA31DA52-6675-48D4-89E0-333A7144397C}.Release_LTCG|Win32.Build.0 = Release_LTCG|Win32\r
+               {DA31DA52-6675-48D4-89E0-333A7144397C}.Release|Win32.ActiveCfg = Release|Win32\r
+               {DA31DA52-6675-48D4-89E0-333A7144397C}.Release|Win32.Build.0 = Release|Win32\r
                {59CC0547-70AC-499C-9B19-EC01C6F61137}.Debug_All|Win32.ActiveCfg = Debug_All|Win32\r
                {59CC0547-70AC-499C-9B19-EC01C6F61137}.Debug_All|Win32.Build.0 = Debug_All|Win32\r
                {59CC0547-70AC-499C-9B19-EC01C6F61137}.Debug|Win32.ActiveCfg = Debug|Win32\r
                {59CC0547-70AC-499C-9B19-EC01C6F61137}.Debug|Win32.Build.0 = Debug|Win32\r
+               {59CC0547-70AC-499C-9B19-EC01C6F61137}.Release_LTCG|Win32.ActiveCfg = Release_LTCG|Win32\r
+               {59CC0547-70AC-499C-9B19-EC01C6F61137}.Release_LTCG|Win32.Build.0 = Release_LTCG|Win32\r
                {59CC0547-70AC-499C-9B19-EC01C6F61137}.Release|Win32.ActiveCfg = Release|Win32\r
                {59CC0547-70AC-499C-9B19-EC01C6F61137}.Release|Win32.Build.0 = Release|Win32\r
                {CBC3391C-F060-4BF5-A66E-81404168816B}.Debug_All|Win32.ActiveCfg = Debug_All|Win32\r
                {CBC3391C-F060-4BF5-A66E-81404168816B}.Debug_All|Win32.Build.0 = Debug_All|Win32\r
                {CBC3391C-F060-4BF5-A66E-81404168816B}.Debug|Win32.ActiveCfg = Debug|Win32\r
                {CBC3391C-F060-4BF5-A66E-81404168816B}.Debug|Win32.Build.0 = Debug|Win32\r
+               {CBC3391C-F060-4BF5-A66E-81404168816B}.Release_LTCG|Win32.ActiveCfg = Release_LTCG|Win32\r
+               {CBC3391C-F060-4BF5-A66E-81404168816B}.Release_LTCG|Win32.Build.0 = Release_LTCG|Win32\r
                {CBC3391C-F060-4BF5-A66E-81404168816B}.Release|Win32.ActiveCfg = Release|Win32\r
                {CBC3391C-F060-4BF5-A66E-81404168816B}.Release|Win32.Build.0 = Release|Win32\r
                {C0737398-3565-439E-A2B8-AB2BE4D5430C}.Debug_All|Win32.ActiveCfg = Debug_All|Win32\r
                {C0737398-3565-439E-A2B8-AB2BE4D5430C}.Debug_All|Win32.Build.0 = Debug_All|Win32\r
                {C0737398-3565-439E-A2B8-AB2BE4D5430C}.Debug|Win32.ActiveCfg = Debug|Win32\r
                {C0737398-3565-439E-A2B8-AB2BE4D5430C}.Debug|Win32.Build.0 = Debug|Win32\r
+               {C0737398-3565-439E-A2B8-AB2BE4D5430C}.Release_LTCG|Win32.ActiveCfg = Release_LTCG|Win32\r
+               {C0737398-3565-439E-A2B8-AB2BE4D5430C}.Release_LTCG|Win32.Build.0 = Release_LTCG|Win32\r
                {C0737398-3565-439E-A2B8-AB2BE4D5430C}.Release|Win32.ActiveCfg = Release|Win32\r
                {C0737398-3565-439E-A2B8-AB2BE4D5430C}.Release|Win32.Build.0 = Release|Win32\r
        EndGlobalSection\r
index 1148edd..99ff313 100755 (executable)
        </ToolFiles>\r
        <Configurations>\r
                <Configuration\r
-                       Name="all|Win32"\r
-                       OutputDirectory="$(WebKitOutputDir)\lib"\r
-                       IntermediateDirectory="$(WebKitOutputDir)\obj\$(ProjectName)\$(ConfigurationName)"\r
+                       Name="Debug|Win32"\r
                        ConfigurationType="0"\r
+                       InheritedPropertySheets=".\InjectedBundleGeneratedCommon.vsprops"\r
+                       >\r
+                       <Tool\r
+                               Name="VCNMakeTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Release|Win32"\r
+                       ConfigurationType="0"\r
+                       InheritedPropertySheets=".\InjectedBundleGeneratedCommon.vsprops"\r
+                       >\r
+                       <Tool\r
+                               Name="VCNMakeTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Debug_All|Win32"\r
+                       ConfigurationType="0"\r
+                       InheritedPropertySheets=".\InjectedBundleGeneratedCommon.vsprops"\r
+                       >\r
+                       <Tool\r
+                               Name="VCNMakeTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Release_LTCG|Win32"\r
+                       ConfigurationType="0"\r
+                       InheritedPropertySheets=".\InjectedBundleGeneratedCommon.vsprops"\r
                        >\r
                        <Tool\r
                                Name="VCNMakeTool"\r
-                               BuildCommandLine="if exist &quot;$(WebKitOutputDir)\buildfailed&quot; grep XX$(ProjectName)XX &quot;$(WebKitOutputDir)\buildfailed&quot;&#x0D;&#x0A;if errorlevel 1 exit 1&#x0D;&#x0A;echo XX$(ProjectName)XX &gt; &quot;$(WebKitOutputDir)\buildfailed&quot;&#x0D;&#x0A;&#x0D;&#x0A;set PATH=%SystemDrive%\cygwin\bin;%PATH%&#x0D;&#x0A;bash build-generated-files.sh &quot;$(WebKitOutputDir)&quot; &quot;$(WebKitLibrariesDir)&quot;&#x0D;&#x0A;if errorlevel 1 exit 1&#x0D;&#x0A;&#x0D;&#x0A;if exist &quot;$(WebKitOutputDir)\buildfailed&quot; del &quot;$(WebKitOutputDir)\buildfailed&quot;&#x0D;&#x0A;"\r
-                               ReBuildCommandLine="echo XX$(ProjectName)XX &gt; &quot;$(WebKitOutputDir)\buildfailed&quot;&#x0D;&#x0A;&#x0D;&#x0A;del /s /q &quot;$(WebKitOutputDir)\obj\InjectedBundle\DerivedSources&quot;&#x0D;&#x0A;set PATH=%SystemDrive%\cygwin\bin;%PATH%&#x0D;&#x0A;bash build-generated-files.sh &quot;$(WebKitOutputDir)&quot; &quot;$(WebKitLibrariesDir)&quot;&#x0D;&#x0A;if errorlevel 1 exit 1&#x0D;&#x0A;&#x0D;&#x0A;if exist &quot;$(WebKitOutputDir)\buildfailed&quot; del &quot;$(WebKitOutputDir)\buildfailed&quot;&#x0D;&#x0A;"\r
-                               CleanCommandLine="del /s /q &quot;$(WebKitOutputDir)\obj\InjectedBundle\DerivedSources&quot;&#x0D;&#x0A;if exist &quot;$(WebKitOutputDir)\buildfailed&quot; del &quot;$(WebKitOutputDir)\buildfailed&quot;&#x0D;&#x0A;"\r
-                               Output=""\r
-                               PreprocessorDefinitions=""\r
-                               IncludeSearchPath=""\r
-                               ForcedIncludes=""\r
-                               AssemblySearchPath=""\r
-                               ForcedUsingAssemblies=""\r
-                               CompileAsManaged=""\r
                        />\r
                </Configuration>\r
        </Configurations>\r
diff --git a/WebKitTools/WebKitTestRunner/win/InjectedBundleGeneratedCommon.vsprops b/WebKitTools/WebKitTestRunner/win/InjectedBundleGeneratedCommon.vsprops
new file mode 100644 (file)
index 0000000..3f653ac
--- /dev/null
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="Windows-1252"?>\r
+<VisualStudioPropertySheet\r
+       ProjectType="Visual C++"\r
+       Version="8.00"\r
+       Name="InjectedBundleGeneratedCommon"\r
+       OutputDirectory="$(WebKitOutputDir)\lib"\r
+       IntermediateDirectory="$(WebKitOutputDir)\obj\$(ProjectName)\$(ConfigurationName)"\r
+       >\r
+       <Tool\r
+               Name="VCNMakeTool"\r
+               BuildCommandLine="if exist &quot;$(WebKitOutputDir)\buildfailed&quot; grep XX$(ProjectName)XX &quot;$(WebKitOutputDir)\buildfailed&quot;&#x0D;&#x0A;if errorlevel 1 exit 1&#x0D;&#x0A;echo XX$(ProjectName)XX &gt; &quot;$(WebKitOutputDir)\buildfailed&quot;&#x0D;&#x0A;&#x0D;&#x0A;set PATH=%SystemDrive%\cygwin\bin;%PATH%&#x0D;&#x0A;bash build-generated-files.sh &quot;$(WebKitOutputDir)&quot; &quot;$(WebKitLibrariesDir)&quot;&#x0D;&#x0A;if errorlevel 1 exit 1&#x0D;&#x0A;&#x0D;&#x0A;if exist &quot;$(WebKitOutputDir)\buildfailed&quot; del &quot;$(WebKitOutputDir)\buildfailed&quot;&#x0D;&#x0A;"\r
+               ReBuildCommandLine="echo XX$(ProjectName)XX &gt; &quot;$(WebKitOutputDir)\buildfailed&quot;&#x0D;&#x0A;&#x0D;&#x0A;del /s /q &quot;$(WebKitOutputDir)\obj\InjectedBundle\DerivedSources&quot;&#x0D;&#x0A;set PATH=%SystemDrive%\cygwin\bin;%PATH%&#x0D;&#x0A;bash build-generated-files.sh &quot;$(WebKitOutputDir)&quot; &quot;$(WebKitLibrariesDir)&quot;&#x0D;&#x0A;if errorlevel 1 exit 1&#x0D;&#x0A;&#x0D;&#x0A;if exist &quot;$(WebKitOutputDir)\buildfailed&quot; del &quot;$(WebKitOutputDir)\buildfailed&quot;&#x0D;&#x0A;"\r
+               CleanCommandLine="del /s /q &quot;$(WebKitOutputDir)\obj\InjectedBundle\DerivedSources&quot;&#x0D;&#x0A;if exist &quot;$(WebKitOutputDir)\buildfailed&quot; del &quot;$(WebKitOutputDir)\buildfailed&quot;&#x0D;&#x0A;"\r
+       />\r
+</VisualStudioPropertySheet>\r
index dd97fc6..e27fd05 100644 (file)
                                Name="VCPostBuildEventTool"\r
                        />\r
                </Configuration>\r
+               <Configuration\r
+                       Name="Debug|Win32"\r
+                       ConfigurationType="1"\r
+                       InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsprops\common.vsprops;$(WebKitLibrariesDir)\tools\vsprops\debug.vsprops;.\record-memory-win-common.vsprops"\r
+                       CharacterSet="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Debug_All|Win32"\r
+                       ConfigurationType="1"\r
+                       InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsprops\common.vsprops;$(WebKitLibrariesDir)\tools\vsprops\debug.vsprops;$(WebKitLibrariesDir)\tools\vsprops\debug_all.vsprops;.\record-memory-win-common.vsprops"\r
+                       CharacterSet="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
        </Configurations>\r
        <References>\r
        </References>\r