diff options
| author | maruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-20 19:13:38 +0000 |
|---|---|---|
| committer | maruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-20 19:13:38 +0000 |
| commit | eb30cb13961a2fdf48395acf6e52bf00f70b75d7 (patch) | |
| tree | aa1a1c0678f9a959497753759ac4614332811ec2 /webkit/build | |
| parent | 662bec415c7b4a2c25ba413fffc9e937d8723f3b (diff) | |
| download | chromium_src-eb30cb13961a2fdf48395acf6e52bf00f70b75d7.zip chromium_src-eb30cb13961a2fdf48395acf6e52bf00f70b75d7.tar.gz chromium_src-eb30cb13961a2fdf48395acf6e52bf00f70b75d7.tar.bz2 | |
Reverting 8295.
Review URL: http://codereview.chromium.org/18371
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8296 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/build')
| -rw-r--r-- | webkit/build/WebCore/WebCore.vcproj | 11 | ||||
| -rw-r--r-- | webkit/build/WebCore/WebCore_prebuild.vcproj | 88 | ||||
| -rw-r--r-- | webkit/build/webkit_resources/webkit_resources.vcproj | 19 | ||||
| -rw-r--r-- | webkit/build/webkit_version.rules | 5 |
4 files changed, 17 insertions, 106 deletions
diff --git a/webkit/build/WebCore/WebCore.vcproj b/webkit/build/WebCore/WebCore.vcproj index 5f8c1a5..5ffda11 100644 --- a/webkit/build/WebCore/WebCore.vcproj +++ b/webkit/build/WebCore/WebCore.vcproj @@ -13,6 +13,9 @@ /> </Platforms> <ToolFiles> + <ToolFile + RelativePath="..\webkit_version.rules" + /> </ToolFiles> <Configurations> <Configuration @@ -7367,6 +7370,14 @@ </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 deleted file mode 100644 index 349ca34..0000000 --- a/webkit/build/WebCore/WebCore_prebuild.vcproj +++ /dev/null @@ -1,88 +0,0 @@ -<?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 8d22b6d..d6d2a83 100644 --- a/webkit/build/webkit_resources/webkit_resources.vcproj +++ b/webkit/build/webkit_resources/webkit_resources.vcproj @@ -27,9 +27,6 @@ Name="VCPreBuildEventTool"
/>
<Tool
- Name="WebKitVersion"
- />
- <Tool
Name="GRIT Generated Resources"
/>
<Tool
@@ -51,9 +48,6 @@ Name="VCPreBuildEventTool"
/>
<Tool
- Name="WebKitVersion"
- />
- <Tool
Name="GRIT Generated Resources"
/>
<Tool
@@ -70,19 +64,14 @@ <References>
</References>
<Files>
- <Filter
- Name="Generated Files"
- SourceControlFiles="false"
- >
- <File
- RelativePath="$(OutDir)\grit_derived_sources\webkit_resources.h"
- >
- </File>
- </Filter>
<File
RelativePath="..\..\glue\webkit_resources.grd"
>
</File>
+ <File
+ RelativePath="$(OutDir)\grit_derived_sources\webkit_resources.h"
+ >
+ </File>
</Files>
<Globals>
</Globals>
diff --git a/webkit/build/webkit_version.rules b/webkit/build/webkit_version.rules index 8800223..94e11e8 100644 --- a/webkit/build/webkit_version.rules +++ b/webkit/build/webkit_version.rules @@ -7,10 +7,9 @@ <CustomBuildRule Name="WebKitVersion" DisplayName="WebKit Version" - CommandLine="$(SolutionDir)/../third_party/python_24/python.exe $(SolutionDir)/../webkit/build/webkit_version.py "$(InputPath)" "$(IntDir)/../WebCore/"" - Outputs="$(IntDir)/../WebCore/webkit_version.h" + CommandLine="$(SolutionDir)/../third_party/python_24/python.exe $(SolutionDir)/../webkit/build/webkit_version.py "$(InputPath)" "$(IntDir)"" + Outputs="$(IntDir)/webkit_version.h" FileExtensions="*.xcconfig" - ExecutionDescription="Generating webkit_version.h" > <Properties> </Properties> |