From a401ca528aa59207576a72a2558843be30b1d68f Mon Sep 17 00:00:00 2001 From: peter Date: Tue, 8 Feb 2000 00:04:29 +0000 Subject: [PATCH] * ide support --- base/Makefile | 58 ++++++++++++++++++++++++++++++------- base/Makefile.fpc | 73 ++++++++++++++++++++++++++++++++++++----------- 2 files changed, 104 insertions(+), 27 deletions(-) diff --git a/base/Makefile b/base/Makefile index 273b741213..63d2a3be65 100644 --- a/base/Makefile +++ b/base/Makefile @@ -1,5 +1,5 @@ # -# Makefile generated by fpcmake v0.99.13 [2000/02/07] +# Makefile generated by fpcmake v0.99.13 [2000/02/08] # defaultrule: help @@ -177,6 +177,11 @@ endif override RELEASE=1 export RELEASE +# We want to have the resulting .zips in the current dir +ifndef DESTZIPDIR +export DESTZIPDIR:=$(BASEDIR) +endif + # Temporary path to pack a file BASEPACKDIR=$(BASEDIR)/basepack @@ -194,6 +199,21 @@ INSTALLOPTS=FPC=$(PPNEW) ZIPDESTDIR=$(BASEDIR) ifdef PPUFILESNEW override INSTALLOPT+=PPUFILES=$(PPUFILESNEW) endif + +# Compile also IDE (check for ide and fv dir) +ifneq ($(wildcard ide),) +ifneq ($(wildcard fv),) +ifeq ($(OS_TARGET),go32v2) +IDE=1 +endif +ifeq ($(OS_TARGET),win32) +IDE=1 +endif +ifeq ($(OS_TARGET),linux) +IDE=1 +endif +endif +endif ##################################################################### # FPCDIR Setting ##################################################################### @@ -1236,7 +1256,7 @@ unexport FPC_VERSION OS_SOURCE ##################################################################### .PHONY: help checkfpcdir - + help: @echo @echo Directory targets: @@ -1263,6 +1283,7 @@ help: compiler_cycle: $(MAKE) -C compiler cycle + ####################################### # IDE ####################################### @@ -1270,10 +1291,19 @@ compiler_cycle: .PHONY: ide_comp ide_full ide_comp: + $(MAKE) -C compiler ppuclean $(MAKE) -C ide full +# Look if libgdb.a is available then use fullgdb +ifneq ($(wildcard packages/gdbint/libgdb/go32v2/libgdb.a),) ide_full: + $(MAKE) -C compiler ppuclean $(MAKE) -C ide fullgdb +else +ide_full: + $(MAKE) -C compiler ppuclean + $(MAKE) -C ide full +endif ####################################### @@ -1294,10 +1324,6 @@ doc_install: # Packaging targets ####################################### -ifndef DESTZIPDIR -export DESTZIPDIR:=$(BASEDIR) -endif - idezips: clean ide_allzip ide_gdbzip ide_fullzip ide_fullgdbzip ide_allzip: @@ -1308,7 +1334,7 @@ ide_gdbzip: $(MAKE) ide_clean $(MAKE) ide_gdb $(MAKE) -C ide/text zipinstall ZIPNAME=ide-gdb-$(PACKAGESUFFIX) -ide_fullzip: +ide_compzip: $(MAKE) compiler_clean $(MAKE) ide_clean $(MAKE) ide_full @@ -1369,13 +1395,19 @@ build-stamp: $(MAKE) fcl_clean $(MAKE) packages_clean $(MAKE) utils_clean +ifdef IDE + $(MAKE) fv_clean + $(MAKE) ide_clean +endif # build everything $(MAKE) rtl_$(ALLTARGET) $(BUILDOPTS) $(MAKE) api_$(ALLTARGET) $(BUILDOPTS) $(MAKE) fcl_$(ALLTARGET) $(BUILDOPTS) $(MAKE) packages_$(ALLTARGET) $(BUILDOPTS) $(MAKE) utils_all $(BUILDOPTS) - +ifdef IDE + $(MAKE) ide_full $(BUILDOPTS) +endif $(ECHO) Build > build-stamp installbase: build-stamp @@ -1392,7 +1424,8 @@ endif # binw32 (cygwin1.dll) ifeq ($(OS_TARGET),win32) $(COPY) $(CVSINSTALL)/binw32/* $(BININSTALLDIR) -endif# manpages for linux +endif +# manpages for linux ifeq ($(OS_TARGET),linux) $(MAKE) -C $(CVSINSTALL)/man installman endif @@ -1406,6 +1439,9 @@ install: build-stamp $(MAKE) api_install $(INSTALLOPTS) $(MAKE) fcl_install $(INSTALLOPTS) $(MAKE) packages_install $(INSTALLOPTS) +ifdef IDE + $(MAKE) ide_install $(BUILDOPTS) +endif zipinstall: $(FPCDIRSET) build-stamp $(MAKE) fpc_zipinstall ZIPTARGET=installbase PACKAGENAME=base $(INSTALLOPTS) @@ -1413,6 +1449,9 @@ zipinstall: $(FPCDIRSET) build-stamp $(MAKE) api_zipinstall $(INSTALLOPTS) PACKAGEPREFIX=$(PKGPRE) $(MAKE) fcl_zipinstall $(INSTALLOPTS) PACKAGEPREFIX=$(PKGPRE) $(MAKE) packages_zipinstall $(INSTALLOPTS) PACKAGEPREFIX=$(PKGPRE) +ifdef IDE + $(MAKE) ide_zipinstall $(INSTALLOPTS) +endif ########################################################################## @@ -1567,4 +1606,3 @@ rpmcopy: distclean rpm: rpmcopy cd $(RPMSPECDIR) ; rpm -ba fpc-$(FPC_VERSION).spec cd $(RPMSPECDIR) ; rpm -ba fpc-docs-$(FPC_VERSION).spec - diff --git a/base/Makefile.fpc b/base/Makefile.fpc index 2048b5feb1..0f63886447 100644 --- a/base/Makefile.fpc +++ b/base/Makefile.fpc @@ -83,6 +83,11 @@ endif override RELEASE=1 export RELEASE +# We want to have the resulting .zips in the current dir +ifndef DESTZIPDIR +export DESTZIPDIR:=$(BASEDIR) +endif + # Temporary path to pack a file BASEPACKDIR=$(BASEDIR)/basepack @@ -101,6 +106,21 @@ ifdef PPUFILESNEW override INSTALLOPT+=PPUFILES=$(PPUFILESNEW) endif +# Compile also IDE (check for ide and fv dir) +ifneq ($(wildcard ide),) +ifneq ($(wildcard fv),) +ifeq ($(OS_TARGET),go32v2) +IDE=1 +endif +ifeq ($(OS_TARGET),win32) +IDE=1 +endif +ifeq ($(OS_TARGET),linux) +IDE=1 +endif +endif +endif + [rules] # These values can change @@ -111,12 +131,12 @@ unexport FPC_VERSION OS_SOURCE ##################################################################### .PHONY: help checkfpcdir - + help: - @echo - @echo Directory targets: - @echo - @echo $(DIROBJECTS) + @echo + @echo Directory targets: + @echo + @echo $(DIROBJECTS) @echo @echo Packing targets are: @echo @@ -138,6 +158,7 @@ help: compiler_cycle: $(MAKE) -C compiler cycle + ####################################### # IDE ####################################### @@ -145,10 +166,19 @@ compiler_cycle: .PHONY: ide_comp ide_full ide_comp: + $(MAKE) -C compiler ppuclean $(MAKE) -C ide full +# Look if libgdb.a is available then use fullgdb +ifneq ($(wildcard packages/gdbint/libgdb/go32v2/libgdb.a),) ide_full: + $(MAKE) -C compiler ppuclean $(MAKE) -C ide fullgdb +else +ide_full: + $(MAKE) -C compiler ppuclean + $(MAKE) -C ide full +endif ####################################### @@ -169,10 +199,6 @@ doc_install: # Packaging targets ####################################### -ifndef DESTZIPDIR -export DESTZIPDIR:=$(BASEDIR) -endif - idezips: clean ide_allzip ide_gdbzip ide_fullzip ide_fullgdbzip ide_allzip: @@ -183,7 +209,7 @@ ide_gdbzip: $(MAKE) ide_clean $(MAKE) ide_gdb $(MAKE) -C ide/text zipinstall ZIPNAME=ide-gdb-$(PACKAGESUFFIX) -ide_fullzip: +ide_compzip: $(MAKE) compiler_clean $(MAKE) ide_clean $(MAKE) ide_full @@ -229,7 +255,7 @@ export RELEASE DESTZIPDIR all: build clean: $(addsuffix _distclean,$(DIROBJECTS)) - $(DEL) build-stamp + $(DEL) build-stamp distclean: clean @@ -244,13 +270,19 @@ build-stamp: $(MAKE) fcl_clean $(MAKE) packages_clean $(MAKE) utils_clean +ifdef IDE + $(MAKE) fv_clean + $(MAKE) ide_clean +endif # build everything $(MAKE) rtl_$(ALLTARGET) $(BUILDOPTS) $(MAKE) api_$(ALLTARGET) $(BUILDOPTS) $(MAKE) fcl_$(ALLTARGET) $(BUILDOPTS) $(MAKE) packages_$(ALLTARGET) $(BUILDOPTS) $(MAKE) utils_all $(BUILDOPTS) - +ifdef IDE + $(MAKE) ide_full $(BUILDOPTS) +endif $(ECHO) Build > build-stamp installbase: build-stamp @@ -267,7 +299,8 @@ endif # binw32 (cygwin1.dll) ifeq ($(OS_TARGET),win32) $(COPY) $(CVSINSTALL)/binw32/* $(BININSTALLDIR) -endif# manpages for linux +endif +# manpages for linux ifeq ($(OS_TARGET),linux) $(MAKE) -C $(CVSINSTALL)/man installman endif @@ -281,6 +314,9 @@ install: build-stamp $(MAKE) api_install $(INSTALLOPTS) $(MAKE) fcl_install $(INSTALLOPTS) $(MAKE) packages_install $(INSTALLOPTS) +ifdef IDE + $(MAKE) ide_install $(BUILDOPTS) +endif zipinstall: $(FPCDIRSET) build-stamp $(MAKE) fpc_zipinstall ZIPTARGET=installbase PACKAGENAME=base $(INSTALLOPTS) @@ -288,6 +324,9 @@ zipinstall: $(FPCDIRSET) build-stamp $(MAKE) api_zipinstall $(INSTALLOPTS) PACKAGEPREFIX=$(PKGPRE) $(MAKE) fcl_zipinstall $(INSTALLOPTS) PACKAGEPREFIX=$(PKGPRE) $(MAKE) packages_zipinstall $(INSTALLOPTS) PACKAGEPREFIX=$(PKGPRE) +ifdef IDE + $(MAKE) ide_zipinstall $(INSTALLOPTS) +endif ########################################################################## @@ -411,9 +450,9 @@ RPMSPECDIR:=$(REDHATDIR)/SPECS RPMSRCDIR:=$(RPMSOURCESDIR)/fpc DOCSRCDIR:=$(RPMSOURCESDIR)/fpcdoc rpmcopy: distclean - install -d $(REDHATDIR) - install -d $(RPMSPECDIR) - install -d $(RPMSOURCESDIR) + install -d $(REDHATDIR) + install -d $(RPMSPECDIR) + install -d $(RPMSOURCESDIR) # fpc.rpm rm -rf $(RPMSRCDIR) cp $(CVSINSTALL)/fpc-$(FPC_VERSION).spec $(RPMSPECDIR) @@ -442,4 +481,4 @@ rpmcopy: distclean rpm: rpmcopy cd $(RPMSPECDIR) ; rpm -ba fpc-$(FPC_VERSION).spec cd $(RPMSPECDIR) ; rpm -ba fpc-docs-$(FPC_VERSION).spec - +