Remove hand-rolled protobufs generation; enable rel paths in protoc.gypi

build/protoc.gypi

Index: build/protoc.gypi
diff --git a/build/protoc.gypi b/build/protoc.gypi
index 555c5be45d29f3e0866eddc6aa996ec6a8a675ad..a552c7bccf87d7a7f85e02911c2056605f256774 100644
--- a/build/protoc.gypi
+++ b/build/protoc.gypi
@@ -43,6 +43,7 @@
     'cc_dir': '<(SHARED_INTERMEDIATE_DIR)/protoc_out/<(proto_out_dir)',
     'py_dir': '<(PRODUCT_DIR)/pyproto/<(proto_out_dir)',
     'proto_in_dir%': '.',
+    'proto_relpath%': '.',

[Ryan Sleevi, 2012/02/15 20:15:29]

Can you please add examples to the documentation about why this is necessary?

Note, you do not need to specifically reference cacheinvalidation, just the
pattern it uses and why this may be necessary.

[Evan Martin, 2012/02/15 20:19:51]

If you define this as "must have a trailing slash if provided", then you can
remove all of the "./" that show up in paths.

[Ryan Sleevi, 2012/02/16 09:23:49]

This comment had not been addressed. The explanation of what "proto_relpath"
means and when and why it is necessary belongs in protoc.gypi, not
cacheinvalidation.gyp. Please see lines 5-38, which specifically explain each of
the (client-definable) variables and when and how they are to be used.

   },
   'rules': [
     {
@@ -52,16 +53,16 @@
         '<(protoc)',
       ],
       'outputs': [
-        '<(py_dir)/<(RULE_INPUT_ROOT)_pb2.py',
-        '<(cc_dir)/<(RULE_INPUT_ROOT).pb.cc',
-        '<(cc_dir)/<(RULE_INPUT_ROOT).pb.h',
+        '<(py_dir)/<(proto_relpath)/<(RULE_INPUT_ROOT)_pb2.py',
+        '<(cc_dir)/<(proto_relpath)/<(RULE_INPUT_ROOT).pb.cc',
+        '<(cc_dir)/<(proto_relpath)/<(RULE_INPUT_ROOT).pb.h',
       ],
       'action': [
         '<(protoc)',
         '--proto_path=<(proto_in_dir)',
         # Naively you'd use <(RULE_INPUT_PATH) here, but protoc requires
         # --proto_path is a strict prefix of the path given as an argument.
-        '<(proto_in_dir)/<(RULE_INPUT_ROOT)<(RULE_INPUT_EXT)',
+        '<(proto_in_dir)/<(proto_relpath)/<(RULE_INPUT_ROOT)<(RULE_INPUT_EXT)',
         '--cpp_out=<(cc_dir)',
         '--python_out=<(py_dir)',
         ],