From eb2f8e66a661e54ba722983060db22be80a3b9a7 Mon Sep 17 00:00:00 2001
From: bladeoner <bladeoner112@gmail.com>
Date: Sun, 25 Oct 2020 17:19:56 +0100
Subject: [PATCH] Refactor make files and change artifact output (#410)

This changes the following:
- Uploads a separate Wii and Gamecube artifact
- Excludes uploading the elf files
- Creates the complete Wii structure under executables/VisualBoyAdvanceGX
- Creates the complete GameCube structure under executables/VisualBoyAdvanceGX-GameCube
- Doesn't upload empty folders like the vbagx folder with cheats, roms and saves but it is created in a local environment
---
 .../continuous-integration-workflow.yml       | 23 ++++++++++++++++---
 Makefile.gc                                   |  7 +++---
 Makefile.wii                                  | 13 +++++++----
 3 files changed, 33 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/continuous-integration-workflow.yml b/.github/workflows/continuous-integration-workflow.yml
index af37155..5d116f9 100644
--- a/.github/workflows/continuous-integration-workflow.yml
+++ b/.github/workflows/continuous-integration-workflow.yml
@@ -16,9 +16,26 @@ jobs:
     - name: Build
       run: |
         make -j2
+    
+    - name: Copy files
+      run: | 
+        cp -f hbc/* executables/VisualBoyAdvanceGX/apps/vbagx/
+        cp -f hbc/* executables/VisualBoyAdvanceGX-GameCube/
+        cp -f README.md executables/VisualBoyAdvanceGX/apps/vbagx/
+        cp -f README.md executables/VisualBoyAdvanceGX-GameCube/
 
-    - name: Upload a Build Artifact
+    - name: Upload Wii Build Artifacts
       uses: actions/upload-artifact@v2
       with: 
-        name: executables
-        path: executables/*
+        name: VisualBoyAdvanceGX-Nightly
+        path: |
+         executables/VisualBoyAdvanceGX/
+         !executables/VisualBoyAdvanceGX/apps/vbagx/*.elf
+    
+    - name: Upload GameCube Build Artifacts
+      uses: actions/upload-artifact@v2
+      with: 
+        name: VisualBoyAdvanceGX-Nightly-GameCube
+        path: |
+         executables/VisualBoyAdvanceGX-GameCube/
+         !executables/VisualBoyAdvanceGX-GameCube/*.elf
diff --git a/Makefile.gc b/Makefile.gc
index 8f15e0c..90d9b15 100644
--- a/Makefile.gc
+++ b/Makefile.gc
@@ -11,12 +11,13 @@ include $(DEVKITPPC)/gamecube_rules
 
 #---------------------------------------------------------------------------------
 # TARGET is the name of the output
+# TARGETDIR is the directory where the output files will be placed
 # BUILD is the directory where object files & intermediate files will be placed
 # SOURCES is a list of directories containing source code
 # INCLUDES is a list of directories containing extra header files
 #---------------------------------------------------------------------------------
-TARGET		:=	vbagx-gc
-TARGETDIR   :=  executables
+TARGET		:=	boot
+TARGETDIR   :=  executables/VisualBoyAdvanceGX-GameCube
 BUILD		:=	build_gc
 SOURCES		:=	source source/gui source/utils source/utils/sz \
 				source/vba source/vba/apu source/vba/common \
@@ -119,7 +120,7 @@ $(BUILD):
 #---------------------------------------------------------------------------------
 clean:
 	@echo clean ...
-	@rm -fr $(BUILD) $(OUTPUT).elf $(OUTPUT).dol
+	@rm -fr $(BUILD) $(TARGETDIR)
 
 #---------------------------------------------------------------------------------
 run:
diff --git a/Makefile.wii b/Makefile.wii
index a1b0910..6fdf687 100644
--- a/Makefile.wii
+++ b/Makefile.wii
@@ -11,12 +11,17 @@ include $(DEVKITPPC)/wii_rules
 
 #---------------------------------------------------------------------------------
 # TARGET is the name of the output
+# TARGETDIR is the directory where the output files will be placed
+# SUBDIR are the directories where the cheats, roms and saves need to be placed
+# ROOTDIR is the root directory of the build
 # BUILD is the directory where object files & intermediate files will be placed
 # SOURCES is a list of directories containing source code
 # INCLUDES is a list of directories containing extra header files
 #---------------------------------------------------------------------------------
-TARGET		:=	vbagx-wii
-TARGETDIR   :=  executables
+TARGET		:=	boot
+TARGETDIR   :=  executables/VisualBoyAdvanceGX/apps/vbagx
+ROOTDIR		:=	executables/VisualBoyAdvanceGX
+SUBDIR		:=	executables/VisualBoyAdvanceGX/vbagx/{cheats,roms,saves}
 BUILD		:=	build_wii
 SOURCES		:=	source source/gui source/utils source/utils/sz \
 				source/vba source/vba/apu source/vba/common \
@@ -114,13 +119,13 @@ export OUTPUT	:=	$(CURDIR)/$(TARGETDIR)/$(TARGET)
 #---------------------------------------------------------------------------------
 $(BUILD):
 	@[ -d $@ ] || mkdir -p $@
-	@[ -d $(TARGETDIR) ] || mkdir -p $(TARGETDIR)
+	@[ -d $(TARGETDIR) ] || mkdir -p $(TARGETDIR) $(SUBDIR)
 	@make --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile.wii
 
 #---------------------------------------------------------------------------------
 clean:
 	@echo clean ...
-	@rm -fr $(BUILD) $(OUTPUT).elf $(OUTPUT).dol
+	@rm -fr $(BUILD) $(ROOTDIR)
 
 #---------------------------------------------------------------------------------
 run: