Skip to content
Permalink
Browse files

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 <eostroukhov@google.com>
Reviewed-By: Aleksei Koziatinskii <ak239spb@gmail.com>
  • Loading branch information...
aslushnikov authored and ak239 committed Jul 25, 2018
1 parent 2e37d0f commit e0395247c899af101f8a1f76a8554be1ff14040a
Showing with 18,555 additions and 4 deletions.
  1. +103 −0 LICENSE
  2. +4 −4 node.gyp
  3. +479 −0 tools/inspector_protocol/CheckProtocolCompatibility.py
  4. +654 −0 tools/inspector_protocol/CodeGenerator.py
  5. +39 −0 tools/inspector_protocol/ConcatenateProtocols.py
  6. +183 −0 tools/inspector_protocol/ConvertProtocolToJSON.py
  7. +27 −0 tools/inspector_protocol/LICENSE
  8. +8 −0 tools/inspector_protocol/OWNERS
  9. +16 −0 tools/inspector_protocol/README.v8
  10. +89 −0 tools/inspector_protocol/inspector_protocol.gni
  11. +33 −0 tools/inspector_protocol/inspector_protocol.gypi
  12. +30 −0 tools/inspector_protocol/lib/Allocator_h.template
  13. +136 −0 tools/inspector_protocol/lib/Array_h.template
  14. +43 −0 tools/inspector_protocol/lib/Collections_h.template
  15. +354 −0 tools/inspector_protocol/lib/DispatcherBase_cpp.template
  16. +173 −0 tools/inspector_protocol/lib/DispatcherBase_h.template
  17. +71 −0 tools/inspector_protocol/lib/ErrorSupport_cpp.template
  18. +37 −0 tools/inspector_protocol/lib/ErrorSupport_h.template
  19. +37 −0 tools/inspector_protocol/lib/Forward_h.template
  20. +30 −0 tools/inspector_protocol/lib/FrontendChannel_h.template
  21. +86 −0 tools/inspector_protocol/lib/Maybe_h.template
  22. +38 −0 tools/inspector_protocol/lib/Object_cpp.template
  23. +32 −0 tools/inspector_protocol/lib/Object_h.template
  24. +547 −0 tools/inspector_protocol/lib/Parser_cpp.template
  25. +22 −0 tools/inspector_protocol/lib/Parser_h.template
  26. +12 −0 tools/inspector_protocol/lib/Protocol_cpp.template
  27. +171 −0 tools/inspector_protocol/lib/ValueConversions_h.template
  28. +409 −0 tools/inspector_protocol/lib/Values_cpp.template
  29. +249 −0 tools/inspector_protocol/lib/Values_h.template
  30. +65 −0 tools/inspector_protocol/templates/Exported_h.template
  31. +55 −0 tools/inspector_protocol/templates/Imported_h.template
  32. +397 −0 tools/inspector_protocol/templates/TypeBuilder_cpp.template
  33. +301 −0 tools/inspector_protocol/templates/TypeBuilder_h.template
  34. +34 −0 tools/jinja2/AUTHORS
  35. +1 −0 tools/jinja2/Jinja2-2.10.tar.gz.md5
  36. +1 −0 tools/jinja2/Jinja2-2.10.tar.gz.sha512
  37. +31 −0 tools/jinja2/LICENSE
  38. +6 −0 tools/jinja2/OWNERS
  39. +26 −0 tools/jinja2/README.chromium
  40. +83 −0 tools/jinja2/__init__.py
  41. +99 −0 tools/jinja2/_compat.py
  42. +2 −0 tools/jinja2/_identifier.py
  43. +146 −0 tools/jinja2/asyncfilters.py
  44. +256 −0 tools/jinja2/asyncsupport.py
  45. +362 −0 tools/jinja2/bccache.py
  46. +1,721 −0 tools/jinja2/compiler.py
  47. +32 −0 tools/jinja2/constants.py
  48. +372 −0 tools/jinja2/debug.py
  49. +56 −0 tools/jinja2/defaults.py
  50. +1,276 −0 tools/jinja2/environment.py
  51. +146 −0 tools/jinja2/exceptions.py
  52. +627 −0 tools/jinja2/ext.py
  53. +1,190 −0 tools/jinja2/filters.py
  54. +136 −0 tools/jinja2/get_jinja2.sh
  55. +286 −0 tools/jinja2/idtracking.py
  56. +31 −0 tools/jinja2/jinja2.gni
  57. +739 −0 tools/jinja2/lexer.py
  58. +481 −0 tools/jinja2/loaders.py
  59. +106 −0 tools/jinja2/meta.py
  60. +220 −0 tools/jinja2/nativetypes.py
  61. +999 −0 tools/jinja2/nodes.py
  62. +49 −0 tools/jinja2/optimizer.py
  63. +903 −0 tools/jinja2/parser.py
  64. +813 −0 tools/jinja2/runtime.py
  65. +475 −0 tools/jinja2/sandbox.py
  66. +175 −0 tools/jinja2/tests.py
  67. +647 −0 tools/jinja2/utils.py
  68. +87 −0 tools/jinja2/visitor.py
  69. +3 −0 tools/license-builder.sh
  70. +13 −0 tools/markupsafe/AUTHORS
  71. +33 −0 tools/markupsafe/LICENSE
  72. +1 −0 tools/markupsafe/MarkupSafe-0.18.tar.gz.md5
  73. +1 −0 tools/markupsafe/MarkupSafe-0.18.tar.gz.sha512
  74. +5 −0 tools/markupsafe/OWNERS
  75. +24 −0 tools/markupsafe/README.chromium
  76. +234 −0 tools/markupsafe/__init__.py
  77. +24 −0 tools/markupsafe/_compat.py
  78. +267 −0 tools/markupsafe/_constants.py
  79. +46 −0 tools/markupsafe/_native.py
  80. +239 −0 tools/markupsafe/_speedups.c
  81. +121 −0 tools/markupsafe/get_markupsafe.sh
103 LICENSE
@@ -1035,6 +1035,109 @@ The externally maintained libraries used by Node.js are:
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
"""

- inspector_protocol, located at tools/inspector_protocol, is licensed as follows:
"""
// Copyright 2016 The Chromium Authors. All rights reserved.
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are
// met:
//
// * Redistributions of source code must retain the above copyright
// notice, this list of conditions and the following disclaimer.
// * Redistributions in binary form must reproduce the above
// copyright notice, this list of conditions and the following disclaimer
// in the documentation and/or other materials provided with the
// distribution.
// * Neither the name of Google Inc. nor the names of its
// contributors may be used to endorse or promote products derived from
// this software without specific prior written permission.
//
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
"""

- jinja2, located at tools/jinja2, is licensed as follows:
"""
Copyright (c) 2009 by the Jinja Team, see AUTHORS for more details.

Some rights reserved.

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
met:

* Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.

* Redistributions in binary form must reproduce the above
copyright notice, this list of conditions and the following
disclaimer in the documentation and/or other materials provided
with the distribution.

* The names of the contributors may not be used to endorse or
promote products derived from this software without specific
prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
"""

- markupsafe, located at tools/markupsafe, is licensed as follows:
"""
Copyright (c) 2010 by Armin Ronacher and contributors. See AUTHORS
for more details.

Some rights reserved.

Redistribution and use in source and binary forms of the software as well
as documentation, with or without modification, are permitted provided
that the following conditions are met:

* Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.

* Redistributions in binary form must reproduce the above
copyright notice, this list of conditions and the following
disclaimer in the documentation and/or other materials provided
with the distribution.

* The names of the contributors may not be used to endorse or
promote products derived from this software without specific
prior written permission.

THIS SOFTWARE AND DOCUMENTATION IS PROVIDED BY THE COPYRIGHT HOLDERS AND
CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT
NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE AND DOCUMENTATION, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
DAMAGE.
"""

- cpplint.py, located at tools/cpplint.py, is licensed as follows:
"""
Copyright (c) 2009 Google Inc. All rights reserved.
@@ -1045,7 +1045,7 @@
}], # end aix section
[ 'v8_enable_inspector==1', {
'variables': {
'protocol_path': 'deps/v8/third_party/inspector_protocol',
'protocol_path': 'tools/inspector_protocol',
'node_inspector_path': 'src/inspector',
'node_inspector_generated_sources': [
'<(SHARED_INTERMEDIATE_DIR)/src/node/inspector/protocol/Forward.h',
@@ -1105,7 +1105,7 @@
],
'action': [
'python',
'deps/v8/third_party/inspector_protocol/ConvertProtocolToJSON.py',
'tools/inspector_protocol/ConvertProtocolToJSON.py',
'<@(_inputs)',
'<@(_outputs)',
],
@@ -1160,7 +1160,7 @@
],
'action': [
'python',
'deps/v8/third_party/inspector_protocol/ConvertProtocolToJSON.py',
'tools/inspector_protocol/ConvertProtocolToJSON.py',
'<@(_inputs)',
'<@(_outputs)',
],
@@ -1176,7 +1176,7 @@
],
'action': [
'python',
'deps/v8/third_party/inspector_protocol/ConcatenateProtocols.py',
'tools/inspector_protocol/ConcatenateProtocols.py',
'<@(_inputs)',
'<@(_outputs)',
],
Oops, something went wrong.

0 comments on commit e039524

Please sign in to comment.
You can’t perform that action at this time.