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

Unified Diff: chrome/chrome.gyp

Issue 7648001: Enable the packed_resources target on Windows. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 4 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 | « chrome/app/resources/locale_settings_win.grd ('k') | chrome/tools/build/repack_locales.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome.gyp
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index b4f6bad22dafc2cbeabebdee529e4fa06571b3dd..640b57329b526cde1faff23357167df668aeccb5 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -1611,7 +1611,7 @@
},
]}, # 'targets'
], # OS=="win"
- ['os_posix == 1 and OS != "mac"', {
+ ['OS != "mac"', {
'targets': [{
'target_name': 'packed_resources',
'type': 'none',
@@ -1676,15 +1676,10 @@
},
'inputs': [
'tools/build/repack_locales.py',
- # NOTE: Ideally the common command args would be shared amongst
- # inputs/outputs/action, but the args include shell variables
- # which need to be passed intact, and command expansion wants
- # to expand the shell variables. Adding the explicit quoting
- # here was the only way it seemed to work.
- '>!@(<(repack_locales_cmd) -i <(branding_flag) -g \'<(grit_out_dir)\' -s \'<(SHARED_INTERMEDIATE_DIR)\' -x \'<(INTERMEDIATE_DIR)\' <(locales))',
+ '<!@pymod_do_main(repack_locales -i <(branding_flag) -g <(grit_out_dir) -s <(SHARED_INTERMEDIATE_DIR) -x <(INTERMEDIATE_DIR) <(locales))'
],
'outputs': [
- '>!@(<(repack_locales_cmd) -o -g \'<(grit_out_dir)\' -s \'<(SHARED_INTERMEDIATE_DIR)\' -x \'<(INTERMEDIATE_DIR)\' <(locales))',
+ '<!@pymod_do_main(repack_locales -o -g <(grit_out_dir) -s <(SHARED_INTERMEDIATE_DIR) -x <(INTERMEDIATE_DIR) <(locales))'
Nico 2011/08/12 21:46:25 I'm always unsure about the difference between < a
tony 2011/08/12 21:53:36 I don't understand the difference either. I was j
],
'action': [
'<@(repack_locales_cmd)',
@@ -1701,7 +1696,7 @@
{
'destination': '<(PRODUCT_DIR)/locales',
'files': [
- '>!@(<(repack_locales_cmd) -o -g \'<(grit_out_dir)\' -s \'<(SHARED_INTERMEDIATE_DIR)\' -x \'<(INTERMEDIATE_DIR)\' <(locales))',
+ '<!@pymod_do_main(repack_locales -o -g <(grit_out_dir) -s <(SHARED_INTERMEDIATE_DIR) -x <(INTERMEDIATE_DIR) <(locales))'
],
},
{
@@ -1712,6 +1707,6 @@
},
],
}], # targets
- }], # os_posix == 1 and OS != "mac"
+ }], # OS != "mac"
], # 'conditions'
}
« no previous file with comments | « chrome/app/resources/locale_settings_win.grd ('k') | chrome/tools/build/repack_locales.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698