Option added to protobuf build for import directories

tools/protoc_wrapper/protoc_wrapper.py

 #!/usr/bin/env python
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """
 A simple wrapper for protoc.
 Script for //third_party/protobuf/proto_library.gni .
 Features:
 - Inserts #include for extra header automatically.
@@ skipping 71 matching lines @@
                       help="Output directory for custom generator plugin.")
 
   parser.add_argument("--plugin",
                       help="Relative path to custom generator plugin.")
   parser.add_argument("--plugin-options",
                       help="Custom generator plugin options.")
   parser.add_argument("--cc-options",
                       help="Standard C++ generator options.")
   parser.add_argument("--include",
                       help="Name of include to insert into generated headers.")
-
+  parser.add_argument("--import-dir", nargs='*', default=[],

[scottmg, 2017/01/23 16:53:11]

I have no idea why this script uses " everywhere, but please make nargs use "
too, unless you want to fix the whole script to use ' instead.

[Ramin Halavati, 2017/01/24 08:38:33]

Done.

+                      help="Name of extra import directories for protos.")

[scottmg, 2017/01/23 16:53:11]

nit; "Extra import directories for protos." would sound more natural.

[xyzzyz, 2017/01/23 17:53:56]

Just like my comment in the other file, please rename the flag to --import-dirs.

[Ramin Halavati, 2017/01/24 08:38:33]

Done. Help corrected, name did not change as it now accepts just one directory
for each --import-dir switch.

   parser.add_argument("protos", nargs="+",
                       help="Input protobuf definition file(s).")
 
   options = parser.parse_args()
 
   proto_dir = os.path.relpath(options.proto_in_dir)
   protoc_cmd = [os.path.realpath(options.protoc)]
 
   protos = options.protos
   headers = []
@@ skipping 12 matching lines @@
 
   if options.plugin_out_dir:
     plugin_options = FormatGeneratorOptions(options.plugin_options)
     protoc_cmd += [
       "--plugin", "protoc-gen-plugin=" + os.path.relpath(options.plugin),
       "--plugin_out", plugin_options + options.plugin_out_dir
     ]
 
   protoc_cmd += ["--proto_path", proto_dir]
   protoc_cmd += [os.path.join(proto_dir, name) for name in protos]
+
+  for path in options.import_dir:

[xyzzyz, 2017/01/23 17:53:56]

This loop should probably be between lines 124 and 125 -- line 124 adds extra
paths, just like this loop does, and 125 finally adds proto files to generate
bindings from.

[Ramin Halavati, 2017/01/24 08:38:33]

Done.

+    protoc_cmd += ["--proto_path", path]
+
   ret = subprocess.call(protoc_cmd)
   if ret != 0:
     raise RuntimeError("Protoc has returned non-zero status: "
                        "{0} .".format(ret))
 
   if options.include:
     WriteIncludes(headers, options.include)
 
 
 if __name__ == "__main__":
   try:
     main(sys.argv)
   except RuntimeError as e:
     print(e, file=sys.stderr)
     sys.exit(1)