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

* Clear fpmkunit bootstrap files when make (dist)clean is called from packages directory

Browse Source 
git-svn-id: trunk@22636 -
This commit is contained in:
joost 2012-10-13 12:12:59 +00:00
parent 6697ee21bb
commit 9035d3ae5d
4 changed files with 33 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
packages/Makefile
View File

@ -1650,6 +1650,8 @@ FPMAKE_OPT+=-bu
.NOTPARALLEL: .NOTPARALLEL:
fpmkunit_bootstrap: fpmkunit_bootstrap:
$(MAKE) -C fpmkunit bootstrap $(MAKE) -C fpmkunit bootstrap
fpmkunit_clean_bootstrap:
$(MAKE) -C fpmkunit clean_bootstrap
fpmake: fpmake.pp fpmkunit_bootstrap fpmake: fpmake.pp fpmkunit_bootstrap
$(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) $(OPT) $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) $(OPT)
all: fpmake all: fpmake
@ -1661,18 +1663,18 @@ release: fpmake
debug: fpmake debug: fpmake
$(LOCALFPMAKE) compile $(FPMAKE_OPT) -o -dDEBUG $(LOCALFPMAKE) compile $(FPMAKE_OPT) -o -dDEBUG
ifeq ($(FPMAKE_BIN_CLEAN),) ifeq ($(FPMAKE_BIN_CLEAN),)
clean: clean: fpmkunit_clean_bootstrap
else else
clean: clean: fpmkunit_clean_bootstrap
$(FPMAKE_BIN_CLEAN) clean $(FPMAKE_OPT) $(FPMAKE_BIN_CLEAN) clean $(FPMAKE_OPT)
endif endif
CLEAN_TARGET_DIRS=$(subst /Makefile, ,$(wildcard */Makefile)) CLEAN_TARGET_DIRS=$(subst /Makefile, ,$(wildcard */Makefile))
%_distclean: %_distclean:
$(MAKE) -C $* distclean $(MAKE) -C $* distclean
ifeq ($(FPMAKE_BIN_CLEAN),) ifeq ($(FPMAKE_BIN_CLEAN),)
distclean: fpc_cleanall $(addsuffix _distclean,$(CLEAN_TARGET_DIRS)) distclean: fpc_cleanall $(addsuffix _distclean,$(CLEAN_TARGET_DIRS)) fpmkunit_clean_bootstrap
else else
distclean: distclean: fpmkunit_clean_bootstrap
ifdef inUnix ifdef inUnix
{ $(FPMAKE_BIN_CLEAN) distclean $(FPMAKE_OPT); if [ $$? != "0" ]; then { echo Something wrong with fpmake exectable. Remove the executable and call make recursively to recover.; $(DEL) $(FPMAKE_BIN_CLEAN); $(MAKE) fpc_cleanall; }; fi; } { $(FPMAKE_BIN_CLEAN) distclean $(FPMAKE_OPT); if [ $$? != "0" ]; then { echo Something wrong with fpmake exectable. Remove the executable and call make recursively to recover.; $(DEL) $(FPMAKE_BIN_CLEAN); $(MAKE) fpc_cleanall; }; fi; }
else else

10
packages/Makefile.fpc
View File

@ -60,6 +60,8 @@ FPMAKE_OPT+=-bu
fpmkunit_bootstrap: fpmkunit_bootstrap:
$(MAKE) -C fpmkunit bootstrap $(MAKE) -C fpmkunit bootstrap
fpmkunit_clean_bootstrap:
$(MAKE) -C fpmkunit clean_bootstrap
fpmake: fpmake.pp fpmkunit_bootstrap fpmake: fpmake.pp fpmkunit_bootstrap
$(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) $(OPT) $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) $(OPT)
all: fpmake all: fpmake
@ -74,9 +76,9 @@ debug: fpmake
# most often fail because the dependencies are cleared. # most often fail because the dependencies are cleared.
# In case of a clean, simply do nothing # In case of a clean, simply do nothing
ifeq ($(FPMAKE_BIN_CLEAN),) ifeq ($(FPMAKE_BIN_CLEAN),)
clean: clean: fpmkunit_clean_bootstrap
else else
clean: clean: fpmkunit_clean_bootstrap
$(FPMAKE_BIN_CLEAN) clean $(FPMAKE_OPT) $(FPMAKE_BIN_CLEAN) clean $(FPMAKE_OPT)
endif endif
@ -87,9 +89,9 @@ CLEAN_TARGET_DIRS=$(subst /Makefile, ,$(wildcard */Makefile))
# In case of a distclean, perform an 'old'-style distclean. This to avoid problems # In case of a distclean, perform an 'old'-style distclean. This to avoid problems
# when the package is compiled using fpcmake prior to running this clean using fpmake # when the package is compiled using fpcmake prior to running this clean using fpmake
ifeq ($(FPMAKE_BIN_CLEAN),) ifeq ($(FPMAKE_BIN_CLEAN),)
distclean: fpc_cleanall $(addsuffix _distclean,$(CLEAN_TARGET_DIRS)) distclean: fpc_cleanall $(addsuffix _distclean,$(CLEAN_TARGET_DIRS)) fpmkunit_clean_bootstrap
else else
distclean: distclean: fpmkunit_clean_bootstrap
ifdef inUnix ifdef inUnix
{ $(FPMAKE_BIN_CLEAN) distclean $(FPMAKE_OPT); if [ $$? != "0" ]; then { echo Something wrong with fpmake exectable. Remove the executable and call make recursively to recover.; $(DEL) $(FPMAKE_BIN_CLEAN); $(MAKE) fpc_cleanall; }; fi; } { $(FPMAKE_BIN_CLEAN) distclean $(FPMAKE_OPT); if [ $$? != "0" ]; then { echo Something wrong with fpmake exectable. Remove the executable and call make recursively to recover.; $(DEL) $(FPMAKE_BIN_CLEAN); $(MAKE) fpc_cleanall; }; fi; }
else else

24
packages/fpmkunit/Makefile
View File

@ -1,5 +1,5 @@
# #
# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/08/17] # Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/10/12]
# #
default: all default: all
MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android
@ -209,6 +209,14 @@ endif
ifeq ($(OS_TARGET),linux) ifeq ($(OS_TARGET),linux)
linuxHier=1 linuxHier=1
endif endif
ifndef CROSSCOMPILE
BUILDFULLNATIVE=1
export BUILDFULLNATIVE
endif
ifdef BUILDFULLNATIVE
BUILDNATIVE=1
export BUILDNATIVE
endif
export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE
ifdef FPCDIR ifdef FPCDIR
override FPCDIR:=$(subst \,/,$(FPCDIR)) override FPCDIR:=$(subst \,/,$(FPCDIR))
@ -2127,6 +2135,8 @@ $(TARGET_UNITDIRBS):
$(MKDIRTREE) $(TARGET_UNITDIRBS) $(MKDIRTREE) $(TARGET_UNITDIRBS)
bootstrap: $(TARGET_UNITDIRBS) bootstrap: $(TARGET_UNITDIRBS)
$(FPCFPMAKE) src/fpmkunit.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) -FU$(TARGET_UNITDIRBS) $(UNIT_ZIPPER) $(UNIT_PROCESS) $(OPT) $(FPCFPMAKE) src/fpmkunit.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) -FU$(TARGET_UNITDIRBS) $(UNIT_ZIPPER) $(UNIT_PROCESS) $(OPT)
clean_bootstrap:
-$(DELTREE) units_bs
fpmake: fpmake.pp fpmake: fpmake.pp
$(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(UNITDIR_FPMAKE_RTL)) $(FPCMAKEOPT) -Fu$(TARGET_UNITDIRBS) $(OPT) $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(UNITDIR_FPMAKE_RTL)) $(FPCMAKEOPT) -Fu$(TARGET_UNITDIRBS) $(OPT)
all: fpmake all: fpmake
@ -2138,25 +2148,21 @@ release: fpmake
debug: fpmake debug: fpmake
$(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dDEBUG $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dDEBUG
ifeq ($(FPMAKE_BIN_CLEAN),) ifeq ($(FPMAKE_BIN_CLEAN),)
clean: clean: clean_bootstrap
-$(DELTREE) units_bs
else else
clean: clean: clean_bootstrap
$(FPMAKE_BIN_CLEAN) clean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) $(FPMAKE_BIN_CLEAN) clean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC)
-$(DELTREE) units_bs
endif endif
ifeq ($(FPMAKE_BIN_CLEAN),) ifeq ($(FPMAKE_BIN_CLEAN),)
distclean: $(addsuffix _distclean,$(TARGET_DIRS)) fpc_cleanall distclean: $(addsuffix _distclean,$(TARGET_DIRS)) fpc_cleanall clean_bootstrap
-$(DELTREE) units_bs
else else
distclean: distclean: clean_bootstrap
ifdef inUnix ifdef inUnix
{ $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC); if [ $$? != "0" ]; then { echo Something wrong with fpmake exectable. Remove the executable and call make recursively to recover.; $(DEL) $(FPMAKE_BIN_CLEAN); $(MAKE) fpc_cleanall; }; fi; } { $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC); if [ $$? != "0" ]; then { echo Something wrong with fpmake exectable. Remove the executable and call make recursively to recover.; $(DEL) $(FPMAKE_BIN_CLEAN); $(MAKE) fpc_cleanall; }; fi; }
else else
$(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC)
endif endif
-$(DEL) $(LOCALFPMAKE) -$(DEL) $(LOCALFPMAKE)
-$(DELTREE) units_bs
endif endif
install: fpmake install: fpmake
ifdef UNIXHier ifdef UNIXHier

14
packages/fpmkunit/Makefile.fpc
View File

@ -68,6 +68,8 @@ $(TARGET_UNITDIRBS):
$(MKDIRTREE) $(TARGET_UNITDIRBS) $(MKDIRTREE) $(TARGET_UNITDIRBS)
bootstrap: $(TARGET_UNITDIRBS) bootstrap: $(TARGET_UNITDIRBS)
$(FPCFPMAKE) src/fpmkunit.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) -FU$(TARGET_UNITDIRBS) $(UNIT_ZIPPER) $(UNIT_PROCESS) $(OPT) $(FPCFPMAKE) src/fpmkunit.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) -FU$(TARGET_UNITDIRBS) $(UNIT_ZIPPER) $(UNIT_PROCESS) $(OPT)
clean_bootstrap:
-$(DELTREE) units_bs
fpmake: fpmake.pp fpmake: fpmake.pp
$(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(UNITDIR_FPMAKE_RTL)) $(FPCMAKEOPT) -Fu$(TARGET_UNITDIRBS) $(OPT) $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(UNITDIR_FPMAKE_RTL)) $(FPCMAKEOPT) -Fu$(TARGET_UNITDIRBS) $(OPT)
all: fpmake all: fpmake
@ -82,27 +84,23 @@ debug: fpmake
# most often fail because the dependencies are cleared. # most often fail because the dependencies are cleared.
# In case of a clean, simply do nothing # In case of a clean, simply do nothing
ifeq ($(FPMAKE_BIN_CLEAN),) ifeq ($(FPMAKE_BIN_CLEAN),)
clean: clean: clean_bootstrap
-$(DELTREE) units_bs
else else
clean: clean: clean_bootstrap
$(FPMAKE_BIN_CLEAN) clean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) $(FPMAKE_BIN_CLEAN) clean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC)
-$(DELTREE) units_bs
endif endif
# In case of a distclean, perform an 'old'-style distclean. This to avoid problems # In case of a distclean, perform an 'old'-style distclean. This to avoid problems
# when the package is compiled using fpcmake prior to running this clean using fpmake # when the package is compiled using fpcmake prior to running this clean using fpmake
ifeq ($(FPMAKE_BIN_CLEAN),) ifeq ($(FPMAKE_BIN_CLEAN),)
distclean: $(addsuffix _distclean,$(TARGET_DIRS)) fpc_cleanall distclean: $(addsuffix _distclean,$(TARGET_DIRS)) fpc_cleanall clean_bootstrap
-$(DELTREE) units_bs
else else
distclean: distclean: clean_bootstrap
ifdef inUnix ifdef inUnix
{ $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC); if [ $$? != "0" ]; then { echo Something wrong with fpmake exectable. Remove the executable and call make recursively to recover.; $(DEL) $(FPMAKE_BIN_CLEAN); $(MAKE) fpc_cleanall; }; fi; } { $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC); if [ $$? != "0" ]; then { echo Something wrong with fpmake exectable. Remove the executable and call make recursively to recover.; $(DEL) $(FPMAKE_BIN_CLEAN); $(MAKE) fpc_cleanall; }; fi; }
else else
$(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC)
endif endif
-$(DEL) $(LOCALFPMAKE) -$(DEL) $(LOCALFPMAKE)
-$(DELTREE) units_bs
endif endif
install: fpmake install: fpmake
ifdef UNIXHier ifdef UNIXHier