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 +234 -239
jaby commented 2025-01-07 22:23:35 +00:00
Owner
Copy Link

Replaces the build system with podman.

  • Install script provided for easy setup of podman
  • Existing builds adjusted to use podman
    • Optionally podman can be turned off
  • Project template adjusted
  • Documentation updated
Replaces the build system with `podman`. * Install script provided for easy setup of podman * Existing builds adjusted to use podman * Optionally podman can be turned off * Project template adjusted * Documentation updated
jaby added 23 commits 2025-01-07 22:23:35 +00:00
jaby force-pushed feature/jb/potman from 16d7bb9216 to c6eeb40680 2025-01-07 22:39:52 +00:00 Compare
jaby requested review from cody 2025-01-07 22:40:34 +00:00
cody requested changes 2025-01-08 20:09:38 +00:00
Dismissed
podman/Dockerfile
@ -0,0 +1,18 @@
FROM "ubuntu:22.04"
WORKDIR /usr/scripts
cody commented 2025-01-08 19:35:33 +00:00
Collaborator
Copy Link

Potentially not needed?

Potentially not needed?
cody marked this conversation as resolved
podman/Dockerfile Outdated
@ -0,0 +1,18 @@
FROM "ubuntu:22.04"
WORKDIR /usr/scripts
ADD ["scripts/make_gcc.sh", "/usr/scripts"]
WORKDIR /usr
cody commented 2025-01-08 19:35:17 +00:00
Collaborator
Copy Link

For temporary working spaces to compile programs it would be preferable to use /tmp or $HOME instead of /usr to conform to normal *NIX conventions.

For temporary working spaces to compile programs it would be preferable to use `/tmp` or `$HOME` instead of `/usr` to conform to normal *NIX conventions.
cody marked this conversation as resolved
podman/Dockerfile Outdated
@ -0,0 +15,4 @@
ENV PATH="/jaby_engine/bin:/root/.cargo/bin:${PATH}"
ENV JABY_ENGINE_PATH=/jaby_engine
ENV JABY_ENGINE_DIR=/jaby_engine
ENV PSX_LICENSE_PATH=/psx_license
cody commented 2025-01-08 19:37:14 +00:00
Collaborator
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`?
cody marked this conversation as resolved
podman/install.sh Outdated
@ -0,0 +6,4 @@
SCRIPT_DIR="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &> /dev/null && pwd)"
JABY_ENGINE_PATH="$(dirname "$SCRIPT_DIR")"
cat << End >> ~/.profile
cody commented 2025-01-08 19:42:54 +00:00
Collaborator
Copy Link

This will not work as expected on any distro that does not use bash by default. You could echo an example of what to add to your "bashrc" and let users add it to the correct rc file for their shell.

This will not work as expected on any distro that does not use bash by default. You could echo an example of what to add to your "bashrc" and let users add it to the correct rc file for their shell.
cody commented 2025-01-08 19:50:47 +00:00
Collaborator
Copy Link

for example

echo "Please ensure that you source ~/.profile in your shell rc"

so that people with alternate shells will still be able to use your tools.

for example ``` echo "Please ensure that you source ~/.profile in your shell rc" ``` so that people with alternate shells will still be able to use your tools.
cody commented 2025-01-08 20:00:53 +00:00
Collaborator
Copy Link

or use

if cat /etc/passwd | grep $USER | grep bash; then
# do stuff if they use bash
else
# warn the users then need to add the export statement to their shell RC
fi
or use ```bash if cat /etc/passwd | grep $USER | grep bash; then # do stuff if they use bash else # warn the users then need to add the export statement to their shell RC fi ```
cody marked this conversation as resolved
scripts/podman_jaby_engine.sh
@ -0,0 +1,25 @@
#!/usr/bin/env bash
JABY_ENGINE_DOT_FOLDER="$HOME/.jaby_engine"
JABY_ENGINE_CARGO_FOLDER="$JABY_ENGINE_DOT_FOLDER/cargo/registry"
cody commented 2025-01-08 20:03:11 +00:00
Collaborator
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
Author
Owner
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
cody marked this conversation as resolved
template/install.sh Outdated
@ -0,0 +1,6 @@
#!/usr/bin/env bash
dst_name=JabyEngine-PSX_Game
cody commented 2025-01-08 20:05:20 +00:00
Collaborator
Copy Link

should be src_name

should be `src_name`
cody marked this conversation as resolved
jaby added 1 commit 2025-01-08 21:13:42 +00:00
jaby added 1 commit 2025-01-08 21:17:07 +00:00
jaby added 1 commit 2025-01-08 21:18:48 +00:00
cody approved these changes 2025-01-08 21:21:47 +00:00
jaby merged commit 0f48b3aedb into main 2025-01-08 21:22:17 +00:00
jaby deleted branch feature/jb/potman 2025-01-08 21:22:17 +00:00
Sign in to join this conversation.
Reviewers
No reviewers
cody
Labels
Clear labels
No items
No Label
Milestone
Clear milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
No Assignees
2 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: jaby/jabyengine#9
No description provided.
Delete Branch "feature/jb/potman"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?