diff options
author | tnakamura@webrtc.org <tnakamura@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2013-05-10 22:33:50 +0000 |
---|---|---|
committer | tnakamura@webrtc.org <tnakamura@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2013-05-10 22:33:50 +0000 |
commit | 22aedca9f19b6b1260148a46792dc0613d985c8c (patch) | |
tree | f6c25e21d3f7b6ddeee0f043c1fc5c78d6ac40a9 | |
parent | 4de065dad7914b7518ffc8c98cb59b903ce41518 (diff) | |
download | webrtc-22aedca9f19b6b1260148a46792dc0613d985c8c.tar.gz |
Revert 3977
BUG=webrtc:1749
> Update protoc.gypi to match Chromium's latest.
>
> This is in preparation for enabling protobufs in Chromium. Requires
> syncing tools/protoc_wrapper.
>
> BUG=webrtc:830
> R=kjellander@webrtc.org
>
> Review URL: https://webrtc-codereview.appspot.com/1426004
TBR=andrew@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/1453005
git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@4001 4adac7df-926f-26a2-2b94-8c16560cd09d
-rw-r--r-- | build/protoc.gypi | 60 |
1 files changed, 11 insertions, 49 deletions
diff --git a/build/protoc.gypi b/build/protoc.gypi index a996c5c4..70bf71e1 100644 --- a/build/protoc.gypi +++ b/build/protoc.gypi @@ -1,21 +1,14 @@ -# Copyright (c) 2013 The WebRTC project authors. All Rights Reserved. -# -# Use of this source code is governed by a BSD-style license -# that can be found in the LICENSE file in the root of the source -# tree. An additional intellectual property rights grant can be found -# in the file PATENTS. All contributing project authors may -# be found in the AUTHORS file in the root of the source tree. +# 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. -# Copied from Chromium's src/build/protoc.gypi -# # It was necessary to copy this file to WebRTC, because the path to # build/common.gypi is different for the standalone and Chromium builds. Gyp # doesn't permit conditional inclusion or variable expansion in include paths. # http://code.google.com/p/gyp/wiki/InputFormatReference#Including_Other_Files # This file is meant to be included into a target to provide a rule -# to invoke protoc in a consistent manner. For Java-targets, see -# protoc_java.gypi. +# to invoke protoc in a consistent manner. # # To use this, create a gyp target with the following form: # { @@ -44,14 +37,6 @@ # like: # #include "dir/for/my_proto_lib/foo.pb.h" # -# If you need to add an EXPORT macro to a protobuf's c++ header, set the -# 'cc_generator_options' variable with the value: 'dllexport_decl=FOO_EXPORT:' -# e.g. 'dllexport_decl=BASE_EXPORT:' -# -# It is likely you also need to #include a file for the above EXPORT macro to -# work. You can do so with the 'cc_include' variable. -# e.g. 'base/base_export.h' -# # Implementation notes: # A proto_out_dir of foo/bar produces # <(SHARED_INTERMEDIATE_DIR)/protoc_out/foo/bar/{file1,file2}.pb.{cc,h} @@ -59,26 +44,16 @@ { '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_generator_options%': '', - 'cc_include%': '', 'proto_in_dir%': '.', - 'conditions': [ - ['use_system_protobuf==0', { - 'protoc': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)protoc<(EXECUTABLE_SUFFIX)', - }, { # use_system_protobuf==1 - 'protoc': '<!(which protoc)', - }], - ], }, 'rules': [ { 'rule_name': 'genproto', 'extension': 'proto', 'inputs': [ - '<(protoc_wrapper)', '<(protoc)', ], 'outputs': [ @@ -87,25 +62,14 @@ '<(cc_dir)/<(RULE_INPUT_ROOT).pb.h', ], 'action': [ - 'python', - '<(protoc_wrapper)', - '--include', - '<(cc_include)', - '--protobuf', - '<(cc_dir)/<(RULE_INPUT_ROOT).pb.h', - # Using the --arg val form (instead of --arg=val) allows gyp's msvs rule - # generation to correct 'val' which is a path. - '--proto-in-dir','<(proto_in_dir)', + '<(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-file','<(RULE_INPUT_ROOT)<(RULE_INPUT_EXT)', - '--use-system-protobuf=<(use_system_protobuf)', - '--', - '<(protoc)', - '--cpp_out', '<(cc_generator_options)<(cc_dir)', - '--python_out', '<(py_dir)', - ], - 'msvs_cygwin_shell': 0, + '<(proto_in_dir)/<(RULE_INPUT_ROOT)<(RULE_INPUT_EXT)', + '--cpp_out=<(cc_dir)', + '--python_out=<(py_dir)', + ], 'message': 'Generating C++ and Python code from <(RULE_INPUT_PATH)', 'process_outputs_as_sources': 1, }, @@ -116,12 +80,10 @@ ], 'include_dirs': [ '<(SHARED_INTERMEDIATE_DIR)/protoc_out', - '<(DEPTH)', ], 'direct_dependent_settings': { 'include_dirs': [ '<(SHARED_INTERMEDIATE_DIR)/protoc_out', - '<(DEPTH)', ] }, 'export_dependent_settings': [ |