diff options
30 files changed, 36 insertions, 30 deletions
@@ -15,7 +15,7 @@ deps = { "/trunk/deps/third_party/cygwin@1788", "src/third_party/icu38": - "/trunk/deps/third_party/icu38@2463", + "/trunk/deps/third_party/icu38@2650", "src/third_party/python_24": "/trunk/deps/third_party/python_24@1790", diff --git a/base/SConscript b/base/SConscript index 3c6a6db..11858d1 100644 --- a/base/SConscript +++ b/base/SConscript @@ -197,7 +197,7 @@ env_tests.Prepend( 'base', 'base_gfx', 'gtest', - 'icuuc', + env_tests['ICU_LIBS'], # TODO(sgk): '$ICU_LIBS' when scons is fixed 'libpng', 'skia', 'zlib', diff --git a/build/SConscript.googleurl b/build/SConscript.googleurl index 844def0..9792fb5 100644 --- a/build/SConscript.googleurl +++ b/build/SConscript.googleurl @@ -60,7 +60,7 @@ env_tests.Append( LIBS = [ 'googleurl', 'base', - 'icuuc', + env_tests['ICU_LIBS'], # TODO(sgk): '$ICU_LIBS' when scons is fixed 'gtest', ] ) diff --git a/build/SConscript.main b/build/SConscript.main index 5a9f0a7..f19a459 100644 --- a/build/SConscript.main +++ b/build/SConscript.main @@ -249,6 +249,8 @@ if env['PLATFORM'] == 'win32': '/nologo', '/DEBUG', ], + + ICU_LIBS = ['icu'], ) env.Append( @@ -333,6 +335,8 @@ elif env['PLATFORM'] == 'posix': 'PERL_INCLUDE_PATH, ' 'PERL_INCLUDE_SUFFIX,' '__env__, RDirs, TARGET, SOURCE)}'), + + ICU_LIBS = ['icu'], ) # Build with support for gcov when COVERAGE=1. if ARGUMENTS.get('COVERAGE') == '1': @@ -397,6 +401,8 @@ elif env['PLATFORM'] == 'darwin': 'ApplicationServices', 'Foundation', ], + + ICU_LIBS = ['icu'], ) else: diff --git a/chrome/SConscript b/chrome/SConscript index 2ff2347..958d8ab 100644 --- a/chrome/SConscript +++ b/chrome/SConscript @@ -104,7 +104,7 @@ env_dll.Append( 'net', 'skia', 'bzip2', - 'icuuc', + env_dll['ICU_LIBS'], # TODO(sgk): '$ICU_LIBS' when scons is fixed 'libjpeg', 'libpng', 'libxml', @@ -288,7 +288,7 @@ env_exe.Prepend( LIBS = [ 'base', 'breakpad_handler', - 'icuuc', + 'icu', 'sandbox', 'util', ], diff --git a/chrome/SConscript.automated_ui_tests b/chrome/SConscript.automated_ui_tests index 59ecbd0..db35988 100644 --- a/chrome/SConscript.automated_ui_tests +++ b/chrome/SConscript.automated_ui_tests @@ -30,7 +30,7 @@ env_test.Prepend( 'libpng', 'gtest', 'base_gfx', - 'icuuc', + env_test['ICU_LIBS'], # TODO(sgk): '$ICU_LIBS' when scons is fixed 'zlib', 'base', ], diff --git a/chrome/SConscript.ui_tests b/chrome/SConscript.ui_tests index 174f077..60a0603 100644 --- a/chrome/SConscript.ui_tests +++ b/chrome/SConscript.ui_tests @@ -38,7 +38,7 @@ env_test.Prepend( 'npapi_layout_test_plugin', 'gtest', 'base_gfx', - 'icuuc', + env_test['ICU_LIBS'], # TODO(sgk): '$ICU_LIBS' when scons is fixed 'zlib', 'modp_b64', 'net', diff --git a/chrome/SConscript.unit_tests b/chrome/SConscript.unit_tests index 98d80e6..4178314 100644 --- a/chrome/SConscript.unit_tests +++ b/chrome/SConscript.unit_tests @@ -47,7 +47,7 @@ env_test.Prepend( 'base_gfx', 'googleurl', 'gtest', - 'icuuc', + env_test['ICU_LIBS'], # TODO(sgk): '$ICU_LIBS' when scons is fixed 'libjpeg', 'libpng', 'libxml', diff --git a/chrome/common/SConscript b/chrome/common/SConscript index 3c0931c..ee658a3 100644 --- a/chrome/common/SConscript +++ b/chrome/common/SConscript @@ -138,7 +138,7 @@ env_test.Append( LIBS = [ 'base', 'gtest', - 'icuuc', + env_test['ICU_LIBS'], # TODO(sgk): '$ICU_LIBS' when scons is fixed ], ) diff --git a/chrome/installer/mini_installer/SConscript b/chrome/installer/mini_installer/SConscript index 062c1f7..f2a8269 100644 --- a/chrome/installer/mini_installer/SConscript +++ b/chrome/installer/mini_installer/SConscript @@ -113,7 +113,7 @@ env_test.Prepend( ], LIBS = [ 'gtest', - 'icuuc', + env_test['ICU_LIBS'], # TODO(sgk): '$ICU_LIBS' when scons is fixed 'common', 'base', ], diff --git a/chrome/installer/setup/SConscript b/chrome/installer/setup/SConscript index 81e7c9c..a920f31 100644 --- a/chrome/installer/setup/SConscript +++ b/chrome/installer/setup/SConscript @@ -36,7 +36,7 @@ env.Prepend( 'base', 'bspatch', 'common', - 'icuuc', + env['ICU_LIBS'], # TODO(sgk): '$ICU_LIBS' when scons is fixed 'lzma_sdk', 'util', ], diff --git a/chrome/test/chrome_plugin/SConscript b/chrome/test/chrome_plugin/SConscript index 77c6ab9..4a545e2 100644 --- a/chrome/test/chrome_plugin/SConscript +++ b/chrome/test/chrome_plugin/SConscript @@ -13,7 +13,7 @@ env.Prepend( ], LIBS = [ 'googleurl', - 'icuuc', + env['ICU_LIBS'], # TODO(sgk): '$ICU_LIBS' when scons is fixed 'base', ], ) diff --git a/chrome/test/interactive_ui/SConscript b/chrome/test/interactive_ui/SConscript index faf8027..72c28df 100644 --- a/chrome/test/interactive_ui/SConscript +++ b/chrome/test/interactive_ui/SConscript @@ -35,7 +35,7 @@ env_test.Prepend( 'common', 'googleurl', 'gtest', - 'icuuc', + env_test['ICU_LIBS'], # TODO(sgk): '$ICU_LIBS' when scons is fixed 'libpng', 'modp_b64', 'net', diff --git a/chrome/test/memory_test/SConscript b/chrome/test/memory_test/SConscript index 6c87f12..e0bb274 100644 --- a/chrome/test/memory_test/SConscript +++ b/chrome/test/memory_test/SConscript @@ -29,7 +29,7 @@ env_test.Prepend( 'common', 'googleurl', 'gtest', - 'icuuc', + env_test['ICU_LIBS'], # TODO(sgk): '$ICU_LIBS' when scons is fixed 'libpng', 'net', 'skia', diff --git a/chrome/test/mini_installer_test/SConscript b/chrome/test/mini_installer_test/SConscript index 62bb0ce..99ebfed 100644 --- a/chrome/test/mini_installer_test/SConscript +++ b/chrome/test/mini_installer_test/SConscript @@ -20,7 +20,7 @@ env_test.Prepend( LIBS = [ 'util', 'gtest', - 'icuuc', + env_test['ICU_LIBS'], # TODO(sgk): '$ICU_LIBS' when scons is fixed 'base', ], ) diff --git a/chrome/test/page_cycler/SConscript b/chrome/test/page_cycler/SConscript index e0a58fe..4e0aef6 100644 --- a/chrome/test/page_cycler/SConscript +++ b/chrome/test/page_cycler/SConscript @@ -26,7 +26,7 @@ env_test.Prepend( 'libpng', 'gtest', 'base_gfx', - 'icuuc', + env_test['ICU_LIBS'], # TODO(sgk): '$ICU_LIBS' when scons is fixed 'common', 'zlib', 'modp_b64', diff --git a/chrome/test/plugin/SConscript b/chrome/test/plugin/SConscript index 43a8b4b..432cd64 100644 --- a/chrome/test/plugin/SConscript +++ b/chrome/test/plugin/SConscript @@ -31,7 +31,7 @@ env_test.Prepend( 'libpng', 'gtest', 'base_gfx', - 'icuuc', + env_test['ICU_LIBS'], # TODO(sgk): '$ICU_LIBS' when scons is fixed 'common', 'zlib', 'modp_b64', diff --git a/chrome/test/reliability/SConscript b/chrome/test/reliability/SConscript index 50f2329..89453d0 100644 --- a/chrome/test/reliability/SConscript +++ b/chrome/test/reliability/SConscript @@ -27,7 +27,7 @@ env_test.Prepend( 'libpng', 'gtest', 'base_gfx', - 'icuuc', + env_test['ICU_LIBS'], # TODO(sgk): '$ICU_LIBS' when scons is fixed 'common', 'zlib', 'browser', diff --git a/chrome/test/selenium/SConscript b/chrome/test/selenium/SConscript index a7c5fe2..c06189f 100644 --- a/chrome/test/selenium/SConscript +++ b/chrome/test/selenium/SConscript @@ -25,7 +25,7 @@ env_test.Prepend( 'libpng', 'gtest', 'base_gfx', - 'icuuc', + env_test['ICU_LIBS'], # TODO(sgk): '$ICU_LIBS' when scons is fixed 'common', 'zlib', 'modp_b64', diff --git a/chrome/test/startup/SConscript b/chrome/test/startup/SConscript index 697d365..9541815 100644 --- a/chrome/test/startup/SConscript +++ b/chrome/test/startup/SConscript @@ -25,7 +25,7 @@ env_test.Prepend( 'libpng', 'gtest', 'base_gfx', - 'icuuc', + env_test['ICU_LIBS'], # TODO(sgk): '$ICU_LIBS' when scons is fixed 'common', 'zlib', 'browser', diff --git a/chrome/test/tab_switching/SConscript b/chrome/test/tab_switching/SConscript index d19e169..e54372f 100644 --- a/chrome/test/tab_switching/SConscript +++ b/chrome/test/tab_switching/SConscript @@ -25,7 +25,7 @@ env_test.Prepend( 'libpng', 'gtest', 'base_gfx', - 'icuuc', + env_test['ICU_LIBS'], # TODO(sgk): '$ICU_LIBS' when scons is fixed 'common', 'zlib', 'modp_b64', diff --git a/chrome/tools/crash_service/SConscript b/chrome/tools/crash_service/SConscript index 27c4ce0..35bbfc5 100644 --- a/chrome/tools/crash_service/SConscript +++ b/chrome/tools/crash_service/SConscript @@ -17,7 +17,7 @@ env.Prepend( 'breakpad_handler', 'breakpad_sender', 'common', - 'icuuc', + env['ICU_LIBS'], # TODO(sgk): '$ICU_LIBS' when scons is fixed 'skia', 'zlib', ], diff --git a/chrome/tools/perf/flush_cache/SConscript b/chrome/tools/perf/flush_cache/SConscript index 785273d..5bf1fe6 100644 --- a/chrome/tools/perf/flush_cache/SConscript +++ b/chrome/tools/perf/flush_cache/SConscript @@ -11,7 +11,7 @@ env_test.Prepend( '#/..', ], LIBS = [ - 'icuuc', + env_test['ICU_LIBS'], # TODO(sgk): '$ICU_LIBS' when scons is fixed 'base', ], ) diff --git a/chrome/tools/test/image_diff/SConscript b/chrome/tools/test/image_diff/SConscript index 729bc51..0485e01 100644 --- a/chrome/tools/test/image_diff/SConscript +++ b/chrome/tools/test/image_diff/SConscript @@ -21,7 +21,7 @@ env_test.Prepend( 'skia', 'libpng', 'base_gfx', - 'icuuc', + env_test['ICU_LIBS'], # TODO(sgk): '$ICU_LIBS' when scons is fixed 'zlib', 'base', ], diff --git a/gears/SConscript.dll b/gears/SConscript.dll index c987f2d..befdc9a 100644 --- a/gears/SConscript.dll +++ b/gears/SConscript.dll @@ -268,7 +268,7 @@ env_browser.Append( # 'base', 'gd', 'googleurl-gears', -# 'icuuc', +# env_browser['ICU_LIBS'], # TODO(sgk): '$ICU_LIBS' when scons is fixed 'jpeg', 'modp_b64', 'png', diff --git a/gears/SConscript.googleurl b/gears/SConscript.googleurl index 865ba03..771c0e7 100644 --- a/gears/SConscript.googleurl +++ b/gears/SConscript.googleurl @@ -70,7 +70,7 @@ env.ChromeStaticLibrary('googleurl-gears', input_files) # LIBS = [ # 'googleurl', # 'base', -# 'icuuc', +# env_tests['ICU_LIBS'], # TODO(sgk): '$ICU_LIBS' when scons is fixed # 'gtest', # ] #) diff --git a/net/SConscript b/net/SConscript index c0d775e..225647d 100644 --- a/net/SConscript +++ b/net/SConscript @@ -171,7 +171,7 @@ env_tests.Prepend( 'base', 'googleurl', 'gtest', - 'icuuc', + env_tests['ICU_LIBS'], # TODO(sgk): '$ICU_LIBS' when scons is fixed 'modp_b64', 'zlib', ] diff --git a/net/tools/tld_cleanup/SConscript b/net/tools/tld_cleanup/SConscript index 0bd6197..5ab7e82 100644 --- a/net/tools/tld_cleanup/SConscript +++ b/net/tools/tld_cleanup/SConscript @@ -12,7 +12,7 @@ env.Prepend( ], LIBS = [ 'googleurl', - 'icuuc', + env['ICU_LIBS'], # TODO(sgk): '$ICU_LIBS' when scons is fixed 'base', # We only need to link with net due to use precompiled_net.pch. 'net', diff --git a/webkit/activex_shim_dll/SConscript b/webkit/activex_shim_dll/SConscript index b12b23a..a4dc1b2 100644 --- a/webkit/activex_shim_dll/SConscript +++ b/webkit/activex_shim_dll/SConscript @@ -14,7 +14,7 @@ env.Prepend( LIBS = [ 'activex_shim', 'googleurl', - 'icuuc', + env['ICU_LIBS'], # TODO(sgk): '$ICU_LIBS' when scons is fixed 'base', ], ) diff --git a/webkit/tools/test_shell/SConscript b/webkit/tools/test_shell/SConscript index 3f364b3..93fb762 100644 --- a/webkit/tools/test_shell/SConscript +++ b/webkit/tools/test_shell/SConscript @@ -36,7 +36,7 @@ env.Append( 'skia', 'gtest', 'bzip2', - 'icuuc', + env['ICU_LIBS'], # TODO(sgk): '$ICU_LIBS' when scons is fixed 'libjpeg', 'libpng', 'libxml', |