diff options
| author | rahulk@google.com <rahulk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-28 15:58:53 +0000 |
|---|---|---|
| committer | rahulk@google.com <rahulk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-28 15:58:53 +0000 |
| commit | da27ac3cbf0acb3a17878502c279dbaca90b63eb (patch) | |
| tree | 6012ed645aff301fc6f998da450793f26c50caf4 | |
| parent | 60cff8bfbf19dad3d362f3ef0983b7db39c08e02 (diff) | |
| download | chromium_src-da27ac3cbf0acb3a17878502c279dbaca90b63eb.zip chromium_src-da27ac3cbf0acb3a17878502c279dbaca90b63eb.tar.gz chromium_src-da27ac3cbf0acb3a17878502c279dbaca90b63eb.tar.bz2 | |
Use distribution specific branding for binaries version stamp.
BUG=1296800
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@1486 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/BRANDING | 5 | ||||
| -rw-r--r-- | chrome/app/theme/chromium/BRANDING | 5 | ||||
| -rw-r--r-- | chrome/tools/build/win/version.bat | 7 | ||||
| -rw-r--r-- | chrome/tools/build/win/version.rules | 2 |
4 files changed, 12 insertions, 7 deletions
diff --git a/chrome/BRANDING b/chrome/BRANDING deleted file mode 100644 index 41aceb3..0000000 --- a/chrome/BRANDING +++ /dev/null @@ -1,5 +0,0 @@ -COMPANY_FULLNAME=Google Inc. -COMPANY_SHORTNAME=Google -PRODUCT_FULLNAME=Google Chrome -PRODUCT_SHORTNAME=Chrome -COPYRIGHT=Copyright (C) 2006-2008 Google Inc. All Rights Reserved. diff --git a/chrome/app/theme/chromium/BRANDING b/chrome/app/theme/chromium/BRANDING new file mode 100644 index 0000000..510c8b5 --- /dev/null +++ b/chrome/app/theme/chromium/BRANDING @@ -0,0 +1,5 @@ +COMPANY_FULLNAME=The Chromium Authors +COMPANY_SHORTNAME=The Chromium Authors +PRODUCT_FULLNAME=Chromium +PRODUCT_SHORTNAME=Chromium +COPYRIGHT=Copyright (C) 2006-2008 The Chromium Authors. All Rights Reserved. diff --git a/chrome/tools/build/win/version.bat b/chrome/tools/build/win/version.bat index afdfa1a..1c43ca5 100644 --- a/chrome/tools/build/win/version.bat +++ b/chrome/tools/build/win/version.bat @@ -15,8 +15,13 @@ 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 -cat %SolutionDir%\BRANDING | sed "s/\(.*\)/set \1/" >> %VarsBat% +set Distribution="chromium" +if "%CHROMIUM_BUILD%" == "_google_chrome" set Distribution="google_chrome" +cat %SolutionDir%app\theme\%Distribution%\BRANDING | sed "s/\(.*\)/set \1/" >> %VarsBat% set OFFICIAL_BUILD=0 if "%CHROME_BUILD_TYPE%" == "_official" set OFFICIAL_BUILD=1 diff --git a/chrome/tools/build/win/version.rules b/chrome/tools/build/win/version.rules index 244de21..843bb6f 100644 --- a/chrome/tools/build/win/version.rules +++ b/chrome/tools/build/win/version.rules @@ -9,7 +9,7 @@ DisplayName="Version" CommandLine="$(SolutionDir)/tools/build/win/version.bat [inputs] "$(SolutionDir)" "$(IntDir)" "$(IntDir)/$(InputName)"" Outputs="$(IntDir)/$(InputName)" - AdditionalDependencies="$(SolutionDir)/VERSION;$(SolutionDir)/BRANDING;$(SolutionDir)/tools/build/win/version.bat" + AdditionalDependencies="$(SolutionDir)/VERSION;$(SolutionDir)/tools/build/win/version.bat" FileExtensions="*.version" ExecutionDescription="Generating version template file" > |