From 1f9471a6fa3f37d206fc56132bb62234e4de3daf Mon Sep 17 00:00:00 2001 From: "bradnelson@google.com" Date: Mon, 4 Jan 2010 06:40:16 +0000 Subject: 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 --- build/common.gypi | 27 ++++++---- build/common.vsprops | 7 --- build/debug.vsprops | 23 --------- build/external_code.vsprops | 14 ----- build/internal/debug_info.vsprops | 15 ------ build/internal/debug_infofastbuild.vsprops | 15 ------ build/internal/essential.vsprops | 76 ---------------------------- build/internal/release_defaults.gypi | 15 ++++++ build/internal/release_defaults.vsprops | 25 --------- build/internal/release_impl.gypi | 3 ++ build/internal/release_impl.vsprops | 12 ----- build/internal/release_impl_official.gypi | 21 ++++++++ build/internal/release_impl_official.vsprops | 27 ---------- build/release.gypi | 19 +++++++ build/release.vsprops | 7 --- 15 files changed, 76 insertions(+), 230 deletions(-) delete mode 100644 build/common.vsprops delete mode 100644 build/debug.vsprops delete mode 100644 build/external_code.vsprops delete mode 100644 build/internal/debug_info.vsprops delete mode 100644 build/internal/debug_infofastbuild.vsprops delete mode 100644 build/internal/essential.vsprops create mode 100644 build/internal/release_defaults.gypi delete mode 100644 build/internal/release_defaults.vsprops create mode 100644 build/internal/release_impl.gypi delete mode 100644 build/internal/release_impl.vsprops create mode 100644 build/internal/release_impl_official.gypi delete mode 100644 build/internal/release_impl_official.vsprops create mode 100755 build/release.gypi delete mode 100644 build/release.vsprops (limited to 'build') 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 @@ - - - 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 @@ - - - - - - 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 @@ - - - - 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 @@ - - - - - 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 @@ - - - - - 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 @@ - - - - - - - - - - - - - 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 @@ - - - - - - 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 @@ - - - - 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 @@ - - - - - - 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 @@ - - - -- cgit v1.1