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

Side by Side Diff: chrome/chrome.gyp

Issue 5259007: Undo removal of chrome_dll_version from r67457. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge to head Created 10 years 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/chrome_dll_version.rc.version ('k') | chrome/chrome_dll.gypi » ('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) 2010 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2010 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 1660 matching lines...) Expand 10 before | Expand all | Expand 10 after
1671 ], 1671 ],
1672 'conditions': [ 1672 'conditions': [
1673 ['win_use_allocator_shim==1', { 1673 ['win_use_allocator_shim==1', {
1674 'dependencies': [ 1674 'dependencies': [
1675 '../base/allocator/allocator.gyp:*', 1675 '../base/allocator/allocator.gyp:*',
1676 ], 1676 ],
1677 }], 1677 }],
1678 ], 1678 ],
1679 }, 1679 },
1680 { 1680 {
1681 'target_name': 'chrome_dll_version',
1682 'type': 'none',
1683 #'msvs_guid': '414D4D24-5D65-498B-A33F-3A29AD3CDEDC',
1684 'dependencies': [
1685 '../build/util/build_util.gyp:lastchange',
1686 ],
1687 'direct_dependent_settings': {
1688 'include_dirs': [
1689 '<(SHARED_INTERMEDIATE_DIR)/chrome_dll_version',
1690 ],
1691 },
1692 'actions': [
1693 {
1694 'action_name': 'version',
1695 'variables': {
1696 'lastchange_path':
1697 '<(SHARED_INTERMEDIATE_DIR)/build/LASTCHANGE',
1698 'template_input_path': 'app/chrome_dll_version.rc.version',
1699 },
1700 'conditions': [
1701 [ 'branding == "Chrome"', {
1702 'variables': {
1703 'branding_path': 'app/theme/google_chrome/BRANDING',
1704 },
1705 }, { # else branding!="Chrome"
1706 'variables': {
1707 'branding_path': 'app/theme/chromium/BRANDING',
1708 },
1709 }],
1710 ],
1711 'inputs': [
1712 '<(template_input_path)',
1713 '<(version_path)',
1714 '<(branding_path)',
1715 '<(lastchange_path)',
1716 ],
1717 'outputs': [
1718 '<(SHARED_INTERMEDIATE_DIR)/chrome_dll_version/chrome_dll_versio n.rc',
1719 ],
1720 'action': [
1721 'python',
1722 '<(version_py_path)',
1723 '-f', '<(version_path)',
1724 '-f', '<(branding_path)',
1725 '-f', '<(lastchange_path)',
1726 '<(template_input_path)',
1727 '<@(_outputs)',
1728 ],
1729 'message': 'Generating version information in <(_outputs)'
1730 },
1731 ],
1732 },
1733 {
1681 'target_name': 'chrome_version_header', 1734 'target_name': 'chrome_version_header',
1682 'type': 'none', 1735 'type': 'none',
1683 'hard_dependency': 1, 1736 'hard_dependency': 1,
1684 'dependencies': [ 1737 'dependencies': [
1685 '../build/util/build_util.gyp:lastchange', 1738 '../build/util/build_util.gyp:lastchange',
1686 ], 1739 ],
1687 'actions': [ 1740 'actions': [
1688 { 1741 {
1689 'action_name': 'version_header', 1742 'action_name': 'version_header',
1690 'variables': { 1743 'variables': {
(...skipping 183 matching lines...) Expand 10 before | Expand all | Expand 10 after
1874 }], # targets 1927 }], # targets
1875 }], # OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris" 1928 }], # OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"
1876 ], # 'conditions' 1929 ], # 'conditions'
1877 } 1930 }
1878 1931
1879 # Local Variables: 1932 # Local Variables:
1880 # tab-width:2 1933 # tab-width:2
1881 # indent-tabs-mode:nil 1934 # indent-tabs-mode:nil
1882 # End: 1935 # End:
1883 # vim: set expandtab tabstop=2 shiftwidth=2: 1936 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « chrome/app/chrome_dll_version.rc.version ('k') | chrome/chrome_dll.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698