scmversion: Use annotated tag as base
This commit is contained in:
parent
61a5efe62b
commit
706dc86a94
|
@ -17,7 +17,7 @@ GIT_VERSION=$(git tag --points-at HEAD)
|
|||
GIT_HASH=$(git rev-parse HEAD)
|
||||
|
||||
if [[ "${GIT_VERSION}" == "" ]]; then
|
||||
GIT_VERSION=$(git describe --tags --dirty --exclude latest --exclude preview --exclude legacy --exclude previous-latest | tr -d '\r\n')
|
||||
GIT_VERSION=$(git describe --dirty | tr -d '\r\n')
|
||||
if [[ "${GIT_VERSION}" == "" ]]; then
|
||||
GIT_VERSION=$(git rev-parse HEAD)
|
||||
fi
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
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 --abbrev-ref HEAD`) do (SET "BRANCH=%%g")
|
||||
FOR /F "tokens=* USEBACKQ" %%g IN (`git describe --tags --dirty --exclude latest --exclude preview --exclude legacy --exclude previous-latest`) do (SET "TAG=%%g")
|
||||
FOR /F "tokens=* USEBACKQ" %%g IN (`git describe --dirty`) do (SET "TAG=%%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%
|
||||
|
@ -14,7 +14,7 @@ IF "%EXISTINGLINE%"=="%SIGNATURELINE%" (
|
|||
EXIT
|
||||
)
|
||||
|
||||
ECHO Updating %VERSIONFILE%...
|
||||
ECHO Updating %VERSIONFILE% with %TAG%...
|
||||
|
||||
(ECHO %SIGNATURELINE%
|
||||
ECHO const char* g_scm_hash_str = "%HASH%";
|
||||
|
|
|
@ -12,7 +12,7 @@ fi
|
|||
|
||||
HASH=$(git rev-parse HEAD)
|
||||
BRANCH=$(git rev-parse --abbrev-ref HEAD | tr -d '\r\n')
|
||||
TAG=$(git describe --tags --dirty --exclude latest --exclude preview --exclude legacy --exclude previous-latest | tr -d '\r\n')
|
||||
TAG=$(git describe --dirty | tr -d '\r\n')
|
||||
DATE=$(git log -1 --date=iso8601-strict --format=%cd)
|
||||
|
||||
cd $CURDIR
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
@echo off
|
||||
|
||||
FOR /F "tokens=* USEBACKQ" %%g IN (`git describe --tags --dirty --exclude latest --exclude preview --exclude legacy --exclude play-store-release`) do (SET "TAG=%%g")
|
||||
FOR /F "tokens=* USEBACKQ" %%g IN (`git describe --dirty`) do (SET "TAG=%%g")
|
||||
|
||||
powershell -Command "(gc ..\duckstation-qt\duckstation-qt.rc) -replace '1,0,0,1', '"%TAG:~0,1%","%TAG:~2,1%","%TAG:~4,4%",0' | Out-File -encoding ASCII ..\duckstation-qt\duckstation-qt.rc"
|
||||
powershell -Command "(gc ..\duckstation-qt\duckstation-qt.rc) -replace '1.0.0.1', '"%TAG:~0,1%"."%TAG:~2,1%"."%TAG:~4,4%"' | Out-File -encoding ASCII ..\duckstation-qt\duckstation-qt.rc"
|
||||
|
|
Loading…
Reference in New Issue