diff options
author | Paul Phillips <paulp@improving.org> | 2011-12-02 05:36:03 -0800 |
---|---|---|
committer | Paul Phillips <paulp@improving.org> | 2011-12-04 17:20:50 -0800 |
commit | a289465c70630719cbd3a74edf5502a156ef83c4 (patch) | |
tree | c1c5d6add5b0c9d4e8d94b6b8f3456245ae4576b /tools/get-scala-revision.bat | |
parent | a17908694b89115026f587bcb8a8ed6d16768cad (diff) | |
download | scala-a289465c70630719cbd3a74edf5502a156ef83c4.tar.gz scala-a289465c70630719cbd3a74edf5502a156ef83c4.tar.bz2 scala-a289465c70630719cbd3a74edf5502a156ef83c4.zip |
Use git-describe to create build string.
Created dev tag which is the merge-base of master and 2.9.1 (merge-base
is the last common commit), and told ant to generate build strings based
on that. So distributions look like
scala-2.10.0.dev-1289-gbba3918
Where the 1289 means you are 1289 commits ahead of "dev" and
the last segment (minus the g) is the sha-1 hash.
This no doubt breaks windows even further. Help getting it
back on its feet greatly appreciated.
Diffstat (limited to 'tools/get-scala-revision.bat')
-rw-r--r-- | tools/get-scala-revision.bat | 27 |
1 files changed, 4 insertions, 23 deletions
diff --git a/tools/get-scala-revision.bat b/tools/get-scala-revision.bat index 880bcc3f5c..ed3ade8a3e 100644 --- a/tools/get-scala-revision.bat +++ b/tools/get-scala-revision.bat @@ -1,17 +1,11 @@ @echo off rem rem Usage: get-scala-revison.bat [dir] -rem Figures out current scala revision of an svn checkout or -rem a git-svn mirror (or a git clone.) +rem Figures out current scala revision of a git clone. rem rem If no dir is given, current working dir is used. -if "%OS%" NEQ "Windows_NT" ( - echo "Sorry, your version of Windows is too old to run Scala." - goto :eof -) @setlocal - set _DIR= if "%*"=="" ( for /f "delims=;" %%i in ('cd') do set "_DIR=%%i" @@ -20,23 +14,10 @@ if "%*"=="" ( ) cd %_DIR% -if exist .svn\NUL ( - rem 2>&1 to catch also error output (e.g. svn warnings) - for /f "skip=4 tokens=2" %%i in ('svn info') do ( - echo %%i - goto :end - ) -) else ( if exist .git\NUL ( - set _GIT_PAGER=type - rem this grabs more than one line because otherwise if you have local - rem commits which aren't in git-svn it won't see any revision. - rem TODO: git log -10 | findstr git-svn-id | ... +if exist .git\NUL ( + git describe head --abbrev=7 --match dev echo 0 -) else ( - echo %_DIR% doesn't appear to be git or svn dir. - echo 0 - exit 1 -)) +) :end @endlocal |