paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-10 14:26:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

+ include -unpushed in revision.inc if not all changes are pushed to the remote

Browse Source 
(cherry picked from commit 4c1eb4e454)
This commit is contained in:
florian 2021-08-17 15:43:53 +02:00
parent 0e537519ac
commit d48e34a81d
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
compiler/Makefile
View File

@ -501,6 +501,9 @@ ifneq ($(wildcard ../.git),)
ifneq ($(GIT),) ifneq ($(GIT),)
GITDESCRIBE=$(shell $(GIT) describe --dirty) GITDESCRIBE=$(shell $(GIT) describe --dirty)
REVSTR:=$(word 2,$(subst -, ,$(GITDESCRIBE)))-$(word 3,$(subst -, ,$(GITDESCRIBE))) REVSTR:=$(word 2,$(subst -, ,$(GITDESCRIBE)))-$(word 3,$(subst -, ,$(GITDESCRIBE)))
ifneq (git log @{u}..,)
REVSTR:=$(REVSTR)-unpushed
endif
ifneq ($(word 4,$(subst -, ,$(GITDESCRIBE))),) ifneq ($(word 4,$(subst -, ,$(GITDESCRIBE))),)
REVSTR:=$(REVSTR)-$(word 4,$(subst -, ,$(GITDESCRIBE))) REVSTR:=$(REVSTR)-$(word 4,$(subst -, ,$(GITDESCRIBE)))
endif endif

3
compiler/Makefile.fpc
View File

@ -246,6 +246,9 @@ ifneq ($(wildcard ../.git),)
ifneq ($(GIT),) ifneq ($(GIT),)
GITDESCRIBE=$(shell $(GIT) describe --dirty) GITDESCRIBE=$(shell $(GIT) describe --dirty)
REVSTR:=$(word 2,$(subst -, ,$(GITDESCRIBE)))-$(word 3,$(subst -, ,$(GITDESCRIBE))) REVSTR:=$(word 2,$(subst -, ,$(GITDESCRIBE)))-$(word 3,$(subst -, ,$(GITDESCRIBE)))
ifneq (git log @{u}..,)
REVSTR:=$(REVSTR)-unpushed
endif
ifneq ($(word 4,$(subst -, ,$(GITDESCRIBE))),) ifneq ($(word 4,$(subst -, ,$(GITDESCRIBE))),)
REVSTR:=$(REVSTR)-$(word 4,$(subst -, ,$(GITDESCRIBE))) REVSTR:=$(REVSTR)-$(word 4,$(subst -, ,$(GITDESCRIBE)))
endif endif