diff options
| author | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-09 21:03:03 +0000 |
|---|---|---|
| committer | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-09 21:03:03 +0000 |
| commit | 22a3188988e576693604aa3e7a39a97762fe584d (patch) | |
| tree | 5ce25cf76f06b7d87d083213d4261aaf08553e51 /net/tools | |
| parent | 5f1746bff720c94389dd288f88c80d6f4e9cccc0 (diff) | |
| download | chromium_src-22a3188988e576693604aa3e7a39a97762fe584d.zip chromium_src-22a3188988e576693604aa3e7a39a97762fe584d.tar.gz chromium_src-22a3188988e576693604aa3e7a39a97762fe584d.tar.bz2 | |
Back out r7826, which broke the Linux build
Review URL: http://codereview.chromium.org/17327
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7830 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/tools')
| -rw-r--r-- | net/tools/tld_cleanup/tld_cleanup.scons | 63 |
1 files changed, 9 insertions, 54 deletions
diff --git a/net/tools/tld_cleanup/tld_cleanup.scons b/net/tools/tld_cleanup/tld_cleanup.scons index 5f366c4..cd937ca 100644 --- a/net/tools/tld_cleanup/tld_cleanup.scons +++ b/net/tools/tld_cleanup/tld_cleanup.scons @@ -23,61 +23,16 @@ if env.Bit('windows'): ], ) -input_files = ChromeFileList([ +input_files = [ 'tld_cleanup.cc', -]) +] env.ChromeProgram('tld_cleanup', input_files) -p = env.ChromeMSVSProject('$NET_DIR/build/tld_cleanup.vcproj', - guid='{E13045CD-7E1F-4A41-9B18-8D288B2E7B41}', - dependencies = [ - '$BASE_DIR/build/base.vcproj', - '$ICU38_DIR/build/icu.vcproj', - '$GOOGLEURL_DIR/build/googleurl.vcproj', - ], - # TODO: restore when we can derive all info, - # on all platforms, from the windows build targets. - #buildtargets=TODO, - files=input_files, - tools=[ - 'VCPreBuildEventTool', - 'VCCustomBuildTool', - 'VCXMLDataGeneratorTool', - 'VCWebServiceProxyGeneratorTool', - 'VCMIDLTool', - 'VCCLCompilerTool', - 'VCManagedResourceCompilerTool', - 'VCResourceCompilerTool', - 'VCPreLinkEventTool', - MSVSTool('VCLinkerTool', - SubSystem='1'), - 'VCALinkTool', - 'VCManifestTool', - 'VCXDCMakeTool', - 'VCBscMakeTool', - 'VCFxCopTool', - 'VCAppVerifierTool', - 'VCWebDeploymentTool', - 'VCPostBuildEventTool', - ], - ConfigurationType='1') - - -p.AddConfig('Debug|Win32', - InheritedPropertySheets=[ - '$(SolutionDir)../build/common.vsprops', - '$(SolutionDir)../build/debug.vsprops', - ]) - -p.AddConfig('Release|Win32', - InheritedPropertySheets=[ - '$(SolutionDir)../build/common.vsprops', - '$(SolutionDir)../build/release.vsprops', - ]) - -env.AlwaysBuild(p) - -i = env.Command('$CHROME_SRC_DIR/net/build/tld_cleanup.vcproj', p, - Copy('$TARGET', '$SOURCE')) -Alias('msvs', i) +env.ChromeMSVSProject('$NET_DIR/build/tld_cleanup.vcproj', + dependencies = [ + '$BASE_DIR/build/base.vcproj', + '$ICU38_DIR/build/icu.vcproj', + '$GOOGLEURL_DIR/build/googleurl.vcproj', + ], + guid='{E13045CD-7E1F-4A41-9B18-8D288B2E7B41}') |