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

Side by Side Diff: build/common.gypi

Issue 342041: Taking advantage of new configuration inheritance option.... (Closed) Base URL: svn://chrome-svn.corp.google.com/chrome/trunk/src/
Patch Set: '' Created 11 years, 1 month 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 | « DEPS ('k') | chrome/installer/mini_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 # IMPORTANT: 5 # IMPORTANT:
6 # Please don't directly include this file if you are building via gyp_chromium, 6 # Please don't directly include this file if you are building via gyp_chromium,
7 # since gyp_chromium is automatically forcing its inclusion. 7 # since gyp_chromium is automatically forcing its inclusion.
8 { 8 {
9 'variables': { 9 'variables': {
10 # .gyp files should set chromium_code to 1 if they build Chromium-specific 10 # .gyp files should set chromium_code to 1 if they build Chromium-specific
(...skipping 332 matching lines...) Expand 10 before | Expand all | Expand 10 after
343 ], # conditions for coverage 343 ], # conditions for coverage
344 }], # coverage!=0 344 }], # coverage!=0
345 ], # conditions for 'target_defaults' 345 ], # conditions for 'target_defaults'
346 'default_configuration': 'Debug', 346 'default_configuration': 'Debug',
347 'configurations': { 347 'configurations': {
348 # VCLinkerTool LinkIncremental values below: 348 # VCLinkerTool LinkIncremental values below:
349 # 0 == default 349 # 0 == default
350 # 1 == /INCREMENTAL:NO 350 # 1 == /INCREMENTAL:NO
351 # 2 == /INCREMENTAL 351 # 2 == /INCREMENTAL
352 # Debug links incremental, Release does not. 352 # Debug links incremental, Release does not.
353 'Common': {
354 'abstract': 1,
355 'msvs_configuration_attributes': {
356 'OutputDirectory': '$(SolutionDir)$(ConfigurationName)',
357 'IntermediateDirectory': '$(OutDir)\\obj\\$(ProjectName)',
358 'CharacterSet': '1',
359 },
360 'conditions': [
361 ['OS=="win"', {
362 'configuration_platform': 'Win32',
363 }],
364 ],
365 },
353 'Debug': { 366 'Debug': {
367 'inherit_from': ['Common'],
354 'xcode_settings': { 368 'xcode_settings': {
355 'COPY_PHASE_STRIP': 'NO', 369 'COPY_PHASE_STRIP': 'NO',
356 'GCC_OPTIMIZATION_LEVEL': '<(mac_debug_optimization)', 370 'GCC_OPTIMIZATION_LEVEL': '<(mac_debug_optimization)',
357 'OTHER_CFLAGS': [ '<@(debug_extra_cflags)', ], 371 'OTHER_CFLAGS': [ '<@(debug_extra_cflags)', ],
358 }, 372 },
373 'msvs_settings': {
374 'VCCLCompilerTool': {
375 'Optimization': '0',
376 'PreprocessorDefinitions': ['_DEBUG'],
377 'BasicRuntimeChecks': '3',
378 'RuntimeLibrary': '1',
379 },
380 'VCLinkerTool': {
381 'LinkIncremental': '<(msvs_debug_link_incremental)',
382 },
383 'VCResourceCompilerTool': {
384 'PreprocessorDefinitions': ['_DEBUG'],
385 },
386 },
359 'conditions': [ 387 'conditions': [
360 [ 'OS=="win"', { 388 ['OS=="linux"', {
361 'configuration_platform': 'Win32', 389 'cflags': [
362 'msvs_configuration_attributes': { 390 '<@(debug_extra_cflags)',
363 'OutputDirectory': '$(SolutionDir)$(ConfigurationName)', 391 ],
364 'IntermediateDirectory': '$(OutDir)\\obj\\$(ProjectName)',
365 'CharacterSet': '1',
366 },
367 'msvs_settings': {
368 'VCCLCompilerTool': {
369 'Optimization': '0',
370 'PreprocessorDefinitions': ['_DEBUG'],
371 'BasicRuntimeChecks': '3',
372 'RuntimeLibrary': '1',
373 },
374 'VCLinkerTool': {
375 'LinkIncremental': '<(msvs_debug_link_incremental)',
376 },
377 'VCResourceCompilerTool': {
378 'PreprocessorDefinitions': ['_DEBUG'],
379 },
380 },
381 }], 392 }],
382 ['OS=="linux"', {
383 'cflags': [
384 '<@(debug_extra_cflags)',
385 ],
386 }],
387 ], 393 ],
388 }, 394 },
389 'Release': { 395 'Release': {
396 'inherit_from': ['Common'],
390 'defines': [ 397 'defines': [
391 'NDEBUG', 398 'NDEBUG',
392 ], 399 ],
393 'xcode_settings': { 400 'xcode_settings': {
394 'DEAD_CODE_STRIPPING': 'YES', # -Wl,-dead_strip 401 'DEAD_CODE_STRIPPING': 'YES', # -Wl,-dead_strip
395 'GCC_OPTIMIZATION_LEVEL': '<(mac_release_optimization)', 402 'GCC_OPTIMIZATION_LEVEL': '<(mac_release_optimization)',
396 'OTHER_CFLAGS': [ '<@(release_extra_cflags)', ], 403 'OTHER_CFLAGS': [ '<@(release_extra_cflags)', ],
397 }, 404 },
405 'msvs_settings': {
406 'VCLinkerTool': {
407 'LinkIncremental': '1',
408 },
409 },
398 'conditions': [ 410 'conditions': [
399 ['release_valgrind_build==0', { 411 ['release_valgrind_build==0', {
400 'defines': ['NVALGRIND'], 412 'defines': ['NVALGRIND'],
401 }], 413 }],
402 [ 'OS=="win" and msvs_use_common_release', { 414 ['msvs_use_common_release', {
403 'msvs_props': ['release.vsprops'], 415 'msvs_props': ['release.vsprops'],
404 }], 416 }],
405 [ 'OS=="win"', { 417 ['OS=="linux"', {
406 'configuration_platform': 'Win32', 418 'cflags': [
407 'msvs_configuration_attributes': { 419 '<@(release_extra_cflags)',
408 'OutputDirectory': '$(SolutionDir)$(ConfigurationName)', 420 ],
409 'IntermediateDirectory': '$(OutDir)\\obj\\$(ProjectName)',
410 'CharacterSet': '1',
411 },
412 'msvs_settings': {
413 'VCLinkerTool': {
414 'LinkIncremental': '1',
415 },
416 },
417 }], 421 }],
418 ['OS=="linux"', {
419 'cflags': [
420 '<@(release_extra_cflags)',
421 ],
422 }],
423 ], 422 ],
424 }, 423 },
425 'conditions': [ 424 'conditions': [
426 [ 'OS=="win"', { 425 [ 'OS=="win"', {
427 # TODO(bradnelson): add a gyp mechanism to make this more graceful. 426 # TODO(bradnelson): add a gyp mechanism to make this more graceful.
428 'Purify': { 427 'Purify': {
429 'configuration_platform': 'Win32', 428 'inherit_from': ['Release'],
430 'defines': [ 429 'defines': [
431 'NDEBUG',
432 'PURIFY', 430 'PURIFY',
433 'NO_TCMALLOC', 431 'NO_TCMALLOC',
434 ], 432 ],
435 'msvs_configuration_attributes': {
436 'OutputDirectory': '$(SolutionDir)$(ConfigurationName)',
437 'IntermediateDirectory': '$(OutDir)\\obj\\$(ProjectName)',
438 'CharacterSet': '1',
439 },
440 'msvs_settings': { 433 'msvs_settings': {
441 'VCCLCompilerTool': { 434 'VCCLCompilerTool': {
442 'Optimization': '0', 435 'Optimization': '0',
443 'RuntimeLibrary': '0', 436 'RuntimeLibrary': '0',
444 'BufferSecurityCheck': 'false', 437 'BufferSecurityCheck': 'false',
445 }, 438 },
446 'VCLinkerTool': { 439 'VCLinkerTool': {
447 'EnableCOMDATFolding': '1', 440 'EnableCOMDATFolding': '1',
448 'LinkIncremental': '1', 441 'LinkIncremental': '1',
449 }, 442 },
450 }, 443 },
451 'conditions': [
452 [ 'msvs_use_common_release', {
453 'msvs_props': ['release.vsprops'],
454 }],
455 ],
456 },
457 'Release - no tcmalloc': {
458 'configuration_platform': 'Win32',
459 'defines': [
460 'NDEBUG',
461 'NO_TCMALLOC',
462 ],
463 'msvs_configuration_attributes': {
464 'OutputDirectory': '$(SolutionDir)$(ConfigurationName)',
465 'IntermediateDirectory': '$(OutDir)\\obj\\$(ProjectName)',
466 'CharacterSet': '1',
467 },
468 'conditions': [
469 [ 'msvs_use_common_release', {
470 'msvs_props': ['release.vsprops'],
471 }],
472 ],
473 'msvs_settings': {
474 'VCLinkerTool': {
475 'LinkIncremental': '1',
476 },
477 },
478 }, 444 },
445 'Release - no tcmalloc': {
446 'inherit_from': ['Release'],
447 'defines': ['NO_TCMALLOC'],
448 },
479 }], 449 }],
480 ], 450 ],
481 }, 451 },
482 }, 452 },
483 'conditions': [ 453 'conditions': [
484 ['OS=="linux"', { 454 ['OS=="linux"', {
485 'target_defaults': { 455 'target_defaults': {
486 # Enable -Werror by default, but put it in a variable so it can 456 # Enable -Werror by default, but put it in a variable so it can
487 # be disabled in ~/.gyp/include.gypi on the valgrind builders. 457 # be disabled in ~/.gyp/include.gypi on the valgrind builders.
488 'variables': { 458 'variables': {
(...skipping 449 matching lines...) Expand 10 before | Expand all | Expand 10 after
938 # and therefore SYMROOT, needs to be set at the project level. 908 # and therefore SYMROOT, needs to be set at the project level.
939 'SYMROOT': '<(DEPTH)/xcodebuild', 909 'SYMROOT': '<(DEPTH)/xcodebuild',
940 }, 910 },
941 } 911 }
942 912
943 # Local Variables: 913 # Local Variables:
944 # tab-width:2 914 # tab-width:2
945 # indent-tabs-mode:nil 915 # indent-tabs-mode:nil
946 # End: 916 # End:
947 # vim: set expandtab tabstop=2 shiftwidth=2: 917 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « DEPS ('k') | chrome/installer/mini_installer.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698