Skip to content

Commit f17cb95

Browse files
aslushnikovhashseed
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: nodejs#21975 Reviewed-By: Eugene Ostroukhov <[email protected]> Reviewed-By: Aleksei Koziatinskii <[email protected]>
1 parent a35a0b2 commit f17cb95

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

+18557
-6
lines changed

LICENSE

Lines changed: 103 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1058,6 +1058,109 @@ The externally maintained libraries used by Node.js are:
10581058
THE SOFTWARE.
10591059
"""
10601060

1061+
- inspector_protocol, located at tools/inspector_protocol, is licensed as follows:
1062+
"""
1063+
// Copyright 2016 The Chromium Authors. All rights reserved.
1064+
//
1065+
// Redistribution and use in source and binary forms, with or without
1066+
// modification, are permitted provided that the following conditions are
1067+
// met:
1068+
//
1069+
// * Redistributions of source code must retain the above copyright
1070+
// notice, this list of conditions and the following disclaimer.
1071+
// * Redistributions in binary form must reproduce the above
1072+
// copyright notice, this list of conditions and the following disclaimer
1073+
// in the documentation and/or other materials provided with the
1074+
// distribution.
1075+
// * Neither the name of Google Inc. nor the names of its
1076+
// contributors may be used to endorse or promote products derived from
1077+
// this software without specific prior written permission.
1078+
//
1079+
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
1080+
// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
1081+
// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
1082+
// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
1083+
// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
1084+
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
1085+
// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
1086+
// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
1087+
// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
1088+
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
1089+
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
1090+
"""
1091+
1092+
- jinja2, located at tools/jinja2, is licensed as follows:
1093+
"""
1094+
Copyright (c) 2009 by the Jinja Team, see AUTHORS for more details.
1095+
1096+
Some rights reserved.
1097+
1098+
Redistribution and use in source and binary forms, with or without
1099+
modification, are permitted provided that the following conditions are
1100+
met:
1101+
1102+
* Redistributions of source code must retain the above copyright
1103+
notice, this list of conditions and the following disclaimer.
1104+
1105+
* Redistributions in binary form must reproduce the above
1106+
copyright notice, this list of conditions and the following
1107+
disclaimer in the documentation and/or other materials provided
1108+
with the distribution.
1109+
1110+
* The names of the contributors may not be used to endorse or
1111+
promote products derived from this software without specific
1112+
prior written permission.
1113+
1114+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
1115+
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
1116+
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
1117+
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
1118+
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
1119+
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
1120+
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
1121+
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
1122+
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
1123+
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
1124+
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
1125+
"""
1126+
1127+
- markupsafe, located at tools/markupsafe, is licensed as follows:
1128+
"""
1129+
Copyright (c) 2010 by Armin Ronacher and contributors. See AUTHORS
1130+
for more details.
1131+
1132+
Some rights reserved.
1133+
1134+
Redistribution and use in source and binary forms of the software as well
1135+
as documentation, with or without modification, are permitted provided
1136+
that the following conditions are met:
1137+
1138+
* Redistributions of source code must retain the above copyright
1139+
notice, this list of conditions and the following disclaimer.
1140+
1141+
* Redistributions in binary form must reproduce the above
1142+
copyright notice, this list of conditions and the following
1143+
disclaimer in the documentation and/or other materials provided
1144+
with the distribution.
1145+
1146+
* The names of the contributors may not be used to endorse or
1147+
promote products derived from this software without specific
1148+
prior written permission.
1149+
1150+
THIS SOFTWARE AND DOCUMENTATION IS PROVIDED BY THE COPYRIGHT HOLDERS AND
1151+
CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT
1152+
NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
1153+
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
1154+
OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
1155+
EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
1156+
PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
1157+
PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
1158+
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
1159+
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
1160+
SOFTWARE AND DOCUMENTATION, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
1161+
DAMAGE.
1162+
"""
1163+
10611164
- cpplint.py, located at tools/cpplint.py, is licensed as follows:
10621165
"""
10631166
Copyright (c) 2009 Google Inc. All rights reserved.

node.gyp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1043,7 +1043,7 @@
10431043
}], # end aix section
10441044
[ 'v8_enable_inspector==1', {
10451045
'variables': {
1046-
'protocol_path': 'deps/v8/third_party/inspector_protocol',
1046+
'protocol_path': 'tools/inspector_protocol',
10471047
'node_inspector_path': 'src/inspector',
10481048
'node_inspector_generated_sources': [
10491049
'<(SHARED_INTERMEDIATE_DIR)/src/node/inspector/protocol/Forward.h',
@@ -1074,7 +1074,7 @@
10741074
'<(protocol_path)/templates/Imported_h.template',
10751075
'<(protocol_path)/templates/TypeBuilder_cpp.template',
10761076
'<(protocol_path)/templates/TypeBuilder_h.template',
1077-
'<(protocol_path)/code_generator.py',
1077+
'<(protocol_path)/CodeGenerator.py',
10781078
]
10791079
},
10801080
'targets': [
@@ -1102,7 +1102,7 @@
11021102
],
11031103
'action': [
11041104
'python',
1105-
'deps/v8/third_party/inspector_protocol/convert_protocol_to_json.py',
1105+
'tools/inspector_protocol/ConvertProtocolToJSON.py',
11061106
'<@(_inputs)',
11071107
'<@(_outputs)',
11081108
],
@@ -1127,7 +1127,7 @@
11271127
],
11281128
'action': [
11291129
'python',
1130-
'<(protocol_path)/code_generator.py',
1130+
'<(protocol_path)/CodeGenerator.py',
11311131
'--jinja_dir', '<@(protocol_path)/..',
11321132
'--output_base', '<(SHARED_INTERMEDIATE_DIR)/src/',
11331133
'--config', '<(SHARED_INTERMEDIATE_DIR)/node_protocol_config.json',
@@ -1157,7 +1157,7 @@
11571157
],
11581158
'action': [
11591159
'python',
1160-
'deps/v8/third_party/inspector_protocol/convert_protocol_to_json.py',
1160+
'tools/inspector_protocol/ConvertProtocolToJSON.py',
11611161
'<@(_inputs)',
11621162
'<@(_outputs)',
11631163
],
@@ -1173,7 +1173,7 @@
11731173
],
11741174
'action': [
11751175
'python',
1176-
'deps/v8/third_party/inspector_protocol/concatenate_protocols.py',
1176+
'tools/inspector_protocol/ConcatenateProtocols.py',
11771177
'<@(_inputs)',
11781178
'<@(_outputs)',
11791179
],

0 commit comments

Comments
 (0)