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 /sdch | |
| 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 'sdch')
| -rw-r--r-- | sdch/SConscript | 103 | ||||
| -rw-r--r-- | sdch/sdch.vcproj | 9 | 
2 files changed, 89 insertions, 23 deletions
diff --git a/sdch/SConscript b/sdch/SConscript index 64ac0e2..2ab22b9f 100644 --- a/sdch/SConscript +++ b/sdch/SConscript @@ -17,26 +17,48 @@ if env.Bit('windows'):  env.Prepend(CPPPATH = cpppath) -input_files = [ -    '$OPEN_VCDIFF_DIR/src/addrcache.cc', -    '$OPEN_VCDIFF_DIR/src/adler32.c', -    '$OPEN_VCDIFF_DIR/src/blockhash.cc', -    '$OPEN_VCDIFF_DIR/src/codetable.cc', -    '$OPEN_VCDIFF_DIR/src/decodetable.cc', -    '$OPEN_VCDIFF_DIR/src/encodetable.cc', -    '$OPEN_VCDIFF_DIR/src/headerparser.cc', -    '$OPEN_VCDIFF_DIR/src/instruction_map.cc', -    '$OPEN_VCDIFF_DIR/src/logging.cc', -    '$OPEN_VCDIFF_DIR/src/varint_bigendian.cc', -    '$OPEN_VCDIFF_DIR/src/vcdecoder.cc', -    '$OPEN_VCDIFF_DIR/src/vcdiffengine.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('Header Files', [ +    'open-vcdiff/src/blockhash.h', +    'open-vcdiff/src/checksum.h', +    'open-vcdiff/src/codetable.h', +    'open-vcdiff/src/compile_assert.h', +    'open-vcdiff/vsprojects/config.h', +    'open-vcdiff/src/decodetable.h', +    'open-vcdiff/src/encodetable.h', +    'open-vcdiff/src/headerparser.h', +    'open-vcdiff/src/logging.h', +    'open-vcdiff/src/google/output_string.h', +    'open-vcdiff/src/rolling_hash.h', +    'open-vcdiff/vsprojects/stdint.h', +    'open-vcdiff/src/testing.h', +    'open-vcdiff/src/varint_bigendian.h', +    'open-vcdiff/src/google/vcdecoder.h', +    'open-vcdiff/src/vcdiff_defs.h', +    'open-vcdiff/src/vcdiffengine.h', +    'open-vcdiff/src/zconf.h', +    'open-vcdiff/src/zlib.h', +  ]), +  MSVSFilter('Source Files', [ +    'open-vcdiff/src/addrcache.cc', +    'open-vcdiff/src/adler32.c', +    'open-vcdiff/src/blockhash.cc', +    'open-vcdiff/src/codetable.cc', +    'open-vcdiff/src/decodetable.cc', +    'open-vcdiff/src/encodetable.cc', +    'open-vcdiff/src/headerparser.cc', +    'open-vcdiff/src/logging.cc', +    'open-vcdiff/src/varint_bigendian.cc', +    'open-vcdiff/src/vcdecoder.cc', +    'open-vcdiff/src/vcdiffengine.cc', +  ]), +])  env.ChromeLibrary('sdch', input_files) -env.ChromeMSVSProject('$SDCH_DIR/sdch.vcproj', -                guid='{F54ABC59-5C00-414A-A9BA-BAF26D1699F0}') -  if env.Bit('posix'):    # Generate a target config.h file from a source config.h.in file. @@ -124,3 +146,50 @@ if env.Bit('posix'):                '$OPEN_VCDIFF_DIR/src/config.h.in',                Action(AutoConfig, varlist=['DEFINES']),                DEFINES=defines) + + +p = env.ChromeMSVSProject('sdch.vcproj', +                          dest='$CHROME_SRC_DIR/sdch/sdch.vcproj', +                          guid='{F54ABC59-5C00-414A-A9BA-BAF26D1699F0}', +                          keyword='Win32Proj', +                          # TODO(sgk):  when we can intuit the hierarchy +                          # from the built targets. +                          #buildtargets=TODO, +                          files=input_files, +                          relative_path_prefix='./', +                          tools=[ +                              'VCPreBuildEventTool', +                              'VCCustomBuildTool', +                              'VCXMLDataGeneratorTool', +                              'VCWebServiceProxyGeneratorTool', +                              'VCMIDLTool', +                              MSVSTool('VCCLCompilerTool', +                                       AdditionalIncludeDirectories=[ +                                           './open-vcdiff/vsprojects', +                                           '', +                                       ], +                                       DefaultCharIsUnsigned="true"), +                              'VCManagedResourceCompilerTool', +                              'VCResourceCompilerTool', +                              'VCPreLinkEventTool', +                              'VCLibrarianTool', +                              'VCALinkTool', +                              'VCXDCMakeTool', +                              'VCBscMakeTool', +                              'VCFxCopTool', +                              'VCPostBuildEventTool', +                          ], +                          ConfigurationType='4') + + +p.AddConfig('Debug|Win32', +            InheritedPropertySheets=[ +                '$(SolutionDir)../build/debug.vsprops', +                '$(SolutionDir)../sdch/using_sdch.vsprops', +            ]) + +p.AddConfig('Release|Win32', +            InheritedPropertySheets=[ +                '$(SolutionDir)../build/release.vsprops', +                '$(SolutionDir)../sdch/using_sdch.vsprops', +            ]) diff --git a/sdch/sdch.vcproj b/sdch/sdch.vcproj index 91a9564..76a43c9 100644 --- a/sdch/sdch.vcproj +++ b/sdch/sdch.vcproj @@ -4,6 +4,7 @@  	Version="8.00"  	Name="sdch"  	ProjectGUID="{F54ABC59-5C00-414A-A9BA-BAF26D1699F0}" +	RootNamespace="sdch"  	Keyword="Win32Proj"  	>  	<Platforms> @@ -36,7 +37,7 @@  			/>  			<Tool  				Name="VCCLCompilerTool" -				AdditionalIncludeDirectories="./open-vcdiff/vsprojects;" +				AdditionalIncludeDirectories=".\open-vcdiff\vsprojects;"  				DefaultCharIsUnsigned="true"  			/>  			<Tool @@ -89,7 +90,7 @@  			/>  			<Tool  				Name="VCCLCompilerTool" -				AdditionalIncludeDirectories="./open-vcdiff/vsprojects;" +				AdditionalIncludeDirectories=".\open-vcdiff\vsprojects;"  				DefaultCharIsUnsigned="true"  			/>  			<Tool @@ -126,8 +127,6 @@  	<Files>  		<Filter  			Name="Header Files" -			Filter="h;hpp;hxx;hm;inl;inc;xsd" -			UniqueIdentifier="{5612E1F3-EC29-4848-8301-B23786CED3CA}"  			>  			<File  				RelativePath=".\open-vcdiff\src\blockhash.h" @@ -208,8 +207,6 @@  		</Filter>  		<Filter  			Name="Source Files" -			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" -			UniqueIdentifier="{883D491D-EF73-4c2f-BB09-6F87DC95DC28}"  			>  			<File  				RelativePath=".\open-vcdiff\src\addrcache.cc"  | 
