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 /sandbox | |
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 'sandbox')
-rw-r--r-- | sandbox/SConstruct | 8 | ||||
-rw-r--r-- | sandbox/sandbox.scons | 32 | ||||
-rw-r--r-- | sandbox/sandbox_sln.scons | 137 | ||||
-rw-r--r-- | sandbox/src/sandbox_lib.scons | 84 | ||||
-rw-r--r-- | sandbox/tests/common/sandbox_common.scons | 16 | ||||
-rw-r--r-- | sandbox/tests/integration_tests/sbox_integration_tests.scons | 51 | ||||
-rw-r--r-- | sandbox/tests/unit_tests/sbox_unittests.scons | 50 | ||||
-rw-r--r-- | sandbox/tests/validation_tests/sbox_validation_tests.scons | 49 | ||||
-rw-r--r-- | sandbox/using_sandbox.scons | 18 | ||||
-rw-r--r-- | sandbox/wow_helper/wow_helper.scons | 87 |
10 files changed, 0 insertions, 532 deletions
diff --git a/sandbox/SConstruct b/sandbox/SConstruct deleted file mode 100644 index aff44be..0000000 --- a/sandbox/SConstruct +++ /dev/null @@ -1,8 +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. - -build_component = 'sandbox' -SConscript('../build/SConscript.main', - exports=['build_component']) - diff --git a/sandbox/sandbox.scons b/sandbox/sandbox.scons deleted file mode 100644 index 26920a3..0000000 --- a/sandbox/sandbox.scons +++ /dev/null @@ -1,32 +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__ = """ -Master configuration for building base components (including base_gfx). -""" - -Import('env') - -# Arrange for Hammer to add all programs to the 'sandbox' Alias. -env.Append( - COMPONENT_PROGRAM_GROUPS = ['sandbox'], - COMPONENT_TEST_PROGRAM_GROUPS = ['sandbox'], -) - -sconscript_files = [ - 'src/sandbox_lib.scons', - 'sandbox_sln.scons', - 'tests/common/sandbox_common.scons', - 'tests/integration_tests/sbox_integration_tests.scons', - 'tests/unit_tests/sbox_unittests.scons', - 'tests/validation_tests/sbox_validation_tests.scons', - - # NOTE: We don't build wow_helper. It has generated binaries - # checked in directly. The wow_helper.scons config should be - # close (it replicates most options) but may need work to build - # successfully (plus the 64-bit version of Visual Studio tools). - #'wow_helper/wow_helper.scons', -] - -SConscript(sconscript_files, exports=['env']) diff --git a/sandbox/sandbox_sln.scons b/sandbox/sandbox_sln.scons deleted file mode 100644 index 4ee96a0..0000000 --- a/sandbox/sandbox_sln.scons +++ /dev/null @@ -1,137 +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__ = """ -Configuration for building base.sln. -""" - -Import('env') - -env = env.Clone() - -env.Tool('MSVSNew') - -env.ChromeMSVSProject('$SANDBOX_DIR/sandbox_poc/sandbox_poc.vcproj', - dependencies = [ - '$BASE_DIR/build/base.vcproj', - '$SANDBOX_DIR/src/sandbox.vcproj', - '$SANDBOX_DIR/sandbox_poc/pocdll/pocdll.vcproj', - ], - guid='{CF757839-F2A1-417C-8F25-DCAE480020F1}') - -env.ChromeMSVSProject('$SANDBOX_DIR/sandbox_poc/pocdll/pocdll.vcproj', - guid='{AE5BFB87-850E-4454-B01D-58E7D8BAC224}') - -env.ChromeMSVSProject('$SANDBOX_DIR/src/sandbox.vcproj', - guid='{881F6A97-D539-4C48-B401-DF04385B2343}') - -env.ChromeMSVSProject(('$SANDBOX_DIR/tests/integration_tests/' + - 'sbox_integration_tests.vcproj'), - dependencies = [ - '$BASE_DIR/build/debug_message.vcproj', - '$BASE_DIR/build/base.vcproj', - '$SANDBOX_DIR/src/sandbox.vcproj', - '$TESTING_DIR/gtest.vcproj', - ], - guid='{542D4B3B-98D4-4233-B68D-0103891508C6}') - -env.ChromeMSVSProject('$SANDBOX_DIR/tests/unit_tests/sbox_unittests.vcproj', - dependencies = [ - '$BASE_DIR/build/debug_message.vcproj', - '$BASE_DIR/build/base.vcproj', - '$SANDBOX_DIR/src/sandbox.vcproj', - '$TESTING_DIR/gtest.vcproj', - ], - guid='{883553BE-2A9D-418C-A121-61FE1DFBC562}') - -env.ChromeMSVSProject(('$SANDBOX_DIR/tests/validation_tests/' + - 'sbox_validation_tests.vcproj'), - dependencies = [ - '$BASE_DIR/build/debug_message.vcproj', - '$BASE_DIR/build/base.vcproj', - '$SANDBOX_DIR/src/sandbox.vcproj', - '$TESTING_DIR/gtest.vcproj', - ], - guid='{B9CC7B0D-145A-49C2-B887-84E43CFA0F27}') - -env.ChromeMSVSProject('$SANDBOX_DIR/tools/finder/finder.vcproj', - dependencies = [ - '$BASE_DIR/build/base.vcproj', - '$SANDBOX_DIR/src/sandbox.vcproj', - ], - guid='{ACDC2E06-0366-41A4-A646-C37E130A605D}') - -env.ChromeMSVSProject('$SANDBOX_DIR/tools/launcher/launcher.vcproj', - dependencies = [ - '$BASE_DIR/build/base.vcproj', - '$SANDBOX_DIR/src/sandbox.vcproj', - ], - guid='{386FA217-FBC2-4461-882D-CDAD221ED800}') - - -dependencies = env.ChromeMSVSFolder('sandbox_dependencies', - name='dependencies', - entries = [ - '$BASE_DIR/build/debug_message.vcproj', - '$BASE_DIR/build/base.vcproj', - '$TESTING_DIR/gtest.vcproj', - ], - guid='{BCE54389-D18D-48B9-977E-9D1998200F63}') - -proof_of_concept = env.ChromeMSVSFolder('proof_of_concept', - entries = [ - ('$SANDBOX_DIR/sandbox_poc/pocdll/' + - 'pocdll.vcproj'), - ('$SANDBOX_DIR/sandbox_poc/' + - 'sandbox_poc.vcproj'), - ], - guid='{B607BE7B-3555-422C-A40B-28E73C0B5E24}') - -tests = env.ChromeMSVSFolder('tests', - entries = [ - ('$SANDBOX_DIR/tests/integration_tests/' + - 'sbox_integration_tests.vcproj'), - ('$SANDBOX_DIR/tests/unit_tests/' + - 'sbox_unittests.vcproj'), - ('$SANDBOX_DIR/tests/validation_tests/' + - 'sbox_validation_tests.vcproj'), - ], - guid='{F7A3B82E-B8B4-4FDF-BC8E-FEC9398F57ED}') - -tools = env.ChromeMSVSFolder('sandbox_tools', - name='tools', - entries = [ - '$SANDBOX_DIR/tools/launcher/launcher.vcproj', - '$SANDBOX_DIR/tools/finder/finder.vcproj', - ], - guid='{7F36EE20-5016-4051-B0D7-42824CDA0291}') - - -solution = env.ChromeMSVSSolution('$SANDBOX_DIR/sandbox.sln', - dest='$CHROME_SRC_DIR/sandbox/sandbox.sln', - entries = [ - '$SANDBOX_DIR/src/sandbox.vcproj', - ('$SANDBOX_DIR/tests/unit_tests/' + - 'sbox_unittests.vcproj'), - tests, - ('$SANDBOX_DIR/tests/validation_tests/' + - 'sbox_validation_tests.vcproj'), - dependencies, - '$BASE_DIR/build/debug_message.vcproj', - tools, - proof_of_concept, - '$SANDBOX_DIR/sandbox_poc/sandbox_poc.vcproj', - '$SANDBOX_DIR/sandbox_poc/pocdll/pocdll.vcproj', - '$SANDBOX_DIR/tools/finder/finder.vcproj', - '$SANDBOX_DIR/tools/launcher/launcher.vcproj', - ('$SANDBOX_DIR/tests/integration_tests/' + - 'sbox_integration_tests.vcproj'), - '$BASE_DIR/build/base.vcproj', - '$TESTING_DIR/gtest.vcproj', - ], - variants = [ - 'Debug|Win32', - 'Release|Win32', - ], - websiteProperties=False) diff --git a/sandbox/src/sandbox_lib.scons b/sandbox/src/sandbox_lib.scons deleted file mode 100644 index 8667968..0000000 --- a/sandbox/src/sandbox_lib.scons +++ /dev/null @@ -1,84 +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. - -Import('env') - -env = env.Clone() - -env.ApplySConscript([ - '$GTEST_DIR/../using_gtest.scons', -]) - -if env.Bit('windows'): - env.Append( - CCFLAGS = [ - '/WX', # treat warnings as errors - ], - ) - -input_files = [ - 'Wow64.cc', - 'acl.cc', - 'broker_services.cc', - 'crosscall_server.cc', - 'dep.cc', - 'eat_resolver.cc', - 'filesystem_dispatcher.cc', - 'filesystem_interception.cc', - 'filesystem_policy.cc', - 'interception.cc', - 'interception_agent.cc', - 'job.cc', - 'named_pipe_dispatcher.cc', - 'named_pipe_interception.cc', - 'named_pipe_policy.cc', - 'pe_image.cc', - 'policy_broker.cc', - 'policy_engine_opcodes.cc', - 'policy_engine_processor.cc', - 'policy_low_level.cc', - 'policy_target.cc', - 'process_thread_dispatcher.cc', - 'process_thread_interception.cc', - 'process_thread_policy.cc', - 'registry_dispatcher.cc', - 'registry_interception.cc', - 'registry_policy.cc', - 'resolver.cc', - 'restricted_token.cc', - 'restricted_token_utils.cc', - 'sandbox.cc', - 'sandbox_nt_util.cc', - 'sandbox_policy_base.cc', - 'sandbox_utils.cc', - 'service_resolver.cc', - 'shared_handles.cc', - 'sharedmem_ipc_client.cc', - 'sharedmem_ipc_server.cc', - 'sid.cc', - 'sidestep/ia32_modrm_map.cpp', - 'sidestep/ia32_opcode_map.cpp', - 'sidestep/mini_disassembler.cpp', - 'sidestep/preamble_patcher_with_stub.cpp', - 'sidestep_resolver.cc', - 'sync_dispatcher.cc', - 'sync_interception.cc', - 'sync_policy.cc', - 'target_interceptions.cc', - 'target_process.cc', - 'target_services.cc', - 'win2k_threadpool.cc', - 'win_utils.cc', -] - -# TODO(bradnelson): This step generates sandbox.pch.ib_tag -# SCons doesn't know. -env_p = env.Clone() -env_p.Append(CCFLAGS='/Ylsandbox') -pch, obj = env_p.PCH(['sandbox.pch', 'stdafx.obj'], 'stdafx.cc') -env['PCH'] = pch -env['PCHSTOP'] = 'stdafx.h' -env.Append(CCPCHFLAGS = ['/FIstdafx.h']) - -env.ChromeLibrary('sandbox', input_files + [obj]) diff --git a/sandbox/tests/common/sandbox_common.scons b/sandbox/tests/common/sandbox_common.scons deleted file mode 100644 index 6b50ba4..0000000 --- a/sandbox/tests/common/sandbox_common.scons +++ /dev/null @@ -1,16 +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. - -Import('env') - -env = env.Clone() - -if env.Bit('windows'): - env.Append( - CCFLAGS = [ - '/WX', # treat warnings as errors - ], - ) - -env.StaticObject('controller.cc') diff --git a/sandbox/tests/integration_tests/sbox_integration_tests.scons b/sandbox/tests/integration_tests/sbox_integration_tests.scons deleted file mode 100644 index 71e927d..0000000 --- a/sandbox/tests/integration_tests/sbox_integration_tests.scons +++ /dev/null @@ -1,51 +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. - -Import('env') - -env = env.Clone() - -env.ApplySConscript([ - '$BASE_DIR/using_base.scons', - '$GTEST_DIR/../using_gtest.scons', - '$SANDBOX_DIR/using_sandbox.scons', -]) - -if env.Bit('windows'): - env.Append( - CCFLAGS = [ - '/WX', # treat warnings as errors - ], - ) - -# TODO(bradnelson): This step generates integration_tests.pch.ib_tag -# SCons doesn't know. -env_p = env.Clone() -pch, obj = env_p.PCH(['integration_tests.pch', 'integration_tests.obj'], - 'integration_tests.cc') -env['PCH'] = pch -env['PCHSTOP'] = 'stdafx.h' -env.Append(CCPCHFLAGS = ['/FIstdafx.h']) - - -input_files = [ - obj, - 'integration_tests_test.cc', - -# '$SANDBOX_DIR/src/dep_test.cc', - '$SANDBOX_DIR/src/file_policy_test.cc', - '$SANDBOX_DIR/src/integrity_level_test.cc', - '$SANDBOX_DIR/src/ipc_ping_test.cc', - '$SANDBOX_DIR/src/named_pipe_policy_test.cc', - '$SANDBOX_DIR/src/policy_target_test.cc', - '$SANDBOX_DIR/src/process_policy_test.cc', - '$SANDBOX_DIR/src/registry_policy_test.cc', - '$SANDBOX_DIR/src/sync_policy_test.cc', - '$SANDBOX_DIR/src/unload_dll_test.cc', - - '../common/controller$OBJSUFFIX', -] - -env.ChromeTestProgram('sbox_integration_tests', input_files, - COMPONENT_PLATFORM_SETUP=None) diff --git a/sandbox/tests/unit_tests/sbox_unittests.scons b/sandbox/tests/unit_tests/sbox_unittests.scons deleted file mode 100644 index 660a13a..0000000 --- a/sandbox/tests/unit_tests/sbox_unittests.scons +++ /dev/null @@ -1,50 +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. - -Import('env') - -env = env.Clone() - -env.ApplySConscript([ - '$BASE_DIR/using_base.scons', - '$GTEST_DIR/../using_gtest.scons', - '$SANDBOX_DIR/using_sandbox.scons', -]) - -if env.Bit('windows'): - env.Append( - CCFLAGS = [ - '/WX', # treat warnings as errors - ], - ) - -# TODO(bradnelson): This step generates unittests_tests.pch.ib_tag -# SCons doesn't know. -env_p = env.Clone() -pch, obj = env_p.PCH(['unit_tests.pch', 'unit_tests.obj'], - 'unit_tests.cc') -env['PCH'] = pch -env['PCHSTOP'] = 'stdafx.h' -env.Append(CCPCHFLAGS = ['/FIstdafx.h']) - -input_files = [ - obj, - - '$SANDBOX_DIR/src/interception_unittest.cc', - '$SANDBOX_DIR/src/ipc_unittest.cc', - '$SANDBOX_DIR/src/job_unittest.cc', - '$SANDBOX_DIR/src/pe_image_unittest.cc', - '$SANDBOX_DIR/src/policy_engine_unittest.cc', - '$SANDBOX_DIR/src/policy_low_level_unittest.cc', - '$SANDBOX_DIR/src/policy_opcodes_unittest.cc', - '$SANDBOX_DIR/src/restricted_token_unittest.cc', - '$SANDBOX_DIR/src/service_resolver_unittest.cc', - '$SANDBOX_DIR/src/sid_unittest.cc', - '$SANDBOX_DIR/src/threadpool_unittest.cc', - - '../common/controller$OBJSUFFIX', -] - -env.ChromeTestProgram('sbox_unittests', input_files, - COMPONENT_PLATFORM_SETUP=None) diff --git a/sandbox/tests/validation_tests/sbox_validation_tests.scons b/sandbox/tests/validation_tests/sbox_validation_tests.scons deleted file mode 100644 index e23a3c7..0000000 --- a/sandbox/tests/validation_tests/sbox_validation_tests.scons +++ /dev/null @@ -1,49 +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. - -Import('env') - -env = env.Clone() - -env.ApplySConscript([ - '$BASE_DIR/using_base.scons', - '$GTEST_DIR/../using_gtest.scons', - '$SANDBOX_DIR/using_sandbox.scons', -]) - -if env.Bit('windows'): - env.Append( - CCFLAGS = [ - '/WX', # treat warnings as errors - ], - ) - -env.Prepend( - LIBS = [ - 'shlwapi', - ], -) - - -# TODO(bradnelson): This step generates unittests_tests.pch.ib_tag -# SCons doesn't know. -env_p = env.Clone() -pch, obj = env_p.PCH(['unit_tests.pch', 'unit_tests.obj'], - 'unit_tests.cc') -env['PCH'] = pch -env['PCHSTOP'] = 'stdafx.h' -env.Append(CCPCHFLAGS = ['/FIstdafx.h']) - - -input_files = [ - obj, - - 'suite.cc', - 'commands.cc', - - '../common/controller$OBJSUFFIX', -] - -env.ChromeTestProgram('sbox_validation_tests', input_files, - COMPONENT_PLATFORM_SETUP=None) diff --git a/sandbox/using_sandbox.scons b/sandbox/using_sandbox.scons deleted file mode 100644 index 41b93a8..0000000 --- a/sandbox/using_sandbox.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__ = """ -Settings for other components using the gtest library. -""" - -Import("env") - -env.Append( - CPPPATH = [ - '$SANDBOX_DIR/src', - ], - LIBS = [ - 'sandbox', - ], -) diff --git a/sandbox/wow_helper/wow_helper.scons b/sandbox/wow_helper/wow_helper.scons deleted file mode 100644 index 2430aeb..0000000 --- a/sandbox/wow_helper/wow_helper.scons +++ /dev/null @@ -1,87 +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. - -Import('env') - -env = env.Clone() - -if env.Bit('windows'): - - # NOTE: env.Replace() instead of inhering the normal *.scons settings! - env.Replace( - CPPDEFINES = [ - ('_WIN32_WINNT', '0x0501'), - ('WINVER', '0x0501'), - 'WIN32', - '_UNICODE', - 'UNICODE', - ], - CPPPATH = [ - '$CHROME_SRC_DIR', - ], - CCFLAGS = [ - '/nologo', - - '/EHsc', - - '/GS-', # VCCLCompilerTool.BufferSecurityCheck="false" - '/GR-', # VCCLCompilerTool.RuntimeTypeInfo="false" - '/W3', # treat warnings as errors - '/Wp64', # VCCLCompilerTool.Detect64BitPortabilityProblems="false" - - # 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" - - ], - LINKFLAGS = [ - '/nologo', - '/INCREMENTAL:NO', - '/DEBUG', - '/MACHINE:X64', - '/SUBSYSTEM:WINDOWS', - ], - ) - if env['TARGET_DEBUG']: - env.Append( - CPPDEFINES = [ - '_DEBUG', - ], - CCFLAGS = [ - '/Od', - '/MTd', - ], - ) - else: - env.Append( - CPPDEFINES = [ - 'NDEBUG', - ], - CCFLAGS = [ - '/O2', - '/GL', - '/FD', - '/MT', # VCCLLinkerTool.RuntimeLibrary="0" - ], - LINKFLAGS = [ - '/OPT:REF', # VCCLLinkerTool.OptimizeReferences="2" - '/OPT:ICF', # VCCLLinkerTool.EnableCOMDATFolding="2" - ], - ) - -input_files = [ - 'service64_resolver.cc', - 'target_code.cc', - 'wow_helper.cc', -] - -env.ChromeProgram('wow_helper', input_files) |