Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(268)

Unified Diff: net/tools/tld_cleanup/tld_cleanup.scons

Issue 7807: SCons renaming updates for base, net and googleurl:... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 12 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/tools/tld_cleanup/SConscript ('k') | net/using_net.scons » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/tools/tld_cleanup/tld_cleanup.scons
===================================================================
--- net/tools/tld_cleanup/tld_cleanup.scons (revision 3648)
+++ net/tools/tld_cleanup/tld_cleanup.scons (working copy)
@@ -2,51 +2,53 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
+__doc__ = """
+Configuration the tld_cleanup{,.exe} executable.
+"""
+
Import('env')
env = env.Clone()
+env.SConscript([
+ '$BASE_DIR/using_base.scons',
+ '#/../build/using_googleurl.scons',
+ '$ICU38_DIR/using_icu38.scons',
+ '$NET_DIR/using_net.scons',
+], {'env':env})
+
env.Prepend(
CPPPATH = [
- '../../..',
+ '$ROOT_DIR',
],
- LIBS = [
- 'googleurl',
- env['ICU_LIBS'], # TODO(sgk): '$ICU_LIBS' when scons is fixed
- 'base',
- # We only need to link with net due to use precompiled_net.pch.
- 'net',
- ],
)
-env.Append(
- CCFLAGS = [
- '/TP',
- ],
+if env['PLATFORM'] == 'win32':
+ env.Append(
+ CCFLAGS = [
+ '/TP',
+ ],
- LINKFLAGS = [
- '/INCREMENTAL',
- '/MANIFEST',
- '/DELAYLOAD:"dwmapi.dll"',
- '/DELAYLOAD:"uxtheme.dll"',
- '/DEBUG',
- '/SUBSYSTEM:CONSOLE',
- '/MACHINE:X86',
- '/FIXED:No',
- '/safeseh',
- '/dynamicbase',
- '/ignore:4199',
- '/nxcompat',
- ],
-)
+ LINKFLAGS = [
+ '/INCREMENTAL',
+ '/MANIFEST',
+ '/DELAYLOAD:"dwmapi.dll"',
+ '/DELAYLOAD:"uxtheme.dll"',
+ '/DEBUG',
+ '/SUBSYSTEM:CONSOLE',
+ '/MACHINE:X86',
+ '/FIXED:No',
+ '/safeseh',
+ '/dynamicbase',
+ '/ignore:4199',
+ '/nxcompat',
+ ],
+ )
input_files = [
'tld_cleanup.cc',
]
-exe_targets = env.ChromeProgram('tld_cleanup', input_files)
-i = env.Install('$TARGET_ROOT', exe_targets)
+tld_cleanup = env.ChromeProgram('tld_cleanup', input_files)
+i = env.Install('$TARGET_ROOT', tld_cleanup)
env.Alias('net', i)
-
-env.Install('$TARGET_ROOT', exe_targets)
-
Property changes on: net/tools/tld_cleanup/tld_cleanup.scons
___________________________________________________________________
Added: svn:mergeinfo
« no previous file with comments | « net/tools/tld_cleanup/SConscript ('k') | net/using_net.scons » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698