tools: Fix license-builder.sh for ICU #4762
Conversation
Modify tools/license-builder.sh to restore the Third-Party Software licenses for ICU. Also fix arguments to tail to work on Linux.
|
Perhaps consider for v5.5.0? cc @rvagg @evanlucas |
Fishrock123
added
the
meta
|
cc @srl295 re: ICU license I don't know enough about |
| @@ -33,7 +33,7 @@ addlicense "c-ares" "deps/cares" \ | |||
| "$(sed -e '/^ \*\/$/,$d' -e '/^$/d' -e 's/^[/ ]\* *//' ${rootdir}/deps/cares/src/ares_init.c)" | |||
| addlicense "HTTP Parser" "deps/http_parser" "$(cat deps/http_parser/LICENSE-MIT)" | |||
| addlicense "ICU" "deps/icu" \ | |||
| "$(sed -e '1,/COPYRIGHT AND PERMISSION NOTICE/d' -e '/^<hr/,$d' -e 's/^<\/*p>$//' ${rootdir}/deps/icu/license.html)" | |||
| "$(sed -e '1,/ICU License - ICU 1\.8\.1 and later/d' -e :a -e 's/<[^>]*>//g;/</N;//ba' ${rootdir}/deps/icu/license.html)" | |||
There was a problem hiding this comment.
can you regex that exact version number out of this so we don't have to update this tool with each upgrade?
There was a problem hiding this comment.
- You don't have to Regex the version. The "1.8.1" is not going to change.
- sorry about the wrap
- Icu is going to move from a HTML to a text license. Suggestions welcome.
S
There was a problem hiding this comment.
oh, missed the "and later", just saw a version number and red lights went off in my brain! I'll get this sorted out now, thanks @richardlau and @srl295!
There was a problem hiding this comment.
No problem.
!! I had manually formatted the license html into text. How long has this been omitted? Can you stick the license file into the download dir or something so it can be compliant with Icu and icu's dependents?
Icu's license.html I repeat is going away. I'll probably name the replacement LICENSE.txt. You could future proof now by checking for such a file and using cat instead.
Feed back welcome here http://bugs.icu-project.org/trac/ticket/12037
Enviado desde nuestro iPhone.
There was a problem hiding this comment.
@srl295 license-builder.sh was introduced in 031b87d and I don't believe we've had a release since then. The idea is to touch LICENSE as little as possible and have a tool that automatically builds it and keeps it clean, so it overwrote your previous work (sorry, but it was too manual!).
Just let us know when we get LICENSE.txt and we can update it here, or you could PR it yourself, when you do away with the HTML it'll be much easier!
Modify tools/license-builder.sh to restore the Third-Party Software
licenses for ICU.
Also fix arguments to tail to work on Linux.
rvagg: modified sed command for ICU to replace tabs with spaces and
remove whitespace at the end of lines
PR-URL: #4762
Reviewed-By: Rod Vagg <rod@vagg.org>
PR-URL: #4762 Reviewed-By: Rod Vagg <rod@vagg.org>
PR-URL: #4762 Reviewed-By: Rod Vagg <rod@vagg.org>
Modify tools/license-builder.sh to restore the Third-Party Software
licenses for ICU.
Also fix arguments to tail to work on Linux.
rvagg: modified sed command for ICU to replace tabs with spaces and
remove whitespace at the end of lines
PR-URL: #4762
Reviewed-By: Rod Vagg <rod@vagg.org>
|
@rvagg no problem… I have a test case now! |
PR-URL: #4762 Reviewed-By: Rod Vagg <rod@vagg.org>
Modify tools/license-builder.sh to restore the Third-Party Software
licenses for ICU.
Also fix arguments to tail to work on Linux.
rvagg: modified sed command for ICU to replace tabs with spaces and
remove whitespace at the end of lines
PR-URL: #4762
Reviewed-By: Rod Vagg <rod@vagg.org>
Modify tools/license-builder.sh to restore the Third-Party Software
licenses for ICU.
Also fix arguments to tail to work on Linux.
rvagg: modified sed command for ICU to replace tabs with spaces and
remove whitespace at the end of lines
PR-URL: #4762
Reviewed-By: Rod Vagg <rod@vagg.org>
PR-URL: #4762 Reviewed-By: Rod Vagg <rod@vagg.org>
|
thanks @richardlau, also landed on |
Modify tools/license-builder.sh to restore the Third-Party Software
licenses for ICU.
Also fix arguments to tail to work on Linux.
rvagg: modified sed command for ICU to replace tabs with spaces and
remove whitespace at the end of lines
PR-URL: #4762
Reviewed-By: Rod Vagg <rod@vagg.org>
PR-URL: #4762 Reviewed-By: Rod Vagg <rod@vagg.org>
Modify tools/license-builder.sh to restore the Third-Party Software
licenses for ICU.
Also fix arguments to tail to work on Linux.
rvagg: modified sed command for ICU to replace tabs with spaces and
remove whitespace at the end of lines
PR-URL: nodejs#4762
Reviewed-By: Rod Vagg <rod@vagg.org>
PR-URL: nodejs#4762 Reviewed-By: Rod Vagg <rod@vagg.org>
Modify tools/license-builder.sh to restore the Third-Party Software
licenses for ICU.
Also fix arguments to tail to work on Linux.
rvagg: modified sed command for ICU to replace tabs with spaces and
remove whitespace at the end of lines
PR-URL: nodejs#4762
Reviewed-By: Rod Vagg <rod@vagg.org>
PR-URL: nodejs#4762 Reviewed-By: Rod Vagg <rod@vagg.org>
|
@rvagg fyi - http://bugs.icu-project.org/trac/ticket/12037 landed in ICU4C. ICU 57 will have a plain text license file. |
Modify tools/license-builder.sh to restore the Third-Party Software
licenses for ICU.
Also fix arguments to tail to work on Linux.
rvagg: modified sed command for ICU to replace tabs with spaces and
remove whitespace at the end of lines
PR-URL: nodejs#4762
Reviewed-By: Rod Vagg <rod@vagg.org>
PR-URL: nodejs#4762 Reviewed-By: Rod Vagg <rod@vagg.org>
The generated LICENSE using tools/license-builder.sh added by #4194 has omitted the entire Third-Party Software Licenses for ICU. This pull request modifies the license-builder.sh tool to add them back.