ShuriZma
/
duckstation
mirror of https://github.com/stenzek/duckstation
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

scmversion: Fix incorrect tagging after stable/beta split

This commit is contained in:
Connor McLaughlin 2020-12-22 03:24:19 +10:00
parent 3ab017c32e
commit 14c227a813
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/scmversion/gen_scmversion.bat
View File

@ -3,7 +3,7 @@
SET VERSIONFILE="scmversion.cpp" SET VERSIONFILE="scmversion.cpp"
FOR /F "tokens=* USEBACKQ" %%g IN (`git rev-parse HEAD`) do (SET "HASH=%%g") FOR /F "tokens=* USEBACKQ" %%g IN (`git rev-parse HEAD`) do (SET "HASH=%%g")
FOR /F "tokens=* USEBACKQ" %%g IN (`git rev-parse --abbrev-ref HEAD`) do (SET "BRANCH=%%g") FOR /F "tokens=* USEBACKQ" %%g IN (`git rev-parse --abbrev-ref HEAD`) do (SET "BRANCH=%%g")
FOR /F "tokens=* USEBACKQ" %%g IN (`git describe --tags --dirty --exclude latest`) do (SET "TAG=%%g") FOR /F "tokens=* USEBACKQ" %%g IN (`git describe --tags --dirty --exclude latest --exclude beta`) do (SET "TAG=%%g")
FOR /F "tokens=* USEBACKQ" %%g IN (`git log -1 --date=iso8601-strict "--format=%%cd"`) do (SET "CDATE=%%g") FOR /F "tokens=* USEBACKQ" %%g IN (`git log -1 --date=iso8601-strict "--format=%%cd"`) do (SET "CDATE=%%g")
SET SIGNATURELINE=// %HASH% %BRANCH% %TAG% %CDATE% SET SIGNATURELINE=// %HASH% %BRANCH% %TAG% %CDATE%

2
src/scmversion/gen_scmversion.sh
View File

@ -3,7 +3,7 @@
VERSION_FILE="scmversion.cpp" VERSION_FILE="scmversion.cpp"
HASH=$(git rev-parse HEAD) HASH=$(git rev-parse HEAD)
BRANCH=$(git rev-parse --abbrev-ref HEAD | tr -d '\r\n') BRANCH=$(git rev-parse --abbrev-ref HEAD | tr -d '\r\n')
TAG=$(git describe --tags --dirty --exclude latest | tr -d '\r\n') TAG=$(git describe --tags --dirty --exclude latest --exclude beta | tr -d '\r\n')
DATE=$(git log -1 --date=iso8601-strict --format=%cd) DATE=$(git log -1 --date=iso8601-strict --format=%cd)
SIGNATURE_LINE="// ${HASH} ${BRANCH} ${TAG} ${DATE}" SIGNATURE_LINE="// ${HASH} ${BRANCH} ${TAG} ${DATE}"