Commit 827000e
deps: Intl: ICU 58 bump: configure/LICENSE/docs
* bump to ICU 58.1 - update URL / hash
* does not attempt to reduce size - yet
* patch to work around http://bugs.icu-project.org/trac/ticket/12822
( compile issue on Windows)
* Fix ICU shrinker to delete old license.html file
(update to #8674 )
Fixes: #7844
PR-URL: #9234
Reviewed-By: James M Snell <jasnell@gmail.com>1 parent 3550419 commit 827000e
5 files changed
Lines changed: 1162 additions & 62 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -98,12 +98,53 @@ The externally maintained libraries used by Node.js are: | |||
| 98 | 98 | ||
| 99 | 99 | - ICU, located at deps/icu-small, is licensed as follows: | |
| 100 | 100 | """ | |
| 101 | - ICU License - ICU 1.8.1 and later | ||
| 101 | + COPYRIGHT AND PERMISSION NOTICE (ICU 58 and later) | ||
| 102 | + | ||
| 103 | + Copyright © 1991-2016 Unicode, Inc. All rights reserved. | ||
| 104 | + Distributed under the Terms of Use in http://www.unicode.org/copyright.html | ||
| 105 | + | ||
| 106 | + Permission is hereby granted, free of charge, to any person obtaining | ||
| 107 | + a copy of the Unicode data files and any associated documentation | ||
| 108 | + (the "Data Files") or Unicode software and any associated documentation | ||
| 109 | + (the "Software") to deal in the Data Files or Software | ||
| 110 | + without restriction, including without limitation the rights to use, | ||
| 111 | + copy, modify, merge, publish, distribute, and/or sell copies of | ||
| 112 | + the Data Files or Software, and to permit persons to whom the Data Files | ||
| 113 | + or Software are furnished to do so, provided that either | ||
| 114 | + (a) this copyright and permission notice appear with all copies | ||
| 115 | + of the Data Files or Software, or | ||
| 116 | + (b) this copyright and permission notice appear in associated | ||
| 117 | + Documentation. | ||
| 118 | + | ||
| 119 | + THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF | ||
| 120 | + ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE | ||
| 121 | + WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND | ||
| 122 | + NONINFRINGEMENT OF THIRD PARTY RIGHTS. | ||
| 123 | + IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS | ||
| 124 | + NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL | ||
| 125 | + DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, | ||
| 126 | + DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER | ||
| 127 | + TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR | ||
| 128 | + PERFORMANCE OF THE DATA FILES OR SOFTWARE. | ||
| 129 | + | ||
| 130 | + Except as contained in this notice, the name of a copyright holder | ||
| 131 | + shall not be used in advertising or otherwise to promote the sale, | ||
| 132 | + use or other dealings in these Data Files or Software without prior | ||
| 133 | + written authorization of the copyright holder. | ||
| 134 | + | ||
| 135 | + --------------------- | ||
| 136 | + | ||
| 137 | + Third-Party Software Licenses | ||
| 138 | + | ||
| 139 | + This section contains third-party software notices and/or additional | ||
| 140 | + terms for licensed third-party software components included within ICU | ||
| 141 | + libraries. | ||
| 142 | + | ||
| 143 | + 1. ICU License - ICU 1.8.1 to ICU 57.1 | ||
| 102 | 144 | ||
| 103 | 145 | COPYRIGHT AND PERMISSION NOTICE | |
| 104 | 146 | ||
| 105 | 147 | Copyright (c) 1995-2016 International Business Machines Corporation and others | |
| 106 | - | ||
| 107 | 148 | All rights reserved. | |
| 108 | 149 | ||
| 109 | 150 | Permission is hereby granted, free of charge, to any person obtaining | |
@@ -134,54 +175,6 @@ The externally maintained libraries used by Node.js are: | |||
| 134 | 175 | All trademarks and registered trademarks mentioned herein are the | |
| 135 | 176 | property of their respective owners. | |
| 136 | 177 | ||
| 137 | - --------------------- | ||
| 138 | - | ||
| 139 | - Third-Party Software Licenses | ||
| 140 | - | ||
| 141 | - This section contains third-party software notices and/or additional | ||
| 142 | - terms for licensed third-party software components included within ICU | ||
| 143 | - libraries. | ||
| 144 | - | ||
| 145 | - 1. Unicode Data Files and Software | ||
| 146 | - | ||
| 147 | - COPYRIGHT AND PERMISSION NOTICE | ||
| 148 | - | ||
| 149 | - Copyright © 1991-2016 Unicode, Inc. All rights reserved. | ||
| 150 | - Distributed under the Terms of Use in | ||
| 151 | - http://www.unicode.org/copyright.html. | ||
| 152 | - | ||
| 153 | - Permission is hereby granted, free of charge, to any person obtaining | ||
| 154 | - a copy of the Unicode data files and any associated documentation | ||
| 155 | - (the "Data Files") or Unicode software and any associated documentation | ||
| 156 | - (the "Software") to deal in the Data Files or Software | ||
| 157 | - without restriction, including without limitation the rights to use, | ||
| 158 | - copy, modify, merge, publish, distribute, and/or sell copies of | ||
| 159 | - the Data Files or Software, and to permit persons to whom the Data Files | ||
| 160 | - or Software are furnished to do so, provided that | ||
| 161 | - (a) this copyright and permission notice appear with all copies | ||
| 162 | - of the Data Files or Software, | ||
| 163 | - (b) this copyright and permission notice appear in associated | ||
| 164 | - documentation, and | ||
| 165 | - (c) there is clear notice in each modified Data File or in the Software | ||
| 166 | - as well as in the documentation associated with the Data File(s) or | ||
| 167 | - Software that the data or software has been modified. | ||
| 168 | - | ||
| 169 | - THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF | ||
| 170 | - ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE | ||
| 171 | - WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND | ||
| 172 | - NONINFRINGEMENT OF THIRD PARTY RIGHTS. | ||
| 173 | - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS | ||
| 174 | - NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL | ||
| 175 | - DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, | ||
| 176 | - DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER | ||
| 177 | - TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR | ||
| 178 | - PERFORMANCE OF THE DATA FILES OR SOFTWARE. | ||
| 179 | - | ||
| 180 | - Except as contained in this notice, the name of a copyright holder | ||
| 181 | - shall not be used in advertising or otherwise to promote the sale, | ||
| 182 | - use or other dealings in these Data Files or Software without prior | ||
| 183 | - written authorization of the copyright holder. | ||
| 184 | - | ||
| 185 | 178 | 2. Chinese/Japanese Word Break Dictionary Data (cjdict.txt) | |
| 186 | 179 | ||
| 187 | 180 | # The Google Chrome software developed by Google is licensed under | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -967,8 +967,8 @@ def glob_to_var(dir_base, dir_sub, patch_dir): | |||
| 967 | 967 | def configure_intl(o): | |
| 968 | 968 | icus = [ | |
| 969 | 969 | { | |
| 970 | - 'url': 'https://ssl.icu-project.org/files/icu4c/57.1/icu4c-57_1-src.zip', | ||
| 971 | - 'md5': 'f797503ecaebf1d38920013dc7893066', | ||
| 970 | + 'url': 'https://ssl.icu-project.org/files/icu4c/58.1/icu4c-58_1-src.zip', | ||
| 971 | + 'md5': 'd6476b355f66a11fbe12db1d61d90d69', | ||
| 972 | 972 | }, | |
| 973 | 973 | ] | |
| 974 | 974 | def icu_download(path): | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -8,11 +8,12 @@ | |||
| 8 | 8 | ```shell | |
| 9 | 9 | ./configure \ | |
| 10 | 10 | --with-intl=small-icu \ | |
| 11 | - --with-icu-source=http://download.icu-project.org/files/icu4c/56.1/icu4c-56_1-src.zip | ||
| 11 | + --with-icu-source=http://download.icu-project.org/files/icu4c/58.1/icu4c-58_1-src.tgz | ||
| 12 | 12 | make | |
| 13 | 13 | ``` | |
| 14 | 14 | ||
| 15 | - (the equivalent `vcbuild.bat` commands should work also.) | ||
| 15 | + (The equivalent `vcbuild.bat` commands should work also. Note that we use the `.tgz` and not the `.zip` here, | ||
| 16 | + that is because of line endings.) | ||
| 16 | 17 | ||
| 17 | 18 | - (note- may need to make changes in `icu-generic.gyp` or `tools/icu/patches` for | |
| 18 | 19 | version specific stuff) | |
@@ -58,6 +59,14 @@ new Intl.DateTimeFormat('es',{month:'long'}).format(new Date(9E8)); | |||
| 58 | 59 | - You are ready to check in the updated `deps/small-icu`. | |
| 59 | 60 | This is a big commit, so make this a separate commit from other changes. | |
| 60 | 61 | ||
| 62 | + - Now, rebuild the Node license. | ||
| 63 | + | ||
| 64 | + ```shell | ||
| 65 | + # clean up - remove deps/icu | ||
| 66 | + make clean | ||
| 67 | + tools/license-builder.sh | ||
| 68 | + ``` | ||
| 69 | + | ||
| 61 | 70 | - Now, fix the default URL for the `full-icu` build in `/configure`, in | |
| 62 | 71 | the `configure_intl()` function. It should match the ICU URL used in the | |
| 63 | 72 | first step. When this is done, the following should build with full ICU. | |
@@ -70,7 +79,7 @@ make | |||
| 70 | 79 | make test-ci | |
| 71 | 80 | ``` | |
| 72 | 81 | ||
| 73 | - - commit the change to `configure`. | ||
| 82 | + - commit the change to `configure` along with the updated `LICENSE` file. | ||
| 74 | 83 | ||
| 75 | 84 | ----- | |
| 76 | 85 | ||
0 commit comments