diff options
| author | Richard Lau <riclau@uk.ibm.com> | 2016-01-19 10:41:23 -0500 |
|---|---|---|
| committer | Rod Vagg <rod@vagg.org> | 2016-01-20 16:34:16 +1100 |
| commit | 2b9bd0f7b005cce9e329ae85e068880cc9ae853b (patch) | |
| tree | 257ef62cb08e2c17b46a386fc53d1ff6336afb78 /tools | |
| parent | 44aba1ab1c2656caf8f0f03a2f47b4c4b35aa4a2 (diff) | |
| download | android-node-v8-2b9bd0f7b005cce9e329ae85e068880cc9ae853b.tar.gz android-node-v8-2b9bd0f7b005cce9e329ae85e068880cc9ae853b.tar.bz2 android-node-v8-2b9bd0f7b005cce9e329ae85e068880cc9ae853b.zip | |
tools: fix license-builder.sh for ICU
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: https://github.com/nodejs/node/pull/4762
Reviewed-By: Rod Vagg <rod@vagg.org>
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/license-builder.sh | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tools/license-builder.sh b/tools/license-builder.sh index bb350e5a8b..5d6b810e12 100755 --- a/tools/license-builder.sh +++ b/tools/license-builder.sh @@ -33,7 +33,8 @@ 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;s/ / /g;s/ +$//;/</N;//ba' ${rootdir}/deps/icu/license.html)" addlicense "libuv" "deps/uv" "$(cat ${rootdir}/deps/uv/LICENSE)" addlicense "OpenSSL" "deps/openssl" \ "$(sed -e '/^ \*\/$/,$d' -e '/^ [^*].*$/d' -e '/\/\*.*$/d' -e '/^$/d' -e 's/^[/ ]\* *//' ${rootdir}/deps/openssl/openssl/LICENSE)" @@ -53,7 +54,7 @@ addlicense "marked" "tools/doc/node_modules/marked" \ # Testing tools addlicense "cpplint.py" "tools/cpplint.py" \ - "$(sed -e '/^$/,$d' -e 's/^#$//' -e 's/^# //' ${rootdir}/tools/cpplint.py | tail +3)" + "$(sed -e '/^$/,$d' -e 's/^#$//' -e 's/^# //' ${rootdir}/tools/cpplint.py | tail -n +3)" addlicense "ESLint" "tools/eslint" "$(cat ${rootdir}/tools/eslint/LICENSE)" addlicense "gtest" "deps/gtest" "$(cat ${rootdir}/deps/gtest/LICENSE)" addlicense "node-weak" "test/gc/node_modules/weak" \ |