paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-11-04 11:39:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

* include installer building in zipinstall make target when building for relevant OS targets

Browse Source
This commit is contained in:
Tomas Hajny 2021-11-04 02:25:06 +01:00
parent 44051b4af3
commit d70bb6a8c2
2 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Makefile
View File

@ -514,6 +514,10 @@ UTILS=1
endif endif
endif endif
endif endif
INSTALLERTARGETS=emx go32v2 msdos os2
ifneq ($(findstring $(OS_TARGET),$(INSTALLERTARGETS)),)
INSTALLER=1
endif
ifeq ($(FULL_TARGET),i386-linux) ifeq ($(FULL_TARGET),i386-linux)
override TARGET_DIRS+=compiler rtl utils packages installer override TARGET_DIRS+=compiler rtl utils packages installer
endif endif
@ -3173,11 +3177,17 @@ endif
$(MAKE) packages_clean $(CLEANOPTS) $(MAKE) packages_clean $(CLEANOPTS)
ifdef UTILS ifdef UTILS
$(MAKE) utils_clean $(CLEANOPTS) $(MAKE) utils_clean $(CLEANOPTS)
endif
ifdef INSTALLER
$(MAKE) installer_clean $(CLEANOPTS)
endif endif
$(MAKE) rtl_$(ALLTARGET) $(BUILDOPTS) $(MAKE) rtl_$(ALLTARGET) $(BUILDOPTS)
$(MAKE) packages_$(ALLTARGET) $(BUILDOPTS) $(MAKE) packages_$(ALLTARGET) $(BUILDOPTS)
ifdef UTILS ifdef UTILS
$(MAKE) utils_all $(BUILDOPTS) $(MAKE) utils_all $(BUILDOPTS)
endif
ifdef INSTALLER
$(MAKE) installer_all $(BUILDOPTS)
endif endif
$(ECHOREDIR) Build > $(BUILDSTAMP) $(ECHOREDIR) Build > $(BUILDSTAMP)
$(ECHOREDIR) Build > base.$(BUILDSTAMP) $(ECHOREDIR) Build > base.$(BUILDSTAMP)

11
Makefile.fpc
View File

@ -231,6 +231,11 @@ endif
endif endif
endif endif
INSTALLERTARGETS=emx go32v2 msdos os2
ifneq ($(findstring $(OS_TARGET),$(INSTALLERTARGETS)),)
INSTALLER=1
endif
[rules] [rules]
# These values can change # These values can change
unexport FPC_VERSION FPC_COMPILERINFO OS_SOURCE unexport FPC_VERSION FPC_COMPILERINFO OS_SOURCE
@ -323,11 +328,17 @@ endif
ifdef UTILS ifdef UTILS
$(MAKE) utils_clean $(CLEANOPTS) $(MAKE) utils_clean $(CLEANOPTS)
endif endif
ifdef INSTALLER
$(MAKE) installer_clean $(CLEANOPTS)
endif
# build everything # build everything
$(MAKE) rtl_$(ALLTARGET) $(BUILDOPTS) $(MAKE) rtl_$(ALLTARGET) $(BUILDOPTS)
$(MAKE) packages_$(ALLTARGET) $(BUILDOPTS) $(MAKE) packages_$(ALLTARGET) $(BUILDOPTS)
ifdef UTILS ifdef UTILS
$(MAKE) utils_all $(BUILDOPTS) $(MAKE) utils_all $(BUILDOPTS)
endif
ifdef INSTALLER
$(MAKE) installer_all $(BUILDOPTS)
endif endif
$(ECHOREDIR) Build > $(BUILDSTAMP) $(ECHOREDIR) Build > $(BUILDSTAMP)
$(ECHOREDIR) Build > base.$(BUILDSTAMP) $(ECHOREDIR) Build > base.$(BUILDSTAMP)