Skip to content

Commit c96e552

Browse files
aslushnikovtargos
authored andcommitted
inspector: add inspector_protocol as a direct dependency
Currently, node.js depends on inspector_protocol indirectly through the dependency on v8. This is a dependency violation that will make it hard to roll V8 into Node if V8 gets a newer inspector protocol version with incompatible API. In fact, this surfaced on one of our bots when we tried to roll new inspector_protocol into V8. This patch adds inspector protocol and its required dependencies to node deps: - jinja2 - markupsafe PR-URL: #21975 Reviewed-By: Eugene Ostroukhov <[email protected]> Reviewed-By: Aleksei Koziatinskii <[email protected]>
1 parent 6f28557 commit c96e552

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

81 files changed

+18555
-4
lines changed

LICENSE

+103
Original file line numberDiff line numberDiff line change
@@ -1035,6 +1035,109 @@ 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+
- inspector_protocol, located at tools/inspector_protocol, is licensed as follows:
1039+
"""
1040+
// Copyright 2016 The Chromium Authors. All rights reserved.
1041+
//
1042+
// Redistribution and use in source and binary forms, with or without
1043+
// modification, are permitted provided that the following conditions are
1044+
// met:
1045+
//
1046+
// * Redistributions of source code must retain the above copyright
1047+
// notice, this list of conditions and the following disclaimer.
1048+
// * Redistributions in binary form must reproduce the above
1049+
// copyright notice, this list of conditions and the following disclaimer
1050+
// in the documentation and/or other materials provided with the
1051+
// distribution.
1052+
// * Neither the name of Google Inc. nor the names of its
1053+
// contributors may be used to endorse or promote products derived from
1054+
// this software without specific prior written permission.
1055+
//
1056+
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
1057+
// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
1058+
// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
1059+
// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
1060+
// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
1061+
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
1062+
// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
1063+
// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
1064+
// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
1065+
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
1066+
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
1067+
"""
1068+
1069+
- jinja2, located at tools/jinja2, is licensed as follows:
1070+
"""
1071+
Copyright (c) 2009 by the Jinja Team, see AUTHORS for more details.
1072+
1073+
Some rights reserved.
1074+
1075+
Redistribution and use in source and binary forms, with or without
1076+
modification, are permitted provided that the following conditions are
1077+
met:
1078+
1079+
* Redistributions of source code must retain the above copyright
1080+
notice, this list of conditions and the following disclaimer.
1081+
1082+
* Redistributions in binary form must reproduce the above
1083+
copyright notice, this list of conditions and the following
1084+
disclaimer in the documentation and/or other materials provided
1085+
with the distribution.
1086+
1087+
* The names of the contributors may not be used to endorse or
1088+
promote products derived from this software without specific
1089+
prior written permission.
1090+
1091+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
1092+
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
1093+
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
1094+
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
1095+
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
1096+
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
1097+
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
1098+
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
1099+
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
1100+
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
1101+
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
1102+
"""
1103+
1104+
- markupsafe, located at tools/markupsafe, is licensed as follows:
1105+
"""
1106+
Copyright (c) 2010 by Armin Ronacher and contributors. See AUTHORS
1107+
for more details.
1108+
1109+
Some rights reserved.
1110+
1111+
Redistribution and use in source and binary forms of the software as well
1112+
as documentation, with or without modification, are permitted provided
1113+
that the following conditions are met:
1114+
1115+
* Redistributions of source code must retain the above copyright
1116+
notice, this list of conditions and the following disclaimer.
1117+
1118+
* Redistributions in binary form must reproduce the above
1119+
copyright notice, this list of conditions and the following
1120+
disclaimer in the documentation and/or other materials provided
1121+
with the distribution.
1122+
1123+
* The names of the contributors may not be used to endorse or
1124+
promote products derived from this software without specific
1125+
prior written permission.
1126+
1127+
THIS SOFTWARE AND DOCUMENTATION IS PROVIDED BY THE COPYRIGHT HOLDERS AND
1128+
CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT
1129+
NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
1130+
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
1131+
OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
1132+
EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
1133+
PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
1134+
PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
1135+
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
1136+
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
1137+
SOFTWARE AND DOCUMENTATION, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
1138+
DAMAGE.
1139+
"""
1140+
10381141
- cpplint.py, located at tools/cpplint.py, is licensed as follows:
10391142
"""
10401143
Copyright (c) 2009 Google Inc. All rights reserved.

node.gyp

+4-4
Original file line numberDiff line numberDiff line change
@@ -1044,7 +1044,7 @@
10441044
}], # end aix section
10451045
[ 'v8_enable_inspector==1', {
10461046
'variables': {
1047-
'protocol_path': 'deps/v8/third_party/inspector_protocol',
1047+
'protocol_path': 'tools/inspector_protocol',
10481048
'node_inspector_path': 'src/inspector',
10491049
'node_inspector_generated_sources': [
10501050
'<(SHARED_INTERMEDIATE_DIR)/src/node/inspector/protocol/Forward.h',
@@ -1104,7 +1104,7 @@
11041104
],
11051105
'action': [
11061106
'python',
1107-
'deps/v8/third_party/inspector_protocol/ConvertProtocolToJSON.py',
1107+
'tools/inspector_protocol/ConvertProtocolToJSON.py',
11081108
'<@(_inputs)',
11091109
'<@(_outputs)',
11101110
],
@@ -1159,7 +1159,7 @@
11591159
],
11601160
'action': [
11611161
'python',
1162-
'deps/v8/third_party/inspector_protocol/ConvertProtocolToJSON.py',
1162+
'tools/inspector_protocol/ConvertProtocolToJSON.py',
11631163
'<@(_inputs)',
11641164
'<@(_outputs)',
11651165
],
@@ -1175,7 +1175,7 @@
11751175
],
11761176
'action': [
11771177
'python',
1178-
'deps/v8/third_party/inspector_protocol/ConcatenateProtocols.py',
1178+
'tools/inspector_protocol/ConcatenateProtocols.py',
11791179
'<@(_inputs)',
11801180
'<@(_outputs)',
11811181
],

0 commit comments

Comments
 (0)