summaryrefslogtreecommitdiffstats
path: root/chrome/chrome.scons
Commit message (Collapse)AuthorAgeFilesLines
* Fix use of LOAD= with WantSystemLib() (we could blow up if a variablesgk@google.com2008-11-211-36/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | hadn't been added to the config) and extend use of LOAD= into submodules: * Add a ChromeLoadSConscriptModules() method that encapsulates the conditional logic, and makes things more readable by specifying component names as keyword arguments, not hard-coding the logic as a series of if-tests. * Put the ChromeLoadSConscriptModules() logic in a Tool module in site_scons/site_tools, so it doesn't clutter up build/SConscript.main directly. * Move env.WantSystemLib() calls into the individual *.scons files, so we call them each time (or not, based one LOAD=) and the config itself just returns if the system library is requested and we don't need to build anything locally. * Move the settings where a library name changes based on whether or not the system lib is being used into the using_*.scons files, so they're available to clients independently of whether or not the component's *.scons configuration is loaded. * While here: rename the affected third_party SConscript files: third_party/libjpeg/SConscript => third_party/libjpeg/libjpeg.scons third_party/libxml/SConscript => third_party/libxml/libxml.scons third_party/libxslt/SConscript => third_party/libxslt/libxslt.scons * While here: move the Chrome{Program,SharedLibrary}() etc. builder definitions from build/SConscript.main to a new too Ad the ChromeLoadSConscriptModules() logic in a Tool module, to remove more clutter from build/SConscript.main. Review URL: http://codereview.chromium.org/11430 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5820 0039d316-1c4b-4281-b951-d872f2087c98
* Add builds of miscellaneous .exes:sgk@google.com2008-11-211-0/+6
| | | | | | | | | | base\debug_message.exe chrome\test\perf\perf_tests.exe chrome\tools\convert_dict\convert_dict.exe chrome\tools\profiles\generate_profile.exe Review URL: http://codereview.chromium.org/11541 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5812 0039d316-1c4b-4281-b951-d872f2087c98
* Fix accumulated webkit merge ramifications in the SCons build of Chromesgk@google.com2008-11-161-0/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (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
* Add a webkit.scons file in between build\SConscript.main andsgk@google.com2008-11-141-0/+6
| | | | | | | | | | webkit\SConscript, as a place for calling renamed *.scons files. Add 'webkit' and 'chrome' COMPONENT_PROGRAM_GROUPS and COMPONENT_TEST_PROGRAM_GROUPS so the generated .exe files get copied correctly into the Hammer\ build subdirectory. Review URL: http://codereview.chromium.org/10768 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5518 0039d316-1c4b-4281-b951-d872f2087c98
* SCons rename: automated_ui_tests and ui_tests.sgk@google.com2008-11-051-2/+6
| | | | | | Review URL: http://codereview.chromium.org/8225 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4784 0039d316-1c4b-4281-b951-d872f2087c98
* fix linux scons buildtc@google.com2008-11-041-0/+8
| | | | | | | | | | | only build debugger and interactive ui tests on windows TBR=sgk Review URL: http://codereview.chromium.org/9131 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4638 0039d316-1c4b-4281-b951-d872f2087c98
* More SCons renaming:sgk@google.com2008-11-041-0/+2
| | | | | | | | | | | * Rename two SConscript files that needed fixing in response to environment changes in the calling SConscript hierarchy: chrome\test\interactive_ui\SConscript => interactive_ui_tests.scons chrome\browser\debugger\SConscript => debugger.scons * Add the google_update library to LIBS in the using_google_update.scons file. Review URL: http://codereview.chromium.org/9309 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4629 0039d316-1c4b-4281-b951-d872f2087c98
* Convert chrome\renderer to new SCons naming.sgk@google.com2008-11-031-0/+1
| | | | | | Review URL: http://codereview.chromium.org/9053 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4510 0039d316-1c4b-4281-b951-d872f2087c98
* Convert chrome/plugin to the new naming (SConscript => plugin.scons).sgk@google.com2008-11-031-0/+1
| | | | | | Review URL: http://codereview.chromium.org/9049 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4470 0039d316-1c4b-4281-b951-d872f2087c98
* Convert chrome/common to new SCons naming:sgk@google.com2008-11-031-0/+2
| | | | | | | | | * Rename chrome/common/SConscript to chrome/common/common.scons. * Use the new using_*.scons files for settings. * Split build of ipc_tests.exe into chrome/common/ipc_tests.scons. Review URL: http://codereview.chromium.org/9253 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4466 0039d316-1c4b-4281-b951-d872f2087c98
* Convert browser.lib to the new naming:sgk@google.com2008-11-031-0/+1
| | | | | | | | | | | | | | | * Move chrome/browser/SConscript => chrome/browser/browser.scons. * Use using_*.scons files instead of by-hand settings. * Add new using_*.scons files: breakpad/using_breakpad.scons chrome/third_party/hunspell/using_hunspell.scons chrome/third_party/wtl/using_wtl.scons google_update/using_google_update.scons third_party/npapi/using_npapi.scons * Delete some unused CPPPATH directories. Review URL: http://codereview.chromium.org/9243 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4456 0039d316-1c4b-4281-b951-d872f2087c98
* Refactor building unit_tests with SCons for the new structure:sgk@google.com2008-11-031-0/+17
* Rename SConscript.unit_tests to test/unit/unit_tests.scons. * Add a new chrome/chrome.scons "master" for building everything chrome. Have it just load the existing SConscript file, and the new test/unit/unit_tests.scons file. We'll move things from SConscript (or elsewhere) into chrome.scons as they get convertd. * Change build/SConscript.main to load chrome/chrome.scons. * Add new using_libjpeg.scons, using_libxml.scons, and using_libxslt.scons "properties" files. * Convert test/unit/unit_tests.scons to use the available using_*.scons files. * Combine settings that were scattered throught test/unit/unit_tests.scons to make it a little more readable. * Add $CHROME_DIR/ to the beginning of the file listed in test/unit/unit_tests.scons, since they're now being interpreted from a SConscript file down two directory levels. Review URL: http://codereview.chromium.org/9005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4448 0039d316-1c4b-4281-b951-d872f2087c98