Fix webkit_version.h generation ordering.

Solution files changes are:
- Glue now depends on WebCore_prebuild (and not WebCore).
- WebCore depends on WebCore_prebuild.

(Reapply R8295 with the path to version.xcconfig fixed)
Review URL: http://codereview.chromium.org/18416

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8299 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 106 insertions, 17 deletions

diff --git a/webkit/build/WebCore/WebCore.vcproj b/webkit/build/WebCore/WebCore.vcproj
index 5ffda11..5f8c1a5 100644
--- a/webkit/build/WebCore/WebCore.vcproj
+++ b/webkit/build/WebCore/WebCore.vcproj
@@ -13,9 +13,6 @@
 		/>
 	</Platforms>
 	<ToolFiles>
-		<ToolFile
-			RelativePath="..\webkit_version.rules"
-		/>
 	</ToolFiles>
 	<Configurations>
 		<Configuration
@@ -7370,14 +7367,6 @@
 				</File>
 			</Filter>
 		</Filter>
-		<Filter
-			Name="version"
-			>
-			<File
-				RelativePath="..\..\..\third_party\WebKit\WebCore\Configurations\Version.xcconfig"
-				>
-			</File>
-		</Filter>
 		<File
 			RelativePath="..\precompiled_webkit.cc"
 			>
diff --git a/webkit/build/WebCore/WebCore_prebuild.vcproj b/webkit/build/WebCore/WebCore_prebuild.vcproj
new file mode 100644
index 0000000..1c5b7c7
--- /dev/null
+++ b/webkit/build/WebCore/WebCore_prebuild.vcproj
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="WebCore_prebuild"
+	ProjectGUID="{1444235E-0E97-4C80-A73E-EE73F3706C32}"
+	RootNamespace="WebCore_prebuild"
+	Keyword="Win32Proj"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+		<ToolFile
+			RelativePath="..\webkit_version.rules"
+		/>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			ConfigurationType="10"
+			InheritedPropertySheets="$(SolutionDir)..\build\debug.vsprops;..\precompiled_webkit.vsprops;.\webcore.vsprops"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="WebKitVersion"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			ConfigurationType="10"
+			InheritedPropertySheets="$(SolutionDir)..\build\release.vsprops;.\webcore.vsprops"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="WebKitVersion"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<File
+			RelativePath="..\..\..\third_party\WebKit\WebCore\Configurations\Version.xcconfig"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="WebKitVersion"
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="WebKitVersion"
+				/>
+			</FileConfiguration>
+		</File>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/webkit/build/webkit_resources/webkit_resources.vcproj b/webkit/build/webkit_resources/webkit_resources.vcproj
index d6d2a83..8d22b6d 100644
--- a/webkit/build/webkit_resources/webkit_resources.vcproj
+++ b/webkit/build/webkit_resources/webkit_resources.vcproj
@@ -27,6 +27,9 @@
 				Name="VCPreBuildEventTool"

 			/>

 			<Tool

+				Name="WebKitVersion"

+			/>

+			<Tool

 				Name="GRIT Generated Resources"

 			/>

 			<Tool

@@ -48,6 +51,9 @@
 				Name="VCPreBuildEventTool"

 			/>

 			<Tool

+				Name="WebKitVersion"

+			/>

+			<Tool

 				Name="GRIT Generated Resources"

 			/>

 			<Tool

@@ -64,12 +70,17 @@
 	<References>

 	</References>

 	<Files>

-		<File

-			RelativePath="..\..\glue\webkit_resources.grd"

+		<Filter

+			Name="Generated Files"

+			SourceControlFiles="false"

 			>

-		</File>

+			<File

+				RelativePath="$(OutDir)\grit_derived_sources\webkit_resources.h"

+				>

+			</File>

+		</Filter>

 		<File

-			RelativePath="$(OutDir)\grit_derived_sources\webkit_resources.h"

+			RelativePath="..\..\glue\webkit_resources.grd"

 			>

 		</File>

 	</Files>

diff --git a/webkit/build/webkit_version.rules b/webkit/build/webkit_version.rules
index 94e11e8..8800223 100644
--- a/webkit/build/webkit_version.rules
+++ b/webkit/build/webkit_version.rules
@@ -7,9 +7,10 @@
 		<CustomBuildRule
 			Name="WebKitVersion"
 			DisplayName="WebKit Version"
-			CommandLine="$(SolutionDir)/../third_party/python_24/python.exe $(SolutionDir)/../webkit/build/webkit_version.py &quot;$(InputPath)&quot; &quot;$(IntDir)&quot;"
-			Outputs="$(IntDir)/webkit_version.h"
+			CommandLine="$(SolutionDir)/../third_party/python_24/python.exe $(SolutionDir)/../webkit/build/webkit_version.py &quot;$(InputPath)&quot; &quot;$(IntDir)/../WebCore/&quot;"
+			Outputs="$(IntDir)/../WebCore/webkit_version.h"
 			FileExtensions="*.xcconfig"
+			ExecutionDescription="Generating webkit_version.h"
 			>
 			<Properties>
 			</Properties>