Convert chrome SConscript files to psuedo-builder calls.

TBR: evanm,bradnelson



git-svn-id: svn://svn.chromium.org/chrome/trunk/src@306 0039d316-1c4b-4281-b951-d872f2087c98

32 files changed, 36 insertions, 36 deletions

diff --git a/chrome/SConscript b/chrome/SConscript
index fb1663c..8ea3c3b 100644
--- a/chrome/SConscript
+++ b/chrome/SConscript
@@ -219,7 +219,7 @@ libs = [
     '$WEBKIT_DIR/Port.lib',

 ]

 

-dll_targets = env_dll.SharedLibrary(['chrome',

+dll_targets = env_dll.ChromeSharedLibrary(['chrome',

                                      'chrome_dll.pdb',

                                      'chrome_dll.lib'],

                                     dll_resources + input_files + libs)

@@ -346,7 +346,7 @@ env_exe.Append(
     ],

 )

 

-chrome_exe = env_exe.Program(

+chrome_exe = env_exe.ChromeProgram(

     ['chrome.exe',

      'chrome_exe.pdb',

      'chrome_exe_implib.lib'],

@@ -398,7 +398,7 @@ env_snapshot.Prepend(
     ],

 )

 

-env_snapshot.StaticLibrary('snapshotv8', 'snapshot.cc')

+env_snapshot.ChromeStaticLibrary('snapshotv8', 'snapshot.cc')

 

 env_snapshot.Command('snapshot.cc', '#/../v8/bin/debug/mksnapshot.exe',

                      '$SOURCE $TARGET')

diff --git a/chrome/SConscript.automated_ui_tests b/chrome/SConscript.automated_ui_tests
index 6bc47b6..f9730d0 100644
--- a/chrome/SConscript.automated_ui_tests
+++ b/chrome/SConscript.automated_ui_tests
@@ -119,7 +119,7 @@ test_files = [
     '$CHROME_DIR/test/ui/ui_test_suite$OBJSUFFIX',

 ]

 

-exe = env_test.Program('automated_ui_tests.exe',  test_files + libs)

+exe = env_test.ChromeTestProgram('automated_ui_tests.exe',  test_files + libs)

 

 i = env_test.Install('$TARGET_ROOT', exe)

 Alias('chrome', i)

diff --git a/chrome/SConscript.ui_tests b/chrome/SConscript.ui_tests
index c6e60b6..7951b0b 100644
--- a/chrome/SConscript.ui_tests
+++ b/chrome/SConscript.ui_tests
@@ -169,7 +169,7 @@ ui_test_files = [
     '$NET_DIR/url_request/url_request_test_job$OBJSUFFIX',

 ]

 

-ui_tests = env_test.Program('ui_tests.exe',  ui_test_files + libs)

+ui_tests = env_test.ChromeTestProgram('ui_tests.exe',  ui_test_files + libs)

 

 i = env_test.Install('$TARGET_ROOT', ui_tests)

 Alias('chrome', i)

diff --git a/chrome/SConscript.unit_tests b/chrome/SConscript.unit_tests
index ce3b199..05ba475 100644
--- a/chrome/SConscript.unit_tests
+++ b/chrome/SConscript.unit_tests
@@ -244,7 +244,7 @@ unit_test_files = [
     env_test['TEST_DATA_RES'],

 ]

 

-unit_tests = env_test.Program('unit_tests.exe', unit_test_files + libs)

+unit_tests = env_test.ChromeTestProgram('unit_tests.exe', unit_test_files + libs)

 

 i = env_test.Install('$TARGET_ROOT', unit_tests)

 Alias('chrome', i)

diff --git a/chrome/app/resources/SConscript b/chrome/app/resources/SConscript
index 754d7bc..11d9f63 100644
--- a/chrome/app/resources/SConscript
+++ b/chrome/app/resources/SConscript
@@ -146,7 +146,7 @@ for locale_settings_res in resources:
   g_r_res = s.replace('locale_settings', 'generated_resources')

   w_s_res = s.replace('locale_settings',

                       '$WEBKIT_DIR/build/localized_strings/webkit_strings')

-  dll = env.SharedLibrary(

+  dll = env.ChromeSharedLibrary(

       lang,

       [

           g_r_res,

diff --git a/chrome/app/theme/SConscript b/chrome/app/theme/SConscript
index 0f7664d..0e3de809 100644
--- a/chrome/app/theme/SConscript
+++ b/chrome/app/theme/SConscript
@@ -85,7 +85,7 @@ env.Append(
     ],

 )

 

-themes_default = env.SharedLibrary("$CHROME_DIR/themes/default", res)

+themes_default = env.ChromeSharedLibrary("$CHROME_DIR/themes/default", res)

 

 env.AddPostAction(themes_default[1], Touch(themes_default[1:]))

 

diff --git a/chrome/browser/SConscript b/chrome/browser/SConscript
index 63560ed..029e63e 100644
--- a/chrome/browser/SConscript
+++ b/chrome/browser/SConscript
@@ -383,7 +383,7 @@ input_files = [
     'xp_frame.cc',

 ]

 

-env.StaticLibrary('browser', input_files)

+env.ChromeStaticLibrary('browser', input_files)

 

 

 SConscript('debugger/SConscript', exports=['env'])

diff --git a/chrome/browser/debugger/SConscript b/chrome/browser/debugger/SConscript
index 5b21722..ba79349 100644
--- a/chrome/browser/debugger/SConscript
+++ b/chrome/browser/debugger/SConscript
@@ -74,4 +74,4 @@ input_files = [
     'debugger_wrapper.cc',

 ]

 

-env.StaticLibrary('debugger', input_files)

+env.ChromeStaticLibrary('debugger', input_files)

diff --git a/chrome/common/SConscript b/chrome/common/SConscript
index 626f05f..8505f98 100644
--- a/chrome/common/SConscript
+++ b/chrome/common/SConscript
@@ -130,7 +130,7 @@ input_files = [
     'worker_thread_ticker.cc',

 ]

 

-env.StaticLibrary('common', input_files)

+env.ChromeStaticLibrary('common', input_files)

 

 

 env_test = env_test.Clone()

@@ -198,7 +198,7 @@ libs = [
     '$BASE_DIR/base.lib',

 ]

 

-ipc_tests = env_test.Program('ipc_tests.exe', ipc_tests_files + libs)

+ipc_tests = env_test.ChromeTestProgram('ipc_tests.exe', ipc_tests_files + libs)

 

 i = env_test.Install('$TARGET_ROOT', ipc_tests)

 Alias('chrome', i)

diff --git a/chrome/installer/mini_installer/SConscript b/chrome/installer/mini_installer/SConscript
index aac6f0a..d3e73b5 100644
--- a/chrome/installer/mini_installer/SConscript
+++ b/chrome/installer/mini_installer/SConscript
@@ -115,7 +115,7 @@ input_files = [
     "pe_resource.cc",

 ]

 

-exe = env.Program(['mini_installer',

+exe = env.ChromeProgram(['mini_installer',

                    'mini_installer.pdb',

                    'mini_installer.map'],

                   components + resources + input_files)

@@ -213,7 +213,7 @@ libs = [
     '$BASE_DIR/base.lib',

 ]

 

-exe = env_test.Program(['installer_unittests',

+exe = env_test.ChromeTestProgram(['installer_unittests',

                         'installer_unittests.pdb'],

                        input_files + libs)

 i = env_test.Install('$TARGET_ROOT', exe)

diff --git a/chrome/installer/setup/SConscript b/chrome/installer/setup/SConscript
index 65c6087..0914a99 100644
--- a/chrome/installer/setup/SConscript
+++ b/chrome/installer/setup/SConscript
@@ -123,7 +123,7 @@ libs = [
     '$BASE_DIR/base.lib',

 ]

 

-exe = env.Program(['setup',

+exe = env.ChromeProgram(['setup',

                    'setup.pdb',

                    'setup.map'],

                   resources + input_files + libs)

diff --git a/chrome/installer/util/SConscript b/chrome/installer/util/SConscript
index 31c8d02..8b4a942 100644
--- a/chrome/installer/util/SConscript
+++ b/chrome/installer/util/SConscript
@@ -82,7 +82,7 @@ input_files = [
     'work_item_list.cc',

 ]

 

-x = env.StaticLibrary('util', input_files)

+x = env.ChromeStaticLibrary('util', input_files)

 

 

 # create_string_rc.py imports FP.py from the tools/grit/grit/extern

diff --git a/chrome/plugin/SConscript b/chrome/plugin/SConscript
index c53c37a..588d151 100644
--- a/chrome/plugin/SConscript
+++ b/chrome/plugin/SConscript
@@ -60,4 +60,4 @@ input_files = [
     'webplugin_proxy.cc',

 ]

 

-env.StaticLibrary('plugin', input_files)

+env.ChromeStaticLibrary('plugin', input_files)

diff --git a/chrome/renderer/SConscript b/chrome/renderer/SConscript
index 200dba7..ba25a7a 100644
--- a/chrome/renderer/SConscript
+++ b/chrome/renderer/SConscript
@@ -78,4 +78,4 @@ input_files = [
     'webplugin_delegate_proxy.cc',

 ]

 

-env.StaticLibrary('renderer', input_files)

+env.ChromeStaticLibrary('renderer', input_files)

diff --git a/chrome/test/activex_test_control/SConscript b/chrome/test/activex_test_control/SConscript
index 6f459c1..46e12b3 100644
--- a/chrome/test/activex_test_control/SConscript
+++ b/chrome/test/activex_test_control/SConscript
@@ -86,7 +86,7 @@ input_files = [
     'chrome_test_control.cc',

 ]

 

-dll = env.SharedLibrary(['activex_test_control', 'activex_test_control.lib'],

+dll = env.ChromeSharedLibrary(['activex_test_control', 'activex_test_control.lib'],

                         input_files)

 

 i = env.Install('$TARGET_ROOT', dll)

diff --git a/chrome/test/automation/SConscript b/chrome/test/automation/SConscript
index 79286f2..fb402ff 100644
--- a/chrome/test/automation/SConscript
+++ b/chrome/test/automation/SConscript
@@ -52,7 +52,7 @@ input_files = [
     'window_proxy.cc',

 ]

 

-lib = env.StaticLibrary('automation', input_files)

+lib = env.ChromeStaticLibrary('automation', input_files)

 

 i = env.Install('$TARGET_ROOT', lib)

 env.Alias('chrome', i)

diff --git a/chrome/test/chrome_plugin/SConscript b/chrome/test/chrome_plugin/SConscript
index 134c868..d95bf07 100644
--- a/chrome/test/chrome_plugin/SConscript
+++ b/chrome/test/chrome_plugin/SConscript
@@ -89,7 +89,7 @@ libs = [
     '$BASE_DIR/base.lib',

 ]

 

-dll = env.SharedLibrary('test_chrome_plugin', input_files + libs)

+dll = env.ChromeSharedLibrary('test_chrome_plugin', input_files + libs)

 

 i = env.Install('$TARGET_ROOT', dll)

 env.Alias('chrome', i)

diff --git a/chrome/test/interactive_ui/SConscript b/chrome/test/interactive_ui/SConscript
index 54d7fc3..efb7cb18 100644
--- a/chrome/test/interactive_ui/SConscript
+++ b/chrome/test/interactive_ui/SConscript
@@ -122,7 +122,7 @@ libs = [
 ]

 

 

-exe = env_test.Program(['interactive_ui_tests',

+exe = env_test.ChromeTestProgram(['interactive_ui_tests',

                         'interactive_ui_tests.pdb'],

                        input_files + libs)

 i = env_test.Install('$TARGET_ROOT', exe)

diff --git a/chrome/test/mini_installer_test/SConscript b/chrome/test/mini_installer_test/SConscript
index 8413c3f..3b06470 100644
--- a/chrome/test/mini_installer_test/SConscript
+++ b/chrome/test/mini_installer_test/SConscript
@@ -101,7 +101,7 @@ libs = [
     '$BASE_DIR/base.lib',

 ]

 

-exe = env_test.Program(['mini_installer_test',

+exe = env_test.ChromeTestProgram(['mini_installer_test',

                         'mini_installer_test.pdb'],

                        input_files + libs)

 i = env_test.Install('$TARGET_ROOT', exe)

diff --git a/chrome/test/page_cycler/SConscript b/chrome/test/page_cycler/SConscript
index 59b1a8a..1f22faa 100644
--- a/chrome/test/page_cycler/SConscript
+++ b/chrome/test/page_cycler/SConscript
@@ -117,7 +117,7 @@ libs = [
 ]

 

 

-exe = env_test.Program(['page_cycler_tests',

+exe = env_test.ChromeTestProgram(['page_cycler_tests',

                         'page_cycler_tests.pdb'],

                        input_files + libs)

 i = env_test.Install('$TARGET_ROOT', exe)

diff --git a/chrome/test/plugin/SConscript b/chrome/test/plugin/SConscript
index 43a192b..b0c7d15 100644
--- a/chrome/test/plugin/SConscript
+++ b/chrome/test/plugin/SConscript
@@ -120,7 +120,7 @@ libs = [
 ]

 

 

-exe = env_test.Program(['plugin_tests',

+exe = env_test.ChromeTestProgram(['plugin_tests',

                         'plugin_tests.pdb'],

                        input_files + libs)

 i = env_test.Install('$TARGET_ROOT', exe)

diff --git a/chrome/test/reliability/SConscript b/chrome/test/reliability/SConscript
index 22dde0e..cca1b6b 100644
--- a/chrome/test/reliability/SConscript
+++ b/chrome/test/reliability/SConscript
@@ -115,7 +115,7 @@ libs = [
 ]

 

 

-exe = env_test.Program(['reliability_tests',

+exe = env_test.ChromeTestProgram(['reliability_tests',

                         'reliability_tests.pdb'],

                        input_files + libs)

 i = env_test.Install('$TARGET_ROOT', exe)

diff --git a/chrome/test/security_tests/SConscript b/chrome/test/security_tests/SConscript
index d903295..653858c 100644
--- a/chrome/test/security_tests/SConscript
+++ b/chrome/test/security_tests/SConscript
@@ -82,7 +82,7 @@ input_files = [
     '$SANDBOX_DIR/tests/validation_tests/commands${OBJSUFFIX}',

 ]

 

-dll = env.SharedLibrary('security_tests', input_files)

+dll = env.ChromeSharedLibrary('security_tests', input_files)

 

 i = env.Install('$TARGET_ROOT', dll)

 env.Alias('chrome', i)

diff --git a/chrome/test/selenium/SConscript b/chrome/test/selenium/SConscript
index b1473c1..9d1ab25 100644
--- a/chrome/test/selenium/SConscript
+++ b/chrome/test/selenium/SConscript
@@ -112,7 +112,7 @@ libs = [
     '$CHROME_DIR/test/automation/automation.lib',

 ]

 

-exe = env_test.Program(['selenium_tests',

+exe = env_test.ChromeTestProgram(['selenium_tests',

                         'selenium_tests.pdb'],

                        input_files + libs)

 i = env_test.Install('$TARGET_ROOT', exe)

diff --git a/chrome/test/startup/SConscript b/chrome/test/startup/SConscript
index a0e13e0..3f8d1e1 100644
--- a/chrome/test/startup/SConscript
+++ b/chrome/test/startup/SConscript
@@ -111,7 +111,7 @@ libs = [
     '$CHROME_DIR/test/automation/automation.lib',

 ]

 

-exe = env_test.Program(['startup_tests',

+exe = env_test.ChromeTestProgram(['startup_tests',

                         'startup_tests.pdb'],

                        input_files + libs)

 i = env_test.Install('$TARGET_ROOT', exe)

diff --git a/chrome/test/tab_switching/SConscript b/chrome/test/tab_switching/SConscript
index cd9c310..e41ce9a 100644
--- a/chrome/test/tab_switching/SConscript
+++ b/chrome/test/tab_switching/SConscript
@@ -115,7 +115,7 @@ libs = [
 

 #"..\..\Debug\obj\tab_switching_test\precompiled_wtl.obj"

 

-exe = env_test.Program(['tab_switching_test',

+exe = env_test.ChromeTestProgram(['tab_switching_test',

                         'tab_switching_test.pdb'],

                        input_files + libs)

 i = env_test.Install('$TARGET_ROOT', exe)

diff --git a/chrome/third_party/hunspell/SConscript b/chrome/third_party/hunspell/SConscript
index 6f7b5d0..ff4153f 100644
--- a/chrome/third_party/hunspell/SConscript
+++ b/chrome/third_party/hunspell/SConscript
@@ -67,7 +67,7 @@ input_files = [
     'src/parsers/textparser.cxx',

 ]

 

-env.StaticLibrary('hunspell', input_files)

+env.ChromeStaticLibrary('hunspell', input_files)

 

 

 

diff --git a/chrome/third_party/sqlite/SConscript b/chrome/third_party/sqlite/SConscript
index c8c94c9..e04381a 100644
--- a/chrome/third_party/sqlite/SConscript
+++ b/chrome/third_party/sqlite/SConscript
@@ -116,4 +116,4 @@ input_files = [
     'where.c',

 ]

 

-env.StaticLibrary('sqlite', input_files)

+env.ChromeStaticLibrary('sqlite', input_files)

diff --git a/chrome/tools/crash_service/SConscript b/chrome/tools/crash_service/SConscript
index b682986..538bf58 100644
--- a/chrome/tools/crash_service/SConscript
+++ b/chrome/tools/crash_service/SConscript
@@ -93,7 +93,7 @@ input_files = [
     'crash_service.cc',

 ]

 

-exe = env.Program('crash_service.exe', input_files + libs)

+exe = env.ChromeProgram('crash_service.exe', input_files + libs)

 

 i = env.Install('$TARGET_ROOT', exe)

 Alias('chrome', i)

diff --git a/chrome/tools/perf/flush_cache/SConscript b/chrome/tools/perf/flush_cache/SConscript
index 7b3d853..22d927b 100644
--- a/chrome/tools/perf/flush_cache/SConscript
+++ b/chrome/tools/perf/flush_cache/SConscript
@@ -84,7 +84,7 @@ libs = [
     '$BASE_DIR/base.lib',

 ]

 

-exe = env_test.Program(['flush_cache',

+exe = env_test.ChromeTestProgram(['flush_cache',

                         'flush_cache'],

                        input_files + libs)

 i = env_test.Install('$TARGET_ROOT', exe)

diff --git a/chrome/tools/test/image_diff/SConscript b/chrome/tools/test/image_diff/SConscript
index b9445d9..6054a304 100644
--- a/chrome/tools/test/image_diff/SConscript
+++ b/chrome/tools/test/image_diff/SConscript
@@ -96,7 +96,7 @@ libs = [
     '$BASE_DIR/base.lib',

 ]

 

-exe = env_test.Program(['image_diff',

+exe = env_test.ChromeTestProgram(['image_diff',

                         'image_diff.pdb'],

                        input_files + libs)

 i = env_test.Install('$TARGET_ROOT', exe)

diff --git a/chrome/views/SConscript b/chrome/views/SConscript
index 49cc275..bff655c 100644
--- a/chrome/views/SConscript
+++ b/chrome/views/SConscript
@@ -114,4 +114,4 @@ input_files = [
     'window.cc',

 ]

 

-env.StaticLibrary('views', input_files)

+env.ChromeStaticLibrary('views', input_files)