From cfd8f7db385f4ce94db6c594f02ad543691cda7a Mon Sep 17 00:00:00 2001 From: vszakats Date: Sat, 16 Mar 2013 18:12:27 +0100 Subject: [PATCH] 2013-03-16 18:11 UTC+0100 Viktor Szakats (harbour syenar.net) * config/global.mk * minor * utils/hbmk2/hbmk2.prg * experimenting with formatting the revision number to more readable format --- ChangeLog.txt | 8 ++++++++ config/global.mk | 2 +- utils/hbmk2/hbmk2.prg | 4 ++-- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index d715d9646c..5fb483f6ba 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -10,6 +10,14 @@ * Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment */ +2013-03-16 18:11 UTC+0100 Viktor Szakats (harbour syenar.net) + * config/global.mk + * minor + + * utils/hbmk2/hbmk2.prg + * experimenting with formatting the revision number + to more readable format + 2013-03-16 17:38 UTC+0100 Viktor Szakats (harbour syenar.net) * bin/commit.hb * contrib/hbblat/tests/test.prg diff --git a/config/global.mk b/config/global.mk index 662f9dcf23..a1839bf368 100644 --- a/config/global.mk +++ b/config/global.mk @@ -1742,7 +1742,7 @@ ifeq ($(HB_INIT_DONE),) $(info ! === WARNING: Locally modified source code ===) endif _tmp := $(shell git rev-parse --short HEAD) - $(info ! GIT-REVISION: $(_tmp)) + $(info ! GIT_REVISION: $(_tmp)) endif endif endif diff --git a/utils/hbmk2/hbmk2.prg b/utils/hbmk2/hbmk2.prg index 00e48e0f79..57377ce876 100644 --- a/utils/hbmk2/hbmk2.prg +++ b/utils/hbmk2/hbmk2.prg @@ -15585,12 +15585,12 @@ STATIC PROCEDURE ShowHeader( hbmk ) RETURN STATIC FUNCTION HBRawVersion() - RETURN hb_StrFormat( "%d.%d.%d%s (r%d)", ; + RETURN hb_StrFormat( "%d.%d.%d%s (r20%s)", ; hb_Version( HB_VERSION_MAJOR ), ; hb_Version( HB_VERSION_MINOR ), ; hb_Version( HB_VERSION_RELEASE ), ; hb_Version( HB_VERSION_STATUS ), ; - hb_Version( HB_VERSION_REVISION ) ) + Transform( hb_Version( HB_VERSION_REVISION ), "99-99-99 99:99" ) ) STATIC FUNCTION ExitCodeStr( nResult )