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

* NODOCS=1 for rpm build

Browse Source 
* Fix (rtl) clean after cycle to use the new compiler so it cleans
    also the 1.1 specific units
This commit is contained in:
peter 2002-11-22 16:34:34 +00:00
parent c304e3ba52
commit c8a3f5aef1
2 changed files with 25 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Makefile
View File

@ -1,5 +1,5 @@
#
# Don't edit, this file is generated by FPCMake Version 1.1 [2002/10/20]
# Don't edit, this file is generated by FPCMake Version 1.1 [2002/11/16]
#
default: help
MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx
@ -312,6 +312,7 @@ export DIST_DESTDIR:=$(BASEDIR)
endif
BASEPACKDIR=$(BASEDIR)/basepack
FPCMAKENEW=$(BASEDIR)/utils/fpcm/fpcmake$(EXEEXT)
CLEANOPTS=FPC=$(PPNEW)
BUILDOPTS=FPC=$(PPNEW) RELEASE=1
INSTALLOPTS=FPC=$(PPNEW) ZIPDESTDIR=$(BASEDIR) FPCMAKE=$(FPCMAKENEW)
ifneq ($(wildcard ide),)
@ -1716,13 +1717,13 @@ distclean: clean
build: build-stamp.$(OS_TARGET)
build-stamp.$(OS_TARGET):
$(MAKE) compiler_cycle
$(MAKE) rtl_clean
$(MAKE) packages_clean
$(MAKE) fcl_clean
$(MAKE) utils_clean
$(MAKE) rtl_clean $(CLEANOPTS)
$(MAKE) packages_clean $(CLEANOPTS)
$(MAKE) fcl_clean $(CLEANOPTS)
$(MAKE) utils_clean $(CLEANOPTS)
ifdef IDE
$(MAKE) fv_clean
$(MAKE) ide_clean
$(MAKE) fv_clean $(CLEANOPTS)
$(MAKE) ide_clean $(CLEANOPTS)
endif
$(MAKE) rtl_$(ALLTARGET) $(BUILDOPTS)
$(MAKE) packages_base_$(ALLTARGET) $(BUILDOPTS)
@ -1908,7 +1909,7 @@ endif
ifdef inUnix
ifneq ($(wildcard $(CVSINSTALL)/fpc.spec),)
.PHONY: rpmcopy rpm
RPMFPCVERSION:=$(shell grep 'define fpcversion' $(CVSINSTALL)/fpc.spec | awk '{ print $$3 }')
RPMFPCVERSION:=$(shell grep '^Version:' $(CVSINSTALL)/fpc.spec | awk '{ print $$2 }')
REDHATDIR=/usr/src/redhat
RPMSOURCESDIR:=$(REDHATDIR)/SOURCES
RPMSPECDIR:=$(REDHATDIR)/SPECS
@ -1933,14 +1934,18 @@ rpmcopy: distclean
$(COPYTREE) $(CVSINSTALL)/doc $(RPMSRCDIR)
find $(RPMSRCDIR) -name 'CVS*' | xargs -n1 rm -rf
cd $(RPMSRCDIR) ; tar cvz * > $(RPMSOURCESDIR)/fpc-$(RPMFPCVERSION)-src.tar.gz
ifndef NODOCS
rm -rf $(DOCSRCDIR)
cp $(CVSINSTALL)/fpc-docs.spec $(RPMSPECDIR)/fpc-docs-$(RPMFPCVERSION).spec
install -d $(DOCSRCDIR)
$(COPYTREE) docs $(DOCSRCDIR)
find $(DOCSRCDIR) -name 'CVS*' | xargs -n1 rm -rf
cd $(DOCSRCDIR) ; tar cvz * > $(RPMSOURCESDIR)/fpc-docs-$(RPMFPCVERSION)-src.tar.gz
endif
rpm: checkfpcdir rpmcopy
cd $(RPMSPECDIR) ; rpm --nodeps -ba fpc-$(RPMFPCVERSION).spec
ifndef NODOCS
cd $(RPMSPECDIR) ; rpm --nodeps -ba fpc-docs-$(RPMFPCVERSION).spec
endif
endif # spec found
endif

19
Makefile.fpc
View File

@ -140,6 +140,7 @@ BASEPACKDIR=$(BASEDIR)/basepack
FPCMAKENEW=$(BASEDIR)/utils/fpcm/fpcmake$(EXEEXT)
# Build/install options
CLEANOPTS=FPC=$(PPNEW)
BUILDOPTS=FPC=$(PPNEW) RELEASE=1
INSTALLOPTS=FPC=$(PPNEW) ZIPDESTDIR=$(BASEDIR) FPCMAKE=$(FPCMAKENEW)
@ -277,13 +278,13 @@ build-stamp.$(OS_TARGET):
# create new compiler
$(MAKE) compiler_cycle
# clean
$(MAKE) rtl_clean
$(MAKE) packages_clean
$(MAKE) fcl_clean
$(MAKE) utils_clean
$(MAKE) rtl_clean $(CLEANOPTS)
$(MAKE) packages_clean $(CLEANOPTS)
$(MAKE) fcl_clean $(CLEANOPTS)
$(MAKE) utils_clean $(CLEANOPTS)
ifdef IDE
$(MAKE) fv_clean
$(MAKE) ide_clean
$(MAKE) fv_clean $(CLEANOPTS)
$(MAKE) ide_clean $(CLEANOPTS)
endif
# build everything
$(MAKE) rtl_$(ALLTARGET) $(BUILDOPTS)
@ -571,7 +572,7 @@ ifneq ($(wildcard $(CVSINSTALL)/fpc.spec),)
.PHONY: rpmcopy rpm
RPMFPCVERSION:=$(shell grep 'define fpcversion' $(CVSINSTALL)/fpc.spec | awk '{ print $$3 }')
RPMFPCVERSION:=$(shell grep '^Version:' $(CVSINSTALL)/fpc.spec | awk '{ print $$2 }')
REDHATDIR=/usr/src/redhat
RPMSOURCESDIR:=$(REDHATDIR)/SOURCES
@ -599,16 +600,20 @@ rpmcopy: distclean
find $(RPMSRCDIR) -name 'CVS*' | xargs -n1 rm -rf
cd $(RPMSRCDIR) ; tar cvz * > $(RPMSOURCESDIR)/fpc-$(RPMFPCVERSION)-src.tar.gz
# fpc-docs.rpm
ifndef NODOCS
rm -rf $(DOCSRCDIR)
cp $(CVSINSTALL)/fpc-docs.spec $(RPMSPECDIR)/fpc-docs-$(RPMFPCVERSION).spec
install -d $(DOCSRCDIR)
$(COPYTREE) docs $(DOCSRCDIR)
find $(DOCSRCDIR) -name 'CVS*' | xargs -n1 rm -rf
cd $(DOCSRCDIR) ; tar cvz * > $(RPMSOURCESDIR)/fpc-docs-$(RPMFPCVERSION)-src.tar.gz
endif
rpm: checkfpcdir rpmcopy
cd $(RPMSPECDIR) ; rpm --nodeps -ba fpc-$(RPMFPCVERSION).spec
ifndef NODOCS
cd $(RPMSPECDIR) ; rpm --nodeps -ba fpc-docs-$(RPMFPCVERSION).spec
endif
endif # spec found