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

Side by Side 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 unified diff | Download patch | Annotate | Revision Log
« 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 »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 { 4 {
5 'variables': { 5 'variables': {
6 'chromium_code': 1, 6 'chromium_code': 1,
7 7
8 'variables': { 8 'variables': {
9 'version_py_path': 'tools/build/version.py', 9 'version_py_path': 'tools/build/version.py',
10 'version_path': 'VERSION', 10 'version_path': 'VERSION',
(...skipping 1593 matching lines...) Expand 10 before | Expand all | Expand 10 after
1604 }, 1604 },
1605 }, 1605 },
1606 'configurations': { 1606 'configurations': {
1607 'Common_Base': { 1607 'Common_Base': {
1608 'msvs_target_platform': 'x64', 1608 'msvs_target_platform': 'x64',
1609 }, 1609 },
1610 }, 1610 },
1611 }, 1611 },
1612 ]}, # 'targets' 1612 ]}, # 'targets'
1613 ], # OS=="win" 1613 ], # OS=="win"
1614 ['os_posix == 1 and OS != "mac"', { 1614 ['OS != "mac"', {
1615 'targets': [{ 1615 'targets': [{
1616 'target_name': 'packed_resources', 1616 'target_name': 'packed_resources',
1617 'type': 'none', 1617 'type': 'none',
1618 'variables': { 1618 'variables': {
1619 'repack_path': '../tools/data_pack/repack.py', 1619 'repack_path': '../tools/data_pack/repack.py',
1620 }, 1620 },
1621 'actions': [ 1621 'actions': [
1622 # TODO(mark): These actions are duplicated for the Mac in the 1622 # TODO(mark): These actions are duplicated for the Mac in the
1623 # chrome_dll target. Can they be unified? 1623 # chrome_dll target. Can they be unified?
1624 # 1624 #
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
1669 'conditions': [ 1669 'conditions': [
1670 ['branding=="Chrome"', { 1670 ['branding=="Chrome"', {
1671 'branding_flag': ['-b', 'google_chrome',], 1671 'branding_flag': ['-b', 'google_chrome',],
1672 }, { # else: branding!="Chrome" 1672 }, { # else: branding!="Chrome"
1673 'branding_flag': ['-b', 'chromium',], 1673 'branding_flag': ['-b', 'chromium',],
1674 }], 1674 }],
1675 ], 1675 ],
1676 }, 1676 },
1677 'inputs': [ 1677 'inputs': [
1678 'tools/build/repack_locales.py', 1678 'tools/build/repack_locales.py',
1679 # NOTE: Ideally the common command args would be shared amongst 1679 '<!@pymod_do_main(repack_locales -i <(branding_flag) -g <(grit_out _dir) -s <(SHARED_INTERMEDIATE_DIR) -x <(INTERMEDIATE_DIR) <(locales))'
1680 # inputs/outputs/action, but the args include shell variables
1681 # which need to be passed intact, and command expansion wants
1682 # to expand the shell variables. Adding the explicit quoting
1683 # here was the only way it seemed to work.
1684 '>!@(<(repack_locales_cmd) -i <(branding_flag) -g \'<(grit_out_dir )\' -s \'<(SHARED_INTERMEDIATE_DIR)\' -x \'<(INTERMEDIATE_DIR)\' <(locales))',
1685 ], 1680 ],
1686 'outputs': [ 1681 'outputs': [
1687 '>!@(<(repack_locales_cmd) -o -g \'<(grit_out_dir)\' -s \'<(SHARED _INTERMEDIATE_DIR)\' -x \'<(INTERMEDIATE_DIR)\' <(locales))', 1682 '<!@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
1688 ], 1683 ],
1689 'action': [ 1684 'action': [
1690 '<@(repack_locales_cmd)', 1685 '<@(repack_locales_cmd)',
1691 '<@(branding_flag)', 1686 '<@(branding_flag)',
1692 '-g', '<(grit_out_dir)', 1687 '-g', '<(grit_out_dir)',
1693 '-s', '<(SHARED_INTERMEDIATE_DIR)', 1688 '-s', '<(SHARED_INTERMEDIATE_DIR)',
1694 '-x', '<(INTERMEDIATE_DIR)', 1689 '-x', '<(INTERMEDIATE_DIR)',
1695 '<@(locales)', 1690 '<@(locales)',
1696 ], 1691 ],
1697 }, 1692 },
1698 ], 1693 ],
1699 # We'll install the resource files to the product directory. 1694 # We'll install the resource files to the product directory.
1700 'copies': [ 1695 'copies': [
1701 { 1696 {
1702 'destination': '<(PRODUCT_DIR)/locales', 1697 'destination': '<(PRODUCT_DIR)/locales',
1703 'files': [ 1698 'files': [
1704 '>!@(<(repack_locales_cmd) -o -g \'<(grit_out_dir)\' -s \'<(SHARED _INTERMEDIATE_DIR)\' -x \'<(INTERMEDIATE_DIR)\' <(locales))', 1699 '<!@pymod_do_main(repack_locales -o -g <(grit_out_dir) -s <(SHARED _INTERMEDIATE_DIR) -x <(INTERMEDIATE_DIR) <(locales))'
1705 ], 1700 ],
1706 }, 1701 },
1707 { 1702 {
1708 'destination': '<(PRODUCT_DIR)', 1703 'destination': '<(PRODUCT_DIR)',
1709 'files': [ 1704 'files': [
1710 '<(INTERMEDIATE_DIR)/repack/chrome.pak' 1705 '<(INTERMEDIATE_DIR)/repack/chrome.pak'
1711 ], 1706 ],
1712 }, 1707 },
1713 ], 1708 ],
1714 }], # targets 1709 }], # targets
1715 }], # os_posix == 1 and OS != "mac" 1710 }], # OS != "mac"
1716 ], # 'conditions' 1711 ], # 'conditions'
1717 } 1712 }
OLDNEW
« 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