Cross-platform: Let SCons abstract library names by getting rid of .lib suffixes when linking with the libraries we build, replacing the lists of explicitly-suffixed "source files" with library base names in the environment LIBS variables. This requires having ChromeStaticLibrary() install .lib files in a $BUILD_TYPE/Libs directory, and adding that directory to $LIBPATH.

R=evanm,bradnelson



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

10 files changed, 161 insertions, 136 deletions

diff --git a/chrome/test/chrome_plugin/SConscript b/chrome/test/chrome_plugin/SConscript
index b4d95e1..dbec5a0 100644
--- a/chrome/test/chrome_plugin/SConscript
+++ b/chrome/test/chrome_plugin/SConscript
@@ -36,6 +36,14 @@ env.Prepend(
     CPPPATH = [

         '#/..',

     ],

+    LIBS = [

+        'googleurl',

+        'icuuc',

+        'base',

+    ],

+)

+

+env.Prepend(

     LINKFLAGS = [

         '/INCREMENTAL',

 

@@ -62,13 +70,7 @@ input_files = [
     'test_chrome_plugin.def',

 ]

 

-libs = [

-    '$GOOGLEURL_DIR/googleurl.lib',

-    '$ICU38_DIR/icuuc.lib',

-    '$BASE_DIR/base.lib',

-]

-

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

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

 

 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 d472554..5262af5 100644
--- a/chrome/test/interactive_ui/SConscript
+++ b/chrome/test/interactive_ui/SConscript
@@ -50,6 +50,25 @@ env_test.Prepend(
         '$LIBXSLT_DIR',

         '$LIBXML_DIR/include',

     ],

+    LIBS = [

+        'automation',

+        'base',

+        'base_gfx',

+        'browser',

+        'bzip2',

+        'common',

+        'googleurl',

+        'gtest',

+        'icuuc',

+        'libpng',

+        'modp_b64',

+        'net',

+        'skia',

+        'zlib',

+    ],

+)

+

+env_test.Prepend(

     LINKFLAGS = [

         '/INCREMENTAL',

         '/DEBUG',

@@ -83,27 +102,9 @@ input_files = [
     '$CHROME_DIR/test/test_file_util$OBJSUFFIX',

 ]

 

-libs = [

-    '$GOOGLEURL_DIR/googleurl.lib',

-    '$SKIA_DIR/skia.lib',

-    '$LIBPNG_DIR/libpng.lib',

-    '$TESTING_DIR/gtest.lib',

-    '$BASE_DIR/gfx/base_gfx.lib',

-    '$ICU38_DIR/icuuc.lib',

-    '$CHROME_DIR/common/common.lib',

-    '$ZLIB_DIR/zlib.lib',

-    '$MODP_B64_DIR/modp_b64.lib',

-    '$CHROME_DIR/browser/browser.lib',

-    '$NET_DIR/net.lib',

-    '$BZIP2_DIR/bzip2.lib',

-    '$BASE_DIR/base.lib',

-    '$CHROME_DIR/test/automation/automation.lib',

-]

-

-

 exe = env_test.ChromeTestProgram(['interactive_ui_tests',

                         'interactive_ui_tests.pdb'],

-                       input_files + libs)

+                       input_files)

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

 

 env_test.Alias('chrome', i)

diff --git a/chrome/test/mini_installer_test/SConscript b/chrome/test/mini_installer_test/SConscript
index af327a8..0aa72c3 100644
--- a/chrome/test/mini_installer_test/SConscript
+++ b/chrome/test/mini_installer_test/SConscript
@@ -42,6 +42,15 @@ env_test.Prepend(
         '$GTEST_DIR',

         '#/..',

     ],

+    LIBS = [

+        'util',

+        'gtest',

+        'icuuc',

+        'base',

+    ],

+)

+

+env_test.Prepend(

     LINKFLAGS = [

         '/INCREMENTAL',

         '/DEBUG',

@@ -73,16 +82,9 @@ input_files = [
     'test.cc',

 ]

 

-libs = [

-    '$CHROME_DIR/installer/util/util.lib',

-    '$TESTING_DIR/gtest.lib',

-    '$ICU38_DIR/icuuc.lib',

-    '$BASE_DIR/base.lib',

-]

-

 exe = env_test.ChromeTestProgram(['mini_installer_test',

                         'mini_installer_test.pdb'],

-                       input_files + libs)

+                       input_files)

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

 

 env_test.Alias('chrome', i)

diff --git a/chrome/test/page_cycler/SConscript b/chrome/test/page_cycler/SConscript
index cf220199..86fbdbf 100644
--- a/chrome/test/page_cycler/SConscript
+++ b/chrome/test/page_cycler/SConscript
@@ -45,6 +45,24 @@ env_test.Prepend(
         '$SKIA_DIR/platform',

         '#/..',

     ],

+    LIBS = [

+        'googleurl',

+        'skia',

+        'libpng',

+        'gtest',

+        'base_gfx',

+        'icuuc',

+        'common',

+        'zlib',

+        'modp_b64',

+        'browser',

+        'net',

+        'base',

+        'automation',

+    ],

+)

+

+env_test.Prepend(

     LINKFLAGS = [

         '/INCREMENTAL',

         '/DEBUG',

@@ -79,26 +97,9 @@ input_files = [
     'page_cycler_test.cc',

 ]

 

-libs = [

-    '$GOOGLEURL_DIR/googleurl.lib',

-    '$SKIA_DIR/skia.lib',

-    '$LIBPNG_DIR/libpng.lib',

-    '$TESTING_DIR/gtest.lib',

-    '$BASE_DIR/gfx/base_gfx.lib',

-    '$ICU38_DIR/icuuc.lib',

-    '$CHROME_DIR/common/common.lib',

-    '$ZLIB_DIR/zlib.lib',

-    '$MODP_B64_DIR/modp_b64.lib',

-    '$CHROME_DIR/browser/browser.lib',

-    '$NET_DIR/net.lib',

-    '$BASE_DIR/base.lib',

-    '$CHROME_DIR/test/automation/automation.lib',

-]

-

-

 exe = env_test.ChromeTestProgram(['page_cycler_tests',

                         'page_cycler_tests.pdb'],

-                       input_files + libs)

+                       input_files)

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

 

 env_test.Alias('chrome', i)

diff --git a/chrome/test/plugin/SConscript b/chrome/test/plugin/SConscript
index 78ecbb0..5cd5202 100644
--- a/chrome/test/plugin/SConscript
+++ b/chrome/test/plugin/SConscript
@@ -49,6 +49,25 @@ env_test.Prepend(
         '$LIBXSLT_DIR',

         '$LIBXML_DIR/includ',

     ],

+    LIBS = [

+        'googleurl',

+        'security_tests',

+        'skia',

+        'libpng',

+        'gtest',

+        'base_gfx',

+        'icuuc',

+        'common',

+        'zlib',

+        'modp_b64',

+        'browser',

+        'net',

+        'base',

+        'automation',

+    ],

+)

+

+env_test.Prepend(

     LINKFLAGS = [

         '/INCREMENTAL',

         '/DEBUG',

@@ -81,27 +100,10 @@ input_files = [
     'plugin_test.cpp',

 ]

 

-libs = [

-    '$GOOGLEURL_DIR/googleurl.lib',

-    '$CHROME_DIR/test/security_tests/security_tests.lib',

-    '$SKIA_DIR/skia.lib',

-    '$LIBPNG_DIR/libpng.lib',

-    '$TESTING_DIR/gtest.lib',

-    '$BASE_DIR/gfx/base_gfx.lib',

-    '$ICU38_DIR/icuuc.lib',

-    '$CHROME_DIR/common/common.lib',

-    '$ZLIB_DIR/zlib.lib',

-    '$MODP_B64_DIR/modp_b64.lib',

-    '$CHROME_DIR/browser/browser.lib',

-    '$NET_DIR/net.lib',

-    '$BASE_DIR/base.lib',

-    '$CHROME_DIR/test/automation/automation.lib',

-]

-

 

 exe = env_test.ChromeTestProgram(['plugin_tests',

                         'plugin_tests.pdb'],

-                       input_files + libs)

+                       input_files)

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

 

 env_test.Alias('chrome', i)

diff --git a/chrome/test/reliability/SConscript b/chrome/test/reliability/SConscript
index 3c0cbf5..0963288 100644
--- a/chrome/test/reliability/SConscript
+++ b/chrome/test/reliability/SConscript
@@ -46,6 +46,22 @@ env_test.Prepend(
         '$SKIA_DIR/platform',

         '#/..',

     ],

+    LIBS = [

+        'googleurl',

+        'skia',

+        'libpng',

+        'gtest',

+        'base_gfx',

+        'icuuc',

+        'common',

+        'zlib',

+        'browser',

+        'base',

+        'automation',

+    ],

+)

+

+env_test.Prepend(

     LINKFLAGS = [

         '/INCREMENTAL',

         '/DEBUG',

@@ -79,24 +95,9 @@ input_files = [
     'run_all_unittests.cc',

 ]

 

-libs = [

-    '$GOOGLEURL_DIR/googleurl.lib',

-    '$SKIA_DIR/skia.lib',

-    '$LIBPNG_DIR/libpng.lib',

-    '$TESTING_DIR/gtest.lib',

-    '$BASE_DIR/gfx/base_gfx.lib',

-    '$ICU38_DIR/icuuc.lib',

-    '$CHROME_DIR/common/common.lib',

-    '$ZLIB_DIR/zlib.lib',

-    '$CHROME_DIR/browser/browser.lib',

-    '$BASE_DIR/base.lib',

-    '$CHROME_DIR/test/automation/automation.lib',

-]

-

-

 exe = env_test.ChromeTestProgram(['reliability_tests',

                         'reliability_tests.pdb'],

-                       input_files + libs)

+                       input_files)

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

 

 env_test.Alias('chrome', i)

diff --git a/chrome/test/security_tests/SConscript b/chrome/test/security_tests/SConscript
index 2caf4d8..27a3eed 100644
--- a/chrome/test/security_tests/SConscript
+++ b/chrome/test/security_tests/SConscript
@@ -36,6 +36,9 @@ env.Prepend(
     CPPPATH = [

         '#/..',

     ],

+)

+

+env.Prepend(

     LINKFLAGS = [

         '/INCREMENTAL',

 

@@ -63,7 +66,14 @@ input_files = [
     '$SANDBOX_DIR/tests/validation_tests/commands${OBJSUFFIX}',

 ]

 

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

+dll = env.ChromeSharedLibrary(['security_tests',

+                               'security_tests.lib',

+                               'security_tests.ilk',

+                               'security_tests.pdb'],

+                              input_files)

+

+# TODO(sgk):  can go away once ChromeSharedLibrary() handles this.

+env.Install('$LIBS_DIR', dll[1])

 

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

 env.Alias('chrome', i)

diff --git a/chrome/test/selenium/SConscript b/chrome/test/selenium/SConscript
index 25cc7c2..c00c570 100644
--- a/chrome/test/selenium/SConscript
+++ b/chrome/test/selenium/SConscript
@@ -44,6 +44,24 @@ env_test.Prepend(
         '$SKIA_DIR/platform',

         '#/..',

     ],

+    LIBS = [

+        'googleurl',

+        'skia',

+        'libpng',

+        'gtest',

+        'base_gfx',

+        'icuuc',

+        'common',

+        'zlib',

+        'modp_b64',

+        'browser',

+        'net',

+        'base',

+        'automation',

+    ],

+)

+

+env_test.Prepend(

     LINKFLAGS = [

         '/INCREMENTAL',

         '/DEBUG',

@@ -75,25 +93,9 @@ input_files = [
     'selenium_test.cc',

 ]

 

-libs = [

-    '$GOOGLEURL_DIR/googleurl.lib',

-    '$SKIA_DIR/skia.lib',

-    '$LIBPNG_DIR/libpng.lib',

-    '$TESTING_DIR/gtest.lib',

-    '$BASE_DIR/gfx/base_gfx.lib',

-    '$ICU38_DIR/icuuc.lib',

-    '$CHROME_DIR/common/common.lib',

-    '$ZLIB_DIR/zlib.lib',

-    '$MODP_B64_DIR/modp_b64.lib',

-    '$CHROME_DIR/browser/browser.lib',

-    '$NET_DIR/net.lib',

-    '$BASE_DIR/base.lib',

-    '$CHROME_DIR/test/automation/automation.lib',

-]

-

 exe = env_test.ChromeTestProgram(['selenium_tests',

                         'selenium_tests.pdb'],

-                       input_files + libs)

+                       input_files)

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

 

 env_test.Alias('chrome', i)

diff --git a/chrome/test/startup/SConscript b/chrome/test/startup/SConscript
index 744014b..7815551 100644
--- a/chrome/test/startup/SConscript
+++ b/chrome/test/startup/SConscript
@@ -44,6 +44,22 @@ env_test.Prepend(
         '$SKIA_DIR/platform',

         '#/..',

     ],

+    LIBS = [

+        'googleurl',

+        'skia',

+        'libpng',

+        'gtest',

+        'base_gfx',

+        'icuuc',

+        'common',

+        'zlib',

+        'browser',

+        'base',

+        'automation',

+    ],

+)

+

+env_test.Prepend(

     LINKFLAGS = [

         '/INCREMENTAL',

         '/DEBUG',

@@ -76,23 +92,9 @@ input_files = [
     'startup_test.cc',

 ]

 

-libs = [

-    '$GOOGLEURL_DIR/googleurl.lib',

-    '$SKIA_DIR/skia.lib',

-    '$LIBPNG_DIR/libpng.lib',

-    '$TESTING_DIR/gtest.lib',

-    '$BASE_DIR/gfx/base_gfx.lib',

-    '$ICU38_DIR/icuuc.lib',

-    '$CHROME_DIR/common/common.lib',

-    '$ZLIB_DIR/zlib.lib',

-    '$CHROME_DIR/browser/browser.lib',

-    '$BASE_DIR/base.lib',

-    '$CHROME_DIR/test/automation/automation.lib',

-]

-

 exe = env_test.ChromeTestProgram(['startup_tests',

                         'startup_tests.pdb'],

-                       input_files + libs)

+                       input_files)

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

 

 env_test.Alias('chrome', i)

diff --git a/chrome/test/tab_switching/SConscript b/chrome/test/tab_switching/SConscript
index 034edce..420583f 100644
--- a/chrome/test/tab_switching/SConscript
+++ b/chrome/test/tab_switching/SConscript
@@ -44,6 +44,24 @@ env_test.Prepend(
         '$SKIA_DIR/platform',

         '#/..',

     ],

+    LIBS = [

+        'googleurl',

+        'skia',

+        'libpng',

+        'gtest',

+        'base_gfx',

+        'icuuc',

+        'common',

+        'zlib',

+        'modp_b64',

+        'browser',

+        'net',

+        'base',

+        'automation',

+    ],

+)

+

+env_test.Prepend(

     LINKFLAGS = [

         '/INCREMENTAL',

         '/DEBUG',

@@ -76,27 +94,11 @@ input_files = [
     'tab_switching_test.cc',

 ]

 

-libs = [

-    '$GOOGLEURL_DIR/googleurl.lib',

-    '$SKIA_DIR/skia.lib',

-    '$LIBPNG_DIR/libpng.lib',

-    '$TESTING_DIR/gtest.lib',

-    '$BASE_DIR/gfx/base_gfx.lib',

-    '$ICU38_DIR/icuuc.lib',

-    '$CHROME_DIR/common/common.lib',

-    '$ZLIB_DIR/zlib.lib',

-    '$MODP_B64_DIR/modp_b64.lib',

-    '$CHROME_DIR/browser/browser.lib',

-    '$NET_DIR/net.lib',

-    '$BASE_DIR/base.lib',

-    '$CHROME_DIR/test/automation/automation.lib',

-]

-

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

 

 exe = env_test.ChromeTestProgram(['tab_switching_test',

                         'tab_switching_test.pdb'],

-                       input_files + libs)

+                       input_files)

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

 

 env_test.Alias('chrome', i)