| OLD | NEW |
| 1 When updating src/net/base/registry_controlled_domains/effective_tld_names.dat: | 1 When updating src/net/base/registry_controlled_domains/effective_tld_names.dat: |
| 2 | 2 |
| 3 1. Obtain the new effective_tld_names.dat, probably by downloading | 3 1. Obtain the new effective_tld_names.dat, probably by downloading |
| 4 http://goo.gl/Ji2bB | 4 http://goo.gl/Ji2bB |
| 5 | 5 |
| 6 2. Remove whitespace from the ends of the lines. | 6 2. Remove whitespace from the ends of the lines. |
| 7 You could possibly use something like: | 7 You could possibly use something like: |
| 8 sed -i -e "s/\s*$//g" \ | 8 sed -i -e "s/\s*$//g" \ |
| 9 src/net/base/registry_controlled_domains/effective_tld_names.dat | 9 src/net/base/registry_controlled_domains/effective_tld_names.dat |
| 10 | 10 |
| 11 3. Add the Chromium note back in just after the license at the top, and just | 11 3. Add the Chromium note back in just after the license at the top, and just |
| 12 before '===BEGIN ICANN DOMAINS==='. Ensure there is an empty line above and | 12 before '===BEGIN ICANN DOMAINS==='. Ensure there is an empty line above and |
| 13 two empty lines below the note. The note should say: | 13 two empty lines below the note. The note should say: |
| 14 // Chromium note: this is based on Mozilla's file: | 14 // Chromium note: this is based on Mozilla's file: |
| 15 // http://mxr.mozilla.org/mozilla-central/source/netwerk/dns/effective_tld_name
s.dat?raw=1 | 15 // http://mxr.mozilla.org/mozilla-central/source/netwerk/dns/effective_tld_name
s.dat?raw=1 |
| 16 | 16 |
| 17 4. Build tld_cleanup (the "(net)" > "tld_cleanup" project) | 17 4. Build tld_cleanup (the "(net)" > "tld_cleanup" project) |
| 18 | 18 |
| 19 5. Run it (no arguments needed), typically from src/build/Release or | 19 5. Run it (no arguments needed), typically from src/build/Release or |
| 20 src/build/Debug. It will re-generate | 20 src/build/Debug. It will re-generate |
| 21 src/net/base/registry_controlled_domains/effective_tld_names.gperf. | 21 src/net/base/registry_controlled_domains/effective_tld_names.gperf. |
| 22 | 22 |
| 23 6. Run gperf on the new effective_tld_names.gperf: | 23 6. Check in the updated effective_tld_names.dat, effective_tld_names.gperf |
| 24 pushd src/net/base/registry_controlled_domains; | |
| 25 gperf -a -L "C++" -C -c -o -t -k '*' -NFindDomain -P -K name_offset -D -m 1
0 \ | |
| 26 effective_tld_names.gperf > effective_tld_names.cc; | |
| 27 popd; | |
| 28 It will produce a new effective_tld_names.cc. | |
| 29 | 24 |
| 30 7. Check in the updated effective_tld_names.dat, effective_tld_names.gperf, | 25 Note that gperf is no longer used for effective_tld_names, but when building |
| 31 and effective_tld_names.cc together. | 26 chromium the file effective_tld_names.gperf will be parsed by make_dafsa.py |
| 27 to generate the file effective_tld_names-inc.cc, which is included in |
| 28 registry_controlled_domain.cc |
| OLD | NEW |