diff options
| author | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-13 22:53:51 +0000 |
|---|---|---|
| committer | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-13 22:53:51 +0000 |
| commit | 823b63ec4135ed33a1bd358d05e863dbf821a3b1 (patch) | |
| tree | 6918b786dab0c6825a441575e81affe201686f39 /net | |
| parent | d50dacfa212414132ab7db970b8b43cfeadb9cbe (diff) | |
| download | chromium_src-823b63ec4135ed33a1bd358d05e863dbf821a3b1.zip chromium_src-823b63ec4135ed33a1bd358d05e863dbf821a3b1.tar.gz chromium_src-823b63ec4135ed33a1bd358d05e863dbf821a3b1.tar.bz2 | |
Add a helper method to SConscript.main for adding .pdb files to the
output target of .exe files on Windows. Change all the callers to
only pass in the basename of the target (e.g., 'base_unittests').
The only exception is chrome.exe which uses chrome_exe.pdb.
This lets us remove a "if env['PLATFORM'] == 'win32'" condition from
base/SConscript and these other files going forward.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@836 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
| -rw-r--r-- | net/SConscript | 33 | ||||
| -rw-r--r-- | net/tools/tld_cleanup/SConscript | 5 |
2 files changed, 12 insertions, 26 deletions
diff --git a/net/SConscript b/net/SConscript index c8410d4..a66dbb59 100644 --- a/net/SConscript +++ b/net/SConscript @@ -255,43 +255,32 @@ unittest_files = [ '$BASE_DIR/run_all_unittests.obj', ] -net_unittests = env_tests.ChromeTestProgram( - ['net_unittests.exe', - 'net_unittests.ilk', - 'net_unittests.pdb'], - unittest_files -) +net_unittests = env_tests.ChromeTestProgram('net_unittests', unittest_files) stress_cache = env_tests.ChromeTestProgram( - ['stress_cache.exe', - 'stress_cache.ilk', - 'stress_cache.pdb'], + 'stress_cache', ['disk_cache/stress_cache.cc', - 'disk_cache/disk_cache_test_util.cc'] + 'disk_cache/disk_cache_test_util.cc'] ) crash_cache = env_tests.ChromeTestProgram( - ['crash_cache.exe', - 'crash_cache.ilk', - 'crash_cache.pdb'], + 'crash_cache', ['tools/crash_cache/crash_cache.cc', - 'disk_cache/disk_cache_test_util.cc'] + 'disk_cache/disk_cache_test_util.cc'] ) net_perftests = env_tests.ChromeTestProgram( - ['net_perftests.exe', - 'net_perftests.ilk', - 'net_perftests.pdb'], + 'net_perftests', ['disk_cache/disk_cache_test_util.cc', - 'disk_cache/disk_cache_perftest.cc', - 'base/cookie_monster_perftest.cc', - # TODO(sgk): avoid using .cc from base directly - '$BASE_DIR/run_all_perftests$OBJSUFFIX', - '$BASE_DIR/perftimer$OBJSUFFIX'] + 'disk_cache/disk_cache_perftest.cc', + 'base/cookie_monster_perftest.cc', + # TODO(sgk): avoid using .cc from base directly + '$BASE_DIR/run_all_perftests$OBJSUFFIX', + '$BASE_DIR/perftimer$OBJSUFFIX'] ) diff --git a/net/tools/tld_cleanup/SConscript b/net/tools/tld_cleanup/SConscript index 9ea10462..597d752 100644 --- a/net/tools/tld_cleanup/SConscript +++ b/net/tools/tld_cleanup/SConscript @@ -69,10 +69,7 @@ input_files = [ 'tld_cleanup.cc', ] -exe_targets = env.ChromeProgram(['tld_cleanup', - 'tld_cleanup.ilk', - 'tld_cleanup.pdb'], - input_files) +exe_targets = env.ChromeProgram('tld_cleanup', input_files) i = env.Install('$TARGET_ROOT', exe_targets) env.Alias('net', i) |