diff options
author | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-01 22:05:12 +0000 |
---|---|---|
committer | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-01 22:05:12 +0000 |
commit | 0fad1f1a74408b939d1b09dcc2f9391544e7e692 (patch) | |
tree | c62164260c26f143c9ae43c32694142a725bc7eb /build/internal | |
parent | a9b826af8ef183810c176b9ede4a2934f4678d50 (diff) | |
download | chromium_src-0fad1f1a74408b939d1b09dcc2f9391544e7e692.zip chromium_src-0fad1f1a74408b939d1b09dcc2f9391544e7e692.tar.gz chromium_src-0fad1f1a74408b939d1b09dcc2f9391544e7e692.tar.bz2 |
Remove the checked-in scons configuration files.
Review URL: http://codereview.chromium.org/53121
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@12982 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/internal')
-rw-r--r-- | build/internal/chromium_build.scons | 15 | ||||
-rw-r--r-- | build/internal/chromium_build_google_chrome.scons | 15 | ||||
-rw-r--r-- | build/internal/essential.scons | 114 | ||||
-rw-r--r-- | build/internal/release_defaults.scons | 47 | ||||
-rw-r--r-- | build/internal/release_impl.scons | 18 | ||||
-rw-r--r-- | build/internal/release_impl_checksenabled.scons | 37 | ||||
-rw-r--r-- | build/internal/release_impl_coverage.scons | 17 | ||||
-rw-r--r-- | build/internal/release_impl_dom_stats.scons | 35 | ||||
-rw-r--r-- | build/internal/release_impl_official.scons | 37 | ||||
-rw-r--r-- | build/internal/release_impl_purify.scons | 33 |
10 files changed, 0 insertions, 368 deletions
diff --git a/build/internal/chromium_build.scons b/build/internal/chromium_build.scons deleted file mode 100644 index 397c365..0000000 --- a/build/internal/chromium_build.scons +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright (c) 2006-2008 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. - -__doc__ = """ -Chromium build settings. -""" - -Import("env") - -env.Append( - CPPDEFINES = [ - 'CHROMIUM_BUILD', - ], -) diff --git a/build/internal/chromium_build_google_chrome.scons b/build/internal/chromium_build_google_chrome.scons deleted file mode 100644 index 01dca62..0000000 --- a/build/internal/chromium_build_google_chrome.scons +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright (c) 2006-2008 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. - -__doc__ = """ -Release settings for Google Chrome. -""" - -Import("env") - -env.Append( - CPPDEFINES = [ - 'GOOGLE_CHROME_BUILD', - ], -) diff --git a/build/internal/essential.scons b/build/internal/essential.scons deleted file mode 100644 index 389ae35..0000000 --- a/build/internal/essential.scons +++ /dev/null @@ -1,114 +0,0 @@ -# Copyright (c) 2006-2008 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. - -__doc__ = """ -Essential settings for Chromium builds. -""" - -Import("env") - -env.Append( - CPPPATH = [ - '$CHROME_SRC_DIR', - ], - CCFLAGS = [ - '$CHROMIUM_CC_OPT_FLAGS', - ], - LINKFLAGS = [ - '$CHROMIUM_LINK_OPT_FLAGS', - '$CHROMIUM_INCREMENTAL_FLAGS', - ], -) - -if env.Bit('windows'): - incremental = env.get('INCREMENTAL') - if incremental is not None: - if incremental: - env['CHROMIUM_INCREMENTAL_FLAGS'] = '/INCREMENTAL' - else: - env['CHROMIUM_INCREMENTAL_FLAGS'] = '/INCREMENTAL:NO' - env.Append( - ARFLAGS = [ - '/ignore:4221', - ], - CPPDEFINES = [ - ('_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), - ], - CPPPATH = [ - '$PLATFORMSDK_6_1/Include', - '$VISUAL_STUDIO/VC/atlmfc/include', - ], - CCFLAGS = [ - '/GR-', # VCCLCompilerTool.RuntimeTypeInfo="false" - '/Gs', # VCCLCompilerTool.BufferSecurityCheck="true" - '/Gy', # VCCLCompilerTool.EnableFunctionLevelLinking="true" - '/W3', # VCCLCompilerTool.WarningLevel="3" - - # TODO(sgk): re-enable this - #'/WX', # WarnAsError="true" - - # In the old Visual Studio build, we used /Zi (edit and continue), - # VCCLComilerTool.DebugInformationFormat="3". - # - # /Zi ends up with multiple compiler invocations trying to updat - # the same vc80.pdb file at the same time, with race conditions - # and permission problems. We're using /Z7 because it makes things - # work even in parallel builds, without special config to avoid - # multiple simultaneous updates the vc80.pdb file. All the - # debugging information and capability still end up in the - # executables. - '/Z7', # VCCLCompilerTool.DebugInformationFormat="1" - - # VCCLCompilerTool.DisableSpecificWarnings="4503; 4819" - '/wd4503', - '/wd4819', - ], - LIBPATH = [ - '$PLATFORMSDK_6_1/Lib', - '$VISUAL_STUDIO/VC/atlmfc/lib', - ], - LIBS = [ - 'msimg32', - 'psapi', - 'usp10.lib', - 'version', - 'wininet', - 'ws2_32', - ], - LINKFLAGS = [ - '/DEBUG', - - '/MANIFEST', - '/DELAYLOAD:"dwmapi.dll"', - '/DELAYLOAD:"uxtheme.dll"', - '/MACHINE:X86', - '/FIXED:No', - - '/safeseh', - '/dynamicbase', - '/ignore:4199', - '/ignore:4221', - '/nxcompat', - ], - ) - env.FilterOut( - CCFLAGS = [ - '/GM', # VCCLCompilerTool.MinimalRebuild="false" - '/EH', # VCCLCompilerTool.ExceptionHandling="0" - ], - ) -elif env.Bit('linux'): - pass -elif env.Bit('mac'): - pass diff --git a/build/internal/release_defaults.scons b/build/internal/release_defaults.scons deleted file mode 100644 index 5d36cf1..0000000 --- a/build/internal/release_defaults.scons +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright (c) 2006-2008 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. - -__doc__ = """ -Default settings for all Chromium release builds. - -Incorporates "essential" settings. -""" - -Import("env") - -env.ApplySConscript([ - 'essential.scons', -]) - -env.Append( - CPPDEFINES = [ - 'NDEBUG', - ], -) - -if env.Bit('windows'): - if env.get('INCREMENTAL') is None: - # INCREMENTAL was not specified on the command line or in the - # external environment; release default is full link. - env['INCREMENTAL'] = False - env['CHROMIUM_INCREMENTAL_FLAGS'] = '/INCREMENTAL:NO' - - env.Replace( - CHROMIUM_CC_OPT_FLAGS = [ - '/O2', # VCCLCompilerTool.Optimization="2" - ], - CHROMIUM_LINK_OPT_FLAGS = [ - '/OPT:REF', # VCLinkerTool.OptimizeReferences="2" - '/OPT:NOICF', # VCLinkerTool.EnableCOMDATFolding="2" - '/OPT:NOWIN98', # VCLinkerTool.OptimizeForWindows98="1" - ], - ), - env.Append( - CCFLAGS = [ - '/GF', # VCCLCompilerTool.StringPooling="true" - ], - LINKFLAGS = [ - '/INCREMENTAL:NO', # VCLinkerTool.LinkIncremental="1" - ], - ) diff --git a/build/internal/release_impl.scons b/build/internal/release_impl.scons deleted file mode 100644 index 23d0543..0000000 --- a/build/internal/release_impl.scons +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright (c) 2006-2008 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. - -__doc__ = """ -Release settings for Chromium builds. -""" - -Import("env") - -env.ApplySConscript(['release_defaults.scons']) - -if env.Bit('windows'): - env.Append( - CCFLAGS = [ - '/Oy-', - ], - ) diff --git a/build/internal/release_impl_checksenabled.scons b/build/internal/release_impl_checksenabled.scons deleted file mode 100644 index c0b4993..0000000 --- a/build/internal/release_impl_checksenabled.scons +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright (c) 2006-2008 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. - -__doc__ = """ -Release settings for Chromium builds with checks enabled. -""" - -Import("env") - -env.ApplySConscript(['release_defaults.scons']) - -env.Append( - CPPDEFINES = [ - '_DEBUG', ' - ('_HAS_ITERATOR_DEBUGGING', '0'), - ('_SECURE_SCL', '0'), - ], -) - -if env.Bit('windows'): - env.Replace( - CHROMIUM_LINK_OPT_FLAGS = [ - '/OPT:REF', # VCLinkerTool.OptimizeReferences="2" - '/OPT:NOICF', # VCLinkerTool.EnableCOMDATFolding="2" - '/OPT:NOWIN98', # VCLinkerTool.OptimizeForWindows98="1" - ], - ), - env.Append( - CCFLAGS = [ - '/Oy-', - '/MTd', # VCCLCompilerTool.RuntimeLibrary="1" - ], - LINKFLAGS = [ - '/INCREMENTAL:NO', # VCLinkerTool.LinkIncremental="1" - ], - ) diff --git a/build/internal/release_impl_coverage.scons b/build/internal/release_impl_coverage.scons deleted file mode 100644 index ec8c547..0000000 --- a/build/internal/release_impl_coverage.scons +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright (c) 2006-2008 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. - -__doc__ = """ -Release settings for Chromium builds with code coverage -""" - -Import("env") - -env.ApplySConscript(['release_defaults.scons']) - -env.Append( - LINKFLAGS = [ - '/PROFILE', # VCLinkerTool.Profile="1" - ], -) diff --git a/build/internal/release_impl_dom_stats.scons b/build/internal/release_impl_dom_stats.scons deleted file mode 100644 index 9dae238..0000000 --- a/build/internal/release_impl_dom_stats.scons +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright (c) 2006-2008 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. - -__doc__ = """ -Release settings for Chromium builds with DOM statistics. -""" - -Import("env") - -env.ApplySConscript(['release_defaults.scons']) - -env.Append( - CPPDEFINES = [ - 'NDEBUG', - 'ENABLE_DOM_STATS_COUNTERS', - ], -) - -if env.Bit('windows'): - env.Replace( - CHROMIUM_LINK_OPT_FLAGS = [ - '/OPT:REF', # VCLinkerTool.OptimizeReferences="2" - '/OPT:NOICF', # VCLinkerTool.EnableCOMDATFolding="2" - '/OPT:NOWIN98', # VCLinkerTool.OptimizeForWindows98="1" - ], - ), - env.Append( - CCFLAGS = [ - '/Oy-', - ], - LINKFLAGS = [ - '/INCREMENTAL:NO', # VCLinkerTool.LinkIncremental="1" - ], - ) diff --git a/build/internal/release_impl_official.scons b/build/internal/release_impl_official.scons deleted file mode 100644 index 94e9670..0000000 --- a/build/internal/release_impl_official.scons +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright (c) 2006-2008 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. - -__doc__ = """ -Release settings for official Chromium builds. -""" - -Import("env") - -env.ApplySConscript(['release_defaults.scons']) - -if env.Bit('windows'): - env.Replace( - CHROMIUM_CC_OPT_FLAGS = [ - '/Ox', # VCCLCompilerTool.Optimization="3" - ], - ), - env.Append( - ARFLAGS = [ - '/ltcg', - ], - CCFLAGS = [ - '/Ob2', # VCCLCompilerTool.InlineFunctionExpansion="2" - '/Oi', # VCCLCompilerTool.EnableIntrinsicFunctions="true" - '/Os', # VCCLCompilerTool.FavorSizeOrSpeed="2" - '/Ox', # VCCLCompilerTool.OmitFramePointers="true" - '/GT', # VCCLCompilerTool.EnableFiberSafeOptimizations="true" - '/GL', # VCCLCompilerTool.WholeProgramOptimization="true" - ], - CPPDEFINES = [ - 'OFFICIAL_BUILD', - ], - LINKFLAGS = [ - '/LTCG', # VCLinkerTool.LinkTimeCodeGeneration="1" - ], - ) diff --git a/build/internal/release_impl_purify.scons b/build/internal/release_impl_purify.scons deleted file mode 100644 index 912f555..0000000 --- a/build/internal/release_impl_purify.scons +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright (c) 2006-2008 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. - -__doc__ = """ -Release settings for Chromium builds with Purify. -""" - -Import("env") - -env.ApplySConscript(['release_defaults.scons']) - -env.Append( - CPPDEFINES = [ - 'PURIFY', - ], -) - -if env.Bit('windows'): - env.Replace( - CHROMIUM_CC_OPT_FLAGS = [ - '/Od', # VCCLCompilerTool.Optimization="0" - ], - CHROMIUM_LINK_OPT_FLAGS = [ - '/OPT:NOICF', # VCLinkerTool.EnableCOMDATFolding="2" - ], - ), - env.Append( - CCFLAGS = [ - '/MT', # VCCLCompilerTool.RuntimeLibrary="0" - '/GS-', # VCCLCompilerTool.BufferSecurityCheck="false" - ], - ) |