Revert 35012 - 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

TBR=gregoryd@google.com
Review URL: http://codereview.chromium.org/500149

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35016 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 45 insertions, 85 deletions

diff --git a/build/common.gypi b/build/common.gypi
index bc442fa..b51ce40 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -396,25 +396,18 @@
     ],  # 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.
-      #
-      # Abstract base configurations to cover common
-      # attributes.
-      #
-      'Common_Base': {
+       # VCLinkerTool LinkIncremental values below:
+       #   0 == default
+       #   1 == /INCREMENTAL:NO
+       #   2 == /INCREMENTAL
+       # Debug links incremental, Release does not.
+      'Common': {
         'abstract': 1,
         'msvs_configuration_attributes': {
           'OutputDirectory': '$(SolutionDir)$(ConfigurationName)',
           'IntermediateDirectory': '$(OutDir)\\obj\\$(ProjectName)',
           'CharacterSet': '1',
         },
-      },
-      'x86_Base': {
-        'abstract': 1,
         'msvs_settings': {
           'VCLinkerTool': {
             'TargetMachine': '1',
@@ -422,36 +415,8 @@
         },
         'msvs_configuration_platform': 'Win32',
       },
-      '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,
+      'Debug': {
+        'inherit_from': ['Common'],
         'xcode_settings': {
           'COPY_PHASE_STRIP': 'NO',
           'GCC_OPTIMIZATION_LEVEL': '<(mac_debug_optimization)',
@@ -479,8 +444,8 @@
           }],
         ],
       },
-      'Release_Base': {
-        'abstract': 1,
+      'Release': {
+        'inherit_from': ['Common'],
         'defines': [
           'NDEBUG',
         ],
@@ -512,6 +477,9 @@
             #  class 'std::bad_cast'
             'msvs_disabled_warnings': [4275],
           }],
+          ['msvs_use_common_release', {
+            'msvs_props': ['release.vsprops'],
+          }],
           ['OS=="linux"', {
             'cflags': [
              '<@(release_extra_cflags)',
@@ -519,52 +487,44 @@
           }],
         ],
       },
-      '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': ['Common_Base', 'x86_Base', 'Release_Base', '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,
           },
           'Debug_x64': {
-            'inherit_from': ['Common_Base', 'x64_Base', 'Debug_Base'],
+            'inherit_from': ['Debug', 'Common_x64'],
           },
           'Release_x64': {
-            'inherit_from': ['Common_Base', 'x64_Base', 'Release_Base'],
+            'inherit_from': ['Release', 'Common_x64'],
           },
           'Purify_x64': {
-            'inherit_from': ['Common_Base', 'x64_Base', 'Release_Base', 'Purify'],
+            'inherit_from': ['Purify', 'Common_x64'],
           },
         }],
       ],
@@ -668,7 +628,7 @@
           'OFFICIAL_BUILD',
         ],
         'configurations': {
-          'Debug_Base': {
+          'Debug': {
             'variables': {
               'debug_optimize%': '0',
             },
@@ -901,7 +861,7 @@
                 # strip_from_xcode will not be used, set Xcode to do the
                 # stripping as well.
                 'configurations': {
-                  'Release_Base': {
+                  'Release': {
                     'xcode_settings': {
                       'DEBUG_INFORMATION_FORMAT': 'dwarf-with-dsym',
                       'DEPLOYMENT_POSTPROCESSING': 'YES',
@@ -1091,7 +1051,7 @@
           },
         },
         'configurations': {
-          'x86_Base': {
+          'Common': {
             'msvs_settings': {
               'VCLinkerTool': {
                 'AdditionalOptions':
@@ -1099,7 +1059,7 @@
               },
             },
           },
-          'x64_Base': {
+          'Common_x64': {
             'msvs_settings': {
               'VCLinkerTool': {
                 'AdditionalOptions':