diff options
| author | rahulk@google.com <rahulk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-29 16:24:24 +0000 |
|---|---|---|
| committer | rahulk@google.com <rahulk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-29 16:24:24 +0000 |
| commit | 5e5701128d20d626ebae21457851c717c7f468b3 (patch) | |
| tree | 362ac52294eb66f3ce4d1f8e23923ad427d7d96e /chrome/tools | |
| parent | 1aa0d49f10942f9334d7546e26a2b2df4617d8a4 (diff) | |
| download | chromium_src-5e5701128d20d626ebae21457851c717c7f468b3.zip chromium_src-5e5701128d20d626ebae21457851c717c7f468b3.tar.gz chromium_src-5e5701128d20d626ebae21457851c717c7f468b3.tar.bz2 | |
Rollback 1529.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@1532 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 | 2 | ||||
| -rw-r--r-- | chrome/tools/build/win/version.bat | 3 |
3 files changed, 7 insertions, 1 deletions
diff --git a/chrome/tools/build/win/create_installer_archive.py b/chrome/tools/build/win/create_installer_archive.py index a4b5eb8..aa154f9 100644 --- a/chrome/tools/build/win/create_installer_archive.py +++ b/chrome/tools/build/win/create_installer_archive.py @@ -93,6 +93,9 @@ 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 d3e4334..fc24088 100644 --- a/chrome/tools/build/win/html_inline.py +++ b/chrome/tools/build/win/html_inline.py @@ -21,7 +21,7 @@ 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 = 'CHROMIUM' +DIST_DEFAULT = 'GOOGLE_CHROME' 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 93bb162..1c43ca5 100644 --- a/chrome/tools/build/win/version.bat +++ b/chrome/tools/build/win/version.bat @@ -15,6 +15,9 @@ 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" |