diff options
author | gregoryd@google.com <gregoryd@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-19 00:35:28 +0000 |
---|---|---|
committer | gregoryd@google.com <gregoryd@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-19 00:35:28 +0000 |
commit | 95d3e0c768b1f9fe7d1a9e052294674a76153664 (patch) | |
tree | 5fe200bf4afa90a567e7a6a138d81adcda34bd39 | |
parent | 2dd8e7fdab91dfbd1ed6478808f2aae5c2d9c064 (diff) | |
download | chromium_src-95d3e0c768b1f9fe7d1a9e052294674a76153664.zip chromium_src-95d3e0c768b1f9fe7d1a9e052294674a76153664.tar.gz chromium_src-95d3e0c768b1f9fe7d1a9e052294674a76153664.tar.bz2 |
Rearrange build configurations - make it clearer and allow better support for x64 on Windows
TEST=none
BUG=29467
Review URL: http://codereview.chromium.org/501127
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35012 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r-- | app/app_base.gypi | 2 | ||||
-rw-r--r-- | base/allocator/allocator.gyp | 4 | ||||
-rw-r--r-- | breakpad/breakpad.gyp | 4 | ||||
-rw-r--r-- | breakpad/breakpad_handler.gypi | 2 | ||||
-rw-r--r-- | breakpad/breakpad_sender.gypi | 2 | ||||
-rw-r--r-- | build/common.gypi | 130 | ||||
-rwxr-xr-x | chrome/chrome.gyp | 4 | ||||
-rwxr-xr-x | chrome/chrome_tests.gypi | 14 | ||||
-rw-r--r-- | chrome/installer/installer_util.gypi | 2 | ||||
-rwxr-xr-x | chrome/installer/mini_installer.gyp | 2 | ||||
-rw-r--r-- | chrome/test/interactive_ui/interactive_ui_tests.gypi | 2 | ||||
-rw-r--r-- | chrome_frame/chrome_frame.gyp | 2 | ||||
-rw-r--r-- | ipc/ipc.gypi | 2 | ||||
-rw-r--r-- | third_party/tcmalloc/tcmalloc.gyp | 4 |
14 files changed, 108 insertions, 68 deletions
diff --git a/app/app_base.gypi b/app/app_base.gypi index f8c86ca..9c15d4c 100644 --- a/app/app_base.gypi +++ b/app/app_base.gypi @@ -282,7 +282,7 @@ '../third_party/skia/include/core', ], 'configurations': { - 'Common': { + 'Common_Base': { 'msvs_target_platform': 'x64', }, }, diff --git a/base/allocator/allocator.gyp b/base/allocator/allocator.gyp index 82876ab..fd33645 100644 --- a/base/allocator/allocator.gyp +++ b/base/allocator/allocator.gyp @@ -20,7 +20,7 @@ ], 'direct_dependent_settings': { 'configurations': { - 'Common': { + 'Common_Base': { 'msvs_settings': { 'VCLinkerTool': { 'IgnoreDefaultLibraryNames': ['libcmtd.lib', 'libcmt.lib'], @@ -261,7 +261,7 @@ }, }, 'configurations': { - 'Debug': { + 'Debug_Base': { 'msvs_settings': { 'VCCLCompilerTool': { 'RuntimeLibrary': '0', diff --git a/breakpad/breakpad.gyp b/breakpad/breakpad.gyp index ab5b98d..da69679 100644 --- a/breakpad/breakpad.gyp +++ b/breakpad/breakpad.gyp @@ -14,7 +14,7 @@ 'src', ], 'configurations': { - 'Debug': { + 'Debug_Base': { 'defines': [ # This is needed for GTMLogger to work correctly. 'DEBUG', @@ -115,7 +115,7 @@ ], }, 'configurations': { - 'Release': { + 'Release_Base': { 'xcode_settings': { # dump_syms crashes when built at -O1, -O2, and -O3. It does # not crash at -Os. To play it safe, dump_syms is always built diff --git a/breakpad/breakpad_handler.gypi b/breakpad/breakpad_handler.gypi index f97c5e7..8c26d42 100644 --- a/breakpad/breakpad_handler.gypi +++ b/breakpad/breakpad_handler.gypi @@ -73,7 +73,7 @@ ], }, 'configurations': { - 'Common': { + 'Common_Base': { 'msvs_target_platform': 'x64', }, }, diff --git a/breakpad/breakpad_sender.gypi b/breakpad/breakpad_sender.gypi index 1408dbe..679c125 100644 --- a/breakpad/breakpad_sender.gypi +++ b/breakpad/breakpad_sender.gypi @@ -59,7 +59,7 @@ ], }, 'configurations': { - 'Common': { + 'Common_Base': { 'msvs_target_platform': 'x64', }, }, diff --git a/build/common.gypi b/build/common.gypi index b51ce40..bc442fa 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -396,18 +396,25 @@ ], # conditions for 'target_defaults' 'default_configuration': 'Debug', 'configurations': { - # VCLinkerTool LinkIncremental values below: - # 0 == default - # 1 == /INCREMENTAL:NO - # 2 == /INCREMENTAL - # Debug links incremental, Release does not. - 'Common': { + # VCLinkerTool LinkIncremental values below: + # 0 == default + # 1 == /INCREMENTAL:NO + # 2 == /INCREMENTAL + # Debug links incremental, Release does not. + # + # Abstract base configurations to cover common + # attributes. + # + 'Common_Base': { 'abstract': 1, 'msvs_configuration_attributes': { 'OutputDirectory': '$(SolutionDir)$(ConfigurationName)', 'IntermediateDirectory': '$(OutDir)\\obj\\$(ProjectName)', 'CharacterSet': '1', }, + }, + 'x86_Base': { + 'abstract': 1, 'msvs_settings': { 'VCLinkerTool': { 'TargetMachine': '1', @@ -415,8 +422,36 @@ }, 'msvs_configuration_platform': 'Win32', }, - 'Debug': { - 'inherit_from': ['Common'], + 'x64_Base': { + 'abstract': 1, + 'msvs_configuration_platform': 'x64', + 'msvs_settings': { + 'VCLinkerTool': { + 'TargetMachine': '17', # x86 - 64 + }, + }, + 'msvs_settings': { + 'VCLibrarianTool': { + 'AdditionalLibraryDirectories!': + ['<(DEPTH)/third_party/platformsdk_win7/files/Lib'], + 'AdditionalLibraryDirectories': + ['<(DEPTH)/third_party/platformsdk_win7/files/Lib/x64'], + }, + 'VCLinkerTool': { + 'TargetMachine': '17', + 'AdditionalLibraryDirectories!': + ['<(DEPTH)/third_party/platformsdk_win7/files/Lib'], + 'AdditionalLibraryDirectories': + ['<(DEPTH)/third_party/platformsdk_win7/files/Lib/x64'], + }, + }, + 'defines': [ + # Not sure if tcmalloc works on 64-bit Windows. + 'NO_TCMALLOC', + ], + }, + 'Debug_Base': { + 'abstract': 1, 'xcode_settings': { 'COPY_PHASE_STRIP': 'NO', 'GCC_OPTIMIZATION_LEVEL': '<(mac_debug_optimization)', @@ -444,8 +479,8 @@ }], ], }, - 'Release': { - 'inherit_from': ['Common'], + 'Release_Base': { + 'abstract': 1, 'defines': [ 'NDEBUG', ], @@ -477,9 +512,6 @@ # class 'std::bad_cast' 'msvs_disabled_warnings': [4275], }], - ['msvs_use_common_release', { - 'msvs_props': ['release.vsprops'], - }], ['OS=="linux"', { 'cflags': [ '<@(release_extra_cflags)', @@ -487,44 +519,52 @@ }], ], }, + 'Purify_Base': { + 'abstract': 1, + 'defines': [ + 'PURIFY', + 'NO_TCMALLOC', + ], + 'msvs_settings': { + 'VCCLCompilerTool': { + 'Optimization': '0', + 'RuntimeLibrary': '0', + 'BufferSecurityCheck': 'false', + }, + 'VCLinkerTool': { + 'EnableCOMDATFolding': '1', + 'LinkIncremental': '1', + }, + }, + }, + # + # Concrete configurations + # + 'Debug': { + 'inherit_from': ['Common_Base', 'x86_Base', 'Debug_Base'], + }, + 'Release': { + 'inherit_from': ['Common_Base', 'x86_Base', 'Release_Base'], + 'conditions': [ + ['msvs_use_common_release', { + 'msvs_props': ['release.vsprops'], + }], + ] + }, 'conditions': [ [ 'OS=="win"', { # TODO(bradnelson): add a gyp mechanism to make this more graceful. 'Purify': { - 'inherit_from': ['Release'], - 'defines': [ - 'PURIFY', - 'NO_TCMALLOC', - ], - 'msvs_settings': { - 'VCCLCompilerTool': { - 'Optimization': '0', - 'RuntimeLibrary': '0', - 'BufferSecurityCheck': 'false', - }, - 'VCLinkerTool': { - 'EnableCOMDATFolding': '1', - 'LinkIncremental': '1', - }, - }, - }, - 'Common_x64': { - 'msvs_configuration_platform': 'x64', - 'msvs_settings': { - 'VCLinkerTool': { - 'TargetMachine': '17', - }, - }, - 'abstract': 1, + 'inherit_from': ['Common_Base', 'x86_Base', 'Release_Base', 'Purify'], }, 'Debug_x64': { - 'inherit_from': ['Debug', 'Common_x64'], + 'inherit_from': ['Common_Base', 'x64_Base', 'Debug_Base'], }, 'Release_x64': { - 'inherit_from': ['Release', 'Common_x64'], + 'inherit_from': ['Common_Base', 'x64_Base', 'Release_Base'], }, 'Purify_x64': { - 'inherit_from': ['Purify', 'Common_x64'], + 'inherit_from': ['Common_Base', 'x64_Base', 'Release_Base', 'Purify'], }, }], ], @@ -628,7 +668,7 @@ 'OFFICIAL_BUILD', ], 'configurations': { - 'Debug': { + 'Debug_Base': { 'variables': { 'debug_optimize%': '0', }, @@ -861,7 +901,7 @@ # strip_from_xcode will not be used, set Xcode to do the # stripping as well. 'configurations': { - 'Release': { + 'Release_Base': { 'xcode_settings': { 'DEBUG_INFORMATION_FORMAT': 'dwarf-with-dsym', 'DEPLOYMENT_POSTPROCESSING': 'YES', @@ -1051,7 +1091,7 @@ }, }, 'configurations': { - 'Common': { + 'x86_Base': { 'msvs_settings': { 'VCLinkerTool': { 'AdditionalOptions': @@ -1059,7 +1099,7 @@ }, }, }, - 'Common_x64': { + 'x64_Base': { 'msvs_settings': { 'VCLinkerTool': { 'AdditionalOptions': diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index da30ab1..6e7639b 100755 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -1764,7 +1764,7 @@ }, }, 'configurations': { - 'Debug': { + 'Debug_Base': { 'msvs_settings': { 'VCLinkerTool': { 'LinkIncremental': '<(msvs_large_module_debug_link_mode)', @@ -2622,7 +2622,7 @@ }], ], 'configurations': { - 'Debug': { + 'Debug_Base': { 'msvs_settings': { 'VCLinkerTool': { 'LinkIncremental': '<(msvs_large_module_debug_link_mode)', diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index aad10e6..bf682a5 100755 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -373,7 +373,7 @@ ], }, 'configurations': { - 'Debug': { + 'Debug_Base': { 'msvs_settings': { 'VCLinkerTool': { 'LinkIncremental': '<(msvs_large_module_debug_link_mode)', @@ -456,7 +456,7 @@ ], }, 'configurations': { - 'Debug': { + 'Debug_Base': { 'msvs_settings': { 'VCLinkerTool': { 'LinkIncremental': '<(msvs_large_module_debug_link_mode)', @@ -998,7 +998,7 @@ ], }, 'configurations': { - 'Debug': { + 'Debug_Base': { 'msvs_settings': { 'VCLinkerTool': { 'LinkIncremental': '<(msvs_large_module_debug_link_mode)', @@ -1133,7 +1133,7 @@ '<(allocator_target)', ], 'configurations': { - 'Debug': { + 'Debug_Base': { 'msvs_settings': { 'VCLinkerTool': { 'LinkIncremental': '<(msvs_large_module_debug_link_mode)', @@ -1483,7 +1483,7 @@ ], }, 'configurations': { - 'Debug': { + 'Debug_Base': { 'msvs_settings': { 'VCLinkerTool': { 'LinkIncremental': '<(msvs_large_module_debug_link_mode)', @@ -1553,7 +1553,7 @@ }], ['OS=="win"', { 'configurations': { - 'Debug': { + 'Debug_Base': { 'msvs_settings': { 'VCLinkerTool': { 'LinkIncremental': '<(msvs_large_module_debug_link_mode)', @@ -1664,7 +1664,7 @@ '<(allocator_target)', ], 'configurations': { - 'Debug': { + 'Debug_Base': { 'msvs_settings': { 'VCLinkerTool': { 'LinkIncremental': '<(msvs_large_module_debug_link_mode)', diff --git a/chrome/installer/installer_util.gypi b/chrome/installer/installer_util.gypi index df69383..eeee198 100644 --- a/chrome/installer/installer_util.gypi +++ b/chrome/installer/installer_util.gypi @@ -112,7 +112,7 @@ '<(SHARED_INTERMEDIATE_DIR)', ], 'configurations': { - 'Common': { + 'Common_Base': { 'msvs_target_platform': 'x64', }, }, diff --git a/chrome/installer/mini_installer.gyp b/chrome/installer/mini_installer.gyp index 698884d..1314599 100755 --- a/chrome/installer/mini_installer.gyp +++ b/chrome/installer/mini_installer.gyp @@ -60,7 +60,7 @@ }, }, 'configurations': { - 'Debug': { + 'Debug_Base': { 'msvs_settings': { 'VCCLCompilerTool': { 'BasicRuntimeChecks': '0', diff --git a/chrome/test/interactive_ui/interactive_ui_tests.gypi b/chrome/test/interactive_ui/interactive_ui_tests.gypi index 983dc27..efa6be0 100644 --- a/chrome/test/interactive_ui/interactive_ui_tests.gypi +++ b/chrome/test/interactive_ui/interactive_ui_tests.gypi @@ -135,7 +135,7 @@ }], ], 'configurations': { - 'Debug': { + 'Debug_Base': { 'msvs_settings': { 'VCLinkerTool': { 'LinkIncremental': '<(msvs_large_module_debug_link_mode)', diff --git a/chrome_frame/chrome_frame.gyp b/chrome_frame/chrome_frame.gyp index 7044648..34d3600 100644 --- a/chrome_frame/chrome_frame.gyp +++ b/chrome_frame/chrome_frame.gyp @@ -583,7 +583,7 @@ }, 'configurations': { # Bring back the standard library in debug buidls. - 'Debug': { + 'Debug_Base': { 'msvs_settings': { 'VCLinkerTool': { 'IgnoreAllDefaultLibraries': "false", diff --git a/ipc/ipc.gypi b/ipc/ipc.gypi index 2623765..fb14f1f 100644 --- a/ipc/ipc.gypi +++ b/ipc/ipc.gypi @@ -82,7 +82,7 @@ ], }, 'configurations': { - 'Common': { + 'Common_Base': { 'msvs_target_platform': 'x64', }, }, diff --git a/third_party/tcmalloc/tcmalloc.gyp b/third_party/tcmalloc/tcmalloc.gyp index 2c673f1..e0166e8 100644 --- a/third_party/tcmalloc/tcmalloc.gyp +++ b/third_party/tcmalloc/tcmalloc.gyp @@ -19,7 +19,7 @@ ], 'direct_dependent_settings': { 'configurations': { - 'Common': { + 'Common_Base': { 'msvs_settings': { 'VCLinkerTool': { 'IgnoreDefaultLibraryNames': ['libcmtd.lib', 'libcmt.lib'], @@ -150,7 +150,7 @@ }, }, 'configurations': { - 'Debug': { + 'Debug_Base': { 'msvs_settings': { 'VCCLCompilerTool': { 'RuntimeLibrary': '0', |