folkert/simh-testsetgenerator
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

makefile: Properly detect building with uncommitted changes

Browse source
This commit is contained in:
Mark Pizzolato 2021-03-08 16:03:11 -08:00
parent 076c1ef094
commit 73be1953ee
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
makefile
View file

@ -290,10 +290,10 @@ ifeq (${WIN32},) #*nix Environments (&& cygwin)
else else
NEED_COMMIT_ID = need-commit-id NEED_COMMIT_ID = need-commit-id
endif endif
ifeq (need-commit-id,$(NEED_COMMIT_ID)) ifneq (,$(shell git update-index --refresh --))
ifneq (,$(shell git update-index --refresh --)) GIT_EXTRA_FILES=+uncommitted-changes
GIT_EXTRA_FILES=+uncommitted-changes endif
endif ifneq (,$(or $(NEED_COMMIT_ID),$(GIT_EXTRA_FILES)))
isodate=$(shell git log -1 --pretty="%ai"|sed -e 's/ /T/'|sed -e 's/ //') isodate=$(shell git log -1 --pretty="%ai"|sed -e 's/ /T/'|sed -e 's/ //')
$(shell git log -1 --pretty="SIM_GIT_COMMIT_ID %H$(GIT_EXTRA_FILES)%nSIM_GIT_COMMIT_TIME $(isodate)" >.git-commit-id) $(shell git log -1 --pretty="SIM_GIT_COMMIT_ID %H$(GIT_EXTRA_FILES)%nSIM_GIT_COMMIT_TIME $(isodate)" >.git-commit-id)
endif endif