From 518f180df582295cee4e8069db0ef6ef92778bdd Mon Sep 17 00:00:00 2001
From: Shaun Inman <shaun@panic.com>
Date: Sat, 4 Feb 2023 11:08:51 -0500
Subject: [PATCH] continuing to flesh out makefile

---
 makefile                      | 50 ++++++++++++++++++++++++-----------
 src/clock/Clock.pak/launch.sh |  4 ---
 src/clock/makefile            |  2 +-
 3 files changed, 36 insertions(+), 20 deletions(-)
 delete mode 100755 src/clock/Clock.pak/launch.sh

diff --git a/makefile b/makefile
index 7679386..ccd9444 100644
--- a/makefile
+++ b/makefile
@@ -19,15 +19,17 @@ RELEASE_BASE=MinUI-$(RELEASE_TIME)
 RELEASE_DOT!=find ./releases/. -regex ".*/$(RELEASE_BASE)-[0-9]+-base\.zip" -printf '.' | wc -m
 RELEASE_NAME=$(RELEASE_BASE)-$(RELEASE_DOT)
 
-all: lib sys cores tools dtb payload readmes zip report
+# TODO: this needs to consider the different platforms, eg. rootfs.ext2 should only be copied in rg35xx-toolchain
+
+all: lib sys cores tools dtb bundle readmes zip report
 	
 lib:
 	cd ./src/libmsettings && make
 
 sys:
 	cd ./src/keymon && make
-	cd ./src/minui && make
 	cd ./src/minarch && make
+	cd ./src/minui && make
 
 cores:
 	echo "TODO: cores"
@@ -39,24 +41,42 @@ tools:
 dtb:
 	cd ./src/dts/ && make
 
-payload:
+bundle:
+	# ready build
 	rm -rf ./build
 	mkdir -p ./releases
-	mkdir -p ./build
-	# cp ~/buildroot/output/images/rootfs.ext2 ./build/rootfs.img
+	cp -R ./skeleton ./build
 	
-	echo "TODO: payload"
-	echo "TDOO: remove .keep and *.meta files"
-	
-
-readmes:
-	echo "TODO: readmes"
-
-zip:
+	# remove authoring detritus
 	cd ./build && find . -type f -name '.keep' -delete
 	cd ./build && find . -type f -name '*.meta' -delete
-	cd ./build && find . -type f -name '.DS_Store' -delete
-	echo "TODO: zip"
+	
+	# populate system
+	cp ~/buildroot/output/images/rootfs.ext2 ./build/SYSTEM/rg35xx/
+	cp ./src/dts/kernel.dtb ./build/SYSTEM/rg35xx/dat
+	cp ./src/libmsettings/libmsettings.so ./build/SYSTEM/rg35xx/lib
+	cp ./src/keymon/keymon.elf ./build/SYSTEM/rg35xx/bin
+	cp ./src/minarch/minarch.elf ./build/SYSTEM/rg35xx/bin
+	cp ./src/minui/minui.elf ./build/SYSTEM/rg35xx/paks/MinUI.pak
+	cp ./src/clock/clock.elf ./build/EXTRAS/Tools/rg35xx/Clock.pak
+	cp ./third-party/DinguxCommander/output/DinguxCommander ./build/EXTRAS/Tools/rg35xx/Files.pak
+	cp -R ./third-party/DinguxCommander/res ./build/EXTRAS/Tools/rg35xx/Files.pak/
+	
+	mkdir -p ./build/PAYLOAD
+	mv ./build/SYSTEM ./build/PAYLOAD/.system
+	
+	# TODO: move to zip target
+	cd ./build/PAYLOAD && find . -type f -name '.DS_Store' -delete # TODO: do this before echo zip
+	cd ./build/PAYLOAD && zip -r MinUI.zip .system
+	mv ./build/PAYLOAD/MinUI.zip ./build/BASE
+	
+readmes:
+	# TODO
+	echo
+
+zip:
+	# TODO: 
+	echo
 
 report:
 	echo "finished building r${RELEASE_TIME}-${RELEASE_DOT}"
diff --git a/src/clock/Clock.pak/launch.sh b/src/clock/Clock.pak/launch.sh
deleted file mode 100755
index 7eba99d..0000000
--- a/src/clock/Clock.pak/launch.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-cd $(dirname "$0")
-./clock.elf
diff --git a/src/clock/makefile b/src/clock/makefile
index e3598a2..5dab676 100644
--- a/src/clock/makefile
+++ b/src/clock/makefile
@@ -2,7 +2,7 @@ ifeq (,$(CROSS_COMPILE))
 $(error missing CROSS_COMPILE for this toolchain)
 endif
 
-TARGET = Clock.pak/clock.elf
+TARGET = clock.elf
 
 CC = $(CROSS_COMPILE)gcc
 CFLAGS   = -marm -mtune=cortex-a9 -mfpu=neon-vfpv4 -mfloat-abi=hard -march=armv7-a -fomit-frame-pointer