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

Make Rust work better; Adjust docker version

This commit is contained in:
jaby 2025-01-05 13:30:57 +01:00
parent a5093d06dd
commit 7c8fa2409d
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,7 +20,7 @@
{ {
"label": "read memory map", "label": "read memory map",
"type": "shell", // TODO: Make this work again? Or remove it and just tell people how to use it? Does not work with docker...? "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", "command": "${env:JABY_ENGINE_PATH}/bin/psxreadmap ${input:output memory map} application/bin/PAL/PSX-${input:build profile}/PoolBox.elf",
"problemMatcher": [], "problemMatcher": [],
} }
], ],

2
podman/Dockerfile
View File

@ -1,4 +1,4 @@
FROM "ubuntu:24.04" FROM "ubuntu:22.04"
WORKDIR /usr/scripts WORKDIR /usr/scripts
ADD ["scripts/make_gcc.sh", "/usr/scripts"] ADD ["scripts/make_gcc.sh", "/usr/scripts"]
WORKDIR /usr WORKDIR /usr

6
scripts/podman_jaby_engine.sh
View File

@ -1,4 +1,7 @@
#!/usr/bin/env bash #!/usr/bin/env bash
JABY_ENGINE_DOT_FOLDER="$HOME/.jaby_engine"
JABY_ENGINE_CARGO_FOLDER="$JABY_ENGINE_DOT_FOLDER/cargo/registry"
if [[ -n "${PSX_LICENSE_PATH}" ]]; then if [[ -n "${PSX_LICENSE_PATH}" ]]; then
LICENSE_MOUNT="-v ${PSX_LICENSE_PATH}:/psx_license" LICENSE_MOUNT="-v ${PSX_LICENSE_PATH}:/psx_license"
else else
@ -9,4 +12,5 @@ PROJECT_PATH=$1
PROJECT_WORK_DIR=$2 PROJECT_WORK_DIR=$2
shift shift
shift shift
podman run --rm -it -v ${JABY_ENGINE_PATH}:/jaby_engine -v ${PROJECT_PATH}:/project $LICENSE_MOUNT -w /project/$PROJECT_WORK_DIR jaby_engine $@ mkdir -p $JABY_ENGINE_CARGO_FOLDER
podman run --rm -it -v $JABY_ENGINE_CARGO_FOLDER:/root/.cargo/registry -v ${JABY_ENGINE_PATH}:/jaby_engine -v ${PROJECT_PATH}:/project $LICENSE_MOUNT -w /project/$PROJECT_WORK_DIR jaby_engine $@