diff options
| author | Tony Theodore <tonyt@logyst.com> | 2015-12-24 02:07:48 (GMT) |
|---|---|---|
| committer | Tony Theodore <tonyt@logyst.com> | 2015-12-27 02:59:24 (GMT) |
| commit | 0ccb9e2f6b46e6bed178e80c8e4553ff5e3f5ecb (patch) | |
| tree | d15ed3cbc4fac5854b3b36836f84565381c0a77f /Makefile | |
| parent | 3f81cdb60fe2e8ed7f8551f9584aa7dc42efda1e (diff) | |
| download | mxe-0ccb9e2f6b46e6bed178e80c8e4553ff5e3f5ecb.zip mxe-0ccb9e2f6b46e6bed178e80c8e4553ff5e3f5ecb.tar.gz mxe-0ccb9e2f6b46e6bed178e80c8e4553ff5e3f5ecb.tar.bz2 | |
Add git commit hash to log and build message
* use short form for build status
* use full hash and refs for logs
* add `TERM` to env whitelist (`git log` assumes a terminal)
closes #1095
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 13 |
1 files changed, 11 insertions, 2 deletions
@@ -45,6 +45,7 @@ REQUIREMENTS := autoconf automake autopoint bash bison bzip2 flex \ PREFIX := $(PWD)/usr LOG_DIR := $(PWD)/log +GIT_HEAD := $(shell git rev-parse HEAD) TIMESTAMP := $(shell date +%Y%m%d_%H%M%S) PKG_DIR := $(PWD)/pkg TMP_DIR = $(MXE_TMP)/tmp-$(1) @@ -344,6 +345,13 @@ $(PREFIX)/installed/check-requirements: $(MAKEFILE) fi @touch '$@' +.PHONY: print-git-oneline +print-git-oneline: $(PREFIX)/installed/print-git-oneline-$(GIT_HEAD) +$(PREFIX)/installed/print-git-oneline-$(GIT_HEAD): + @git log --pretty=tformat:'[git-log] %h %s' -1 | cat + @rm -f '$(PREFIX)/installed/print-git-oneline-'* + @touch '$@' + # include core MXE packages and set *_MAKEFILE include $(patsubst %,$(TOP_DIR)/src/%.mk,$(PKGS)) $(foreach PKG,$(PKGS),\ @@ -456,7 +464,8 @@ $(PREFIX)/$(3)/installed/$(1): $(PKG_MAKEFILES) \ | $(if $(DONT_CHECK_REQUIREMENTS),,check-requirements) \ $(if $(value $(call LOOKUP_PKG_RULE,$(1),URL,$(3))),download-only-$(1)) \ $(addprefix $(PREFIX)/$(3)/installed/,$(if $(call set_is_not_member,$(1),$(MXE_CONF_PKGS)),$(MXE_CONF_PKGS))) \ - $(NONET_LIB) + $(NONET_LIB) \ + print-git-oneline @[ -d '$(LOG_DIR)/$(TIMESTAMP)' ] || mkdir -p '$(LOG_DIR)/$(TIMESTAMP)' $(if $(value $(call LOOKUP_PKG_RULE,$(1),BUILD,$(3))), @$(PRINTF_FMT) '[build]' '$(1)' '$(3)', @@ -496,7 +505,7 @@ build-only-$(1)_$(3): CMAKE_SHARED_BOOL = $(if $(findstring shared,$(3)),ON,OFF) build-only-$(1)_$(3): $(if $(value $(call LOOKUP_PKG_RULE,$(1),BUILD,$(3))), uname -a - git show-branch --list --reflog=1 + git log --pretty=tformat:"%H - %s [%ar] [%d]" -1 lsb_release -a 2>/dev/null || sw_vers 2>/dev/null || true autoconf --version 2>/dev/null | head -1 automake --version 2>/dev/null | head -1 |