summaryrefslogtreecommitdiffstats
path: root/media/media_unittests.scons
diff options
context:
space:
mode:
authorsgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-01-26 18:55:01 +0000
committersgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-01-26 18:55:01 +0000
commit403cf73262903bfc643c5ce21b68179a789aa60d (patch)
tree22550c938688f0267896aa112134566222d3e7d3 /media/media_unittests.scons
parentdebd60bc6c9830c5c3d221e951b395ff4183bf41 (diff)
downloadchromium_src-403cf73262903bfc643c5ce21b68179a789aa60d.zip
chromium_src-403cf73262903bfc643c5ce21b68179a789aa60d.tar.gz
chromium_src-403cf73262903bfc643c5ce21b68179a789aa60d.tar.bz2
Generate additional .vcproj files in miscellaneous top-level components.
This also updates the .vcproj files themselves to fix minor stylistic incompatibilities with the rest. Affected .vcproj files: * No change (byte-for-byte identical): media\build\media.vcproj media\build\media_player.vcproj media\build\media_unittests.vcproj google_update\ondemand_updates.vcproj * Remove .\ prefix where inconsistent with the rest of a filelist: rlz\rlz.vcproj breakpad\breakpad_handler.vcproj * Add empty <ToolFiles>, <References> and <Globals> sections: breakpad\breakpad_sender.vcproj * Add explicit RootNamespace attribute: sdch\sdch.vcproj * Use Windows-canonical \ separators: sdch\sdch.vcproj * Remove unnecessary Filter and UniqueIdentifier attributes from <Filter> declarations: sdch\sdch.vcproj Additional cleanups along for the ride: * Split breakpad\SConscript logic into separate breakpad_{handler,sender}.scons files. * Add a media\media_player.scons configuration. Review URL: http://codereview.chromium.org/18717 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8644 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/media_unittests.scons')
-rw-r--r--media/media_unittests.scons72
1 files changed, 65 insertions, 7 deletions
diff --git a/media/media_unittests.scons b/media/media_unittests.scons
index 40f348d..984be8f 100644
--- a/media/media_unittests.scons
+++ b/media/media_unittests.scons
@@ -51,12 +51,70 @@ input_files = [
'base/run_all_unittests.cc',
]
+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',
+ ]),
+ 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)
-env.ChromeMSVSProject('$MEDIA_DIR/build/media_unittests.vcproj',
- dependencies = [
- '$BASE_DIR/build/base.vcproj',
- '$MEDIA_DIR/build/media.vcproj',
- '$TESTING_DIR/gtest.vcproj',
- ],
- guid='{C8C6183C-B03C-11DD-B471-DFD256D89593}')
+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',
+ ])