summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorsgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-01 22:05:12 +0000
committersgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-01 22:05:12 +0000
commit0fad1f1a74408b939d1b09dcc2f9391544e7e692 (patch)
treec62164260c26f143c9ae43c32694142a725bc7eb /media
parenta9b826af8ef183810c176b9ede4a2934f4678d50 (diff)
downloadchromium_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 'media')
-rw-r--r--media/SConstruct7
-rw-r--r--media/media.scons23
-rw-r--r--media/media_lib.scons127
-rw-r--r--media/media_player.scons62
-rw-r--r--media/media_unittests.scons125
-rw-r--r--media/using_media.scons15
6 files changed, 0 insertions, 359 deletions
diff --git a/media/SConstruct b/media/SConstruct
deleted file mode 100644
index 5c859c2..0000000
--- a/media/SConstruct
+++ /dev/null
@@ -1,7 +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 = 'media'
-SConscript('../build/SConscript.main',
- exports=['build_component'])
diff --git a/media/media.scons b/media/media.scons
deleted file mode 100644
index aeeac77..0000000
--- a/media/media.scons
+++ /dev/null
@@ -1,23 +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 media components.
-"""
-
-Import('env')
-
-# Arrange for Hammer to add all programs to the 'media' Alias.
-env.Append(
- COMPONENT_PROGRAM_GROUPS = ['media'],
- COMPONENT_TEST_PROGRAM_GROUPS = ['media'],
-)
-
-sconscript_files = [
- 'media_lib.scons',
- 'media_player.scons',
- 'media_unittests.scons',
-]
-
-SConscript(sconscript_files, exports=['env'])
diff --git a/media/media_lib.scons b/media/media_lib.scons
deleted file mode 100644
index 3a13b43..0000000
--- a/media/media_lib.scons
+++ /dev/null
@@ -1,127 +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 media.lib / libmedia.a.
-"""
-
-Import('env')
-
-env = env.Clone()
-
-env.SConscript([
- '$ICU38_DIR/using_icu38.scons',
-], {'env':env})
-
-env.Prepend(
- CPPPATH = [
- '$CHROME_SRC_DIR',
- ],
-)
-
-input_files = ChromeFileList([
- # TODO(sgk): violate standard indentation so we don't have to
- # reindent too much when we remove the explicit MSVSFilter() calls
- # in favor of generating the hierarchy to reflect the file system.
- MSVSFilter('base', [
- 'base/buffers.h',
- 'base/data_buffer.cc',
- 'base/data_buffer.h',
- 'base/factory.h',
- 'base/filter_host.h',
- 'base/filter_host_impl.cc',
- 'base/filter_host_impl.h',
- 'base/filters.h',
- 'base/media_format.cc',
- 'base/media_format.h',
- 'base/pipeline.h',
- 'base/pipeline_impl.cc',
- 'base/pipeline_impl.h',
- 'base/synchronizer.cc',
- 'base/synchronizer.h',
- 'base/video_frame_impl.cc',
- 'base/video_frame_impl.h',
- 'base/yuv_convert.cc',
- 'base/yuv_convert.h',
- ]),
- MSVSFilter('filters', [
- 'filters/audio_renderer_base.cc',
- 'filters/audio_renderer_base.h',
- 'filters/audio_renderer_impl.cc',
- 'filters/audio_renderer_impl.h',
- 'filters/decoder_base.h',
- 'filters/file_data_source.cc',
- 'filters/file_data_source.h',
- 'filters/null_audio_renderer.cc',
- 'filters/null_audio_renderer.h',
- 'filters/video_renderer_base.cc',
- 'filters/video_renderer_base.h',
- ]),
- MSVSFilter('audio', [
- 'audio/win/audio_manager_win.h',
- 'audio/audio_output.h',
- 'audio/win/audio_output_win.cc',
- 'audio/simple_sources.h',
- 'audio/win/simple_sources_win.cc',
- 'audio/win/waveout_output_win.cc',
- 'audio/win/waveout_output_win.h',
- ]),
-])
-
-if env.Bit('linux'):
- input_files.Extend([
- 'audio/linux/audio_manager_linux.cc',
- ])
-
-if env.Bit('mac'):
- input_files.Extend([
- 'audio/mac/audio_manager_mac.cc',
- ])
-
-if not env.Bit('windows'):
- # Windows-specific files.
- input_files.Remove(
- 'audio/win/audio_output_win.cc',
- 'audio/win/simple_sources_win.cc',
- 'audio/win/waveout_output_win.cc',
- )
-
-env.ChromeLibrary('media', input_files)
-
-p = env.ChromeMSVSProject('build/media.vcproj',
- dest='$CHROME_SRC_DIR/media/build/media.vcproj',
- guid='{6AE76406-B03B-11DD-94B1-80B556D89593}',
- keyword='Win32Proj',
- # TODO(sgk): when we can intuit the hierarchy
- # from the built targets.
- #buildtargets=TODO,
- files=input_files,
- tools=[
- 'VCPreBuildEventTool',
- 'VCCustomBuildTool',
- 'VCXMLDataGeneratorTool',
- 'VCWebServiceProxyGeneratorTool',
- 'VCMIDLTool',
- 'VCCLCompilerTool',
- 'VCManagedResourceCompilerTool',
- 'VCResourceCompilerTool',
- 'VCPreLinkEventTool',
- 'VCLibrarianTool',
- 'VCALinkTool',
- 'VCXDCMakeTool',
- 'VCBscMakeTool',
- 'VCFxCopTool',
- 'VCPostBuildEventTool',
- ],
- ConfigurationType='4')
-
-p.AddConfig('Debug|Win32',
- InheritedPropertySheets=[
- '$(SolutionDir)../build/debug.vsprops',
- ])
-
-p.AddConfig('Release|Win32',
- InheritedPropertySheets=[
- '$(SolutionDir)../build/release.vsprops',
- ])
diff --git a/media/media_player.scons b/media/media_player.scons
deleted file mode 100644
index 87513c6..0000000
--- a/media/media_player.scons
+++ /dev/null
@@ -1,62 +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 media_player.
-"""
-
-Import('env')
-
-env = env.Clone()
-
-input_files = ChromeFileList([
- # TODO(sgk): violate standard indentation so we don't have to
- # reindent too much when we remove the explicit MSVSFilter() calls
- # in favor of generating the hierarchy to reflect the file system.
- MSVSFilter('player', [
- 'player/player.cc',
- ]),
-])
-
-p = env.ChromeMSVSProject('build/media_player.vcproj',
- dest=('$CHROME_SRC_DIR/media/' +
- 'build/media_player.vcproj'),
- guid='{D4EB0EDC-DC4D-11DD-AE66-DC4F55D89593}',
- keyword='Win32Proj',
- # TODO(sgk): when we can intuit the hierarchy
- # from the built targets.
- #buildtargets=TODO,
- files=input_files,
- tools=[
- 'VCPreBuildEventTool',
- 'VCCustomBuildTool',
- 'VCXMLDataGeneratorTool',
- 'VCWebServiceProxyGeneratorTool',
- 'VCMIDLTool',
- 'VCCLCompilerTool',
- 'VCManagedResourceCompilerTool',
- 'VCResourceCompilerTool',
- 'VCPreLinkEventTool',
- 'VCLinkerTool',
- 'VCALinkTool',
- 'VCManifestTool',
- 'VCXDCMakeTool',
- 'VCBscMakeTool',
- 'VCFxCopTool',
- 'VCAppVerifierTool',
- 'VCWebDeploymentTool',
- 'VCPostBuildEventTool',
- ],
- ConfigurationType='1')
-
-
-p.AddConfig('Debug|Win32',
- InheritedPropertySheets=[
- '$(SolutionDir)../build/debug.vsprops',
- ])
-
-p.AddConfig('Release|Win32',
- InheritedPropertySheets=[
- '$(SolutionDir)../build/release.vsprops',
- ])
diff --git a/media/media_unittests.scons b/media/media_unittests.scons
deleted file mode 100644
index 3a01710..0000000
--- a/media/media_unittests.scons
+++ /dev/null
@@ -1,125 +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 the media_unittests{,.exe} executable.
-"""
-
-Import('env')
-
-env = env.Clone()
-
-env.SConscript([
- '$BASE_DIR/using_base.scons',
- '$GTEST_DIR/../using_gtest.scons',
- '$ICU38_DIR/using_icu38.scons',
- '$MEDIA_DIR/using_media.scons',
-], {'env':env})
-
-env.Prepend(
- CPPPATH = [
- '$CHROME_SRC_DIR',
- ],
-)
-
-if env.Bit('windows'):
- env.Prepend(
- CCFLAGS = [
- '/TP',
- '/WX',
- ],
- CPPDEFINES = [
- '_WIN32_WINNT=0x0600',
- 'WINVER=0x0600',
- '_HAS_EXCEPTIONS=0',
- ],
- LINKFLAGS = [
- '/DELAYLOAD:"dwmapi.dll"',
- '/DELAYLOAD:"uxtheme.dll"',
- '/MACHINE:X86',
- '/FIXED:No',
- '/safeseh',
- '/dynamicbase',
- '/ignore:4199',
- '/nxcompat',
- ],
- )
-
-input_files = ChromeFileList([
- # TODO(sgk): violate standard indentation so we don't have to
- # reindent too much when we remove the explicit MSVSFilter() calls
- # in favor of generating the hierarchy to reflect the file system.
- MSVSFilter('support', [
- 'base/run_all_unittests.cc',
- ]),
- MSVSFilter('tests', [
- MSVSFilter('base', [
- 'base/data_buffer_unittest.cc',
- 'base/pipeline_impl_unittest.cc',
- 'base/video_frame_impl_unittest.cc',
- 'base/yuv_convert_unittest.cc',
- ]),
- MSVSFilter('filters', [
- 'filters/file_data_source_unittest.cc',
- 'filters/test_video_decoder.h',
- 'filters/test_video_renderer.h',
- 'filters/video_renderer_unittest.cc',
- 'filters/video_decoder_unittest.cc',
- ]),
- MSVSFilter('audio', [
- 'audio/win/audio_output_win_unittest.cc',
- ]),
- ]),
-])
-
-if not env.Bit('windows'):
- input_files.Remove(
- 'audio/win/audio_output_win_unittest.cc',
- )
-
-env.ChromeTestProgram('media_unittests', input_files)
-
-p = env.ChromeMSVSProject('build/media_unittests.vcproj',
- dest=('$CHROME_SRC_DIR/media/' +
- 'build/media_unittests.vcproj'),
- guid='{C8C6183C-B03C-11DD-B471-DFD256D89593}',
- keyword='Win32Proj',
- # TODO(sgk): when we can intuit the hierarchy
- # from the built targets.
- #buildtargets=TODO,
- files=input_files,
- tools=[
- 'VCPreBuildEventTool',
- 'VCCustomBuildTool',
- 'VCXMLDataGeneratorTool',
- 'VCWebServiceProxyGeneratorTool',
- 'VCMIDLTool',
- MSVSTool('VCCLCompilerTool',
- PreprocessorDefinitions='UNIT_TEST'),
- 'VCManagedResourceCompilerTool',
- 'VCResourceCompilerTool',
- 'VCPreLinkEventTool',
- 'VCLinkerTool',
- 'VCALinkTool',
- 'VCManifestTool',
- 'VCXDCMakeTool',
- 'VCBscMakeTool',
- 'VCFxCopTool',
- 'VCAppVerifierTool',
- 'VCWebDeploymentTool',
- 'VCPostBuildEventTool',
- ],
- ConfigurationType='1')
-
-p.AddConfig('Debug|Win32',
- InheritedPropertySheets=[
- '$(SolutionDir)../build/debug.vsprops',
- '$(SolutionDir)../testing/using_gtest.vsprops',
- ])
-
-p.AddConfig('Release|Win32',
- InheritedPropertySheets=[
- '$(SolutionDir)../build/release.vsprops',
- '$(SolutionDir)../testing/using_gtest.vsprops',
- ])
diff --git a/media/using_media.scons b/media/using_media.scons
deleted file mode 100644
index 545325a2..0000000
--- a/media/using_media.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__ = """
-Settings for other components using the media library.
-"""
-
-Import("env")
-
-env.Append(
- LIBS = [
- 'media',
- ],
-)