diff options
| author | iannucci@chromium.org <iannucci@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-31 01:07:32 +0000 |
|---|---|---|
| committer | iannucci@chromium.org <iannucci@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-31 01:07:32 +0000 |
| commit | 69e1c46004ad506b2a7cfbce218f4cd20ba76bfe (patch) | |
| tree | a888a9aa5dde202f123e8faba2defc569fceb1c7 /build/protoc.gypi | |
| parent | 9c5620d351e6f8f384de2b3c8a3d2ec34101e21e (diff) | |
| download | chromium_src-69e1c46004ad506b2a7cfbce218f4cd20ba76bfe.zip chromium_src-69e1c46004ad506b2a7cfbce218f4cd20ba76bfe.tar.gz chromium_src-69e1c46004ad506b2a7cfbce218f4cd20ba76bfe.tar.bz2 | |
Change protoc build rule to not use cygwin bash.
Now protoc.exe will be directly invoked.
This rolls cacheinvalidation from r218:r219
------------------------------------------------------------------------
r219 | ghcooper@gmail.com | 2012-07-20 17:44:14 -0700 (Fri, 20 Jul 2012) | 1 line
move protos out of v2/; use relative paths for proto imports
------------------------------------------------------------------------
This also rolls gyp from r1440:r1441
------------------------------------------------------------------------
r1441 | iannucci@chromium.org | 2012-07-26 17:54:17 -0700 (Thu, 26 Jul 2012) | 8 lines
Fix bug: non-cygwin actions incorrectly run options through _FixPath.
This adds an additional heuristic to the existing one. Now if an option begins
with either a '/' OR a '-', it assumes it's not a strict path.
Added a TODO which notes that the existing (and new) behavior will miss options
such as '--opt=a/posix/path', and '/opt:a/posix/path'.
Review URL: https://chromiumcodereview.appspot.com/10829049
------------------------------------------------------------------------
BUG=123026,113339
R=scottmg@chromium.org,cmp@chromium.org,nsylvain@chromium.org,jar@chromium.org,akalin@chromium.org,maruel@chromium.org
TEST=
Review URL: https://chromiumcodereview.appspot.com/10796051
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@149100 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/protoc.gypi')
| -rw-r--r-- | build/protoc.gypi | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/build/protoc.gypi b/build/protoc.gypi index 555c5be..3f776f2 100644 --- a/build/protoc.gypi +++ b/build/protoc.gypi @@ -1,8 +1,8 @@ -# Copyright (c) 2011 The Chromium Authors. All rights reserved. +# Copyright (c) 2012 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. -# This file is meant to be included into an target to provide a rule +# This file is meant to be included into a target to provide a rule # to invoke protoc in a consistent manner. # # To use this, create a gyp target with the following form: @@ -58,13 +58,16 @@ ], 'action': [ '<(protoc)', - '--proto_path=<(proto_in_dir)', + # Using the --arg val form (instead of --arg=val) allows gyp's msvs rule + # generation to correct 'val' which is a path. + '--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)', - '--cpp_out=<(cc_dir)', - '--python_out=<(py_dir)', + '--cpp_out','<(cc_dir)', + '--python_out','<(py_dir)', ], + 'msvs_cygwin_shell': 0, 'message': 'Generating C++ and Python code from <(RULE_INPUT_PATH)', 'process_outputs_as_sources': 1, }, |