Give InjectedBundle our standard set of configurations (minus the *_C…

…airo variants)

InjectedBundle's Debug_All configuration was the same as is Debug
configuration, and it was missing a Debug_Internal configuration.

Fixes <http://webkit.org/b/42749> InjectedBundle's build
configurations are screwy

Reviewed by Darin Adler.

WebKit/win:

Update WebKit.sln for InjectedBundle's Debug_Internal configuration

* WebKit.vcproj/WebKit.sln: Build the Debug_Internal variant of
InjectedBundle when we're using the Debug_Internal solution
configuration.

WebKitTools:

* WebKitTestRunner/InjectedBundle/win/InjectedBundle.vcproj: Added
debug_internal.vsprops and debug_all.vsprops to the Debug_All
configuration. Added a Debug_Internal configuration.

* WebKitTestRunner/WebKitTestRunner.sln: Build the Debug_Internal
variant of InjectedBundle when we're using the Debug_Internal solution
configuration.

Canonical link: https://commits.webkit.org/54666@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@63829 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebKit/win/ChangeLog

@@ -1,3 +1,16 @@
+2010-07-21  Adam Roben  <aroben@apple.com>
+
+        Update WebKit.sln for InjectedBundle's Debug_Internal configuration
+
+        Fixes <http://webkit.org/b/42749> InjectedBundle's build
+        configurations are screwy
+
+        Reviewed by Darin Adler.
+
+        * WebKit.vcproj/WebKit.sln: Build the Debug_Internal variant of
+        InjectedBundle when we're using the Debug_Internal solution
+        configuration.
+
 2010-07-21  Adam Roben  <aroben@apple.com>
 
         Add MiniBrowser to WebKit.sln

WebKit/win/WebKit.vcproj/WebKit.sln

@@ -415,8 +415,8 @@ Global
 		{CBC3391C-F060-4BF5-A66E-81404168816B}.Debug_All|Win32.Build.0 = Debug_All|Win32
 		{CBC3391C-F060-4BF5-A66E-81404168816B}.Debug_Cairo|Win32.ActiveCfg = Debug|Win32
 		{CBC3391C-F060-4BF5-A66E-81404168816B}.Debug_Cairo|Win32.Build.0 = Debug|Win32
-		{CBC3391C-F060-4BF5-A66E-81404168816B}.Debug_Internal|Win32.ActiveCfg = Debug|Win32
-		{CBC3391C-F060-4BF5-A66E-81404168816B}.Debug_Internal|Win32.Build.0 = Debug|Win32
+		{CBC3391C-F060-4BF5-A66E-81404168816B}.Debug_Internal|Win32.ActiveCfg = Debug_Internal|Win32
+		{CBC3391C-F060-4BF5-A66E-81404168816B}.Debug_Internal|Win32.Build.0 = Debug_Internal|Win32
 		{CBC3391C-F060-4BF5-A66E-81404168816B}.Debug|Win32.ActiveCfg = Debug|Win32
 		{CBC3391C-F060-4BF5-A66E-81404168816B}.Debug|Win32.Build.0 = Debug|Win32
 		{CBC3391C-F060-4BF5-A66E-81404168816B}.Release_Cairo|Win32.ActiveCfg = Release|Win32

WebKitTools/ChangeLog

@@ -1,3 +1,24 @@
+2010-07-21  Adam Roben  <aroben@apple.com>
+
+        Give InjectedBundle our standard set of configurations (minus the
+        *_Cairo variants)
+
+        InjectedBundle's Debug_All configuration was the same as is Debug
+        configuration, and it was missing a Debug_Internal configuration.
+
+        Fixes <http://webkit.org/b/42749> InjectedBundle's build
+        configurations are screwy
+
+        Reviewed by Darin Adler.
+
+        * WebKitTestRunner/InjectedBundle/win/InjectedBundle.vcproj: Added
+        debug_internal.vsprops and debug_all.vsprops to the Debug_All
+        configuration. Added a Debug_Internal configuration.
+
+        * WebKitTestRunner/WebKitTestRunner.sln: Build the Debug_Internal
+        variant of InjectedBundle when we're using the Debug_Internal solution
+        configuration.
+
 2010-07-21  Adam Roben  <aroben@apple.com>
 
         Move InjectedBundle's settings to a vsprops file

WebKitTools/WebKitTestRunner/InjectedBundle/win/InjectedBundle.vcproj

@@ -151,7 +151,7 @@
 		<Configuration
 			Name="Debug_All|Win32"
 			ConfigurationType="2"
-			InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsprops\common.vsprops;$(WebKitLibrariesDir)\tools\vsprops\debug.vsprops;..\..\Configurations\InjectedBundleCommon.vsprops"
+			InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsprops\common.vsprops;$(WebKitLibrariesDir)\tools\vsprops\debug.vsprops;$(WebKitLibrariesDir)\tools\vsprops\debug_internal.vsprops;$(WebKitLibrariesDir)\tools\vsprops\debug_all.vsprops;..\..\Configurations\InjectedBundleCommon.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
@@ -212,7 +212,73 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="if exist &quot;$(WebKitOutputDir)\buildfailed&quot; del &quot;$(WebKitOutputDir)\buildfailed&quot;"
+				CommandLine=""
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug_Internal|Win32"
+			ConfigurationType="2"
+			InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsprops\common.vsprops;$(WebKitLibrariesDir)\tools\vsprops\debug.vsprops;$(WebKitLibrariesDir)\tools\vsprops\debug_internal.vsprops;..\..\Configurations\InjectedBundleCommon.vsprops"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+				CommandLine=""
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories=""
+				ForcedIncludeFiles=""
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile=""
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				CommandLine=""
 			/>
 		</Configuration>
 	</Configurations>

WebKitTools/WebKitTestRunner/WebKitTestRunner.sln

@@ -65,8 +65,8 @@ Global
 		{59CC0547-70AC-499C-9B19-EC01C6F61137}.Release|Win32.Build.0 = Release|Win32
 		{CBC3391C-F060-4BF5-A66E-81404168816B}.Debug_All|Win32.ActiveCfg = Debug_All|Win32
 		{CBC3391C-F060-4BF5-A66E-81404168816B}.Debug_All|Win32.Build.0 = Debug_All|Win32
-		{CBC3391C-F060-4BF5-A66E-81404168816B}.Debug_Internal|Win32.ActiveCfg = Debug|Win32
-		{CBC3391C-F060-4BF5-A66E-81404168816B}.Debug_Internal|Win32.Build.0 = Debug|Win32
+		{CBC3391C-F060-4BF5-A66E-81404168816B}.Debug_Internal|Win32.ActiveCfg = Debug_Internal|Win32
+		{CBC3391C-F060-4BF5-A66E-81404168816B}.Debug_Internal|Win32.Build.0 = Debug_Internal|Win32
 		{CBC3391C-F060-4BF5-A66E-81404168816B}.Debug|Win32.ActiveCfg = Debug|Win32
 		{CBC3391C-F060-4BF5-A66E-81404168816B}.Debug|Win32.Build.0 = Debug|Win32
 		{CBC3391C-F060-4BF5-A66E-81404168816B}.Release|Win32.ActiveCfg = Release|Win32