Revert 35012 - Rearrange build configurations make it clearer and allow bett...

build/common.gypi

 # Copyright (c) 2009 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # IMPORTANT:
 # Please don't directly include this file if you are building via gyp_chromium,
 # since gyp_chromium is automatically forcing its inclusion.
 {
   'variables': {
     # .gyp files should set chromium_code to 1 if they build Chromium-specific
@@ skipping 378 matching lines @@
                 'DebugInformationFormat': '1',
                 'AdditionalOptions': '/Yd',
               }
             }
          }],  # OS==win
         ],  # conditions for coverage
       }],  # coverage!=0
     ],  # 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',
           },
         },
         '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)',
           'OTHER_CFLAGS': [ '<@(debug_extra_cflags)', ],
         },
         'msvs_settings': {
           'VCCLCompilerTool': {
             'Optimization': '<(win_debug_Optimization)',
             'PreprocessorDefinitions': ['_DEBUG'],
             'BasicRuntimeChecks': '3',
             'RuntimeLibrary': '<(win_debug_RuntimeLibrary)',
           },
           'VCLinkerTool': {
             'LinkIncremental': '<(msvs_debug_link_incremental)',
           },
           'VCResourceCompilerTool': {
             'PreprocessorDefinitions': ['_DEBUG'],
           },
         },
         'conditions': [
           ['OS=="linux"', {
             'cflags': [
               '<@(debug_extra_cflags)',
             ],
           }],
         ],
       },
-      'Release_Base': {
-        'abstract': 1,
+      'Release': {
+        'inherit_from': ['Common'],
         'defines': [
           'NDEBUG',
         ],
         'xcode_settings': {
           'DEAD_CODE_STRIPPING': 'YES',  # -Wl,-dead_strip
           'GCC_OPTIMIZATION_LEVEL': '<(mac_release_optimization)',
           'OTHER_CFLAGS': [ '<@(release_extra_cflags)', ],
         },
         'msvs_settings': {
           'VCCLCompilerTool': {
@@ skipping 11 matching lines @@
           ['win_use_allocator_shim==0', {
             'defines': ['NO_TCMALLOC'],
           }],
           ['win_release_RuntimeLibrary==2', {
             # Visual C++ 2008 barfs when building anything with /MD (msvcrt):
             #  VC\include\typeinfo(139) : warning C4275: non dll-interface 
             #  class 'stdext::exception' used as base for dll-interface 
             #  class 'std::bad_cast'
             'msvs_disabled_warnings': [4275],
           }],
+          ['msvs_use_common_release', {
+            'msvs_props': ['release.vsprops'],
+          }],
           ['OS=="linux"', {
             'cflags': [
              '<@(release_extra_cflags)',
             ],
           }],
         ],
       },
-      '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'],
           },
         }],
       ],
     },
   },
   'conditions': [
     ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
       'target_defaults': {
         # Enable -Werror by default, but put it in a variable so it can
         # be disabled in ~/.gyp/include.gypi on the valgrind builders.
@@ skipping 83 matching lines @@
           'DISTCC_HOSTS',
           'HOME',
           'INCLUDE_SERVER_ARGS',
           'INCLUDE_SERVER_PORT',
           'LINK',
           'CHROME_BUILD_TYPE',
           'CHROMIUM_BUILD',
           'OFFICIAL_BUILD',
         ],
         'configurations': {
-          'Debug_Base': {
+          'Debug': {
             'variables': {
               'debug_optimize%': '0',
             },
             'defines': [
               '_DEBUG',
             ],
             'cflags': [
               '-O>(debug_optimize)',
               '-g',
               # One can use '-gstabs' to enable building the debugging
@@ skipping 212 matching lines @@
             'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']},
           }],
           ['_type=="executable" or _type=="shared_library"', {
             'target_conditions': [
               ['mac_real_dsym == 1', {
                 # To get a real .dSYM bundle produced by dsymutil, set the
                 # debug information format to dwarf-with-dsym.  Since
                 # 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',
                       'STRIP_INSTALLED_PRODUCT': 'YES',
                       'target_conditions': [
                         ['_type=="shared_library"', {
                           # The Xcode default is to strip debugging symbols
                           # only (-S).  Local symbols should be stripped as
                           # well, which will be handled by -x.  Xcode will
                           # continue to insert -S when stripping even when
@@ skipping 169 matching lines @@
         'msvs_settings': {
           'VCLinkerTool': {
             'DelayLoadDLLs': [
               'dbghelp.dll',
               'dwmapi.dll',
               'uxtheme.dll',
             ],
           },
         },
         'configurations': {
-          'x86_Base': {
+          'Common': {
             'msvs_settings': {
               'VCLinkerTool': {
                 'AdditionalOptions':
                   '/safeseh /dynamicbase /ignore:4199 /ignore:4221 /nxcompat',
               },
             },
           },
-          'x64_Base': {
+          'Common_x64': {
             'msvs_settings': {
               'VCLinkerTool': {
                 'AdditionalOptions':
                   # safeseh is not compatible with x64
                   '/dynamicbase /ignore:4199 /ignore:4221 /nxcompat',
               },
             },
           },
         },
       },
@@ skipping 28 matching lines @@
     # and therefore SYMROOT, needs to be set at the project level.
     'SYMROOT': '<(DEPTH)/xcodebuild',
   },
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: