deps: update inspector_protocol to 1b1bcbbe060e8c8cd8704f00f78978c50991

PR-URL: #60705
Reviewed-By: Chengzhong Wu <legendecas@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>

Author: nodejs-github-bot

deps/inspector_protocol/README.node

@@ -2,7 +2,7 @@ Name: inspector protocol
 Short Name: inspector_protocol
 URL: https://chromium.googlesource.com/deps/inspector_protocol/
 Version: 0
-Revision: af7f5a8173fdbc29f0835ec94395932e328b2ea2
+Revision: 1b1bcbbe060e8c8cd8704f00f78978c50991b307
 License: BSD
 License File: LICENSE
 Security Critical: no

deps/inspector_protocol/code_generator.py

@@ -75,12 +75,18 @@ def init_defaults(config_tuple, path, defaults):
 "--inspector_protocol_dir", type=unicode, required=True,
 help=("directory with code_generator.py and C++ encoding / binding "
 "libraries, relative to the root of the source tree."))
+cmdline_parser.add_argument("--depfile", type=unicode, required=False)
+cmdline_parser.add_argument("--stamp", type=unicode, required=False)
 arg_options=cmdline_parser.parse_args()
 jinja_dir=arg_options.jinja_dir
 output_base=arg_options.output_base
 config_file=arg_options.config
 config_base=os.path.dirname(config_file)
 config_values=arg_options.config_value
+ifbool(arg_options.depfile) !=bool(arg_options.stamp):
+raiseException("--depfile requires --stamp and vice versa")
+depfile=arg_options.depfile
+stamp=arg_options.stamp
 inspector_protocol_dir=arg_options.inspector_protocol_dir.lstrip('/')
 exceptException:
 # Work with python 2 and 3 http://docs.python.org/py3k/howto/pyporting.html
@@ -122,7 +128,8 @@ def init_defaults(config_tuple, path, defaults):
 parts=key_value.split("=")
 iflen(parts) ==2:
 defaults["."+parts[0]] =parts[1]
-return (jinja_dir, config_file, init_defaults(config_partial, "", defaults))
+return (jinja_dir, config_file, init_defaults(config_partial, "", defaults),
+depfile, stamp)
 exceptException:
 # Work with python 2 and 3 http://docs.python.org/py3k/howto/pyporting.html
 exc=sys.exc_info()[1]
@@ -360,6 +367,7 @@ class Protocol(object):
 def__init__(self, config):
 self.config=config
 self.json_api= {"domains": []}
+self.source_set=set()
 self.imported_domains= []
 self.exported_domains= []
 self.generate_domains=self.read_protocol_file(config.protocol.path)
@@ -381,7 +389,8 @@ def __init__(self, config):
 
 defread_protocol_file(self, file_name):
 input_file=open(file_name, "r")
-parsed_json=pdl.loads(input_file.read(), file_name)
+parsed_json=pdl.loads(input_file.read(), file_name, False,
+self.source_set)
 input_file.close()
 version='%s.%s'% (parsed_json["version"]["major"],
 parsed_json["version"]["minor"])
@@ -600,9 +609,10 @@ def is_imported_dependency(self, domain):
 
 
 defmain():
-jinja_dir, config_file, config=read_config()
+jinja_dir, config_file, config, deps_filename, stamp_filename=read_config()
 
 protocol=Protocol(config)
+source_set=protocol.source_set
 
 ifnotconfig.exportedandlen(protocol.exported_domains):
 sys.stderr.write(("Domains [%s] are exported, but config is missing export "
@@ -648,18 +658,26 @@ def main():
  }
 
 ifdomain["domain"] inprotocol.generate_domains:
-outputs[os.path.join(config.protocol.output, to_file_name(
-config, file_name+".h"))] =h_template.render(template_context)
-outputs[os.path.join(config.protocol.output, to_file_name(
-config, file_name+".cpp"))] =cpp_template.render(template_context)
+output_h=os.path.join(config.protocol.output, to_file_name(
+config, file_name+".h"))
+outputs[output_h] =h_template.render(template_context)
+source_set.add(h_template.filename)
+output_cpp=os.path.join(config.protocol.output, to_file_name(
+config, file_name+".cpp"))
+outputs[output_cpp] =cpp_template.render(template_context)
+source_set.add(cpp_template.filename)
 ifdomain["domain"] inprotocol.exported_domains:
-outputs[os.path.join(config.exported.output, to_file_name(
-config, file_name+".h"))] =exported_template.render(
+output_export_h=os.path.join(config.exported.output, to_file_name(
+config, file_name+".h"))
+outputs[output_export_h] =exported_template.render(
 template_context)
+source_set.add(exported_template.filename)
 ifdomain["domain"] inprotocol.imported_domains:
-outputs[os.path.join(config.protocol.output, to_file_name(
-config, file_name+".h"))] =imported_template.render(
+output_import_h=os.path.join(config.protocol.output, to_file_name(
+config, file_name+".h"))
+outputs[output_import_h] =imported_template.render(
 template_context)
+source_set.add(imported_template.filename)
 
 ifconfig.lib:
 template_context= {
@@ -702,6 +720,7 @@ def generate_lib_file(file_name, template_files):
 inputs.append(os.path.join(lib_templates_dir, template_file))
 template=jinja_env.get_template("lib/"+template_file)
 parts.append(template.render(template_context))
+source_set.add(template.filename)
 outputs[file_name] ="\n\n".join(parts)
 
 generate_lib_file(os.path.join(config.lib.output, to_file_name(
@@ -713,17 +732,9 @@ def generate_lib_file(file_name, template_files):
 generate_lib_file(os.path.join(config.lib.output, to_file_name(
 config, "Protocol.cpp")), protocol_cpp_templates)
 
-# Make gyp / make generatos happy, otherwise make rebuilds world.
-inputs_ts=max(map(os.path.getmtime, inputs))
-up_to_date=True
-foroutput_fileinoutputs.keys():
-if (notos.path.exists(output_file)
-oros.path.getmtime(output_file) <inputs_ts):
-up_to_date=False
-break
-ifup_to_date:
-sys.exit()
-
+ifstamp_filename:
+withopen(stamp_filename, "w"):
+pass
 forfile_name, contentinoutputs.items():
 # Remove output file first to account for potential case changes.
 try:
@@ -734,6 +745,12 @@ def generate_lib_file(file_name, template_files):
 out_file.write(content)
 out_file.close()
 
+ifdeps_filename:
+assertstamp_filename
+withopen(deps_filename, "w") asdeps_file:
+deps_file.write("%s: %s\n"% (
+stamp_filename, " ".join(sorted(source_set))))
+
 
 if__name__=="__main__":
 main()

deps/inspector_protocol/concatenate_protocols.py

@@ -5,6 +5,7 @@
 
 importos.path
 importsys
+importargparse
 
 try:
 importjson
@@ -14,29 +15,52 @@
 importpdl
 
 defmain(argv):
-iflen(argv) <1:
+cmdline_parser=argparse.ArgumentParser()
+cmdline_parser.add_argument('filename', nargs='*')
+cmdline_parser.add_argument("--depfile", required=False)
+cmdline_parser.add_argument("--stamp", required=False)
+arg_options=cmdline_parser.parse_args()
+
+ifbool(arg_options.depfile) !=bool(arg_options.stamp):
+raiseException("--depfile requires --stamp and vice versa")
+
+iflen(arg_options.filename) <1:
 sys.stderr.write(
 "Usage: %s <protocol-1> [<protocol-2> [, <protocol-3>...]] "
 "<output-file>\n"%sys.argv[0])
 return1
 
+filenames=arg_options.filename
+deps_filename=arg_options.depfile
+stamp_filename=arg_options.stamp
 domains= []
+source_set=set()
 version=None
-forprotocolinargv[:-1]:
+forprotocolinfilenames[:-1]:
 file_name=os.path.normpath(protocol)
 ifnotos.path.isfile(file_name):
 sys.stderr.write("Cannot find %s\n"%file_name)
 return1
 input_file=open(file_name, "r")
-parsed_json=pdl.loads(input_file.read(), file_name)
+parsed_json=pdl.loads(input_file.read(), file_name, False, source_set)
 domains+=parsed_json["domains"]
 version=parsed_json["version"]
 
+ifstamp_filename:
+withopen(stamp_filename, "w"):
+pass
+
 output_file=open(argv[-1], "w")
 json.dump({"version": version, "domains": domains}, output_file,
 indent=4, sort_keys=False, separators=(',', ': '))
 output_file.close()
 
+ifdeps_filename:
+assertstamp_filename
+withopen(deps_filename, "w") asdeps_file:
+deps_file.write("%s: %s\n"% (
+stamp_filename, " ".join(sorted(source_set))))
+
 
 if__name__=='__main__':
 sys.exit(main(sys.argv[1:]))

deps/inspector_protocol/inspector_protocol.gni

@@ -47,6 +47,7 @@ template("inspector_protocol_generate") {
 "$inspector_protocol_dir/templates/TypeBuilder_cpp.template",
 "$inspector_protocol_dir/templates/TypeBuilder_h.template",
  ]
+
 if (defined(invoker.inputs)) {
 inputs+=invoker.inputs
  }
@@ -61,6 +62,12 @@ template("inspector_protocol_generate") {
  ]
  }
 
+outputs=get_path_info(rebase_path(invoker.outputs, ".", invoker.out_dir),
+"abspath")
+
+_stampfile=outputs[0]
+depfile="${invoker.out_dir}/${target_name}.d"
+
 args= [
 "--jinja_dir",
 rebase_path(jinja_dir, root_build_dir),
@@ -70,6 +77,10 @@ template("inspector_protocol_generate") {
 rebase_path(invoker.config_file, root_build_dir),
 "--inspector_protocol_dir",
 "$inspector_protocol_dir",
+"--depfile",
+rebase_path(depfile, root_build_dir),
+"--stamp",
+rebase_path(_stampfile, root_build_dir),
  ]
 if (use_embedder_types) {
 args+= [
@@ -86,8 +97,55 @@ template("inspector_protocol_generate") {
  }
  }
 
-outputs=get_path_info(rebase_path(invoker.outputs, ".", invoker.out_dir),
-"abspath")
+forward_variables_from(invoker,
+ [
+"visibility",
+"deps",
+"public_deps",
+ ])
+ }
+}
+
+# This template concatenates multiple protocol files
+# into a single (JSON) file.
+#
+# Inputs
+#
+# inputs (required)
+# Paths to .pdl or .json files with protocol definitions.
+#
+# output_file (required)
+# Path to put the concatenated file in. It must be inside output or
+# generated file directory.
+#
+# inspector_protocol_dir (required)
+# Path to the inspector_protocol directory.
+#
+template("inspector_protocol_concatenate") {
+assert(defined(invoker.inputs))
+assert(defined(invoker.output_file))
+assert(defined(invoker.inspector_protocol_dir))
+_inspector_protocol_dir=invoker.inspector_protocol_dir
+
+action(target_name) {
+script="$_inspector_protocol_dir/concatenate_protocols.py"
+
+inputs=invoker.inputs
+outputs= []
+depfile="${invoker.output_file}_${target_name}.d"
+
+args= [
+"--depfile",
+rebase_path(depfile, root_build_dir),
+"--stamp",
+rebase_path(invoker.output_file, root_build_dir),
+ ]
+
+inputs+=invoker.inputs
+args+=rebase_path(invoker.inputs, root_build_dir)
+
+outputs+= [invoker.output_file]
+args+= [rebase_path(invoker.output_file, root_build_dir)]
 
 forward_variables_from(invoker,
  [

deps/inspector_protocol/pdl.py

@@ -50,14 +50,17 @@ def createItem(d, experimental, deprecated, name=None):
 returnresult
 
 
-defparse(data, file_name, map_binary_to_string=False):
+defparse(data, file_name, map_binary_to_string, source_set):
+assertsource_setisNoneorisinstance(source_set, set)
 protocol=collections.OrderedDict()
 protocol['version'] =collections.OrderedDict()
 protocol['domains'] = []
 domain=None
 item=None
 subitems=None
 nukeDescription=False
+ifsource_setisnotNone:
+source_set.add(file_name)
 globaldescription
 lines=data.split('\n')
 foriinrange(0, len(lines)):
@@ -90,11 +93,11 @@ def parse(data, file_name, map_binary_to_string=False):
 r'^include (.*)').match(line)
 ifmatch:
 included_filename=match.group(1)
-ifpath.isabs(included_filename):
-raiseException("Only relative paths are supported in include's")
-resolved_path=path.normpath(path.join(path.dirname(file_name), included_filename))
+ifos.path.isabs(included_filename):
+raiseException("Only relative paths are supported in includes")
+resolved_path=os.path.normpath(os.path.join(os.path.dirname(file_name), included_filename))
 withopen(resolved_path, 'r') asfile:
-included_data=parse(file.read(), resolved_path, map_binary_to_string)
+included_data=parse(file.read(), resolved_path, map_binary_to_string, source_set)
 protocol['domains'].extend(included_data['domains'])
 continue
 
@@ -187,7 +190,7 @@ def parse(data, file_name, map_binary_to_string=False):
 returnprotocol
 
 
-defloads(data, file_name, map_binary_to_string=False):
+defloads(data, file_name, map_binary_to_string=False, source_set=None):
 iffile_name.endswith(".pdl"):
-returnparse(data, file_name, map_binary_to_string)
+returnparse(data, file_name, map_binary_to_string, source_set)
 returnjson.loads(data)