From a20a460a3bf36db13592d7560c4f43d6cace4d33 Mon Sep 17 00:00:00 2001 From: "pam@chromium.org" <pam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Date: Fri, 12 Feb 2010 21:15:35 +0000 Subject: Update effective TLD (registry-controlled domain) data to latest file from Mozilla. This corresponds to their patch ec019978e8dc, from 2010-02-11 13:39 +0000. Also update instructions for updating this file. BUG=27523 TEST=none Review URL: http://codereview.chromium.org/600077 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38946 0039d316-1c4b-4281-b951-d872f2087c98 --- net/tools/tld_cleanup/README | 15 ++++++++++++--- net/tools/tld_cleanup/tld_cleanup.cc | 5 ++--- 2 files changed, 14 insertions(+), 6 deletions(-) (limited to 'net/tools/tld_cleanup') diff --git a/net/tools/tld_cleanup/README b/net/tools/tld_cleanup/README index 8eab5ee..f696843 100644 --- a/net/tools/tld_cleanup/README +++ b/net/tools/tld_cleanup/README @@ -1,3 +1,12 @@ -When updating src/net/base/effective_tld_names.dat, re-run tld_cleanup which -will re-generate src/net/base/effective_tld_names.cc. Check in the updated -effective_tld_names.dat and effective_tld_names.cc together. \ No newline at end of file +When updating src/net/base/effective_tld_names.dat: + +1. Build tld_cleanup.exe (the "(net)" > "tld_cleanup" project) +2. Run it (no arguments needed), typically from src/chrome/Release or + src/chrome/Debug. It will re-generate + src/net/base/effective_tld_names.gperf. +3. Run gperf on the new effective_tld_names.gperf: + gperf -a -L "C++" -C -c -o -t -k '*' -NFindDomain -D -m 5 \ + effective_tld_names.gperf > effective_tld_names.cc + It will produce a new effective_tld_names.cc. +4. Check in the updated effective_tld_names.dat, effective_tld_names.gperf, + and effective_tld_names.cc together. diff --git a/net/tools/tld_cleanup/tld_cleanup.cc b/net/tools/tld_cleanup/tld_cleanup.cc index 8a427ca..e98b95d 100644 --- a/net/tools/tld_cleanup/tld_cleanup.cc +++ b/net/tools/tld_cleanup/tld_cleanup.cc @@ -8,9 +8,8 @@ // generate a perfect hash map. The benefit of this approach is that no time is // spent on program initialization to generate the map of this data. // -// After running this program, "effective_tld_names.gperf" is generated. Run -// gperf using the following command line: -// gperf -a -L "C++" -C -c -o -t -k '*' -NFindDomain -D -m 5 effective_tld_names.gperf > effective_tld_names.c +// Running this program finds "effective_tld_names.cc" in the expected location +// in the source checkout and generates "effective_tld_names.gperf" next to it. // // Any errors or warnings from this program are recorded in tld_cleanup.log. // -- cgit v1.1