Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 254aa83

Browse filesBrowse files
Trotttargos
Trott
authored and
targos
committed
tools: remove obsolete entries from license
The LICENSE file has a few entries for things that no longer ship with the code base. They are installed via npm instead. Remove them from the license file. Running the license builder on a fresh checkout will result in errors until this change lands, since the necessary information is not in the source tree until the `npm install` happens. PR-URL: #21979 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Jon Moss <me@jonathanmoss.me> Reviewed-By: Richard Lau <riclau@uk.ibm.com> Reviewed-By: Yuta Hiroto <hello@hiroppy.me> Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
1 parent 2a0fa47 commit 254aa83
Copy full SHA for 254aa83

File tree

Expand file treeCollapse file tree

2 files changed

+0
-78
lines changed
Open diff view settings
Filter options
Expand file treeCollapse file tree

2 files changed

+0
-78
lines changed
Open diff view settings
Collapse file

‎LICENSE‎

Copy file name to clipboardExpand all lines: LICENSE
-74Lines changed: 0 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -1035,29 +1035,6 @@ The externally maintained libraries used by Node.js are:
10351035
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
10361036
"""
10371037

1038-
- marked, located at tools/doc/node_modules/marked, is licensed as follows:
1039-
"""
1040-
Copyright (c) 2011-2014, Christopher Jeffrey (https://github.com/chjj/)
1041-
1042-
Permission is hereby granted, free of charge, to any person obtaining a copy
1043-
of this software and associated documentation files (the "Software"), to deal
1044-
in the Software without restriction, including without limitation the rights
1045-
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
1046-
copies of the Software, and to permit persons to whom the Software is
1047-
furnished to do so, subject to the following conditions:
1048-
1049-
The above copyright notice and this permission notice shall be included in
1050-
all copies or substantial portions of the Software.
1051-
1052-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
1053-
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
1054-
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
1055-
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
1056-
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
1057-
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
1058-
THE SOFTWARE.
1059-
"""
1060-
10611038
- cpplint.py, located at tools/cpplint.py, is licensed as follows:
10621039
"""
10631040
Copyright (c) 2009 Google Inc. All rights reserved.
@@ -1197,57 +1174,6 @@ The externally maintained libraries used by Node.js are:
11971174
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
11981175
"""
11991176

1200-
- unified, located at deps/unified, is licensed as follows:
1201-
"""
1202-
(The MIT License)
1203-
1204-
Copyright (c) 2015 Titus Wormer <tituswormer@gmail.com>
1205-
1206-
Permission is hereby granted, free of charge, to any person obtaining a copy
1207-
of this software and associated documentation files (the "Software"), to deal
1208-
in the Software without restriction, including without limitation the rights
1209-
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
1210-
copies of the Software, and to permit persons to whom the Software is
1211-
furnished to do so, subject to the following conditions:
1212-
1213-
The above copyright notice and this permission notice shall be included in
1214-
all copies or substantial portions of the Software.
1215-
1216-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
1217-
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
1218-
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
1219-
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
1220-
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
1221-
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
1222-
THE SOFTWARE.
1223-
"""
1224-
1225-
- remark-rehype, located at deps/remark-rehype, is licensed as follows:
1226-
"""
1227-
(The MIT License)
1228-
1229-
Copyright (c) 2016 Titus Wormer <tituswormer@gmail.com>
1230-
1231-
Permission is hereby granted, free of charge, to any person obtaining
1232-
a copy of this software and associated documentation files (the
1233-
'Software'), to deal in the Software without restriction, including
1234-
without limitation the rights to use, copy, modify, merge, publish,
1235-
distribute, sublicense, and/or sell copies of the Software, and to
1236-
permit persons to whom the Software is furnished to do so, subject to
1237-
the following conditions:
1238-
1239-
The above copyright notice and this permission notice shall be
1240-
included in all copies or substantial portions of the Software.
1241-
1242-
THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
1243-
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
1244-
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
1245-
IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
1246-
CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
1247-
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
1248-
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
1249-
"""
1250-
12511177
- remark-cli, located at tools/remark-cli, is licensed as follows:
12521178
"""
12531179
(The MIT License)
Collapse file

‎tools/license-builder.sh‎

Copy file name to clipboardExpand all lines: tools/license-builder.sh
-4Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,6 @@ addlicense "npm" "deps/npm" "$(cat ${rootdir}/deps/npm/LICENSE)"
7171

7272
# Build tools
7373
addlicense "GYP" "tools/gyp" "$(cat ${rootdir}/tools/gyp/LICENSE)"
74-
addlicense "marked" "tools/doc/node_modules/marked" \
75-
"$(cat ${rootdir}/tools/doc/node_modules/marked/LICENSE)"
7674

7775
# Testing tools
7876
addlicense "cpplint.py" "tools/cpplint.py" \
@@ -85,8 +83,6 @@ addlicense "gtest" "deps/gtest" "$(cat ${rootdir}/deps/gtest/LICENSE)"
8583
addlicense "nghttp2" "deps/nghttp2" "$(cat ${rootdir}/deps/nghttp2/COPYING)"
8684

8785
# remark
88-
addlicense "unified" "deps/unified" "$(cat ${rootdir}/tools/doc/node_modules/unified/LICENSE)"
89-
addlicense "remark-rehype" "deps/remark-rehype" "$(cat ${rootdir}/tools/doc/node_modules/remark-rehype/LICENSE)"
9086
addlicense "remark-cli" "tools/remark-cli" "$(cat ${rootdir}/tools/remark-cli/LICENSE)"
9187

9288
# node-inspect

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.