[go: nahoru, domu]

Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4119)

Unified Diff: build/protoc.gypi
Issue 10796051: Change protoc build rule to not use cygwin bash. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix the additional paths Created 8 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « DEPS ('k') | sync/notifier/chrome_invalidation_client.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/protoc.gypi
diff --git a/build/protoc.gypi b/build/protoc.gypi
index 555c5be45d29f3e0866eddc6aa996ec6a8a675ad..41d4aea71207b6fcc7636da78ae30e5faebc1c45 100644
--- a/build/protoc.gypi
+++ b/build/protoc.gypi
@@ -2,7 +2,7 @@
# 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,
},
« no previous file with comments | « DEPS ('k') | sync/notifier/chrome_invalidation_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698