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

Side by Side Diff: chrome/installer/installer.gyp

Issue 150012: Another go at switching mini_installer to gyp. (Closed) Base URL: svn://chrome-svn.corp.google.com/chrome/trunk/src/
Patch Set: '' Created 11 years, 5 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 | « build/common.gypi ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 { 1 {
2 'variables': { 2 'variables': {
3 'version_py': '../../chrome/tools/build/version.py', 3 'version_py': '../../chrome/tools/build/version.py',
4 'version_path': '../../chrome/VERSION', 4 'version_path': '../../chrome/VERSION',
5 'lastchange_path': '<(SHARED_INTERMEDIATE_DIR)/build/LASTCHANGE', 5 'lastchange_path': '<(SHARED_INTERMEDIATE_DIR)/build/LASTCHANGE',
6 # 'branding_dir' is set in the 'conditions' section at the bottom. 6 # 'branding_dir' is set in the 'conditions' section at the bottom.
7 }, 7 },
8 'includes': [ 8 'includes': [
9 '../../build/common.gypi', 9 '../../build/common.gypi',
10 ], 10 ],
(...skipping 292 matching lines...) Expand 10 before | Expand all | Expand 10 after
303 'direct_dependent_settings': { 303 'direct_dependent_settings': {
304 'include_dirs': [ 304 'include_dirs': [
305 '<(SHARED_INTERMEDIATE_DIR)/installer_util_strings', 305 '<(SHARED_INTERMEDIATE_DIR)/installer_util_strings',
306 ], 306 ],
307 }, 307 },
308 }, 308 },
309 { 309 {
310 'target_name': 'mini_installer', 310 'target_name': 'mini_installer',
311 'type': 'executable', 311 'type': 'executable',
312 'msvs_guid': '24A5AC7C-280B-4899-9153-6BA570A081E7', 312 'msvs_guid': '24A5AC7C-280B-4899-9153-6BA570A081E7',
313 'msvs_existing_vcproj': 'mini_installer/mini_installer.vcproj',
314 'dependencies': [ 313 'dependencies': [
315 '../chrome.gyp:chrome', 314 '../chrome.gyp:chrome',
316 '../chrome.gyp:chrome_dll', 315 '../chrome.gyp:chrome_dll',
317 '../../testing/gtest.gyp:gtest', 316 '../../testing/gtest.gyp:gtest',
318 'setup', 317 'setup',
319 ], 318 ],
320 'include_dirs': [ 319 'include_dirs': [
321 '../..', 320 '../..',
322 '<(PRODUCT_DIR)', 321 '<(PRODUCT_DIR)',
323 '<(INTERMEDIATE_DIR)', 322 '<(INTERMEDIATE_DIR)',
(...skipping 17 matching lines...) Expand all
341 'VCLinkerTool': { 340 'VCLinkerTool': {
342 'RandomizedBaseAddress': '1', 341 'RandomizedBaseAddress': '1',
343 'DataExecutionPrevention': '0', 342 'DataExecutionPrevention': '0',
344 'AdditionalDependencies': [ 343 'AdditionalDependencies': [
345 '"$(VCInstallDir)crt\\src\\intel\\mt_lib\\memset.obj"', 344 '"$(VCInstallDir)crt\\src\\intel\\mt_lib\\memset.obj"',
346 '"$(VCInstallDir)crt\\src\\intel\\mt_lib\\P4_memset.obj"', 345 '"$(VCInstallDir)crt\\src\\intel\\mt_lib\\P4_memset.obj"',
347 'shlwapi.lib', 346 'shlwapi.lib',
348 ], 347 ],
349 'AdditionalLibraryDirectories': 348 'AdditionalLibraryDirectories':
350 ['<(DEPTH)/third_party/platformsdk_win2008_6_1/files/Lib;<(PRODU CT_DIR)/lib'], 349 ['<(DEPTH)/third_party/platformsdk_win2008_6_1/files/Lib;<(PRODU CT_DIR)/lib'],
351 'AdditionalOptions':
352 '/safeseh:NO /dynamicbase:no /nxcompat /fixed',
353 'DelayLoadDLLs=': [], 350 'DelayLoadDLLs=': [],
354 'EntryPointSymbol': 'MainEntryPoint', 351 'EntryPointSymbol': 'MainEntryPoint',
355 'GenerateMapFile': 'true', 352 'GenerateMapFile': 'true',
356 'IgnoreAllDefaultLibraries': 'true', 353 'IgnoreAllDefaultLibraries': 'true',
357 'OptimizeForWindows98': '1', 354 'OptimizeForWindows98': '1',
358 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS 355 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS
359 }, 356 },
360 }, 357 },
361 'configurations': { 358 'configurations': {
362 'Debug': { 359 'Debug': {
(...skipping 258 matching lines...) Expand 10 before | Expand all | Expand 10 after
621 'variables': { 618 'variables': {
622 'branding_dir': '../app/theme/google_chrome', 619 'branding_dir': '../app/theme/google_chrome',
623 }, 620 },
624 }, { # else branding!="Chrome" 621 }, { # else branding!="Chrome"
625 'variables': { 622 'variables': {
626 'branding_dir': '../app/theme/chromium', 623 'branding_dir': '../app/theme/chromium',
627 }, 624 },
628 }], 625 }],
629 ], 626 ],
630 } 627 }
OLDNEW
« no previous file with comments | « build/common.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698