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

Side by Side Diff: chrome/chrome.gyp

Issue 115843: Add Linux packaging tools to the build output and the buildbot archive. (Closed)
Patch Set: merge gyp conditions blocks Created 11 years, 7 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
« no previous file with comments | « no previous file | chrome/installer/installer.gyp » ('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) 2009 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2009 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 { 5 {
6 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 # Define the common dependencies that contain all the actual 8 # Define the common dependencies that contain all the actual
9 # Chromium functionality. This list gets pulled in below by 9 # Chromium functionality. This list gets pulled in below by
10 # the link of the actual chrome (or chromium) executable on 10 # the link of the actual chrome (or chromium) executable on
(...skipping 2243 matching lines...) Expand 10 before | Expand all | Expand 10 after
2254 }], 2254 }],
2255 ['OS=="mac"', { 2255 ['OS=="mac"', {
2256 # Copy web inspector resources to the Contents/Resources folder. 2256 # Copy web inspector resources to the Contents/Resources folder.
2257 'copies': [ 2257 'copies': [
2258 { 2258 {
2259 'destination': '<(PRODUCT_DIR)/<(mac_product_name).app/Contents/Re sources', 2259 'destination': '<(PRODUCT_DIR)/<(mac_product_name).app/Contents/Re sources',
2260 'files': ['<(PRODUCT_DIR)/resources/inspector/'], 2260 'files': ['<(PRODUCT_DIR)/resources/inspector/'],
2261 }, 2261 },
2262 ], 2262 ],
2263 }], 2263 }],
2264 ['OS=="linux"', {
2265 'conditions': [
2266 ['branding=="Chrome"', {
2267 'dependencies': [
2268 'installer/installer.gyp:installer_util',
2269 ],
2270 }],
2271 ],
2272 }],
2264 ['OS=="win"', { 2273 ['OS=="win"', {
2265 'dependencies': [ 2274 'dependencies': [
2266 # On Windows, make sure we've built chrome.dll, which 2275 # On Windows, make sure we've built chrome.dll, which
2267 # contains all of the library code with Chromium 2276 # contains all of the library code with Chromium
2268 # functionality. 2277 # functionality.
2269 'chrome_dll', 2278 'chrome_dll',
2270 'installer/installer.gyp:installer_util', 2279 'installer/installer.gyp:installer_util',
2271 'installer/installer.gyp:installer_util_strings', 2280 'installer/installer.gyp:installer_util_strings',
2272 '../breakpad/breakpad.gyp:breakpad_handler', 2281 '../breakpad/breakpad.gyp:breakpad_handler',
2273 '../breakpad/breakpad.gyp:breakpad_sender', 2282 '../breakpad/breakpad.gyp:breakpad_sender',
(...skipping 1829 matching lines...) Expand 10 before | Expand all | Expand 10 after
4103 # Use outputs of this action as inputs for the main target build. 4112 # Use outputs of this action as inputs for the main target build.
4104 # Seems as a misnomer but makes this happy on Linux (scons). 4113 # Seems as a misnomer but makes this happy on Linux (scons).
4105 'process_outputs_as_sources': 1, 4114 'process_outputs_as_sources': 1,
4106 }, 4115 },
4107 ], # 'actions' 4116 ], # 'actions'
4108 }, 4117 },
4109 ] 4118 ]
4110 }], 4119 }],
4111 ], # 'conditions' 4120 ], # 'conditions'
4112 } 4121 }
OLDNEW
« no previous file with comments | « no previous file | chrome/installer/installer.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698