Skip to content

Commit

Permalink
tools,icu: read full ICU version info from file
Browse files Browse the repository at this point in the history
* ATM on every ICU version bump we need to update these data. Reading
  it from a file makes it independant of `configre.py` changes.
* Update guide.

PR-URL: #23269
Refs: #23245
Reviewed-By: Steven R Loomis <srloomis@us.ibm.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com>
  • Loading branch information
refack authored and targos committed Oct 12, 2018
1 parent 5c9ef5e commit 9cc73d3
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 10 deletions.
9 changes: 3 additions & 6 deletions configure.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import json
import sys
import errno
import optparse
Expand Down Expand Up @@ -1252,13 +1253,9 @@ def glob_to_var(dir_base, dir_sub, patch_dir):
return list

def configure_intl(o):
icus = [
{
'url': 'https://sourceforge.net/projects/icu/files/ICU4C/62.1/icu4c-62_1-src.zip',
'md5': '408854f7b9b58311b68fab4b4dfc80be',
},
]
def icu_download(path):
with open('tools/icu/current_ver.dep') as f:
icus = json.load(f)
# download ICU, if needed
if not os.access(options.download_path, os.W_OK):
error('''Cannot write to desired download path.
Expand Down
8 changes: 4 additions & 4 deletions tools/icu/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -92,9 +92,9 @@ make clean
tools/license-builder.sh
```

- Now, fix the default URL for the `full-icu` build in `/configure.py`, in
the `configure_intl()` function. It should match the ICU URL used in the
first step. When this is done, the following should build with full ICU.
- Update the URL and hash for the full ICU file in `tools/icu/current_ver.dep`.
It should match the ICU URL used in the first step. When this is done, the
following should build with full ICU.

```shell
# clean up
Expand All @@ -104,7 +104,7 @@ make
make test-ci
```

- commit the change to `configure.py` along with the updated `LICENSE` file.
- commit the change to `tools/icu/current_ver.dep` and `LICENSE` files.

- Note: To simplify review, I often will “pre-land” this patch, meaning that
I run the patch through `curl -L https://github.com/nodejs/node/pull/xxx.patch
Expand Down
6 changes: 6 additions & 0 deletions tools/icu/current_ver.dep
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
[
{
"url": "https://sourceforge.net/projects/icu/files/ICU4C/62.1/icu4c-62_1-src.zip",
"md5": "408854f7b9b58311b68fab4b4dfc80be"
}
]

0 comments on commit 9cc73d3

Please sign in to comment.