Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Compiler refactor #849

Merged
merged 8 commits into from
Sep 11, 2023
Merged

Compiler refactor #849

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
2890841
Initial commit of organizing things
ethteck Sep 10, 2023
9579def
some bugs
ethteck Sep 10, 2023
5e9d696
anudder
ethteck Sep 10, 2023
22c2f7a
smores
ethteck Sep 11, 2023
e81606b
Merge branch 'main' into compiler-refactor
ethteck Sep 11, 2023
7e558f3
fix bug?
ethteck Sep 11, 2023
5cd824a
oopth
ethteck Sep 11, 2023
b459def
strings
ethteck Sep 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ jobs:
run: |-
docker build backend \
-t decompme_backend \
--build-arg ENABLE_WII_GC_SUPPORT=YES \
--build-arg ENABLE_GC_WII_SUPPORT=YES \
--build-arg ENABLE_PS1_SUPPORT=YES \
--build-arg ENABLE_SATURN_SUPPORT=YES
- name: Run tests
Expand Down
4 changes: 3 additions & 1 deletion .vscode/settings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,5 +41,7 @@
"backend/decompme"
],
"typescript.tsdk": "frontend/node_modules/typescript/lib",
"typescript.enablePromptUseWorkspaceTsdk": true
"typescript.enablePromptUseWorkspaceTsdk": true,
"python.linting.mypyEnabled": true,
"python.linting.enabled": true
}
8 changes: 4 additions & 4 deletions backend/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,15 +61,15 @@ COPY --from=ghcr.io/decompals/wibo:0.4.2 /usr/local/sbin/wibo /usr/bin/
# windows compilers need i386 wine
ARG ENABLE_NDS_SUPPORT
ARG ENABLE_PS1_SUPPORT
ARG ENABLE_WII_GC_SUPPORT
ARG ENABLE_GC_WII_SUPPORT
ARG ENABLE_SATURN_SUPPORT
ARG ENABLE_MSDOS_SUPPORT
ARG ENABLE_WIN9X_SUPPORT
RUN if [ "${ENABLE_NDS_SUPPORT}" = "YES" ] || \
[ "${ENABLE_PS1_SUPPORT}" = "YES" ] || \
[ "${ENABLE_MSDOS_SUPPORT}" = "YES" ] || \
[ "${ENABLE_WIN9X_SUPPORT}" = "YES" ] || \
[ "${ENABLE_WII_GC_SUPPORT}" = "YES" ]; then \
[ "${ENABLE_GC_WII_SUPPORT}" = "YES" ]; then \
dpkg --add-architecture i386 && apt-get update && \
apt-get install -y -o APT::Immediate-Configure=false \
wine; \
Expand Down Expand Up @@ -100,7 +100,7 @@ ARG ENABLE_N64_SUPPORT
ARG ENABLE_SWITCH_SUPPORT

ENV ENABLE_GBA_SUPPORT=${ENABLE_GBA_SUPPORT}
ENV ENABLE_WII_GC_SUPPORT=${ENABLE_WII_GC_SUPPORT}
ENV ENABLE_GC_WII_SUPPORT=${ENABLE_GC_WII_SUPPORT}
ENV ENABLE_N64_SUPPORT=${ENABLE_N64_SUPPORT}
ENV ENABLE_NDS_SUPPORT=${ENABLE_NDS_SUPPORT}
ENV ENABLE_PS1_SUPPORT=${ENABLE_PS1_SUPPORT}
Expand Down Expand Up @@ -131,7 +131,7 @@ USER user

# initialize wine files to /home/user/.wine
RUN if [ "${ENABLE_PS1_SUPPORT}" = "YES" ] || \
[ "${ENABLE_WII_GC_SUPPORT}" = "YES" ] || \
[ "${ENABLE_GC_WII_SUPPORT}" = "YES" ] || \
[ "${ENABLE_MSDOS_SUPPORT}" = "YES" ] || \
[ "${ENABLE_WIN9X_SUPPORT}" = "YES" ] || \
[ "${ENABLE_NDS_SUPPORT}" = "YES" ]; then \
Expand Down
Loading