mirror/decomp.me
1
0
Fork 0
mirror of https://github.com/decompme/decomp.me.git synced 2026-05-08 07:51:24 -05:00
Code Issues Packages Projects Releases Wiki Activity

Allow quotes for n64 egcs (#1407)

Browse Source 
* Replace 'docker-compose' with 'docker compose'

* Use 'printf' approach to COMPILER_FLAGS for n64 egcs compiler

* Use 'ubuntu-22.04' instead of 'ubuntu-latest'
This commit is contained in:
Mark Street
2025-01-21 14:32:30 +00:00
committed by GitHub
parent b25e2658ac
commit c364a685ad
4 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/ci.yml
+4 -4
View File
@@ -158,7 +158,7 @@ jobs:
backend_test_docker:
name: backend tests (docker)
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v4
- name: Build decompme_backend image
@@ -202,7 +202,7 @@ jobs:
frontend_lint:
name: biome
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v4
- name: Setup Node.js 20
@@ -218,7 +218,7 @@ jobs:
mypy:
name: mypy
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v4
- name: Install poetry
@@ -236,7 +236,7 @@ jobs:
black:
name: black
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v4
- uses: psf/black@stable
backend/coreapp/compilers.py
+3 -3
View File
@@ -404,7 +404,7 @@ PSYQ46 = GCCPS1Compiler(
PS1_GCC = (
'cpp -E -lang-c -nostdinc "${INPUT}" -o "${INPUT}".i && '
'${COMPILER_DIR}/gcc -c -pipe -B${COMPILER_DIR}/ ${COMPILER_FLAGS} -o "${OUTPUT}" "${INPUT}.i"'
'printf "%s" "${COMPILER_FLAGS}" | xargs -- ${COMPILER_DIR}/gcc -c -pipe -B${COMPILER_DIR}/ -o "${OUTPUT}" "${INPUT}.i"'
)
GCC257_PSX = GCCPS1Compiler(
@@ -870,13 +870,13 @@ GCC281SNCXX = GCCCompiler(
EGCS1124 = GCCCompiler(
id="egcs_1.1.2-4",
platform=N64,
cc='COMPILER_PATH="${COMPILER_DIR}" "${COMPILER_DIR}"/mips-linux-gcc -c -G 0 -fno-PIC -mgp32 -mfp32 -mcpu=4300 -nostdinc ${COMPILER_FLAGS} "${INPUT}" -o "${OUTPUT}"',
cc='printf "%s" "${COMPILER_FLAGS}" | COMPILER_PATH="${COMPILER_DIR}" xargs -- "${COMPILER_DIR}"/mips-linux-gcc -c -G 0 -fno-PIC -mgp32 -mfp32 -mcpu=4300 -nostdinc "${INPUT}" -o "${OUTPUT}"',
)
EGCS1124C = GCCCompiler(
id="egcs_1.1.2-4c",
platform=N64,
cc='COMPILER_PATH="${COMPILER_DIR}" "${COMPILER_DIR}"/gcc -c -G 0 -fno-PIC -mgp32 -mfp32 -mcpu=4300 -nostdinc ${COMPILER_FLAGS} "${INPUT}" -o "${OUTPUT}"',
cc='printf "%s" "${COMPILER_FLAGS}" | COMPILER_PATH="${COMPILER_DIR}" xargs -- "${COMPILER_DIR}"/gcc -c -G 0 -fno-PIC -mgp32 -mfp32 -mcpu=4300 -nostdinc "${INPUT}" -o "${OUTPUT}"',
)
GCC440MIPS64ELF = GCCCompiler(
backend/coreapp/sandbox.py
+1
View File
@@ -69,6 +69,7 @@ class Sandbox(contextlib.AbstractContextManager["Sandbox"]):
"--bindmount_ro", "/etc/fonts",
"--bindmount_ro", "/etc/passwd",
"--bindmount_ro", "/lib",
"--bindmount_ro", "/lib32",
"--bindmount_ro", "/lib64",
"--bindmount_ro", "/usr",
"--bindmount_ro", "/proc",
docs/DOCKER.md
+4 -4
View File
@@ -23,7 +23,7 @@ mkdir -p postgres
**Run in foreground:**
```sh
docker-compose up --build
docker compose up --build
```
The processes will run in the foreground until you CTRL+C to trigger a shutdown.
@@ -34,16 +34,16 @@ Navigate to [http://localhost:80](http://localhost:80) in your browser.
**Run daemonised:**
```sh
docker-compose up -d && docker-compose logs -f
docker compose up -d && docker compose logs -f
```
You can CTRL+C to stop tailing logs. If you want to stop the processes then running `docker-compose down` will shut everything down.
You can CTRL+C to stop tailing logs. If you want to stop the processes then running `docker compose down` will shut everything down.
**Note:** The first time you bring up the containers can take a minute or so - Docker has to pull/build images, grab Node dependencies, apply database migrations etc. Subsequent runs will be significantly faster to spin up.
## Configuration
By default the Docker `backend` image is built without support for all platforms (e.g. PS2, Switch, Saturn). Platforms can be enabled by changing the `ENABLE_<PLATFORM>_SUPPORT` variables to `"YES"` in the `docker-compose.yaml` and re-running the `docker-compose up --build` command.
By default the Docker `backend` image is built without support for all platforms (e.g. PS2, Switch, Saturn). Platforms can be enabled by changing the `ENABLE_<PLATFORM>_SUPPORT` variables to `"YES"` in the `docker-compose.yaml` and re-running the `docker compose up --build` command.
E.g. to enable `PS2` platform: