summaryrefslogtreecommitdiffstats
path: root/net/build
diff options
context:
space:
mode:
authortc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-24 02:08:39 +0000
committertc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-24 02:08:39 +0000
commitdbd8e4664da046faa5532eb69583158b3b2c191c (patch)
tree7c90340524cefd5c310cb926118559388bcb2c99 /net/build
parent4dd01903cb5c1bb60bfb3682e80389f220ef1c90 (diff)
downloadchromium_src-dbd8e4664da046faa5532eb69583158b3b2c191c.zip
chromium_src-dbd8e4664da046faa5532eb69583158b3b2c191c.tar.gz
chromium_src-dbd8e4664da046faa5532eb69583158b3b2c191c.tar.bz2
Have tld_cleanup generate a .cc file that contains the effective
tld data. This makes the build dependencies easier (helpful for grit and gyp) and brings in the effective tld data on mac. BUG=6076 Review URL: http://codereview.chromium.org/31004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10245 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/build')
-rw-r--r--net/build/convert_tld_data.rules19
-rw-r--r--net/build/net.vcproj13
2 files changed, 1 insertions, 31 deletions
diff --git a/net/build/convert_tld_data.rules b/net/build/convert_tld_data.rules
deleted file mode 100644
index db39029..0000000
--- a/net/build/convert_tld_data.rules
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<VisualStudioToolFile
- Name="Convert TLD Data File"
- Version="8.00"
- >
- <Rules>
- <CustomBuildRule
- Name="Convert TLD Data File"
- DisplayName="Convert TLD Data File"
- CommandLine="&quot;$(OutDir)\tld_cleanup.exe&quot; &quot;$(InputPath)&quot; &quot;$(IntDir)\..\$(InputName)_clean.dat&quot;"
- Outputs="&quot;$(IntDir)\..\$(InputName)_clean.dat&quot;"
- FileExtensions="*.dat"
- ExecutionDescription="Converting TLD data file..."
- >
- <Properties>
- </Properties>
- </CustomBuildRule>
- </Rules>
-</VisualStudioToolFile>
diff --git a/net/build/net.vcproj b/net/build/net.vcproj
index 4afc6a9..bcc1d22 100644
--- a/net/build/net.vcproj
+++ b/net/build/net.vcproj
@@ -12,11 +12,6 @@
Name="Win32"
/>
</Platforms>
- <ToolFiles>
- <ToolFile
- RelativePath=".\convert_tld_data.rules"
- />
- </ToolFiles>
<Configurations>
<Configuration
Name="Debug|Win32"
@@ -30,9 +25,6 @@
Name="VCCustomBuildTool"
/>
<Tool
- Name="Convert TLD Data File"
- />
- <Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
@@ -87,9 +79,6 @@
Name="VCCustomBuildTool"
/>
<Tool
- Name="Convert TLD Data File"
- />
- <Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
@@ -269,7 +258,7 @@
>
</File>
<File
- RelativePath="..\base\effective_tld_names.dat"
+ RelativePath="..\base\effective_tld_names.cc"
>
</File>
<File