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

+ revision.inc rule added

Browse Source 
git-svn-id: trunk@14083 -
This commit is contained in:
pierre 2009-11-06 14:47:32 +00:00
parent 355b7cc306
commit a977607e49
2 changed files with 32 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
compiler/Makefile
View File

@ -348,10 +348,10 @@ CPUSUF=arm
endif
NOCPUDEF=1
MSGFILE=msg/error$(FPCLANG).msg
SVNVERSION:=$(wildcard $(addsuffix /svnversion$(SRCEXEEXT),$(SEARCHPATH)))
REVINC:=$(wildcard revision.inc)
ifneq ($(REVINC),)
override LOCALOPT+=-dREVINC
SVNVERSION:=$(wildcard $(addsuffix /svnversion$(SRCEXEEXT),$(SEARCHPATH)))
ifeq ($(REVSTR),)
ifneq ($(SVNVERSION),)
REVSTR:=$(shell $(SVNVERSION) -c .)
@ -3333,6 +3333,20 @@ insdat: insdatx86 insdatarm
regdatarm : arm/armreg.dat
$(COMPILER) -FE$(COMPILERUTILSDIR) $(COMPILERUTILSDIR)/mkarmreg.pp
cd arm && ../utils/mkarmreg$(SRCEXEEXT)
revision.inc : FORCE
ifneq ($(REVSTR),)
ifdef USEZIPWRAPPER
ifneq ($(ECHOREDIR),echo)
$(ECHOREDIR) "'$(REVSTR)'" > revision.inc
else
$(ECHOREDIR) '$(REVSTR)' > revision.inc
endif
else
$(ECHOREDIR) "'$(REVSTR)'" > revision.inc
endif
else
$(MAKE) revision.inc REVSTR="exported"
endif
$(EXENAME) : $(wildcard *.pas) $(wildcard *.inc) msg \
$(wildcard systems/*.pas) $(wilcard systems/*.inc) \
$(wildcard $(CPC_TARGET)/*.pas) $(wildcard $(CPC_TARGET)/*.inc)

18
compiler/Makefile.fpc
View File

@ -151,6 +151,7 @@ NOCPUDEF=1
MSGFILE=msg/error$(FPCLANG).msg
SVNVERSION:=$(wildcard $(addsuffix /svnversion$(SRCEXEEXT),$(SEARCHPATH)))
# Check if revision.inc is present
REVINC:=$(wildcard revision.inc)
ifneq ($(REVINC),)
@ -159,7 +160,6 @@ ifneq ($(REVINC),)
override LOCALOPT+=-dREVINC
# Automatically update revision.inc if
# svnversion executable is available
SVNVERSION:=$(wildcard $(addsuffix /svnversion$(SRCEXEEXT),$(SEARCHPATH)))
ifeq ($(REVSTR),)
ifneq ($(SVNVERSION),)
REVSTR:=$(shell $(SVNVERSION) -c .)
@ -380,6 +380,22 @@ regdatarm : arm/armreg.dat
$(COMPILER) -FE$(COMPILERUTILSDIR) $(COMPILERUTILSDIR)/mkarmreg.pp
cd arm && ../utils/mkarmreg$(SRCEXEEXT)
# revision.inc rule
revision.inc : FORCE
ifneq ($(REVSTR),)
ifdef USEZIPWRAPPER
ifneq ($(ECHOREDIR),echo)
$(ECHOREDIR) "'$(REVSTR)'" > revision.inc
else
$(ECHOREDIR) '$(REVSTR)' > revision.inc
endif
else
$(ECHOREDIR) "'$(REVSTR)'" > revision.inc
endif
else
$(MAKE) revision.inc REVSTR="exported"
endif
# Make only the compiler
# ECHOREDIR sometimes does not remove double quotes
$(EXENAME) : $(wildcard *.pas) $(wildcard *.inc) msg \