Merge pull request 'Update readme for support' (#12) from topic/jb/last_touch into main

Reviewed-on: #12
Reviewed-by: cody <william@werl.me>

.gitattributes

@@ -3,3 +3,4 @@
 *.png filter=lfs diff=lfs merge=lfs -text
 *.mp3 filter=lfs diff=lfs merge=lfs -text
 *.TMD filter=lfs diff=lfs merge=lfs -text
+* text=auto eol=lf

examples/PoolBox/PoolBox.code-workspace

@@ -20,7 +20,7 @@
 			{
 				"label": "read memory map",
 				"type": "shell", 
-				"command": "${env:JABY_ENGINE_PATH}/bin/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/${input:tv format}/PSX-${input:build profile}/PoolBox.elf",
 				"problemMatcher": [],
 			}
 		],

podman/Dockerfile

@@ -1,7 +1,7 @@
 FROM "ubuntu:22.04"
 WORKDIR /usr/scripts
 ADD ["scripts/make_gcc.sh", "/usr/scripts"]
-WORKDIR /usr
+WORKDIR /tmp
 RUN apt update && /usr/scripts/make_gcc.sh
 
 WORKDIR /usr/scripts
@@ -12,6 +12,7 @@ ADD ["scripts/install_pop-fe.sh", "scripts/run_pop_fe.sh", "/usr/scripts"]
 WORKDIR /usr/jaby_engine/bin/extern
 RUN apt update && /usr/scripts/install_pop-fe.sh
 
+WORKDIR /project
 ENV PATH="/jaby_engine/bin:/root/.cargo/bin:${PATH}"
 ENV JABY_ENGINE_PATH=/jaby_engine
 ENV JABY_ENGINE_DIR=/jaby_engine

podman/install.sh

@@ -2,12 +2,16 @@
 podman build -t jaby_engine .
 
 if [[ -z "${JABY_ENGINE_PATH}" ]]; then
-echo "Setting JABY_ENGINE_PATH to parent folder"
+    echo "Setting JABY_ENGINE_PATH to parent folder"
 
-SCRIPT_DIR="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &> /dev/null && pwd)"
+    SCRIPT_DIR="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &> /dev/null && pwd)"
-JABY_ENGINE_PATH="$(dirname "$SCRIPT_DIR")"
+    export JABY_ENGINE_PATH="$(dirname "$SCRIPT_DIR")"
-cat << End >> ~/.profile
+        if cat /etc/passwd | grep $USER | grep bash > /dev/null; then
-export JABY_ENGINE_PATH="$JABY_ENGINE_PATH"
+            # Bash found
-End
+            echo "export JABY_ENGINE_PATH="$JABY_ENGINE_PATH"" >> ~/.bashrc 
-source ~/.profile
+
+        else
+            # No bash found
+            echo "Please add export JABY_ENGINE_PATH="$JABY_ENGINE_PATH" to your shell profile"
+        fi
 fi

podman/scripts/install_pop-fe.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # Made possible by Cody the white tiger
 
 echo "<<< Install pop-fe >>>"

podman/scripts/install_rust.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 echo "<<< Install Rust prerequisites >>>"
 apt install -y curl
 

podman/scripts/make_gcc.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 echo "<<< Install GCC prerequisites >>>"
 apt install -y make texinfo g++ gcc git libgmp3-dev libmpfr-dev libmpc-dev flex install-info info bison
 
@@ -61,5 +61,5 @@ if [ $? -ne 0 ]; then
 fi
 
 echo "<<< Delete GCC folder >>>"
-cd /usr
+cd /tmp
 rm -fr psx-gcc

podman/scripts/run_pop_fe.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # Made possible by Cody the white tiger
 
 cd /usr/jaby_engine/bin/extern/pop-fe

readme.md

@@ -10,7 +10,7 @@
   - [JabyEngine](#jabyengine-1)
   - [PoolBox](#poolbox)
 - [Special thanks](#special-thanks)
-- [TODO before commit](#todo-before-commit)
+- [Support this project](#support-this-project)
 
 # JabyEngine
 ## About
@@ -90,6 +90,7 @@ These projects shall eventually turn into useful extensions for the engine. So f
 * Pyravia
 * Sickle
 
-# TODO before commit
+# Support this project
-* Remove `wslpath`
+* Try it out
-* Verify template creation
+* Open Issues or Pull Requests
+* [Support it on KoFi](https://ko-fi.com/jabyspielkiste)

src/Library/Library.code-workspace

@@ -71,7 +71,7 @@
         ]
     },
     "extensions": {
-        "recommendations": ["augustocdias.tasks-shell-input"]
+        "recommendations": ["augustocdias.tasks-shell-input", "cantonios.project-templates"]
     },
     "settings": {
         "cmake.configureOnOpen": false,

template/JabyEngine-PSX_Game/#{ProjectName}.code-workspace

@@ -11,32 +11,17 @@
 			{
 				"label": "build",
 				"type": "shell",
-				"windows": { //                                                                                                                                            v re-export for WSL                                 v re-export for WSL
+				"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}",
-					"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}",
-				},
 				"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}/#{ProjectName}.elf",
+				"command": "${env:JABY_ENGINE_PATH}/bin/psxreadmap ${input:output memory map} application/bin/${input:tv format}/PSX-${input:build profile}/#{ProjectName}.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": "|"
                 }

template/install.bat

@@ -1,6 +0,0 @@
-echo off
-set dst_name=JabyEngine-PSX_Game
-set dst="%APPDATA%\Code\User\ProjectTemplates\%dst_name%"
-
-mkdir %dst%
-xcopy /s %dst_name% %dst%

template/install.sh

@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+dst="$HOME/.config/Code/User/ProjectTemplates"
+
+mkdir -p $dst
+cp -r "JabyEngine-PSX_Game" "$dst"