Removing the last remaining vsprops files (that are hooked in).

Also pulling in a newer nacl version.
Switching to use AdditionalOptions in list form.

BUG=None
TEST=None
TBR=mmentovai

Review URL: http://codereview.chromium.org/523027

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

15 files changed, 76 insertions, 230 deletions

diff --git a/build/common.gypi b/build/common.gypi
index 09cf397..b05588b 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -387,7 +387,7 @@
               'VCCLCompilerTool': {
                 # /Z7, not /Zi, so coverage is happyb
                 'DebugInformationFormat': '1',
-                'AdditionalOptions': '/Yd',
+                'AdditionalOptions': ['/Yd'],
               }
             }
          }],  # OS==win
@@ -547,7 +547,7 @@
         'inherit_from': ['Common_Base', 'x86_Base', 'Release_Base'],
         'conditions': [
           ['msvs_use_common_release', {
-            'msvs_props': ['release.vsprops'],
+            'includes': ['release.gypi'],
           }],
         ]
       },
@@ -564,7 +564,7 @@
             'inherit_from': ['Common_Base', 'x64_Base', 'Release_Base'],
           },
           'Purify_x64': {
-            'inherit_from': ['Common_Base', 'x64_Base', 'Release_Base', 'Purify'],
+            'inherit_from': ['Common_Base', 'x64_Base', 'Release_Base', 'Purify_Base'],
           },
         }],
       ],
@@ -977,12 +977,12 @@
             'DebugInformationFormat': '3',
             'conditions': [
               [ 'msvs_multi_core_compile', {
-                'AdditionalOptions': '/MP',
+                'AdditionalOptions': ['/MP'],
               }],
             ],
           },
           'VCLibrarianTool': {
-            'AdditionalOptions': '/ignore:4221',
+            'AdditionalOptions': ['/ignore:4221'],
             'AdditionalLibraryDirectories':
               ['<(DEPTH)/third_party/platformsdk_win7/files/Lib'],
           },
@@ -1097,17 +1097,26 @@
           'x86_Base': {
             'msvs_settings': {
               'VCLinkerTool': {
-                'AdditionalOptions':
-                  '/safeseh /dynamicbase /ignore:4199 /ignore:4221 /nxcompat',
+                'AdditionalOptions': [
+                  '/safeseh',
+                  '/dynamicbase',
+                  '/ignore:4199',
+                  '/ignore:4221',
+                  '/nxcompat',
+                ],
               },
             },
           },
           'x64_Base': {
             'msvs_settings': {
               'VCLinkerTool': {
-                'AdditionalOptions':
+                'AdditionalOptions': [
                   # safeseh is not compatible with x64
-                  '/dynamicbase /ignore:4199 /ignore:4221 /nxcompat',
+                  '/dynamicbase',
+                  '/ignore:4199',
+                  '/ignore:4221',
+                  '/nxcompat',
+                ],
               },
             },
           },
diff --git a/build/common.vsprops b/build/common.vsprops
deleted file mode 100644
index 8fa2fc6..0000000
--- a/build/common.vsprops
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioPropertySheet
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="common (no-op)"
-	>
-</VisualStudioPropertySheet>
diff --git a/build/debug.vsprops b/build/debug.vsprops
deleted file mode 100644
index 681f26b..0000000
--- a/build/debug.vsprops
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioPropertySheet
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="debug"
-	InheritedPropertySheets=".\internal\essential.vsprops;internal\chromium_build$(CHROMIUM_BUILD).vsprops"
-	>
-	<Tool
-		Name="VCCLCompilerTool"
-		Optimization="0"
-		PreprocessorDefinitions="_DEBUG"
-		BasicRuntimeChecks="3"
-		RuntimeLibrary="1"
-	/>
-	<Tool
-		Name="VCLinkerTool"
-		LinkIncremental="2"
-	/>
-	<Tool
-		Name="VCResourceCompilerTool"
-		PreprocessorDefinitions="_DEBUG"
-	/>
-</VisualStudioPropertySheet>
diff --git a/build/external_code.vsprops b/build/external_code.vsprops
deleted file mode 100644
index e13adde..0000000
--- a/build/external_code.vsprops
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioPropertySheet
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="external_code"
-	>
-	<Tool
-		Name="VCCLCompilerTool"
-		PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE"
-		WarnAsError="false"
-		Detect64BitPortabilityProblems="false"
-		DisableSpecificWarnings="4800"
-	/>
-</VisualStudioPropertySheet>
diff --git a/build/internal/debug_info.vsprops b/build/internal/debug_info.vsprops
deleted file mode 100644
index 48a5018..0000000
--- a/build/internal/debug_info.vsprops
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioPropertySheet
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="debug_info"
-	>
-	<Tool
-		Name="VCCLCompilerTool"
-		DebugInformationFormat="3"
-	/>
-	<Tool
-		Name="VCLinkerTool"
-		GenerateDebugInformation="true"
-	/>
-</VisualStudioPropertySheet>
diff --git a/build/internal/debug_infofastbuild.vsprops b/build/internal/debug_infofastbuild.vsprops
deleted file mode 100644
index f77b44b..0000000
--- a/build/internal/debug_infofastbuild.vsprops
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioPropertySheet
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="debug_infofastbuild"
-	>
-	<Tool
-		Name="VCCLCompilerTool"
-		DebugInformationFormat="0"
-	/>
-	<Tool
-		Name="VCLinkerTool"
-		GenerateDebugInformation="false"
-	/>
-</VisualStudioPropertySheet>
diff --git a/build/internal/essential.vsprops b/build/internal/essential.vsprops
deleted file mode 100644
index 6b0f1c4f..0000000
--- a/build/internal/essential.vsprops
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioPropertySheet
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="essential"
-	OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-	IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\obj\$(ProjectName)"
-	CharacterSet="1"
-	InheritedPropertySheets=".\debug_info$(FAST_BUILD_TYPE).vsprops"
-	>
-	<Tool
-		Name="VCCLCompilerTool"
-		AdditionalIncludeDirectories="$(SolutionDir)..;$(SDKIncludes)"
-		PreprocessorDefinitions="_WIN32_WINNT=0x0600;WINVER=0x0600;WIN32;_WINDOWS;_HAS_EXCEPTIONS=0;NOMINMAX;_CRT_RAND_S;CERT_CHAIN_PARA_HAS_EXTRA_FIELDS;WIN32_LEAN_AND_MEAN;_SECURE_ATL;_HAS_TR1=0"
-		MinimalRebuild="false"
-		ExceptionHandling="0"
-		BufferSecurityCheck="true"
-		EnableFunctionLevelLinking="true"
-		RuntimeTypeInfo="false"
-		WarningLevel="3"
-		WarnAsError="true"
-		DisableSpecificWarnings="4503; 4819"
-	/>
-	<Tool
-		Name="VCLibrarianTool"
-		AdditionalOptions="/ignore:4221"
-		OutputFile="$(OutDir)\lib\$(ProjectName).lib"
-		AdditionalLibraryDirectories="$(SDKLibs)"
-	/>
-	<Tool
-		Name="VCLinkerTool"
-		AdditionalOptions="/safeseh /dynamicbase /ignore:4199 /ignore:4221 /nxcompat"
-		AdditionalDependencies="wininet.lib version.lib msimg32.lib ws2_32.lib usp10.lib psapi.lib dbghelp.lib"
-		AdditionalLibraryDirectories="$(SDKLibs);$(OutDir)\lib"
-		DelayLoadDLLs="dbghelp.dll,dwmapi.dll,uxtheme.dll"
-		MapFileName="$(OutDir)\$(TargetName).map"
-		ImportLibrary="$(OutDir)\lib\$(TargetName).lib"
-		TargetMachine="1"
-		FixedBaseAddress="1"
-	/>
-	<Tool
-		Name="VCMIDLTool"
-		GenerateStublessProxies="true"
-		TypeLibraryName="$(InputName).tlb"
-		OutputDirectory="$(IntDir)"
-		HeaderFileName="$(InputName).h"
-		DLLDataFileName="dlldata.c"
-		InterfaceIdentifierFileName="$(InputName)_i.c"
-		ProxyFileName="$(InputName)_p.c"
-	/>
-	<Tool
-		Name="VCResourceCompilerTool"
-		Culture="1033"
-		AdditionalIncludeDirectories="$(SolutionDir).."
-	/>
-	<UserMacro
-		Name="SDK"
-		Value="$(SolutionDir)..\third_party\platformsdk_win2008_6_1\files"
-	/>
-	<UserMacro
-		Name="SDKIncludes"
-		Value="$(SDK)\Include;$(VSInstallDir)\VC\atlmfc\include"
-	/>
-	<UserMacro
-		Name="SDKLibs"
-		Value="$(SDK)\Lib"
-	/>
-	<UserMacro
-		Name="DefaultOutputDirectory"
-		Value="$(SolutionDir)$(ConfigurationName)"
-	/>
-	<UserMacro
-		Name="DefaultIntermediateDirectory"
-		Value="$(SolutionDir)$(ConfigurationName)\obj\$(ProjectName)"
-	/>
-</VisualStudioPropertySheet>
diff --git a/build/internal/release_defaults.gypi b/build/internal/release_defaults.gypi
new file mode 100644
index 0000000..5aa2b75
--- /dev/null
+++ b/build/internal/release_defaults.gypi
@@ -0,0 +1,15 @@
+{
+  'msvs_settings': {
+    'VCCLCompilerTool': {
+      'Optimizations': '2',
+      'StringPooling': 'true',
+      'OmitFramePointers': 'true',
+    },
+    'VCLinkerTool': {
+      'LinkIncremental': '1',
+      'OptimizeReferences': '2',
+      'EnableCOMDATFolding': '2',
+      'OptimizeForWindows98': '1',
+    },
+  },
+}
diff --git a/build/internal/release_defaults.vsprops b/build/internal/release_defaults.vsprops
deleted file mode 100644
index d96c52b..0000000
--- a/build/internal/release_defaults.vsprops
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioPropertySheet
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="release_defaults"
-	InheritedPropertySheets=".\essential.vsprops"
-	>
-	<Tool
-		Name="VCCLCompilerTool"
-		Optimization="2"
-		PreprocessorDefinitions="NDEBUG"
-		StringPooling="true"
-	/>
-	<Tool
-		Name="VCLinkerTool"
-		LinkIncremental="1"
-		OptimizeReferences="2"
-		EnableCOMDATFolding="2"
-		OptimizeForWindows98="1"
-	/>
-	<Tool
-		Name="VCResourceCompilerTool"
-		PreprocessorDefinitions="NDEBUG"
-	/>
-</VisualStudioPropertySheet>
diff --git a/build/internal/release_impl.gypi b/build/internal/release_impl.gypi
new file mode 100644
index 0000000..aff06dc
--- /dev/null
+++ b/build/internal/release_impl.gypi
@@ -0,0 +1,3 @@
+{
+  'includes': ['release_defaults.gypi'],
+}
diff --git a/build/internal/release_impl.vsprops b/build/internal/release_impl.vsprops
deleted file mode 100644
index d1a209d..0000000
--- a/build/internal/release_impl.vsprops
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioPropertySheet
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="release_impl"
-	InheritedPropertySheets=".\release_defaults.vsprops"
-	>
-	<Tool
-		Name="VCCLCompilerTool"
-		AdditionalOptions="/Oy-"
-	/>
-</VisualStudioPropertySheet>
diff --git a/build/internal/release_impl_official.gypi b/build/internal/release_impl_official.gypi
new file mode 100644
index 0000000..1e5571a
--- /dev/null
+++ b/build/internal/release_impl_official.gypi
@@ -0,0 +1,21 @@
+{
+  'includes': ['release_defaults.gypi'],
+  'defines': ['OFFICIAL_BUILD'],
+  'msvs_settings': {
+    'VCCLCompilerTool': {
+      'Optimization': '3',
+      'InlineFunctionExpansion': '2',
+      'EnableIntrinsicFunctions': 'true',
+      'FavorSizeOrSpeed': '2',
+      'OmitFramePointers': 'true',
+      'EnableFiberSafeOptimizations': 'true',
+      'WholeProgramOptimization': 'true',
+    },
+    'VCLibrarianTool': {
+      'AdditionalOptions': ['/ltcg'],
+    },
+    'VCLinkerTool': {
+      'LinkTimeCodeGeneration': '1',
+    },
+  },
+}
diff --git a/build/internal/release_impl_official.vsprops b/build/internal/release_impl_official.vsprops
deleted file mode 100644
index 12899c7..0000000
--- a/build/internal/release_impl_official.vsprops
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioPropertySheet
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="release_impl_official"
-	InheritedPropertySheets=".\release_defaults.vsprops"
-	>
-	<Tool
-		Name="VCCLCompilerTool"
-                PreprocessorDefinitions="OFFICIAL_BUILD"
-		Optimization="3"
-		InlineFunctionExpansion="2"
-		EnableIntrinsicFunctions="true"
-		FavorSizeOrSpeed="2"
-		OmitFramePointers="true"
-		EnableFiberSafeOptimizations="true"
-		WholeProgramOptimization="true"
-	/>
-	<Tool
-		Name="VCLibrarianTool"
-		AdditionalOptions="/ltcg"
-	/>
-	<Tool
-		Name="VCLinkerTool"
-		LinkTimeCodeGeneration="1"
-	/>
-</VisualStudioPropertySheet>
diff --git a/build/release.gypi b/build/release.gypi
new file mode 100755
index 0000000..c12526b
--- /dev/null
+++ b/build/release.gypi
@@ -0,0 +1,19 @@
+{
+  'conditions': [
+    # Handle build types.
+    ['buildtype=="Dev"', {
+      'includes': ['internal/release_impl.gypi'],
+    }],
+    ['buildtype=="Official"', {
+      'includes': ['internal/release_impl_official.gypi'],
+    }],
+    # TODO(bradnelson): may also need:
+    #     checksenabled
+    #     coverage
+    #     dom_stats
+    #     pgo_instrument
+    #     pgo_optimize
+    #     purify
+  ],
+}
+
diff --git a/build/release.vsprops b/build/release.vsprops
deleted file mode 100644
index 61cb323..0000000
--- a/build/release.vsprops
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioPropertySheet
-  ProjectType="Visual C++"
-  Version="8.00"
-  Name="release"
-  InheritedPropertySheets="internal\release_impl$(CHROME_BUILD_TYPE).vsprops">
-</VisualStudioPropertySheet>