diff options
| author | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-16 22:24:55 +0000 |
|---|---|---|
| committer | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-16 22:24:55 +0000 |
| commit | e16027d6b660ac4c0d9b50e7dabbf03d7cf1ba5f (patch) | |
| tree | b265b4cef18b6e708dcf36015c1afb8220aea648 /chrome/test/interactive_ui | |
| parent | 4ed077a820dca166e3e2bf9785311331df0190b0 (diff) | |
| download | chromium_src-e16027d6b660ac4c0d9b50e7dabbf03d7cf1ba5f.zip chromium_src-e16027d6b660ac4c0d9b50e7dabbf03d7cf1ba5f.tar.gz chromium_src-e16027d6b660ac4c0d9b50e7dabbf03d7cf1ba5f.tar.bz2 | |
Fix accumulated webkit merge ramifications in the SCons build of Chrome
(plus various renaming ripple effects masked by merge build errors):
* Move invocation of recently-created *.scons files from
chrome\SConscript into chrome\chrome.scons.
* Move the ChromeVersionRC() Builder up into chrome\chrome.scons
so it's available in all the newer *.scons files (specifically
installer\mini_installer\mini_installer.scons and
installer\setup\setup.scons).
* Build chrome.dll in a chrome_dll subdirectory, and chrome.exe in
a chrome_exe subdirectory, to avoid the name conflict when both
try to create a chrome.lib library as part of linking. Re-name
them to chrome.{dll,lib,exe} on installation into $DESTINATION_ROOT.
* Install underneath Hammer\ ($DESTINATION_ROOT) copies of:
themes\default.dll
* Portability: link against 'chrome' and 'common' from the LIBS variable,
not by explicitly listing 'chrome.lib' and 'common.lib'.
* Link interactive_ui_tests.exe links against sdch, not google_update,
and add CPPPATH directories for included resource files.
* Install a number of necessary ancillary files in explicitly in
$DESTINATION_ROOT, not $TARGET_ROOT: chrome.dll, icudt38.dll, rlz.dll,
"First Run", themes\*, locales\, Dictionaries.
* Add a 'chrome_locales' Alias for the locale .dll files installed
into the locales\ subdirectory, and use Requires() to make sure
they're installed for chrome.exe regardless of what target is used.
* Add a 'chrome_Dictionaries' Alias for the hunspell dictionaries
into the Dictionaries\ subdirectory, and use Requires() to make sure
they're installed for chrome.exe regardless of what target is used.
* Clone() the automated_ui_tests.scons construction environment so its
settings don't pollute builds of other targets.
* Add explicit dependencies on various generated .rc files (with
TODO(sgk) to figure out why they're not picked up by the
implicit dependency scan).
Review URL: http://codereview.chromium.org/10976
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5549 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/interactive_ui')
| -rw-r--r-- | chrome/test/interactive_ui/interactive_ui_tests.scons | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/chrome/test/interactive_ui/interactive_ui_tests.scons b/chrome/test/interactive_ui/interactive_ui_tests.scons index 5163fa3..5f724f2 100644 --- a/chrome/test/interactive_ui/interactive_ui_tests.scons +++ b/chrome/test/interactive_ui/interactive_ui_tests.scons @@ -13,7 +13,6 @@ env.SConscript([ '$CHROME_DIR/third_party/hunspell/using_hunspell.scons', '$CHROME_DIR/third_party/wtl/using_wtl.scons', '$CHROME_SRC_DIR/build/using_googleurl.scons', - '$GOOGLE_UPDATE_DIR/using_google_update.scons', '$GTEST_DIR/../using_gtest.scons', '$ICU38_DIR/using_icu38.scons', '$LIBJPEG_DIR/using_libjpeg.scons', @@ -23,6 +22,7 @@ env.SConscript([ '$MODP_B64_DIR/using_modp_b64.scons', '$NET_DIR/using_net.scons', '$NPAPI_DIR/using_npapi.scons', + '$SDCH_DIR/using_sdch.scons', '$SKIA_DIR/using_skia.scons', '$ZLIB_DIR/using_zlib.scons', ], {'env':env}) @@ -32,6 +32,9 @@ env.Prepend( 'UI_TEST', ], CPPPATH = [ + '$CHROME_DIR/app', + # For generated_resources.h + '$CHROME_DIR/app/resources', '$CHROME_SRC_DIR', ], LIBS = [ |