diff --git a/examples/PoolBox/PoolBox.code-workspace b/examples/PoolBox/PoolBox.code-workspace index ce1c336c..4c22c398 100644 --- a/examples/PoolBox/PoolBox.code-workspace +++ b/examples/PoolBox/PoolBox.code-workspace @@ -10,8 +10,8 @@ "tasks": [ { "label": "build", - "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}", + "type": "shell", + "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}", "group": { "kind": "build", "isDefault": true @@ -19,7 +19,7 @@ }, { "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", "command": "${env:JABY_ENGINE_PATH}/bin/psxreadmap ${input:output memory map} application/bin/PAL/PSX-${input:build profile}/PoolBox.elf", "problemMatcher": [], } diff --git a/scripts/podman_jaby_engine.sh b/scripts/podman_jaby_engine.sh index febc6649..bb16edf8 100755 --- a/scripts/podman_jaby_engine.sh +++ b/scripts/podman_jaby_engine.sh @@ -8,9 +8,9 @@ else LICENSE_MOUNT= fi -PROJECT_PATH=$1 -PROJECT_WORK_DIR=$2 -shift +PROJECT_PATH_ARR=(${1//!/ }) +PROJECT_PATH=${PROJECT_PATH_ARR[0]} +PROJECT_WORK_DIR=${PROJECT_PATH_ARR[1]} shift 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 $@ \ No newline at end of file diff --git a/src/Library/Library.code-workspace b/src/Library/Library.code-workspace index 904f6e6d..9abab54d 100644 --- a/src/Library/Library.code-workspace +++ b/src/Library/Library.code-workspace @@ -19,13 +19,13 @@ { "label": "make", "type": "shell", - "command": "../../scripts/podman_jaby_engine.sh ../../ src/Library make ${input:target} BUILD_PROFILE=${input:build cfg} PSX_TV_FORMAT=${input:tv format} CUSTOM_CONFIG=${input:config options}", + "command": "../../scripts/podman_jaby_engine.sh ../../!src/Library make ${input:target} BUILD_PROFILE=${input:build cfg} PSX_TV_FORMAT=${input:tv format} CUSTOM_CONFIG=${input:config options}", "group": "build" }, { "label": "make_all", "type": "shell", - "command": "../../scripts/podman_jaby_engine.sh ../../ src/Library make -f MakeAll.mk ${input:target prefix}_${input:target} BUILD_PROFILE=${input:build cfg} CUSTOM_CONFIG=${input:config options}", + "command": "../../scripts/podman_jaby_engine.sh ../../!src/Library make -f MakeAll.mk ${input:target prefix}_${input:target} BUILD_PROFILE=${input:build cfg} CUSTOM_CONFIG=${input:config options}", "group": "build" } ], diff --git a/src/Tools/Tools.code-workspace b/src/Tools/Tools.code-workspace index 3acdfd0c..c2e75d27 100644 --- a/src/Tools/Tools.code-workspace +++ b/src/Tools/Tools.code-workspace @@ -25,7 +25,7 @@ "group": { "kind": "build" }, - "command": "../../scripts/podman_jaby_engine.sh ../../ src/Tools make -C ${input:linux_cargo_task} CARGO_CMD=${input:cargo cmd} BUILD_PROFILE=${input:build cfg}", + "command": "../../scripts/podman_jaby_engine.sh ../../!src/Tools make -C ${input:linux_cargo_task} CARGO_CMD=${input:cargo cmd} BUILD_PROFILE=${input:build cfg}", "problemMatcher": [] } ], diff --git a/support/src/SupportLibrary.code-workspace b/support/src/SupportLibrary.code-workspace index 2b9aa6d2..540a2256 100644 --- a/support/src/SupportLibrary.code-workspace +++ b/support/src/SupportLibrary.code-workspace @@ -19,7 +19,7 @@ { "label": "make", "type": "shell", - "command": "../../../scripts/podman_jaby_engine.sh ${workspaceFolder}/.. src/FontWriter 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"