diff options
| author | joi@chromium.org <joi@chromium.org@7262f16d-afe8-6277-6482-052fa10e57b1> | 2014-03-03 14:36:43 +0000 |
|---|---|---|
| committer | joi@chromium.org <joi@chromium.org@7262f16d-afe8-6277-6482-052fa10e57b1> | 2014-03-03 14:36:43 +0000 |
| commit | 77646803647fbfac846a54cc4e42cc265a320d6f (patch) | |
| tree | 3547d65d6673edf5a91bca870191dc9877a85367 | |
| parent | db2e077842c311c22eb33a13cc9eb9fadb7def5a (diff) | |
| download | grit-77646803647fbfac846a54cc4e42cc265a320d6f.tar.gz | |
Start to implicitly include \n in rc_header_format.
Certain tools such as ninja perform escaping on the arguments passed to grit
and that makes it difficult to pass \n at the end of the rc_header_format.
This CL makes the new line at the end implicit by adding automatically.
BUG=338759
Landing for aurimas@chromium.org, patch from issue 183513005.
Review URL: https://codereview.chromium.org/176993010
git-svn-id: http://grit-i18n.googlecode.com/svn/trunk@155 7262f16d-afe8-6277-6482-052fa10e57b1
| -rw-r--r-- | grit/format/rc_header.py | 3 | ||||
| -rw-r--r-- | grit/format/rc_header_unittest.py | 2 | ||||
| -rw-r--r-- | grit/tool/build.py | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/grit/format/rc_header.py b/grit/format/rc_header.py index ef53b0f..74e7127 100644 --- a/grit/format/rc_header.py +++ b/grit/format/rc_header.py @@ -53,7 +53,8 @@ def FormatDefines(root, output_all_resource_defines=True, items = root.ActiveDescendants() if not rc_header_format: - rc_header_format = "#define {textual_id} {numeric_id}\n" + rc_header_format = "#define {textual_id} {numeric_id}" + rc_header_format += "\n" seen = set() for item in items: if not isinstance(item, message.MessageNode): diff --git a/grit/format/rc_header_unittest.py b/grit/format/rc_header_unittest.py index dccead1..5d780e3 100644 --- a/grit/format/rc_header_unittest.py +++ b/grit/format/rc_header_unittest.py @@ -181,7 +181,7 @@ class RcHeaderFormatterUnittest(unittest.TestCase): # Using a custom rc_header format string. grd.AssignRcHeaderFormat( - '#define {textual_id} _Pragma("{textual_id}") {numeric_id}\n') + '#define {textual_id} _Pragma("{textual_id}") {numeric_id}') output = rc_header.FormatDefines(grd, grd.ShouldOutputAllResourceDefines(), grd.GetRcHeaderFormat()) self.assertEqual(('#define IDR_LOGO _Pragma("IDR_LOGO") 300\n' diff --git a/grit/tool/build.py b/grit/tool/build.py index d152d64..2bb8085 100644 --- a/grit/tool/build.py +++ b/grit/tool/build.py @@ -85,7 +85,7 @@ Options: -h HEADERFORMAT Custom format string to use for generating rc header files. The string should have two placeholders: {textual_id} - and {numeric_id}. E.g. "#define {textual_id} {numeric_id}\n" + and {numeric_id}. E.g. "#define {textual_id} {numeric_id}" Otherwise it will use the default "#define SYMBOL 1234" Conditional inclusion of resources only affects the output of files which |