jaby
/
jabyengine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Support for podman #9

Merged
jaby merged 25 commits from feature/jb/potman into main 2025-01-08 21:22:17 +00:00
Conversation 0 Commits 25 Files Changed 30 +18 -29
6 changed files with 18 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 7128681a2f - Show all commits

27
examples/PoolBox/PoolBox.code-workspace
View File

@ -8,35 +8,20 @@
"tasks": {
"version": "2.0.0",
"tasks": [
{
{
"label": "build",
"type": "shell",
"windows": { // v re-export for WSL v re-export for WSL
"command": "wsl make ${input:project}_${input:target} BUILD_PROFILE=${input:build profile} REGION=${input:region} CUSTOM_CONFIG=${input:custom config} PSX_LICENSE_PATH=$(wslpath ${env:PSX_LICENSE_PATH}) JABY_ENGINE_DIR=$(wslpath ${env:JABY_ENGINE_PATH})",
},
"linux": {
"command": "make ${input:project}_${input:target} BUILD_PROFILE=${input:build profile} REGION=${input:region} CUSTOM_CONFIG=${input:custom config}",
},
"type": "shell", // TODO: Sort out JABY_ENGINE_DIR!!! Can it be set in the docker image? Can it just be JABY_ENGINE_PATH?
"command": "${env:JABY_ENGINE_PATH}/scripts/podman_jaby_engine.sh ${workspaceFolder} . make ${input:project}_${input:target} BUILD_PROFILE=${input:build profile} REGION=${input:region} CUSTOM_CONFIG=${input:custom config} JABY_ENGINE_DIR=/jaby_engine",
"group": {
"kind": "build",
"isDefault": true
},
"options": {
"env": {
"PATH": "${env:JABY_ENGINE_PATH}/bin;${env:PATH}"
}
}
},
{
"label": "read memory map",
"type": "shell",
"command": "psxreadmap.exe ${input:output memory map} application/bin/${input:tv format}/PSX-${input:build profile}/PoolBox.elf",
"type": "shell", // TODO: Make this work again? Or remove it and just tell people how to use it? Does not work with docker...?
"command": "${env:JABY_ENGINE_PATH}/scripts/podman_jaby_engine.sh ${workspaceFolder} . psxreadmap ${input:output memory map} application/bin/PAL/PSX-${input:build profile}/PoolBox.elf",
"problemMatcher": [],
"options": {
"env": {
"PATH": "${env:JABY_ENGINE_PATH}/bin;${env:PATH}"
}
}
}
],
"inputs": [
@ -73,7 +58,7 @@
"type": "command",
"command": "shellCommand.execute",
"args": {
"command": "echo ^|^<Default^> && dir /b /a:d",
"command": "echo \"|<Default>\" && ls -d */",
"cwd": "${env:JABY_ENGINE_PATH}/config",
"fieldSeparator": "|"
}

1
examples/PoolBox/iso/Config.xml
View File

@ -9,6 +9,7 @@
</Defaults>-->
<Description>
<Publisher>Jaby</Publisher>
<!-- TODO: v Add to git lfs -->
<License alt-logo = "%JABY_ENGINE_DIR%/bin/extern/32BIT.TMD" alt-text = " Not licensed by Sony Will not work on all hardware/software">
%PSX_LICENSE_PATH%/%PSX_LICENSE%.DAT
</License>

1
podman/Dockerfile
View File

@ -13,6 +13,7 @@ ADD ["scripts/install_pop-fe.sh", "/usr/scripts"]
ENV PATH="/jaby_engine/bin:/root/.cargo/bin:${PATH}"
ENV JABY_ENGINE_PATH=/jaby_engine
ENV PSX_LICENSE_PATH=/psx_license
#WORKDIR /usr/src/project
cody marked this conversation as resolved Outdated
cody commented 2025-01-08 19:37:14 +00:00
Outdated
Review
Copy Link

Never set workdir to /jaby_engine or some other potentially useful directory? is it intended to be in /user/jaby_engine/bin/extern?

Never set workdir to `/jaby_engine` or some other potentially useful directory? is it intended to be in `/user/jaby_engine/bin/extern`?

8
scripts/podman_jaby_engine.sh
View File

@ -1,6 +1,12 @@
#!/usr/bin/env bash
if [[ -n "${PSX_LICENSE_PATH}" ]]; then
LICENSE_MOUNT="-v ${PSX_LICENSE_PATH}:/psx_license"
cody marked this conversation as resolved
cody commented 2025-01-08 20:03:11 +00:00
Review
Copy Link

Can you directly map it to the local system cargo registry? does this potentially cause any problems?

Can you directly map it to the local system cargo registry? does this potentially cause any problems?
jaby commented 2025-01-08 21:12:53 +00:00
Review
Copy Link

I leave this unchanged for now.
I need to figure out first if this is really an issue

I leave this unchanged for now. I need to figure out first if this is really an issue
else
LICENSE_MOUNT=
fi
PROJECT_PATH=$1
PROJECT_WORK_DIR=$2
shift
shift
podman run --rm -it -v ${JABY_ENGINE_PATH}:/jaby_engine -v ${PROJECT_PATH}:/project -e PSX_LICENSE_PATH=${PSX_LICENSE_PATH} -w /project/$PROJECT_WORK_DIR jaby_engine $@
podman run --rm -it -v ${JABY_ENGINE_PATH}:/jaby_engine -v ${PROJECT_PATH}:/project $LICENSE_MOUNT -w /project/$PROJECT_WORK_DIR jaby_engine $@

2
support/src/FontWriter/Makefile
View File

@ -1,4 +1,4 @@
JABY_ENGINE_DIR = ../../..
JABY_ENGINE_DIR = /jaby_engine
include $(JABY_ENGINE_DIR)/mkfile/common/RebuildTarget.mk
ARTIFACT = libFontWriter

8
support/src/SupportLibrary.code-workspace
View File

@ -19,13 +19,9 @@
{
"label": "make",
"type": "shell",
"windows": {
"command": "wsl make ${input:target} BUILD_PROFILE=${input:build cfg}",
},
"linux": {
"command": "make ${input:target} BUILD_PROFILE=${input:build cfg}",
},
"command": "../../../scripts/podman_jaby_engine.sh ${workspaceFolder}/.. src/FontWriter make ${input:target} BUILD_PROFILE=${input:build cfg}",
"options": {
// TODO: This should not be the case
"cwd": "${workspaceFolder}/FontWriter"
},
"group": "build"