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

9 files changed, 22 insertions, 38 deletions

diff --git a/base/SConscript b/base/SConscript
index 635e7b1..424d98d 100644
--- a/base/SConscript
+++ b/base/SConscript
@@ -113,7 +113,7 @@ input_files = [
     'worker_pool.cc',

 ]

 

-env.StaticLibrary('base', input_files)

+env.ChromeStaticLibrary('base', input_files)

 

 

 env_tests.Prepend(

@@ -199,7 +199,7 @@ env_tests_dll.Append(
         'SINGLETON_UNITTEST_EXPORTS',

     ],

 )

-dll = env_tests_dll.SharedLibrary(['singleton_dll_unittest.dll',

+dll = env_tests_dll.ChromeSharedLibrary(['singleton_dll_unittest.dll',

                                    'singleton_dll_unittest.ilk',

                                    'singleton_dll_unittest.pdb'],

                                   ['singleton_dll_unittest.cc',

@@ -207,7 +207,7 @@ dll = env_tests_dll.SharedLibrary(['singleton_dll_unittest.dll',
 i = env.Install('$TARGET_ROOT', dll[0])

 env.Alias('base', i)

 

-env_tests.Program(['debug_message.exe',

+env_tests.ChromeTestProgram(['debug_message.exe',

                    'debug_message.ilk',

                    'debug_message.pdb'],

                   ['debug_message.cc'] + libs)

@@ -263,7 +263,7 @@ test_files = [
     'singleton_dll_unittest.lib',

 ]

 

-base_unittests = env_tests.Program([

+base_unittests = env_tests.ChromeTestProgram([

     'base_unittests',

     'base_unittests.exp',

     'base_unittests.ilk',

diff --git a/base/gfx/SConscript b/base/gfx/SConscript
index 022b35f..f5eec6b 100644
--- a/base/gfx/SConscript
+++ b/base/gfx/SConscript
@@ -73,4 +73,4 @@ input_files = [
     'vector_device.cc',

 ]

 

-env.StaticLibrary('base_gfx', input_files)

+env.ChromeStaticLibrary('base_gfx', input_files)

diff --git a/breakpad/SConscript b/breakpad/SConscript
index ea7079c..2001ad8 100644
--- a/breakpad/SConscript
+++ b/breakpad/SConscript
@@ -50,7 +50,7 @@ sender_input_files = [
     'src/common/windows/http_upload.cc',

 ]

 

-env.StaticLibrary('breakpad_sender', sender_input_files)

+env.ChromeStaticLibrary('breakpad_sender', sender_input_files)

 

 

 handler_input_files = [

@@ -62,4 +62,4 @@ handler_input_files = [
     'src/client/windows/crash_generation/crash_generation_client.cc',

 ]

 

-env.StaticLibrary('breakpad_handler', handler_input_files)

+env.ChromeStaticLibrary('breakpad_handler', handler_input_files)

diff --git a/build/SConscript.googleurl b/build/SConscript.googleurl
index 801370d..4be0e529 100644
--- a/build/SConscript.googleurl
+++ b/build/SConscript.googleurl
@@ -68,7 +68,7 @@ input_files = [
     'src/url_util.cc',

 ]

 

-env.StaticLibrary('googleurl', input_files)

+env.ChromeStaticLibrary('googleurl', input_files)

 

 

 # Commented out for now because we can't build googleurl unit tests

@@ -89,5 +89,5 @@ env.StaticLibrary('googleurl', input_files)
 #    'src/url_util_unittest.cc',

 #]

 #

-#env_tests.StaticLibrary('googleurl_tests', test_files)

+#env_tests.ChromeStaticLibrary('googleurl_tests', test_files)

 

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)

diff --git a/sandbox/src/SConscript b/sandbox/src/SConscript
index 28a4ccb3..18c5977 100644
--- a/sandbox/src/SConscript
+++ b/sandbox/src/SConscript
@@ -127,7 +127,7 @@ env['PCHSTOP'] = 'stdafx.h'
 env.Append(CCPCHFLAGS = ['/FIstdafx.h'])

 

 

-env.StaticLibrary('sandbox', input_files + [obj])

+env.ChromeStaticLibrary('sandbox', input_files + [obj])

 

 

 env_tests.Prepend(

@@ -216,7 +216,7 @@ env_unit_tests['PCHSTOP'] = 'stdafx.h'
 env_unit_tests.Append(CCPCHFLAGS = ['/FIstdafx.h'])

 

 

-unit_tests = env_unit_tests.Program(

+unit_tests = env_unit_tests.ChromeTestProgram(

     ['../sbox_unittests.exe',

     '../sbox_unittests.ilk',

     '../sbox_unittests.pdb'],

@@ -260,7 +260,7 @@ env_integration_tests['PCH'] = pch
 env_integration_tests['PCHSTOP'] = 'stdafx.h'

 env_integration_tests.Append(CCPCHFLAGS = ['/FIstdafx.h'])

 

-integration_tests = env_integration_tests.Program(

+integration_tests = env_integration_tests.ChromeTestProgram(

     ['../sbox_integration_tests.exe',

     '../sbox_integration_tests.ilk',

     '../sbox_integration_tests.lib',

@@ -299,7 +299,7 @@ env_validation_tests['PCH'] = pch
 env_validation_tests['PCHSTOP'] = 'stdafx.h'

 env_validation_tests.Append(CCPCHFLAGS = ['/FIstdafx.h'])

 

-validation_tests = env_validation_tests.Program(

+validation_tests = env_validation_tests.ChromeTestProgram(

     ['../sbox_validation_tests.exe',

     '../sbox_validation_tests.ilk',

     '../sbox_validation_tests.lib',

diff --git a/skia/SConscript b/skia/SConscript
index 848c0b8..54cf1de 100644
--- a/skia/SConscript
+++ b/skia/SConscript
@@ -190,4 +190,4 @@ env_p = env.Clone(
 pch, obj = env_p.PCH(['skia.pch', 'precompiled.obj'], 'precompiled.cc')

 env_p['PCH'] = pch

 

-env.StaticLibrary('skia', input_files + [obj])

+env.ChromeStaticLibrary('skia', input_files + [obj])

diff --git a/testing/SConscript.gtest b/testing/SConscript.gtest
index c2810c1..01d1f46 100644
--- a/testing/SConscript.gtest
+++ b/testing/SConscript.gtest
@@ -55,4 +55,4 @@ input_files = [
     'gtest/src/gtest.cc',

 ]

 

-env.StaticLibrary('gtest', input_files)

+env.ChromeStaticLibrary('gtest', input_files)