Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(46)

Unified Diff: chrome/tools/build/win/version.bat

Issue 7104106: Unify the version string to be displayed on "About Chromium" dialog. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Unify the version string to be displayed on "About Chromium" dialog Created 9 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/tools/build/win/version.bat
diff --git a/chrome/tools/build/win/version.bat b/chrome/tools/build/win/version.bat
index c224e8aaaea9d053e53259510dd69ae32b23b6dd..f9610fc5b6ad18350f25089bafc44ac3c35862a6 100644
--- a/chrome/tools/build/win/version.bat
+++ b/chrome/tools/build/win/version.bat
@@ -11,6 +11,7 @@ set InFile=%~1
set SolutionDir=%~2
set IntDir=%~3
set OutFile=%~4
+set LastChangeDir=%~5
set VarsBat=%IntDir%/vers-vars.bat
:: Put cygwin in the path
@@ -27,30 +28,9 @@ cat %SolutionDir%app\theme\%Distribution%\BRANDING | sed "s/\(.*\)/set \1/" >> %
set OFFICIAL_BUILD=0
if "%CHROME_BUILD_TYPE%" == "_official" set OFFICIAL_BUILD=1
-:: Look if subversion client is available. It may not be available on Windows
-:: if downloaded with a tarball or depot_tools is not in the PATH.
-call svn --version 2>nul 1>nul
-:: If not available, just skip getting the revision number.
-if errorlevel 1 goto :NO_SVN
-goto :SET_ENV
-
-
-:NO_SVN
-:: Not having svn makes it impossible to determine the current checkout revision
-:: number. On normal build, this is not an issue but for official builds, this
-:: *can't* be tolerated so issue an error instead. VS will pick it up corectly.
-set NO_SVN_LEVEL=error
-if "%OFFICIAL_BUILD%" == "0" set NO_SVN_LEVEL=warning
-echo %0(28) : %NO_SVN_LEVEL% : svn is not installed. Can't determine the revision number.
-echo set LASTCHANGE=0 >> %VarsBat%
-goto :GEN_FILE
-
-
-:SET_ENV
-call svn info | grep.exe "Revision:" | cut -d" " -f2- | sed "s/\(.*\)/set LASTCHANGE=\1/" >> %VarsBat%
+python %LastChangeDir%\lastchange.py | sed "s/\(.*\)/set \1/" >> %VarsBat%
goto :GEN_FILE
-
:GEN_FILE
call %VarsBat%
::echo LastChange: %LASTCHANGE%

Powered by Google App Engine
This is Rietveld 408576698