diff options
| author | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-28 05:25:06 +0000 |
|---|---|---|
| committer | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-28 05:25:06 +0000 |
| commit | 3354c312c47227dd6529abae0b755afd3fe0fabb (patch) | |
| tree | 24207f9301d9ff3fc97fff397baf3a3a8ff3b885 /build/protoc.gypi | |
| parent | a263b0455b691f913c9d246c20c4970daf465271 (diff) | |
| download | chromium_src-3354c312c47227dd6529abae0b755afd3fe0fabb.zip chromium_src-3354c312c47227dd6529abae0b755afd3fe0fabb.tar.gz chromium_src-3354c312c47227dd6529abae0b755afd3fe0fabb.tar.bz2 | |
Revert 123894 - Remove hand-rolled protobufs generation; enable rel paths in protoc.gypi
protoc.gypi now accepts a relative path to handle the way that
protoc_out_dir is applied to build the generated path.
Remove the 'cacheinvalidation_proto_cpp' target and instead generate a
static_library to begin with. Simplify all steps by removing the actions
and including the protoc.gypi file.
BUG=113339
Review URL: http://codereview.chromium.org/9378041
TBR=kushi.p@gmail.com
Review URL: https://chromiumcodereview.appspot.com/9480022
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@123896 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/protoc.gypi')
| -rw-r--r-- | build/protoc.gypi | 29 |
1 files changed, 6 insertions, 23 deletions
diff --git a/build/protoc.gypi b/build/protoc.gypi index 5c1fd2b..555c5be 100644 --- a/build/protoc.gypi +++ b/build/protoc.gypi @@ -1,4 +1,4 @@ -# Copyright (c) 2012 The Chromium Authors. All rights reserved. +# Copyright (c) 2011 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. @@ -32,24 +32,8 @@ # like: # #include "dir/for/my_proto_lib/foo.pb.h" # -# The 'proto_relpath' variable specifies another way to provide the path -# suffix that files are generated under. 'proto_relpath' exists because there -# are some protos which import using qualified paths, rather than the more -# common relative import. -# -# By using 'proto_relpath', projects can continue to use qualified imports -# instead of enforcing an import style through this gypi. If provided, -# 'proto_relpath' must have a trailing slash. -# # Implementation notes: -# A 'proto_out_dir' of 'foo/bar', with no 'proto_relpath' provided, produces: -# <(SHARED_INTERMEDIATE_DIR)/protoc_out/foo/bar/{file1,file2}.pb.{cc,h} -# <(SHARED_INTERMEDIATE_DIR)/pyproto/foo/bar/{file1,file2}_pb2.py -# -# By setting 'proto_relpath' to 'foo/bar', with a 'proto_out_dir' of '', the -# protos can use qualified imports instead of relative imports, -# e.g. #import "foo/bar/file2.proto"; instead of #import "file2.proto"; -# A 'proto_out_dir' of '', with a 'proto_relpath' of 'foo/bar/' produces: +# A proto_out_dir of foo/bar produces # <(SHARED_INTERMEDIATE_DIR)/protoc_out/foo/bar/{file1,file2}.pb.{cc,h} # <(SHARED_INTERMEDIATE_DIR)/pyproto/foo/bar/{file1,file2}_pb2.py @@ -59,7 +43,6 @@ 'cc_dir': '<(SHARED_INTERMEDIATE_DIR)/protoc_out/<(proto_out_dir)', 'py_dir': '<(PRODUCT_DIR)/pyproto/<(proto_out_dir)', 'proto_in_dir%': '.', - 'proto_relpath%': '', }, 'rules': [ { @@ -69,16 +52,16 @@ '<(protoc)', ], 'outputs': [ - '<(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', + '<(py_dir)/<(RULE_INPUT_ROOT)_pb2.py', + '<(cc_dir)/<(RULE_INPUT_ROOT).pb.cc', + '<(cc_dir)/<(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)/<(proto_relpath)<(RULE_INPUT_ROOT)<(RULE_INPUT_EXT)', + '<(proto_in_dir)/<(RULE_INPUT_ROOT)<(RULE_INPUT_EXT)', '--cpp_out=<(cc_dir)', '--python_out=<(py_dir)', ], |