Enable the packed_resources target on Windows.

This target generates the locale .pak files on Windows.  Since nothing
depends on this target, it doesn't build by default (they're not used
yet).

Specific changes:
- Have locale_settings_win.grd generate .pak files.
- Use pymod_do_main to avoid some shell escaping problems (and it's a bit
  faster).
- Rewrite repack_locales.py to work with pymod_do_main.

BUG=92724


Review URL: http://codereview.chromium.org/7648001

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@97012 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 5 insertions, 10 deletions

diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index 10eede0..46544a9 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -1616,7 +1616,7 @@
         },
       ]},  # 'targets'
     ],  # OS=="win"
-    ['os_posix == 1 and OS != "mac"', {
+    ['OS != "mac"', {
       'targets': [{
         'target_name': 'packed_resources',
         'type': 'none',
@@ -1681,15 +1681,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))'
             ],
             'action': [
               '<@(repack_locales_cmd)',
@@ -1706,7 +1701,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))'
             ],
           },
           {
@@ -1717,6 +1712,6 @@
           },
         ],
       }],  # targets
-    }],  # os_posix == 1 and OS != "mac"
+    }],  # OS != "mac"
   ],  # 'conditions'
 }