| Index: build/protoc.gypi
|
| ===================================================================
|
| --- build/protoc.gypi (revision 155895)
|
| +++ build/protoc.gypi (working copy)
|
| @@ -39,9 +39,12 @@
|
|
|
| {
|
| 'variables': {
|
| + 'protoc_wrapper': '<(DEPTH)/tools/protoc_wrapper/protoc_wrapper.py',
|
| 'protoc': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)protoc<(EXECUTABLE_SUFFIX)',
|
| 'cc_dir': '<(SHARED_INTERMEDIATE_DIR)/protoc_out/<(proto_out_dir)',
|
| 'py_dir': '<(PRODUCT_DIR)/pyproto/<(proto_out_dir)',
|
| + 'cc_extra%': '',
|
| + 'cc_include%': '',
|
| 'proto_in_dir%': '.',
|
| },
|
| 'rules': [
|
| @@ -49,6 +52,7 @@
|
| 'rule_name': 'genproto',
|
| 'extension': 'proto',
|
| 'inputs': [
|
| + '<(protoc_wrapper)',
|
| '<(protoc)',
|
| ],
|
| 'outputs': [
|
| @@ -57,6 +61,9 @@
|
| '<(cc_dir)/<(RULE_INPUT_ROOT).pb.h',
|
| ],
|
| 'action': [
|
| + 'python',
|
| + '<(protoc_wrapper)',
|
| + '<(cc_include)' ':' '<(cc_dir)/<(RULE_INPUT_ROOT).pb.h',
|
| '<(protoc)',
|
| # Using the --arg val form (instead of --arg=val) allows gyp's msvs rule
|
| # generation to correct 'val' which is a path.
|
| @@ -64,8 +71,8 @@
|
| # 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)',
|
| - '--cpp_out','<(cc_dir)',
|
| - '--python_out','<(py_dir)',
|
| + '--cpp_out', '<(cc_extra)' '<(cc_dir)',
|
| + '--python_out', '<(py_dir)',
|
| ],
|
| 'msvs_cygwin_shell': 0,
|
| 'message': 'Generating C++ and Python code from <(RULE_INPUT_PATH)',
|
| @@ -78,6 +85,7 @@
|
| ],
|
| 'include_dirs': [
|
| '<(SHARED_INTERMEDIATE_DIR)/protoc_out',
|
| + '<(DEPTH)',
|
| ],
|
| 'direct_dependent_settings': {
|
| 'include_dirs': [
|
|
|