From 36fdbc1710be521013486354d6ae2421cd03665a Mon Sep 17 00:00:00 2001
From: jaby <jaby@william.zone>
Date: Tue, 27 Feb 2024 22:31:41 -0500
Subject: [PATCH] Experimental PKG generation support

---
 bin/run_pop_fe.bat                                  | 11 +++++++++++
 examples/PoolBox/.gitignore                         |  1 +
 examples/PoolBox/PoolBox.code-workspace             | 13 +++++++++++++
 mkfile/ISOMakefile.mk                               |  7 ++++---
 .../#{ProjectName}.code-workspace                   | 13 +++++++++++++
 template/JabyEngine-PSX_Game/.gitignore             |  1 +
 6 files changed, 43 insertions(+), 3 deletions(-)
 create mode 100644 bin/run_pop_fe.bat

diff --git a/bin/run_pop_fe.bat b/bin/run_pop_fe.bat
new file mode 100644
index 00000000..4181b2a2
--- /dev/null
+++ b/bin/run_pop_fe.bat
@@ -0,0 +1,11 @@
+rem %1 input cue file
+rem %2 Optional picture files
+setlocal ENABLEDELAYEDEXPANSION
+
+echo %PATH%
+if [%2] == [] (
+    set img_input=
+) else (
+    set img_input=--cover %2/cover.png --pic0 %2/pic0.png --pic1 %2/pic1.png
+)
+pop-fe.exe --ps3-pkg=%~dpn1.pkg %img_input% %1
\ No newline at end of file
diff --git a/examples/PoolBox/.gitignore b/examples/PoolBox/.gitignore
index fa0401e8..32e75896 100644
--- a/examples/PoolBox/.gitignore
+++ b/examples/PoolBox/.gitignore
@@ -1,5 +1,6 @@
 *.bin
 *.cue
+*.pkg
 *.d
 *.o
 *.lba
diff --git a/examples/PoolBox/PoolBox.code-workspace b/examples/PoolBox/PoolBox.code-workspace
index ac0e7d4b..f958c1cb 100644
--- a/examples/PoolBox/PoolBox.code-workspace
+++ b/examples/PoolBox/PoolBox.code-workspace
@@ -27,6 +27,19 @@
 					}
 				}
 			},
+			{
+				"label": "create pkg (experimental)",
+				"type": "shell",
+				"command": "run_pop_fe.bat ${workspaceFolder}/iso/${input:region}/PoolBox.cue",
+				"group": "build",
+				"options": {
+					//      v otherwise the tool won't start...
+					"cwd": "${env:POP_FE_PATH}",
+					"env": {
+						"PATH": "${env:JABY_ENGINE_PATH}/bin;${env:PATH}"
+					}
+				}
+			},
 			{
 				"label": "read memory map",
 				"type": "shell",
diff --git a/mkfile/ISOMakefile.mk b/mkfile/ISOMakefile.mk
index 47a5fd0e..ba88be7c 100644
--- a/mkfile/ISOMakefile.mk
+++ b/mkfile/ISOMakefile.mk
@@ -7,8 +7,9 @@ $(CD_OUTPUT): always
 all: $(CD_OUTPUT)
 
 clean:
-	rm -fr $(TV_FORMAT)/*.bin
-	rm -fr $(TV_FORMAT)/*.cue
-	rm -fr $(TV_FORMAT)/*.lba
+	rm -fr $(REGION)/*.bin
+	rm -fr $(REGION)/*.cue
+	rm -fr $(REGION)/*.lba
+	rm -fr $(REGION)/*.pkg
 
 always: ;
\ No newline at end of file
diff --git a/template/JabyEngine-PSX_Game/#{ProjectName}.code-workspace b/template/JabyEngine-PSX_Game/#{ProjectName}.code-workspace
index beff1495..d626a8b8 100644
--- a/template/JabyEngine-PSX_Game/#{ProjectName}.code-workspace
+++ b/template/JabyEngine-PSX_Game/#{ProjectName}.code-workspace
@@ -27,6 +27,19 @@
 					}
 				}
 			},
+			{
+				"label": "create pkg (experimental)",
+				"type": "shell",
+				"command": "run_pop_fe.bat ${workspaceFolder}/iso/${input:region}/#{ProjectName}.cue",
+				"group": "build",
+				"options": {
+					//      v otherwise the tool won't start...
+					"cwd": "${env:POP_FE_PATH}",
+					"env": {
+						"PATH": "${env:JABY_ENGINE_PATH}/bin;${env:PATH}"
+					}
+				}
+			},
 			{
 				"label": "read memory map",
 				"type": "shell",
diff --git a/template/JabyEngine-PSX_Game/.gitignore b/template/JabyEngine-PSX_Game/.gitignore
index fa0401e8..32e75896 100644
--- a/template/JabyEngine-PSX_Game/.gitignore
+++ b/template/JabyEngine-PSX_Game/.gitignore
@@ -1,5 +1,6 @@
 *.bin
 *.cue
+*.pkg
 *.d
 *.o
 *.lba