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

* properly check if -unpushed should be appended in revision.inc

Browse Source
This commit is contained in:
florian 2021-08-18 10:34:08 +02:00 committed by Michaël Van Canneyt
parent 4fdeada0a5
commit 838cc89fac
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compiler/Makefile
View File

@ -575,7 +575,7 @@ 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}..,) ifneq ($(shell $(GIT) log @{u}..),)
REVSTR:=$(REVSTR)-unpushed REVSTR:=$(REVSTR)-unpushed
endif endif
ifneq ($(word 4,$(subst -, ,$(GITDESCRIBE))),) ifneq ($(word 4,$(subst -, ,$(GITDESCRIBE))),)

2
compiler/Makefile.fpc
View File

@ -315,7 +315,7 @@ 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}..,) ifneq ($(shell $(GIT) log @{u}..),)
REVSTR:=$(REVSTR)-unpushed REVSTR:=$(REVSTR)-unpushed
endif endif
ifneq ($(word 4,$(subst -, ,$(GITDESCRIBE))),) ifneq ($(word 4,$(subst -, ,$(GITDESCRIBE))),)