diff --git a/BUILD.bazel b/BUILD.bazel index 140f8bf35e..4c6c8740db 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -3,6 +3,8 @@ # found in the LICENSE file. load("@bazel_skylib//lib:selects.bzl", "selects") +load("@rules_python//python:defs.bzl", "py_binary") +load("@v8_python_deps//:requirements.bzl", "requirement") load( "@v8//:bazel/defs.bzl", "v8_binary", @@ -3179,9 +3181,39 @@ v8_torque( noicu_srcs = [":noicu/torque_files"], ) +py_binary( + name = "code_generator", + srcs = [ + "third_party/inspector_protocol/code_generator.py", + "third_party/inspector_protocol/pdl.py", + ], + data = [ + "third_party/inspector_protocol/lib/Forward_h.template", + "third_party/inspector_protocol/lib/Object_cpp.template", + "third_party/inspector_protocol/lib/Object_h.template", + "third_party/inspector_protocol/lib/Protocol_cpp.template", + "third_party/inspector_protocol/lib/ValueConversions_cpp.template", + "third_party/inspector_protocol/lib/ValueConversions_h.template", + "third_party/inspector_protocol/lib/Values_cpp.template", + "third_party/inspector_protocol/lib/Values_h.template", + "third_party/inspector_protocol/lib/base_string_adapter_cc.template", + "third_party/inspector_protocol/lib/base_string_adapter_h.template", + "third_party/inspector_protocol/templates/Exported_h.template", + "third_party/inspector_protocol/templates/Imported_h.template", + "third_party/inspector_protocol/templates/TypeBuilder_cpp.template", + "third_party/inspector_protocol/templates/TypeBuilder_h.template", + ], + deps = [ + requirement("jinja2"), + ], +) + genrule( name = "generated_inspector_files", - srcs = ["include/js_protocol.pdl"], + srcs = [ + "include/js_protocol.pdl", + "src/inspector/inspector_protocol_config.json", + ], outs = [ "include/inspector/Debugger.h", "include/inspector/Runtime.h", @@ -3202,10 +3234,15 @@ genrule( "src/inspector/protocol/Schema.cpp", "src/inspector/protocol/Schema.h", ], - cmd = "bazel/generate-inspector-files.sh $(@D)", - cmd_bat = "bazel\\generate-inspector-files.cmd $(@D)", - local = 1, + cmd = "$(location :code_generator) --jinja_dir . \ + --inspector_protocol_dir third_party/inspector_protocol \ + --config $(location :src/inspector/inspector_protocol_config.json) \ + --config_value protocol.path=$(location :include/js_protocol.pdl) \ + --output_base $(@D)/src/inspector", message = "Generating inspector files", + tools = [ + ":code_generator", + ], ) filegroup( diff --git a/WORKSPACE b/WORKSPACE index 289902f68d..283acbd1d8 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -16,6 +16,21 @@ http_archive( load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace") bazel_skylib_workspace() +http_archive( + name = "rules_python", + sha256 = "a30abdfc7126d497a7698c29c46ea9901c6392d6ed315171a6df5ce433aa4502", + strip_prefix = "rules_python-0.6.0", + url = "https://github.com/bazelbuild/rules_python/archive/0.6.0.tar.gz", +) + +load("@rules_python//python:pip.bzl", "pip_install") + +pip_install( + name = "v8_python_deps", + extra_pip_args = ["--require-hashes"], + requirements = "//:bazel/requirements.txt", +) + new_local_repository( name = "zlib", path = "third_party/zlib", diff --git a/bazel/generate-inspector-files.cmd b/bazel/generate-inspector-files.cmd deleted file mode 100644 index 202dd81d7c..0000000000 --- a/bazel/generate-inspector-files.cmd +++ /dev/null @@ -1,24 +0,0 @@ -REM Copyright 2021 the V8 project authors. All rights reserved. -REM Use of this source code is governed by a BSD-style license that can be -REM found in the LICENSE file. - -set BAZEL_OUT=%1 - -REM Bazel nukes all env vars, and we need the following for gn to work -set DEPOT_TOOLS_WIN_TOOLCHAIN=0 -set ProgramFiles(x86)=C:\Program Files (x86) -set windir=C:\Windows - -REM Create a default GN output folder -cmd.exe /S /E:ON /V:ON /D /c gn gen out/inspector - -REM Generate inspector files -cmd.exe /S /E:ON /V:ON /D /c autoninja -C out/inspector gen/src/inspector/protocol/Forward.h - -REM Create directories in bazel output folder -MKDIR -p %BAZEL_OUT%\include\inspector -MKDIR -p %BAZEL_OUT%\src\inspector\protocol - -REM Copy generated files to bazel output folder -COPY out\inspector\gen\include\inspector\* %BAZEL_OUT%\include\inspector\ -COPY out\inspector\gen\src\inspector\protocol\* %BAZEL_OUT%\src\inspector\protocol\ \ No newline at end of file diff --git a/bazel/generate-inspector-files.sh b/bazel/generate-inspector-files.sh deleted file mode 100755 index 9547041c33..0000000000 --- a/bazel/generate-inspector-files.sh +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 2021 the V8 project authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -set -e - -BAZEL_OUT=$1 - -# Create a default GN output folder -gn gen out/inspector - -# Generate inspector files -autoninja -C out/inspector src/inspector:protocol_generated_sources - -# Create directories in bazel output folder -mkdir -p $BAZEL_OUT/include/inspector -mkdir -p $BAZEL_OUT/src/inspector/protocol - -# Copy generated files to bazel output folder -cp out/inspector/gen/include/inspector/* $BAZEL_OUT/include/inspector/ -cp out/inspector/gen/src/inspector/protocol/* $BAZEL_OUT/src/inspector/protocol/ diff --git a/bazel/requirements.in b/bazel/requirements.in new file mode 100644 index 0000000000..7f7afbf3bf --- /dev/null +++ b/bazel/requirements.in @@ -0,0 +1 @@ +jinja2 diff --git a/bazel/requirements.txt b/bazel/requirements.txt new file mode 100644 index 0000000000..a9c132f688 --- /dev/null +++ b/bazel/requirements.txt @@ -0,0 +1,81 @@ +# +# This file is autogenerated by pip-compile with python 3.9 +# To update, run: +# +# pip-compile --generate-hashes requirements.in +# +jinja2==3.0.3 \ + --hash=sha256:077ce6014f7b40d03b47d1f1ca4b0fc8328a692bd284016f806ed0eaca390ad8 \ + --hash=sha256:611bb273cd68f3b993fabdc4064fc858c5b47a973cb5aa7999ec1ba405c87cd7 + # via -r requirements.in +markupsafe==2.0.1 \ + --hash=sha256:01a9b8ea66f1658938f65b93a85ebe8bc016e6769611be228d797c9d998dd298 \ + --hash=sha256:023cb26ec21ece8dc3907c0e8320058b2e0cb3c55cf9564da612bc325bed5e64 \ + --hash=sha256:0446679737af14f45767963a1a9ef7620189912317d095f2d9ffa183a4d25d2b \ + --hash=sha256:04635854b943835a6ea959e948d19dcd311762c5c0c6e1f0e16ee57022669194 \ + --hash=sha256:0717a7390a68be14b8c793ba258e075c6f4ca819f15edfc2a3a027c823718567 \ + --hash=sha256:0955295dd5eec6cb6cc2fe1698f4c6d84af2e92de33fbcac4111913cd100a6ff \ + --hash=sha256:0d4b31cc67ab36e3392bbf3862cfbadac3db12bdd8b02a2731f509ed5b829724 \ + --hash=sha256:10f82115e21dc0dfec9ab5c0223652f7197feb168c940f3ef61563fc2d6beb74 \ + --hash=sha256:168cd0a3642de83558a5153c8bd34f175a9a6e7f6dc6384b9655d2697312a646 \ + --hash=sha256:1d609f577dc6e1aa17d746f8bd3c31aa4d258f4070d61b2aa5c4166c1539de35 \ + --hash=sha256:1f2ade76b9903f39aa442b4aadd2177decb66525062db244b35d71d0ee8599b6 \ + --hash=sha256:20dca64a3ef2d6e4d5d615a3fd418ad3bde77a47ec8a23d984a12b5b4c74491a \ + --hash=sha256:2a7d351cbd8cfeb19ca00de495e224dea7e7d919659c2841bbb7f420ad03e2d6 \ + --hash=sha256:2d7d807855b419fc2ed3e631034685db6079889a1f01d5d9dac950f764da3dad \ + --hash=sha256:2ef54abee730b502252bcdf31b10dacb0a416229b72c18b19e24a4509f273d26 \ + --hash=sha256:36bc903cbb393720fad60fc28c10de6acf10dc6cc883f3e24ee4012371399a38 \ + --hash=sha256:37205cac2a79194e3750b0af2a5720d95f786a55ce7df90c3af697bfa100eaac \ + --hash=sha256:3c112550557578c26af18a1ccc9e090bfe03832ae994343cfdacd287db6a6ae7 \ + --hash=sha256:3dd007d54ee88b46be476e293f48c85048603f5f516008bee124ddd891398ed6 \ + --hash=sha256:4296f2b1ce8c86a6aea78613c34bb1a672ea0e3de9c6ba08a960efe0b0a09047 \ + --hash=sha256:47ab1e7b91c098ab893b828deafa1203de86d0bc6ab587b160f78fe6c4011f75 \ + --hash=sha256:49e3ceeabbfb9d66c3aef5af3a60cc43b85c33df25ce03d0031a608b0a8b2e3f \ + --hash=sha256:4dc8f9fb58f7364b63fd9f85013b780ef83c11857ae79f2feda41e270468dd9b \ + --hash=sha256:4efca8f86c54b22348a5467704e3fec767b2db12fc39c6d963168ab1d3fc9135 \ + --hash=sha256:53edb4da6925ad13c07b6d26c2a852bd81e364f95301c66e930ab2aef5b5ddd8 \ + --hash=sha256:5855f8438a7d1d458206a2466bf82b0f104a3724bf96a1c781ab731e4201731a \ + --hash=sha256:594c67807fb16238b30c44bdf74f36c02cdf22d1c8cda91ef8a0ed8dabf5620a \ + --hash=sha256:5b6d930f030f8ed98e3e6c98ffa0652bdb82601e7a016ec2ab5d7ff23baa78d1 \ + --hash=sha256:5bb28c636d87e840583ee3adeb78172efc47c8b26127267f54a9c0ec251d41a9 \ + --hash=sha256:60bf42e36abfaf9aff1f50f52644b336d4f0a3fd6d8a60ca0d054ac9f713a864 \ + --hash=sha256:611d1ad9a4288cf3e3c16014564df047fe08410e628f89805e475368bd304914 \ + --hash=sha256:6300b8454aa6930a24b9618fbb54b5a68135092bc666f7b06901f897fa5c2fee \ + --hash=sha256:63f3268ba69ace99cab4e3e3b5840b03340efed0948ab8f78d2fd87ee5442a4f \ + --hash=sha256:6557b31b5e2c9ddf0de32a691f2312a32f77cd7681d8af66c2692efdbef84c18 \ + --hash=sha256:693ce3f9e70a6cf7d2fb9e6c9d8b204b6b39897a2c4a1aa65728d5ac97dcc1d8 \ + --hash=sha256:6a7fae0dd14cf60ad5ff42baa2e95727c3d81ded453457771d02b7d2b3f9c0c2 \ + --hash=sha256:6c4ca60fa24e85fe25b912b01e62cb969d69a23a5d5867682dd3e80b5b02581d \ + --hash=sha256:6fcf051089389abe060c9cd7caa212c707e58153afa2c649f00346ce6d260f1b \ + --hash=sha256:7d91275b0245b1da4d4cfa07e0faedd5b0812efc15b702576d103293e252af1b \ + --hash=sha256:89c687013cb1cd489a0f0ac24febe8c7a666e6e221b783e53ac50ebf68e45d86 \ + --hash=sha256:8d206346619592c6200148b01a2142798c989edcb9c896f9ac9722a99d4e77e6 \ + --hash=sha256:905fec760bd2fa1388bb5b489ee8ee5f7291d692638ea5f67982d968366bef9f \ + --hash=sha256:97383d78eb34da7e1fa37dd273c20ad4320929af65d156e35a5e2d89566d9dfb \ + --hash=sha256:984d76483eb32f1bcb536dc27e4ad56bba4baa70be32fa87152832cdd9db0833 \ + --hash=sha256:99df47edb6bda1249d3e80fdabb1dab8c08ef3975f69aed437cb69d0a5de1e28 \ + --hash=sha256:9f02365d4e99430a12647f09b6cc8bab61a6564363f313126f775eb4f6ef798e \ + --hash=sha256:a30e67a65b53ea0a5e62fe23682cfe22712e01f453b95233b25502f7c61cb415 \ + --hash=sha256:ab3ef638ace319fa26553db0624c4699e31a28bb2a835c5faca8f8acf6a5a902 \ + --hash=sha256:aca6377c0cb8a8253e493c6b451565ac77e98c2951c45f913e0b52facdcff83f \ + --hash=sha256:add36cb2dbb8b736611303cd3bfcee00afd96471b09cda130da3581cbdc56a6d \ + --hash=sha256:b2f4bf27480f5e5e8ce285a8c8fd176c0b03e93dcc6646477d4630e83440c6a9 \ + --hash=sha256:b7f2d075102dc8c794cbde1947378051c4e5180d52d276987b8d28a3bd58c17d \ + --hash=sha256:baa1a4e8f868845af802979fcdbf0bb11f94f1cb7ced4c4b8a351bb60d108145 \ + --hash=sha256:be98f628055368795d818ebf93da628541e10b75b41c559fdf36d104c5787066 \ + --hash=sha256:bf5d821ffabf0ef3533c39c518f3357b171a1651c1ff6827325e4489b0e46c3c \ + --hash=sha256:c47adbc92fc1bb2b3274c4b3a43ae0e4573d9fbff4f54cd484555edbf030baf1 \ + --hash=sha256:cdfba22ea2f0029c9261a4bd07e830a8da012291fbe44dc794e488b6c9bb353a \ + --hash=sha256:d6c7ebd4e944c85e2c3421e612a7057a2f48d478d79e61800d81468a8d842207 \ + --hash=sha256:d7f9850398e85aba693bb640262d3611788b1f29a79f0c93c565694658f4071f \ + --hash=sha256:d8446c54dc28c01e5a2dbac5a25f071f6653e6e40f3a8818e8b45d790fe6ef53 \ + --hash=sha256:deb993cacb280823246a026e3b2d81c493c53de6acfd5e6bfe31ab3402bb37dd \ + --hash=sha256:e0f138900af21926a02425cf736db95be9f4af72ba1bb21453432a07f6082134 \ + --hash=sha256:e9936f0b261d4df76ad22f8fee3ae83b60d7c3e871292cd42f40b81b70afae85 \ + --hash=sha256:f0567c4dc99f264f49fe27da5f735f414c4e7e7dd850cfd8e69f0862d7c74ea9 \ + --hash=sha256:f5653a225f31e113b152e56f154ccbe59eeb1c7487b39b9d9f9cdb58e6c79dc5 \ + --hash=sha256:f826e31d18b516f653fe296d967d700fddad5901ae07c622bb3705955e1faa94 \ + --hash=sha256:f8ba0e8349a38d3001fae7eadded3f6606f0da5d748ee53cc1dab1d6527b9509 \ + --hash=sha256:f9081981fe268bd86831e5c75f7de206ef275defcb82bc70740ae6dc507aee51 \ + --hash=sha256:fa130dd50c57d53368c9d59395cb5526eda596d3ffe36666cd81a44d56e48872 + # via jinja2 diff --git a/src/inspector/BUILD.gn b/src/inspector/BUILD.gn index 495354da45..733fab3dff 100644 --- a/src/inspector/BUILD.gn +++ b/src/inspector/BUILD.gn @@ -47,6 +47,8 @@ inspector_protocol_generate("protocol_generated_sources") { inspector_protocol_dir = _inspector_protocol out_dir = target_gen_dir + _protocol_path = rebase_path(v8_inspector_js_protocol, root_build_dir) + config_values = [ "protocol.path=$_protocol_path" ] config_file = v8_path_prefix + "/src/inspector/inspector_protocol_config.json" inputs = [ v8_inspector_js_protocol, diff --git a/src/inspector/inspector_protocol_config.json b/src/inspector/inspector_protocol_config.json index bd4f9c534c..ba96b34574 100644 --- a/src/inspector/inspector_protocol_config.json +++ b/src/inspector/inspector_protocol_config.json @@ -1,6 +1,5 @@ { "protocol": { - "path": "../../include/js_protocol.pdl", "package": "src/inspector/protocol", "output": "protocol", "namespace": ["v8_inspector", "protocol"],