Skip to content
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

tools: fix license builder to work with icu-small #7119

Merged
merged 1 commit into from
Jun 13, 2016

Conversation

MylesBorins
Copy link
Contributor

Checklist
  • the commit message follows commit guidelines
Affected core subsystem(s)

tools

Description of change

Currently the license builder is expecting the ICU package to be
found at deps/icu. ICU is now included by default and found at
deps/icu-small. This commit adds logic to find the license at the new
location.

This could likely be done in a more elegant way, but it works!

/cc @srl295 @jasnell

@MylesBorins MylesBorins added the tools Issues and PRs related to the tools directory. label Jun 3, 2016
@jasnell
Copy link
Member

jasnell commented Jun 3, 2016

LGTM if @srl295 is happy with it

@srl295
Copy link
Member

srl295 commented Jun 3, 2016

LGTM

@rvagg
Copy link
Member

rvagg commented Jun 3, 2016

this is only worth keeping in this format for the purpose of backporting to 4.x and 0.12 right?

@MylesBorins
Copy link
Contributor Author

MylesBorins commented Jun 3, 2016

@rvagg this fix is required to get the license builder to work on master. The folder-name used by the checked in ICU is different from what the license builder is currently grepping for

@rvagg
Copy link
Member

rvagg commented Jun 3, 2016

yeah, I'm thinking out loud sorry, in master we could actually get rid of all the conditions as we already have small-ucy in tree, but if we want to keep the tool consistent across branches then we'll have to go with that

@MylesBorins
Copy link
Contributor Author

Ahh that makes sense. In theory we could remove all the cases from master and simply leave the license builder in v4 < exactly the way it is.

More than happy to update that

@MylesBorins
Copy link
Contributor Author

@srl295 informed me that we may need to make more changes to the license builder with the next icu release.

Perhaps we can hold off optimizing until then @rvagg

@srl295
Copy link
Member

srl295 commented Jun 4, 2016

ICU has a new owner so there's some change there.
(roughly same terms) But mostly I want to make ICU's license as spiffy and cat-able as npm's. At least cat-able with no patching or Fixup needed.

Currently the license builder is expecting the ICU package to be
found at `deps/icu`. ICU is now included by default and found at
`deps/icu-small`. This commit adds logic to find the license at the new
location.

This could likely be done in a more elegant way, but it works!

PR-URL: nodejs#7119
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Steven R Loomis <srloomis@us.ibm.com>
@MylesBorins MylesBorins force-pushed the fix-license-builder branch from 410552b to 5fd6d75 Compare June 13, 2016 18:02
@MylesBorins MylesBorins merged commit 5fd6d75 into nodejs:master Jun 13, 2016
@MylesBorins MylesBorins deleted the fix-license-builder branch June 13, 2016 18:05
evanlucas pushed a commit that referenced this pull request Jun 16, 2016
Currently the license builder is expecting the ICU package to be
found at `deps/icu`. ICU is now included by default and found at
`deps/icu-small`. This commit adds logic to find the license at the new
location.

This could likely be done in a more elegant way, but it works!

PR-URL: #7119
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Steven R Loomis <srloomis@us.ibm.com>
@evanlucas evanlucas mentioned this pull request Jun 16, 2016
MylesBorins pushed a commit that referenced this pull request Jul 11, 2016
Currently the license builder is expecting the ICU package to be
found at `deps/icu`. ICU is now included by default and found at
`deps/icu-small`. This commit adds logic to find the license at the new
location.

This could likely be done in a more elegant way, but it works!

PR-URL: #7119
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Steven R Loomis <srloomis@us.ibm.com>
MylesBorins pushed a commit that referenced this pull request Jul 12, 2016
Currently the license builder is expecting the ICU package to be
found at `deps/icu`. ICU is now included by default and found at
`deps/icu-small`. This commit adds logic to find the license at the new
location.

This could likely be done in a more elegant way, but it works!

PR-URL: #7119
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Steven R Loomis <srloomis@us.ibm.com>
MylesBorins pushed a commit that referenced this pull request Jul 12, 2016
Currently the license builder is expecting the ICU package to be
found at `deps/icu`. ICU is now included by default and found at
`deps/icu-small`. This commit adds logic to find the license at the new
location.

This could likely be done in a more elegant way, but it works!

PR-URL: #7119
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Steven R Loomis <srloomis@us.ibm.com>
@MylesBorins MylesBorins mentioned this pull request Jul 12, 2016
MylesBorins pushed a commit that referenced this pull request Jul 14, 2016
Currently the license builder is expecting the ICU package to be
found at `deps/icu`. ICU is now included by default and found at
`deps/icu-small`. This commit adds logic to find the license at the new
location.

This could likely be done in a more elegant way, but it works!

PR-URL: #7119
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Steven R Loomis <srloomis@us.ibm.com>
MylesBorins pushed a commit that referenced this pull request Jul 14, 2016
Currently the license builder is expecting the ICU package to be
found at `deps/icu`. ICU is now included by default and found at
`deps/icu-small`. This commit adds logic to find the license at the new
location.

This could likely be done in a more elegant way, but it works!

PR-URL: #7119
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Steven R Loomis <srloomis@us.ibm.com>
@srl295
Copy link
Member

srl295 commented Jul 27, 2016

OK- so as of http://bugs.icu-project.org/trac/ticket/12452 the BOM and trailing spaces and junk are fixed in ICU trunk. so for ICU 58 #7844

addlicense "icu" "deps/icu-small" "$(cat ${rootdir}/deps/icu-small/LICENSE)"

… would be sufficient.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
tools Issues and PRs related to the tools directory.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants