diff options
| author | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-26 18:55:01 +0000 |
|---|---|---|
| committer | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-26 18:55:01 +0000 |
| commit | 403cf73262903bfc643c5ce21b68179a789aa60d (patch) | |
| tree | 22550c938688f0267896aa112134566222d3e7d3 /rlz | |
| parent | debd60bc6c9830c5c3d221e951b395ff4183bf41 (diff) | |
| download | chromium_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 'rlz')
| -rw-r--r-- | rlz/SConscript | 37 | ||||
| -rw-r--r-- | rlz/rlz.vcproj | 2 |
2 files changed, 36 insertions, 3 deletions
diff --git a/rlz/SConscript b/rlz/SConscript index 75c2ea7..1753fe7 100644 --- a/rlz/SConscript +++ b/rlz/SConscript @@ -4,9 +4,42 @@ Import('env') +input_files = ChromeFileList([ + 'binaries/rlz.dll', + 'binaries/rlz_dll.pdb', +]) + +# TODO(sgk): derive from above ChromeFileList object. env.Install('$TARGET_ROOT', ['binaries/rlz.dll', 'binaries/rlz_dll.pdb']) -env.ChromeMSVSProject('$RLZ_DIR/rlz.vcproj', - guid='{BF4F447B-72B5-4059-BE1B-F94337B1F385}') +p = env.ChromeMSVSProject('rlz.vcproj', + dest='$CHROME_SRC_DIR/rlz/rlz.vcproj', + guid='{BF4F447B-72B5-4059-BE1B-F94337B1F385}', + keyword='Win32Proj', + # TODO(sgk): when we can intuit the hierarchy + # from the built targets. + #buildtargets=TODO, + files=input_files, + tools=[ + 'VCPreBuildEventTool', + 'Output RLZ copy', + 'VCCustomBuildTool', + 'VCMIDLTool', + 'VCPostBuildEventTool', + ], + ConfigurationType='10') + +# TODO(sgk): remove once SCons drives build +p.AddToolFile('./output_rlz_copy.rules') + +p.AddConfig('Debug|Win32', + InheritedPropertySheets=[ + '$(SolutionDir)../build/debug.vsprops', + ]) + +p.AddConfig('Release|Win32', + InheritedPropertySheets=[ + '$(SolutionDir)../build/release.vsprops', + ]) diff --git a/rlz/rlz.vcproj b/rlz/rlz.vcproj index 560ada7..04f0643 100644 --- a/rlz/rlz.vcproj +++ b/rlz/rlz.vcproj @@ -14,7 +14,7 @@ </Platforms> <ToolFiles> <ToolFile - RelativePath=".\output_rlz_copy.rules" + RelativePath="output_rlz_copy.rules" /> </ToolFiles> <Configurations> |