build: drop 'bzip2' target, add 'full7zip', 'fullgzip', and 'fullxz'

The net result is _simpler_ as it uses the same rules for creating
the subvariations.

Change-Id: I8618a0beb2e1ada156468df3d2b45ff53d49c8c7
This commit is contained in:
Solomon Peachy 2025-03-27 21:07:28 -04:00
parent 61ae5e691e
commit 70dc293a60

View file

@ -313,18 +313,37 @@ tags:
$(SILENT)rm -f TAGS
$(SILENT)etags -o $(BUILDDIR)/TAGS $(filter-out %.o,$(SRC) $(OTHER_SRC))
fontzip:
$(SILENT)$(TOOLSDIR)/buildzip.pl $(VERBOSEOPT) --app=$(APPLICATION) -m \"$(MODELNAME)\" -r "$(ROOTDIR)" --rbdir="$(RBDIR)" -f 1 -o rockbox-fonts.zip $(TARGET) $(BINARY)
zip: $(BUILDDIR)/rockbox.zip
7zip: $(BUILDDIR)/rockbox.7z
tar: $(BUILDDIR)/rockbox.tar
fontzip: BUILDZIPOPTS=-f 1
fontzip: ZIPFILESUFFIX=-fonts
fontzip: zip
font7zip: BUILDZIPOPTS=-f 1
font7zip: ZIPFILESUFFIX=-fonts
font7zip: 7zip
fullzip: BUILDZIPOPTS=-f 2
fullzip: ZIPFILESUFFIX=-full
fullzip: zip
full7zip: BUILDZIPOPTS=-f 2
full7zip: ZIPFILESUFFIX=-full
full7zip: 7zip
fulltar: BUILDZIPOPTS=-f 2
fulltar: ZIPFILESUFFIX=-full
fulltar: tar
ifdef NODEPS
$(BUILDDIR)/rockbox.zip:
else
$(BUILDDIR)/rockbox.zip: build
endif
$(call PRINTS,ZIP $(notdir $@))
$(SILENT)$(TOOLSDIR)/buildzip.pl $(VERBOSEOPT) --app=$(APPLICATION) -m \"$(MODELNAME)\" -i \"$(TARGET_ID)\" -r "$(ROOTDIR)" --rbdir="$(RBDIR)" $(TARGET) $(BINARY)
$(call PRINTS,ZIP rockbox$(ZIPFILESUFFIX).zip)
$(SILENT)$(TOOLSDIR)/buildzip.pl $(VERBOSEOPT) --app=$(APPLICATION) -m \"$(MODELNAME)\" -i \"$(TARGET_ID)\" -o $(BUILDDIR)/rockbox$(ZIPFILESUFFIX).zip -r "$(ROOTDIR)" --rbdir="$(RBDIR)" $(BUILDZIPOPTS) $(TARGET) $(BINARY)
mapzip:
$(SILENT)find . -name "*.map" | xargs zip rockbox-maps.zip
@ -332,11 +351,13 @@ mapzip:
elfzip:
$(SILENT)find . -name "*.elf" | xargs zip rockbox-elfs.zip
fullzip:
$(SILENT)$(TOOLSDIR)/buildzip.pl $(VERBOSEOPT) --app=$(APPLICATION) -m \"$(MODELNAME)\" -i \"$(TARGET_ID)\" -r "$(ROOTDIR)" --rbdir="$(RBDIR)" -f 2 -o rockbox-full.zip $(TARGET) $(BINARY)
7zip:
$(SILENT)$(TOOLSDIR)/buildzip.pl $(VERBOSEOPT) --app=$(APPLICATION) -m \"$(MODELNAME)\" -i \"$(TARGET_ID)\" -o "rockbox.7z" -z "7za a -mx=9" -r "$(ROOTDIR)" --rbdir="$(RBDIR)" $(TARGET) $(BINARY)
ifdef NODEPS
$(BUILDDIR)/rockbox.7z:
else
$(BUILDDIR)/rockbox.7z: build
endif
$(call PRINTS,7Z rockbox$(ZIPFILESUFFIX).7z)
$(SILENT)$(TOOLSDIR)/buildzip.pl $(VERBOSEOPT) --app=$(APPLICATION) -m \"$(MODELNAME)\" -i \"$(TARGET_ID)\" -o $(BUILDDIR)/rockbox$(ZIPFILESUFFIX).7z -z "7za a -mx=9" -r "$(ROOTDIR)" --rbdir="$(RBDIR)" $(BUILDZIPOPTS) $(TARGET) $(BINARY)
ifdef NODEPS
$(BUILDDIR)/rockbox.tar:
@ -345,18 +366,20 @@ $(BUILDDIR)/rockbox.tar: build
endif
$(SILENT)rm -f rockbox.tar
$(call PRINTS,TAR $(notdir $@))
$(SILENT)$(TOOLSDIR)/buildzip.pl $(VERBOSEOPT) --app=$(APPLICATION) -m \"$(MODELNAME)\" -i \"$(TARGET_ID)\" -o "rockbox.tar" -z "tar -cf" -r "$(ROOTDIR)" --rbdir="$(RBDIR)" $(TARGET) $(BINARY)
$(SILENT)$(TOOLSDIR)/buildzip.pl $(VERBOSEOPT) --app=$(APPLICATION) -m \"$(MODELNAME)\" -i \"$(TARGET_ID)\" -o $(BUILDDIR)/rockbox$(ZIPFILESUFFIX).tar -z "tar -cf" -r "$(ROOTDIR)" --rbdir="$(RBDIR)" $(BUILDZIPOPTS) $(TARGET) $(BINARY)
tar: $(BUILDDIR)/rockbox.tar
bzip2: tar
$(SILENT)bzip2 -f9 rockbox.tar
fullgzip: ZIPFILESUFFIX=-full
fullgzip: fulltar gzip
fullxz: ZIPFILESUFFIX=-full
fullxz: fulltar xz
gzip: tar
$(SILENT)gzip -f9 rockbox.tar
$(call PRINTS,GZIP rockbox$(ZIPFILESUFFIX).tar.gz)
$(SILENT)gzip -f9 rockbox$(ZIPFILESUFFIX).tar
xz: tar
$(SILENT)xz -f rockbox.tar
$(call PRINTS,XZ rockbox$(ZIPFILESUFFIX).tar.xz)
$(SILENT)xz -f rockbox$(ZIPFILESUFFIX).tar
manual manual-pdf:
$(SILENT)$(MAKE) -C $(MANUALDIR) OBJDIR=$(BUILDDIR)/manual manual-pdf
@ -428,22 +451,25 @@ help:
@echo "manual-html - HTML manual"
@echo "manual-zip - HTML manual (zipped)"
@echo "manual-txt - txt manual"
@echo "fullzip - creates a rockbox.zip of your build with fonts"
@echo "zip - creates a rockbox.zip of your build (no fonts)"
@echo "gzip - creates a rockbox.tar.gz of your build (no fonts)"
@echo "bzip2 - creates a rockbox.tar.bz2 of your build (no fonts)"
@echo "xz - creates a rockbox.tar.xz of your build (no fonts)"
@echo "7zip - creates a rockbox.7z of your build (no fonts)"
@echo "fullzip - creates a rockbox-full.zip of your build (with fonts)"
@echo "full7zip - creates a rockbox-full.zip of your build (with fonts)"
@echo "fullgzip - creates a rockbox-full.tar.gz of your build (with fonts)"
@echo "fullxz - creates a rockbox-full.tar.xz of your build (with fonts)"
@echo "fontzip - creates rockbox-fonts.zip"
@echo "font7zip - creates rockbox-fonts.7zip"
@echo "mapzip - creates rockbox-maps.zip with all .map files"
@echo "elfzip - creates rockbox-elfs.zip with all .elf files"
@echo "pnd - creates rockbox.pnd archive (Pandora builds only)"
@echo "tools - builds the tools only"
@echo "voice - creates the voice clips (voice builds only)"
@echo "voicetools - builds the voice tools only"
@echo "talkclips - builds talkclips for everything under TALKDIR, skipping existing clips"
@echo "talkclips-force - builds talkclips for everything under TALKDIR, overwriting all existing clips"
@echo "install - installs your build (at PREFIX, defaults to simdisk/ for simulators (no fonts))"
@echo "talkclips - builds talkclips for everything under \$$TALKDIR, skipping existing clips"
@echo "talkclips-force - builds talkclips for everything under \$$TALKDIR, overwriting all existing clips"
@echo "install - installs your build (at \$$PREFIX, defaults to simdisk/ for simulators (no fonts))"
@echo "fullinstall - installs your build (like install, but with fonts)"
@echo "symlinkinstall - like fullinstall, but with links instead of copying files. (Good for developing on simulator)"
@echo "reconf - rerun configure with the same selection"