diff options
| author | pamg@google.com <pamg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-30 18:43:14 +0000 |
|---|---|---|
| committer | pamg@google.com <pamg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-30 18:43:14 +0000 |
| commit | 5dd7867d7b62724082a5524f98718618410fd642 (patch) | |
| tree | 03096376281c1075797298f6d52a6f48d68f19b9 /chrome/tools | |
| parent | 0daa4fc8d2809bb42f93f1a348e43924608ff7fe (diff) | |
| download | chromium_src-5dd7867d7b62724082a5524f98718618410fd642.zip chromium_src-5dd7867d7b62724082a5524f98718618410fd642.tar.gz chromium_src-5dd7867d7b62724082a5524f98718618410fd642.tar.bz2 | |
Switch to building Chromium rather than Google Chrome by default.
The official builder will need the CHROMIUM_BUILD environment variable set to "_google_chrome".
Same as Rietveld issue 2943, approved by nsylvain and rahulk, but in the writeable repository rather than the read-only one.
BUG=1296800
TEST=covered by buildbots
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@1588 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/tools')
| -rw-r--r-- | chrome/tools/build/win/create_installer_archive.py | 3 | ||||
| -rw-r--r-- | chrome/tools/build/win/html_inline.py | 4 | ||||
| -rw-r--r-- | chrome/tools/build/win/version.bat | 3 |
3 files changed, 1 insertions, 9 deletions
diff --git a/chrome/tools/build/win/create_installer_archive.py b/chrome/tools/build/win/create_installer_archive.py index 024f8b3..95b3110 100644 --- a/chrome/tools/build/win/create_installer_archive.py +++ b/chrome/tools/build/win/create_installer_archive.py @@ -93,9 +93,6 @@ def CopyAllFilesToStagingDir(config, distribution, staging_dir, output_dir): Copies all common files required for various distributions of Chromium and also files for the specific Chromium build specified by distribution. """ - # TODO(rahulk) remove the line below once we have setup environment variable - # CHROMIUM_BUILD on buildbots appropriately. - distribution = '_google_chrome' CopySectionFilesToStagingDir(config, 'GENERAL', staging_dir, output_dir) if distribution: if len(distribution) > 1 and distribution[0] == '_': diff --git a/chrome/tools/build/win/html_inline.py b/chrome/tools/build/win/html_inline.py index fc24088..6423866 100644 --- a/chrome/tools/build/win/html_inline.py +++ b/chrome/tools/build/win/html_inline.py @@ -19,9 +19,7 @@ import sys import base64 import mimetypes -# TODO(rahulk) The default here will change to 'CHROMIUM' as soon as the buildbots -# are ready with the correct environment variable -DIST_DEFAULT = 'GOOGLE_CHROME' +DIST_DEFAULT = 'CHROMIUM' DIST_ENV_VAR = 'CHROMIUM_BUILD' DIST_SUBSTR = '%DISTRIBUTION%' diff --git a/chrome/tools/build/win/version.bat b/chrome/tools/build/win/version.bat index 1c43ca5..93bb162 100644 --- a/chrome/tools/build/win/version.bat +++ b/chrome/tools/build/win/version.bat @@ -15,9 +15,6 @@ call %SolutionDir%\..\third_party\cygwin\setup_env.bat :: Load version digits as environment variables cat %SolutionDir%\VERSION | sed "s/\(.*\)/set \1/" > %VarsBat% -REM TODO(rahulk) this line will be removed once google chrome buildbots are setup properly -set CHROMIUM_BUILD="_google_chrome" - :: Load branding strings as environment variables set Distribution="chromium" if "%CHROMIUM_BUILD%" == "_google_chrome" set Distribution="google_chrome" |