2013-03-15 02:46 UTC+0100 Viktor Szakats (harbour syenar.net)

* config/global.mk
    + enabled git revision detection instead of svn
    + added detection for locally modified source code with git

  * bin/commit.hb
    + process 'T' git change status
This commit is contained in:
vszakats
2013-03-15 02:48:59 +01:00
parent cddeab3e83
commit 1fe090768f
3 changed files with 22 additions and 9 deletions

View File

@@ -10,6 +10,14 @@
* Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment
*/
2013-03-15 02:46 UTC+0100 Viktor Szakats (harbour syenar.net)
* config/global.mk
+ enabled git revision detection instead of svn
+ added detection for locally modified source code with git
* bin/commit.hb
+ process 'T' git change status
2013-03-14 18:36 UTC+0100 Viktor Szakats (harbour syenar.net)
* utils/hbmk2/hbmk2.prg
! fixed to not issue warning about missing sign tool

View File

@@ -169,6 +169,7 @@ STATIC FUNCTION DoctorChanges( cVCS, aChanges )
EXIT
CASE "M"
CASE "R"
CASE "T"
CASE "U"
cStart := "*"
EXIT

View File

@@ -1739,17 +1739,21 @@ ifeq ($(HB_INIT_DONE),)
$(info ! HB_INSTALL_PREFIX automatically set to: $(HB_INSTALL_PREFIX))
endif
ifeq ($(ROOT),./)
ifneq ($(call find_in_path,svnversion),)
_tmp := $(shell svnversion .)
ifneq ($(findstring M,$(_tmp)),)
$(info ! === WARNING: Locally modified source code ===)
endif
$(info ! REVISION: $(_tmp))
endif
# ifneq ($(call find_in_path,git),)
# _tmp := $(shell git rev-parse --short HEAD)
# ifneq ($(call find_in_path,svnversion),)
# _tmp := $(shell svnversion .)
# ifneq ($(findstring M,$(_tmp)),)
# $(info ! === WARNING: Locally modified source code ===)
# endif
# $(info ! REVISION: $(_tmp))
# endif
ifneq ($(call find_in_path,git),)
_tmp := $(shell git diff --name-only)
ifneq ($(_tmp),)
$(info ! === WARNING: Locally modified source code ===)
endif
_tmp := $(shell git rev-parse --short HEAD)
$(info ! REVISION: $(_tmp))
endif
endif
endif