-
Notifications
You must be signed in to change notification settings - Fork 30.2k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
deps: fix icu-shrinker to handle ICU 58 #8674
Conversation
ICU’s license file changed from `license.html` to `LICENSE`. Fix `shrink-icu-src.py` (which is manually run) to accept either file. Related to nodejs#7844 which is the 58 bump.
if 'license.html' in ign: | ||
ign.remove('license.html') | ||
if 'LICENSE' in ign: | ||
ign.remove('LICENSE') |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
out of my head but perhaps if any(item in ign for item in('LICENSE', 'license.html'))
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks. I'm going to change the logic a bit here. We want to keep 'LICENSE' || 'license.html' in that order.
elif subdir == 'source/data': | ||
ign = ign + ['unidata','curr','zone','unit','lang','region','misc','sprep'] | ||
#elif subdir == 'source/data': | ||
# ign = ign + ['unidata','curr','zone','unit','lang','region','misc','sprep'] | ||
# else: |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
remove?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
yes, will remove. and the following comments.
c133999
to
83c7a88
Compare
@jbergstroem I'm not sure where I ended up with this… but I'll revisit your comments now that #7844 is now in progress. |
@jbergstroem I'm going to fold this into #9234 and close this PR. |
* 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 nodejs#8674 ) Fixes: nodejs#7844 PR-URL: nodejs#9234 Reviewed-By: James M Snell <jasnell@gmail.com>
* 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>
* 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>
* 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 nodejs#8674 ) Fixes: nodejs#7844 PR-URL: nodejs#9234 Reviewed-By: James M Snell <jasnell@gmail.com>
* 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>
* 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>
* 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>
Affected core subsystem(s)
Description of change
ICU’s license file changed from
license.html
toLICENSE
.Fix
shrink-icu-src.py
(which is manually run) to accept either file.Related to #7844 which is the 58 bump.