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

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

Browse Source 
(cherry picked from commit d70bb6a8c2)
This commit is contained in:
Tomas Hajny 2021-11-04 02:25:06 +01:00 committed by florian
parent db49020205
commit e31036b5d6
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

@ -476,6 +476,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
@ -2837,11 +2841,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

@ -207,6 +207,11 @@ endif
endif endif
endif endif
INSTALLERTARGETS=emx go32v2 msdos os2
ifneq ($(findstring $(OS_TARGET),$(INSTALLERTARGETS)),)
INSTALLER=1
endif
[rules] [rules]
.NOTPARALLEL: .NOTPARALLEL:
@ -301,11 +306,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)