From f1db7a1f34514312bd704e1b966ff40d2666dee7 Mon Sep 17 00:00:00 2001
From: "sgk@google.com" <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Sun, 3 Aug 2008 21:21:33 +0000
Subject: Convert submodules SConscript files to psuedo-builder calls. TBR:
 evanm,bradnelson

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@304 0039d316-1c4b-4281-b951-d872f2087c98
---
 net/SConscript                   | 12 ++++++------
 net/tools/tld_cleanup/SConscript | 18 +-----------------
 2 files changed, 7 insertions(+), 23 deletions(-)

(limited to 'net')

diff --git a/net/SConscript b/net/SConscript
index fc9d706..4ebf744 100644
--- a/net/SConscript
+++ b/net/SConscript
@@ -138,7 +138,7 @@ input_files = [
 #pch, obj = env_p.PCH(['net.pch', 'precompiled_net.obj'], 'precompiled_net.cc')
 #env_p['PCH'] = pch
 
-#env.StaticLibrary('net', input_files + [obj])
+#env.ChromeStaticLibrary('net', input_files + [obj])
 
 # TODO(bradnelson): This step generates file precompiled_net.pch.ib_tag
 #                   possibly only on incredibuild, scons doesn't know this.
@@ -149,7 +149,7 @@ env['PCH'] = pch
 env['PCHSTOP'] = 'precompiled_net.h'
 env.Append(CCPCHFLAGS = ['/FIprecompiled_net.h'])
 
-env.StaticLibrary('net', input_files + [obj])
+env.ChromeStaticLibrary('net', input_files + [obj])
 
 
 env_tests.Prepend(
@@ -258,7 +258,7 @@ unittest_files = [
     '$BASE_DIR/run_all_unittests.obj',
 ]
 
-net_unittests = env_tests.Program(
+net_unittests = env_tests.ChromeTestProgram(
     ['net_unittests.exe',
     'net_unittests.ilk',
     'net_unittests.pdb'],
@@ -267,7 +267,7 @@ net_unittests = env_tests.Program(
 
 
 
-stress_cache = env_tests.Program(
+stress_cache = env_tests.ChromeTestProgram(
     ['stress_cache.exe',
     'stress_cache.ilk',
     'stress_cache.pdb'],
@@ -276,7 +276,7 @@ stress_cache = env_tests.Program(
 )
 
 
-crash_cache = env_tests.Program(
+crash_cache = env_tests.ChromeTestProgram(
     ['crash_cache.exe',
     'crash_cache.ilk',
     'crash_cache.pdb'],
@@ -285,7 +285,7 @@ crash_cache = env_tests.Program(
 )
 
 
-net_perftests = env_tests.Program(
+net_perftests = env_tests.ChromeTestProgram(
     ['net_perftests.exe',
     'net_perftests.ilk',
     'net_perftests.pdb'],
diff --git a/net/tools/tld_cleanup/SConscript b/net/tools/tld_cleanup/SConscript
index 223f871f..7f1fe56 100644
--- a/net/tools/tld_cleanup/SConscript
+++ b/net/tools/tld_cleanup/SConscript
@@ -92,27 +92,11 @@ libs = [
   '$NET_DIR/net.lib',
 ]
 
-exe_targets = env.Program(['tld_cleanup',
+exe_targets = env.ChromeProgram(['tld_cleanup',
                            'tld_cleanup.ilk',
                            'tld_cleanup.pdb'],
                           input_files + libs)
 i = env.Install('$TARGET_ROOT', exe_targets)
 env.Alias('net', i)
 
-#env.Program('tld_cleanup', input_files + libs,
-#            #WINDOWS_INSERT_MANIFEST=1,
-#            PDB='tld_cleanup.pdb')
-
-#env.Command('tld_cleanup.exe.embed.manifest',
-#            'tld_cleanup.exe.intermediate.manifest',
-#            '-mt.exe /out:${TARGET} /notify_update /manifest $SOURCE')
-
-#env.RES('tld_cleanup.exe.embed.manifest.res',
-#        'tld_cleanup.exe.embed.manifest',
-#        CFLAGS=None,
-#        CCFLAGS=None,
-#        CXXFLAGS=None,
-#        CPPDEFINES=[],
-#        CPPPATH=[])
-
 env.Install('$TARGET_ROOT', exe_targets)
-- 
cgit v1.1