From bdbe5395f5483cc8553b9054358c866d17e751ca Mon Sep 17 00:00:00 2001 From: Philip Rinn Date: Sat, 15 Aug 2015 20:05:23 +0200 Subject: [PATCH] Update tools/generateReleaseInfo to work with git (see #2865) --- tools/generateReleaseInfo | 17 +++++++++-------- tools/generateReleaseInfo.bat | 11 ----------- 2 files changed, 9 insertions(+), 19 deletions(-) delete mode 100644 tools/generateReleaseInfo.bat diff --git a/tools/generateReleaseInfo b/tools/generateReleaseInfo index 4b3d8f427..79189ad44 100755 --- a/tools/generateReleaseInfo +++ b/tools/generateReleaseInfo @@ -1,11 +1,12 @@ #!/usr/bin/env bash -hgBranch="`hg branch`" -hgLatesttag="`hg parents --template '{latesttag}'`" -hgLatesttagdistance="`hg parents --template '{latesttagdistance}'`" -hgChangeset="`hg parents --template '{node|short}'`" +gitBranch="`git symbolic-ref --short -q HEAD`" +gitVersion="`git describe --tags --always`" +gitLatesttag="`echo $gitVersion | sed 's/-.*//'`" +gitLatesttagdistance="`echo $gitVersion | sed 's/.*-\(.*\)-g.*/\1/'`" +gitChangeset="`git rev-parse --verify HEAD`" -echo "set(HG_BRANCH $hgBranch) -set(HG_VERSION $hgLatesttag.$hgLatesttagdistance) -set(HG_CHANGESET $hgChangeset) -set(HG_TAGDISTANCE $hgLatesttagdistance)" > ReleaseInfo.cmake +echo "set(GIT_BRANCH $gitBranch) +set(GIT_VERSION $gitLatesttag.$gitLatesttagdistance) +set(GIT_CHANGESET $gitChangeset) +set(GIT_TAGDISTANCE $gitLatesttagdistance)" > ReleaseInfo.cmake diff --git a/tools/generateReleaseInfo.bat b/tools/generateReleaseInfo.bat deleted file mode 100644 index a8ac1289e..000000000 --- a/tools/generateReleaseInfo.bat +++ /dev/null @@ -1,11 +0,0 @@ -@echo off -for /f "tokens=*" %%a in ('hg branch') do @set hgBranch=%%a -for /f "tokens=*" %%a in ('hg parents --template "{latesttag}"') do @set hgLatesttag=%%a -for /f "tokens=*" %%a in ('hg parents --template "{latesttagdistance}"') do @set hgLatesttagdistance=%%a -for /f "tokens=*" %%a in ('hg parents --template "{node|short}"') do @set hgChangeset=%%a - -echo set(HG_BRANCH %hgBranch%) > ReleaseInfo.cmake -echo set(HG_VERSION %hgLatesttag%.%hgLatesttagdistance%) >> ReleaseInfo.cmake -echo set(HG_CHANGESET %hgChangeset%) >> ReleaseInfo.cmake -echo set(HG_TAGDISTANCE %hgLatesttagdistance%) >> ReleaseInfo.cmake -