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

third_party/cacheinvalidation/cacheinvalidation.gyp

Index: third_party/cacheinvalidation/cacheinvalidation.gyp
diff --git a/third_party/cacheinvalidation/cacheinvalidation.gyp b/third_party/cacheinvalidation/cacheinvalidation.gyp
index dce6f6eb33df3068d20459364cf260758816df1e..a79824f874aeadca08e305d43eec909211fc3e07 100644
--- a/third_party/cacheinvalidation/cacheinvalidation.gyp
+++ b/third_party/cacheinvalidation/cacheinvalidation.gyp
@@ -15,17 +15,13 @@
     # we don't need this variable.
     # TODO(ghc): Remove v2/ dir and move all files up a level.
     'proto_dir_relpath': 'google/cacheinvalidation/v2',
-    # Where files generated from proto files are put.
-    'protoc_out_dir': '<(SHARED_INTERMEDIATE_DIR)/protoc_out',
-    # The path to the protoc executable.
-    'protoc': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)protoc<(EXECUTABLE_SUFFIX)',
   },
   'targets': [
     # The rule/action to generate files from the cacheinvalidation proto
-    # files.
+    # files and package them into a static library.
     {
       'target_name': 'cacheinvalidation_proto',
-      'type': 'none',
+      'type': 'static_library',
       'sources': [
         '<(proto_dir_root)/<(proto_dir_relpath)/client.proto',
         '<(proto_dir_root)/<(proto_dir_relpath)/client_gateway.proto',
@@ -33,68 +29,14 @@
         '<(proto_dir_root)/<(proto_dir_relpath)/client_test_internal.proto',
         '<(proto_dir_root)/<(proto_dir_relpath)/types.proto',
       ],
-      # TODO(akalin): This block was copied from the sync_proto target
-      # from chrome.gyp.  Decomp the shared blocks out somehow.
-      'rules': [
-        {
-          'rule_name': 'genproto',
-          'extension': 'proto',
-          'inputs': [
-            '<(protoc)',
-          ],
-          'outputs': [
-            '<(protoc_out_dir)/<(proto_dir_relpath)/<(RULE_INPUT_ROOT).pb.h',
-            '<(protoc_out_dir)/<(proto_dir_relpath)/<(RULE_INPUT_ROOT).pb.cc',
-          ],
-          'action': [
-            '<(protoc)',
-            '--proto_path=<(proto_dir_root)',
-            # This path needs to be prefixed by proto_path, so we can't
-            # use RULE_INPUT_PATH (which is an absolute path).
-            '<(proto_dir_root)/<(proto_dir_relpath)/<(RULE_INPUT_NAME)',
-            '--cpp_out=<(protoc_out_dir)',
-          ],
-          'message': 'Generating C++ code from <(RULE_INPUT_PATH)',
-        },
-      ],
-      'dependencies': [
-        '../../third_party/protobuf/protobuf.gyp:protoc#host',
-      ],
-    },
-    # The C++ files generated from the cache invalidation protocol buffers.
-    {
-      'target_name': 'cacheinvalidation_proto_cpp',
-      'type': 'static_library',
-      'sources': [
-        '<(protoc_out_dir)/<(proto_dir_relpath)/client.pb.h',
-        '<(protoc_out_dir)/<(proto_dir_relpath)/client.pb.cc',
-        '<(protoc_out_dir)/<(proto_dir_relpath)/client_gateway.pb.h',
-        '<(protoc_out_dir)/<(proto_dir_relpath)/client_gateway.pb.cc',
-        '<(protoc_out_dir)/<(proto_dir_relpath)/client_protocol.pb.h',
-        '<(protoc_out_dir)/<(proto_dir_relpath)/client_protocol.pb.cc',
-        '<(protoc_out_dir)/<(proto_dir_relpath)/client_test_internal.pb.h',
-        '<(protoc_out_dir)/<(proto_dir_relpath)/client_test_internal.pb.cc',
-        '<(protoc_out_dir)/<(proto_dir_relpath)/types.pb.h',
-        '<(protoc_out_dir)/<(proto_dir_relpath)/types.pb.cc',
-      ],
-      'dependencies': [
-        '../../third_party/protobuf/protobuf.gyp:protobuf_lite',
-        'cacheinvalidation_proto',
-      ],
-      'include_dirs': [
-        '<(protoc_out_dir)',
-      ],
-      'direct_dependent_settings': {
-        'include_dirs': [
-          '<(protoc_out_dir)',
-        ],
+      'variables': {
+        'proto_in_dir': '<(proto_dir_root)',
+        # Setting this will lead to the generated files being placed in:
+        # out/Debug/pyproto/<(proto_out_dir)/<(proto_relpath)/file_pb2.py

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

I don't feel this comment is accurate for what it states.

Setting the variable doesn't change that behaviour - it always happens. It's
because the protos use fully qualified imports that this is necessary.

# Set proto_out_dir to '', because protoc will place generated files in
# subdirectories based on the relative path between proto_in_dir and
# the source. Because all the input files' relative paths start with
# <(proto_dir_relpath), the output files will effectively be placed in
# <(proto_out_dir)/<(proto_relpath)/file_pb2.py, which is the desired
# naming. This is only necessary because of how these protos import
# eachother. See protoc.gypi for more explanation.

Although feel free to wordsmith the above as appropriate, I'm trying to explain
1) Why this particular target needs to do this
2) Why it's not generally needed.
3) Explain the non-obvious surprises
4) Where to go for more information about the general pattern

+        'proto_out_dir': '',
+        'proto_relpath': '<(proto_dir_relpath)',
       },
-      'export_dependent_settings': [
-        '../../third_party/protobuf/protobuf.gyp:protobuf_lite',
-      ],
-      # This target exports a hard dependency because it contains generated
-      # header files.
-      'hard_dependency': 1,
+      'includes': [ '../../build/protoc.gypi' ],
     },
     # The main cache invalidation library.  External clients should depend
     # only on this.
@@ -170,7 +112,6 @@
       'dependencies': [
         '../../base/base.gyp:base',
         'cacheinvalidation_proto',
-        'cacheinvalidation_proto_cpp',
       ],
       # This target exports a hard dependency because its include files
       # include generated header files from cache_invalidation_proto_cpp.
@@ -183,7 +124,6 @@
       },
       'export_dependent_settings': [
         '../../base/base.gyp:base',
-        'cacheinvalidation_proto_cpp',
       ],
     },
     # Unittests for the cache invalidation library.