diff options
Diffstat (limited to 'chrome/tools')
| -rw-r--r-- | chrome/tools/build/win/version.bat | 7 | ||||
| -rw-r--r-- | chrome/tools/build/win/version.rules | 2 |
2 files changed, 7 insertions, 2 deletions
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" > |