From a988b90d95fadaef341cec6b51aaabddcc8657ff Mon Sep 17 00:00:00 2001
From: Jacoby6000 <jacoby6000@gmail.com>
Date: Tue, 23 Jul 2024 21:39:25 -0500
Subject: [PATCH] more build refinements

---
 Dockerfile |  4 ++--
 Makefile   | 17 ++++++++++++-----
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 3977a0af..fa87fe37 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -31,11 +31,11 @@ ENV DEVKITPPC=/devkitpro/devkitPPC
 # Now we have a container that has the dev environment set up. 
 # Copy current folder into container, then compile
 COPY . /projectroot/
-RUN cd /projectroot && make clean && make -j8 package
+RUN cd /projectroot && make clean && make -j8 dist
 
 
 # Copy the DOL and ELF out of the container
 FROM scratch AS export-stage
 COPY --from=usbloader /projectroot/boot.* / 
 COPY --from=usbloader /projectroot/usbloader_gx /
-COPY --from=usbloader /projectroot/usbloader_gx.zip /
+COPY --from=usbloader /projectroot/usbloadergx_r*.zip /
diff --git a/Makefile b/Makefile
index 007ea41d..f4bf7a97 100644
--- a/Makefile
+++ b/Makefile
@@ -180,17 +180,24 @@ clean:
 package:
 	$(MAKE)
 	@echo Packaging...
-	@[ -d usbloader_gx ] || mkdir -p usbloader_gx
-	@cp $(TARGET).dol usbloader_gx/
-	@cp HBC/icon.png usbloader_gx/
-	@cp HBC/meta.xml usbloader_gx/
-	@zip usbloader_gx.zip usbloader_gx/*
+	@[ -d $(PROJECTDIR)/usbloader_gx ] || mkdir -p $(PROJECTDIR)/usbloader_gx
+	@cp $(TARGET).dol $(PROJECTDIR)/usbloader_gx/
+	@cp $(PROJECTDIR)/HBC/icon.png $(PROJECTDIR)/usbloader_gx/
+	@cp $(PROJECTDIR)/HBC/meta.xml $(PROJECTDIR)/usbloader_gx/
+
+#---------------------------------------------------------------------------------
+dist:
+	$(MAKE) package
+	@mkdir -p $(PROJECTDIR)/dist/apps
+	@cp -r $(PROJECTDIR)/usbloader_gx $(PROJECTDIR)/dist/apps/
+	@cd $(PROJECTDIR)/dist && zip "../usbloadergx_r`cat $(PROJECTDIR)/version.txt`" -r .
 
 #---------------------------------------------------------------------------------
 
 deploy:
 	$(MAKE) package	
 	@echo Deploying...
+	@zip usbloader_gx.zip usbloader_gx/*
 	wiiload usbloader_gx.zip
 
 #---------------------------------------------------------------------------------