File tree Expand file tree Collapse file tree 3 files changed +11
-7
lines changed
Expand file tree Collapse file tree 3 files changed +11
-7
lines changed Original file line number Diff line number Diff line change @@ -20,7 +20,8 @@ export LC_CTYPE='C'
2020
2121# ====== REVISION/VERSION ======
2222declare -r CLOVER_VERSION=' v2.5k'
23- declare -r CLOVER_REVISION=$( git describe --tags $( git rev-list --tags --max-count=1) )
23+ # declare -r CLOVER_REVISION=$(git describe --tags $(git rev-list --tags --max-count=1))
24+ declare -r CLOVER_REVISION=$( git describe --tags --abbrev=0)
2425
2526# ==== CHECK ENVIRONEMENT ====
2627
Original file line number Diff line number Diff line change @@ -57,10 +57,11 @@ rem set F_VER_TXT=vers.txt
5757rem # svnversion -n> %F_VER_TXT%
5858rem set /P s=< %F_VER_TXT%
5959rem # del %F_VER_TXT%
60- git rev-list --tags --max-count=1 > revs.txt
61- set /p c = < revs.txt
62- del revs.txt
63- git describe --tags %c% > vers.txt
60+ rem git rev-list --tags --max-count=1 > revs.txt
61+ rem set /p c=< revs.txt
62+ rem del revs.txt
63+ rem git describe --tags %c% > vers.txt
64+ git describe --tags --abbrev=0 > vers.txt
6465 set /P s = < vers.txt
6566 del vers.txt
6667
Original file line number Diff line number Diff line change @@ -453,7 +453,8 @@ MainBuildScript() {
453453 checkCmdlineArguments $@
454454 checkToolchain
455455
456- local repoRev=$( git describe --tags $( git rev-list --tags --max-count=1) )
456+ # local repoRev=$(git describe --tags $(git rev-list --tags --max-count=1))
457+ local repoRev=$( git describe --tags --abbrev=0)
457458
458459 #
459460 # we are building the same rev as before?
@@ -574,7 +575,8 @@ MainBuildScript() {
574575 if (( $SkipAutoGen == 0 )) || (( $FORCEREBUILD == 1 )) ; then
575576
576577 # local clover_revision=$(cat "${CLOVERROOT}/${VERSTXT}")
577- local clover_revision=$( git describe --tags $( git rev-list --tags --max-count=1) )
578+ # local clover_revision=$(git describe --tags $(git rev-list --tags --max-count=1))
579+ local clover_revision=$( git describe --tags --abbrev=0)
578580 local clover_build_date=$( date ' +%Y-%m-%d %H:%M:%S' )
579581 # echo "#define FIRMWARE_VERSION \"2.31\"" > "$CLOVERROOT"/Version.h
580582
You can’t perform that action at this time.
0 commit comments