44

decompme · Sep 15, 2023 · af50c6e · af50c6e
1 parent b81002a
commit af50c6e
Show file tree

Hide file tree

Showing 16 changed files with 32 additions and 64 deletions.
diff --git a/download.py b/download.py
@@ -400,7 +400,6 @@ def main():
     logger.info("Updated %i / %i compiler(s) in %.2f second(s)", compilers_downloaded, len(to_download), (end - start).total_seconds())
 
 
-
 if __name__ == "__main__":
     logging.basicConfig(
         handlers=[logging.StreamHandler()],

diff --git a/platforms/n64/ido5.3/darwin/Dockerfile b/platforms/n64/ido5.3/darwin/Dockerfile
@@ -0,0 +1,17 @@
+# NOTE: This file is generated automatically via template.py. Do not edit manually!
+
+
+FROM alpine:3.18 as base
+
+RUN mkdir -p /compilers/n64/ido5.3
+
+RUN wget -O ido-5.3-recomp-macos-latest.tar.gz "https://github.com/ethteck/ido-static-recomp/releases/download/v0.6/ido-5.3-recomp-macos-latest.tar.gz"
+RUN tar xvzf ido-5.3-recomp-macos-latest.tar.gz -C /compilers/n64/ido5.3
+
+RUN chown -R root:root /compilers/n64/ido5.3/
+RUN chmod +x /compilers/n64/ido5.3/*
+
+
+FROM scratch as release
+
+COPY --from=base /compilers /compilers
diff --git a/platforms/n64/ido5.3/linux/Dockerfile b/platforms/n64/ido5.3/linux/Dockerfile
@@ -5,8 +5,8 @@ FROM alpine:3.18 as base
 
 RUN mkdir -p /compilers/n64/ido5.3
 
-RUN wget -O ido-5.3-recomp-macos-latest.tar.gz "https://github.com/ethteck/ido-static-recomp/releases/download/v0.6/ido-5.3-recomp-macos-latest.tar.gz"
-RUN tar xvzf ido-5.3-recomp-macos-latest.tar.gz -C /compilers/n64/ido5.3
+RUN wget -O ido-5.3-recomp-ubuntu-20.04.tar.gz "https://github.com/ethteck/ido-static-recomp/releases/download/v0.6/ido-5.3-recomp-ubuntu-20.04.tar.gz"
+RUN tar xvzf ido-5.3-recomp-ubuntu-20.04.tar.gz -C /compilers/n64/ido5.3
 
 RUN chown -R root:root /compilers/n64/ido5.3/
 RUN chmod +x /compilers/n64/ido5.3/*

diff --git a/platforms/ps1/gcc2.6.3-mipsel/Dockerfile b/platforms/ps1/gcc2.6.3-mipsel/Dockerfile
@@ -15,12 +15,8 @@ RUN wget -O maspsx.zip https://github.com/mkst/maspsx/archive/${MASPSX_HASH}.zip
 RUN unzip maspsx.zip
 RUN cp -r maspsx-${MASPSX_HASH} /compilers/ps1/gcc2.6.3-mipsel/maspsx
 
-RUN wget -O gte_macros.s https://raw.githubusercontent.com/Decompollaborate/rabbitizer/3d0221687b587497ed60b1cf1f207a873ade7cf9/docs/r3000gte/gte_macros.s
-RUN cp gte_macros.s /compilers/ps1/gcc2.6.3-mipsel/
-
 RUN echo '#!/bin/bash' >> as
-RUN echo 'python3 $(dirname -- $0)/maspsx/maspsx.py --run-assembler -I${COMPILER_DIR} $@' >> as
-RUN cat as
+RUN echo 'python3 $(dirname -- $0)/maspsx/maspsx.py --run-assembler --no-macro-inc -I${COMPILER_DIR} $@' >> as
 RUN cp as /compilers/ps1/gcc2.6.3-mipsel/
 
 RUN chown -R root:root /compilers/ps1/gcc2.6.3-mipsel/

diff --git a/platforms/ps1/gcc2.6.3-psx/Dockerfile b/platforms/ps1/gcc2.6.3-psx/Dockerfile
@@ -15,12 +15,8 @@ RUN wget -O maspsx.zip https://github.com/mkst/maspsx/archive/${MASPSX_HASH}.zip
 RUN unzip maspsx.zip
 RUN cp -r maspsx-${MASPSX_HASH} /compilers/ps1/gcc2.6.3-psx/maspsx
 
-RUN wget -O gte_macros.s https://raw.githubusercontent.com/Decompollaborate/rabbitizer/3d0221687b587497ed60b1cf1f207a873ade7cf9/docs/r3000gte/gte_macros.s
-RUN cp gte_macros.s /compilers/ps1/gcc2.6.3-psx/
-
 RUN echo '#!/bin/bash' >> as
-RUN echo 'python3 $(dirname -- $0)/maspsx/maspsx.py --run-assembler -I${COMPILER_DIR} $@' >> as
-RUN cat as
+RUN echo 'python3 $(dirname -- $0)/maspsx/maspsx.py --run-assembler --no-macro-inc -I${COMPILER_DIR} $@' >> as
 RUN cp as /compilers/ps1/gcc2.6.3-psx/
 
 RUN chown -R root:root /compilers/ps1/gcc2.6.3-psx/

diff --git a/platforms/ps1/gcc2.7.1-mipsel/Dockerfile b/platforms/ps1/gcc2.7.1-mipsel/Dockerfile
@@ -15,12 +15,8 @@ RUN wget -O maspsx.zip https://github.com/mkst/maspsx/archive/${MASPSX_HASH}.zip
 RUN unzip maspsx.zip
 RUN cp -r maspsx-${MASPSX_HASH} /compilers/ps1/gcc2.7.1-mipsel/maspsx
 
-RUN wget -O gte_macros.s https://raw.githubusercontent.com/Decompollaborate/rabbitizer/3d0221687b587497ed60b1cf1f207a873ade7cf9/docs/r3000gte/gte_macros.s
-RUN cp gte_macros.s /compilers/ps1/gcc2.7.1-mipsel/
-
 RUN echo '#!/bin/bash' >> as
-RUN echo 'python3 $(dirname -- $0)/maspsx/maspsx.py --run-assembler -I${COMPILER_DIR} $@' >> as
-RUN cat as
+RUN echo 'python3 $(dirname -- $0)/maspsx/maspsx.py --run-assembler --no-macro-inc -I${COMPILER_DIR} $@' >> as
 RUN cp as /compilers/ps1/gcc2.7.1-mipsel/
 
 RUN chown -R root:root /compilers/ps1/gcc2.7.1-mipsel/

diff --git a/platforms/ps1/gcc2.7.2-mipsel/Dockerfile b/platforms/ps1/gcc2.7.2-mipsel/Dockerfile
@@ -15,12 +15,8 @@ RUN wget -O maspsx.zip https://github.com/mkst/maspsx/archive/${MASPSX_HASH}.zip
 RUN unzip maspsx.zip
 RUN cp -r maspsx-${MASPSX_HASH} /compilers/ps1/gcc2.7.2-mipsel/maspsx
 
-RUN wget -O gte_macros.s https://raw.githubusercontent.com/Decompollaborate/rabbitizer/3d0221687b587497ed60b1cf1f207a873ade7cf9/docs/r3000gte/gte_macros.s
-RUN cp gte_macros.s /compilers/ps1/gcc2.7.2-mipsel/
-
 RUN echo '#!/bin/bash' >> as
-RUN echo 'python3 $(dirname -- $0)/maspsx/maspsx.py --run-assembler -I${COMPILER_DIR} $@' >> as
-RUN cat as
+RUN echo 'python3 $(dirname -- $0)/maspsx/maspsx.py --run-assembler --no-macro-inc -I${COMPILER_DIR} $@' >> as
 RUN cp as /compilers/ps1/gcc2.7.2-mipsel/
 
 RUN chown -R root:root /compilers/ps1/gcc2.7.2-mipsel/

diff --git a/platforms/ps1/gcc2.7.2.1-mipsel/Dockerfile b/platforms/ps1/gcc2.7.2.1-mipsel/Dockerfile
@@ -15,12 +15,8 @@ RUN wget -O maspsx.zip https://github.com/mkst/maspsx/archive/${MASPSX_HASH}.zip
 RUN unzip maspsx.zip
 RUN cp -r maspsx-${MASPSX_HASH} /compilers/ps1/gcc2.7.2.1-mipsel/maspsx
 
-RUN wget -O gte_macros.s https://raw.githubusercontent.com/Decompollaborate/rabbitizer/3d0221687b587497ed60b1cf1f207a873ade7cf9/docs/r3000gte/gte_macros.s
-RUN cp gte_macros.s /compilers/ps1/gcc2.7.2.1-mipsel/
-
 RUN echo '#!/bin/bash' >> as
-RUN echo 'python3 $(dirname -- $0)/maspsx/maspsx.py --run-assembler -I${COMPILER_DIR} $@' >> as
-RUN cat as
+RUN echo 'python3 $(dirname -- $0)/maspsx/maspsx.py --run-assembler --no-macro-inc -I${COMPILER_DIR} $@' >> as
 RUN cp as /compilers/ps1/gcc2.7.2.1-mipsel/
 
 RUN chown -R root:root /compilers/ps1/gcc2.7.2.1-mipsel/

diff --git a/platforms/ps1/gcc2.7.2.2-mipsel/Dockerfile b/platforms/ps1/gcc2.7.2.2-mipsel/Dockerfile
@@ -15,12 +15,8 @@ RUN wget -O maspsx.zip https://github.com/mkst/maspsx/archive/${MASPSX_HASH}.zip
 RUN unzip maspsx.zip
 RUN cp -r maspsx-${MASPSX_HASH} /compilers/ps1/gcc2.7.2.2-mipsel/maspsx
 
-RUN wget -O gte_macros.s https://raw.githubusercontent.com/Decompollaborate/rabbitizer/3d0221687b587497ed60b1cf1f207a873ade7cf9/docs/r3000gte/gte_macros.s
-RUN cp gte_macros.s /compilers/ps1/gcc2.7.2.2-mipsel/
-
 RUN echo '#!/bin/bash' >> as
-RUN echo 'python3 $(dirname -- $0)/maspsx/maspsx.py --run-assembler -I${COMPILER_DIR} $@' >> as
-RUN cat as
+RUN echo 'python3 $(dirname -- $0)/maspsx/maspsx.py --run-assembler --no-macro-inc -I${COMPILER_DIR} $@' >> as
 RUN cp as /compilers/ps1/gcc2.7.2.2-mipsel/
 
 RUN chown -R root:root /compilers/ps1/gcc2.7.2.2-mipsel/

diff --git a/platforms/ps1/gcc2.7.2.3-mipsel/Dockerfile b/platforms/ps1/gcc2.7.2.3-mipsel/Dockerfile
@@ -15,12 +15,8 @@ RUN wget -O maspsx.zip https://github.com/mkst/maspsx/archive/${MASPSX_HASH}.zip
 RUN unzip maspsx.zip
 RUN cp -r maspsx-${MASPSX_HASH} /compilers/ps1/gcc2.7.2.3-mipsel/maspsx
 
-RUN wget -O gte_macros.s https://raw.githubusercontent.com/Decompollaborate/rabbitizer/3d0221687b587497ed60b1cf1f207a873ade7cf9/docs/r3000gte/gte_macros.s
-RUN cp gte_macros.s /compilers/ps1/gcc2.7.2.3-mipsel/
-
 RUN echo '#!/bin/bash' >> as
-RUN echo 'python3 $(dirname -- $0)/maspsx/maspsx.py --run-assembler -I${COMPILER_DIR} $@' >> as
-RUN cat as
+RUN echo 'python3 $(dirname -- $0)/maspsx/maspsx.py --run-assembler --no-macro-inc -I${COMPILER_DIR} $@' >> as
 RUN cp as /compilers/ps1/gcc2.7.2.3-mipsel/
 
 RUN chown -R root:root /compilers/ps1/gcc2.7.2.3-mipsel/

diff --git a/platforms/ps1/gcc2.8.0-mipsel/Dockerfile b/platforms/ps1/gcc2.8.0-mipsel/Dockerfile
@@ -15,12 +15,8 @@ RUN wget -O maspsx.zip https://github.com/mkst/maspsx/archive/${MASPSX_HASH}.zip
 RUN unzip maspsx.zip
 RUN cp -r maspsx-${MASPSX_HASH} /compilers/ps1/gcc2.8.0-mipsel/maspsx
 
-RUN wget -O gte_macros.s https://raw.githubusercontent.com/Decompollaborate/rabbitizer/3d0221687b587497ed60b1cf1f207a873ade7cf9/docs/r3000gte/gte_macros.s
-RUN cp gte_macros.s /compilers/ps1/gcc2.8.0-mipsel/
-
 RUN echo '#!/bin/bash' >> as
-RUN echo 'python3 $(dirname -- $0)/maspsx/maspsx.py --run-assembler -I${COMPILER_DIR} $@' >> as
-RUN cat as
+RUN echo 'python3 $(dirname -- $0)/maspsx/maspsx.py --run-assembler --no-macro-inc -I${COMPILER_DIR} $@' >> as
 RUN cp as /compilers/ps1/gcc2.8.0-mipsel/
 
 RUN chown -R root:root /compilers/ps1/gcc2.8.0-mipsel/

diff --git a/platforms/ps1/gcc2.8.1-mipsel/Dockerfile b/platforms/ps1/gcc2.8.1-mipsel/Dockerfile
@@ -15,12 +15,8 @@ RUN wget -O maspsx.zip https://github.com/mkst/maspsx/archive/${MASPSX_HASH}.zip
 RUN unzip maspsx.zip
 RUN cp -r maspsx-${MASPSX_HASH} /compilers/ps1/gcc2.8.1-mipsel/maspsx
 
-RUN wget -O gte_macros.s https://raw.githubusercontent.com/Decompollaborate/rabbitizer/3d0221687b587497ed60b1cf1f207a873ade7cf9/docs/r3000gte/gte_macros.s
-RUN cp gte_macros.s /compilers/ps1/gcc2.8.1-mipsel/
-
 RUN echo '#!/bin/bash' >> as
-RUN echo 'python3 $(dirname -- $0)/maspsx/maspsx.py --run-assembler -I${COMPILER_DIR} $@' >> as
-RUN cat as
+RUN echo 'python3 $(dirname -- $0)/maspsx/maspsx.py --run-assembler --no-macro-inc -I${COMPILER_DIR} $@' >> as
 RUN cp as /compilers/ps1/gcc2.8.1-mipsel/
 
 RUN chown -R root:root /compilers/ps1/gcc2.8.1-mipsel/

diff --git a/platforms/ps1/gcc2.91.66-mipsel/Dockerfile b/platforms/ps1/gcc2.91.66-mipsel/Dockerfile
@@ -15,12 +15,8 @@ RUN wget -O maspsx.zip https://github.com/mkst/maspsx/archive/${MASPSX_HASH}.zip
 RUN unzip maspsx.zip
 RUN cp -r maspsx-${MASPSX_HASH} /compilers/ps1/gcc2.91.66-mipsel/maspsx
 
-RUN wget -O gte_macros.s https://raw.githubusercontent.com/Decompollaborate/rabbitizer/3d0221687b587497ed60b1cf1f207a873ade7cf9/docs/r3000gte/gte_macros.s
-RUN cp gte_macros.s /compilers/ps1/gcc2.91.66-mipsel/
-
 RUN echo '#!/bin/bash' >> as
-RUN echo 'python3 $(dirname -- $0)/maspsx/maspsx.py --run-assembler -I${COMPILER_DIR} $@' >> as
-RUN cat as
+RUN echo 'python3 $(dirname -- $0)/maspsx/maspsx.py --run-assembler --no-macro-inc -I${COMPILER_DIR} $@' >> as
 RUN cp as /compilers/ps1/gcc2.91.66-mipsel/
 
 RUN chown -R root:root /compilers/ps1/gcc2.91.66-mipsel/

diff --git a/platforms/ps1/gcc2.95.2-mipsel/Dockerfile b/platforms/ps1/gcc2.95.2-mipsel/Dockerfile
@@ -15,12 +15,8 @@ RUN wget -O maspsx.zip https://github.com/mkst/maspsx/archive/${MASPSX_HASH}.zip
 RUN unzip maspsx.zip
 RUN cp -r maspsx-${MASPSX_HASH} /compilers/ps1/gcc2.95.2-mipsel/maspsx
 
-RUN wget -O gte_macros.s https://raw.githubusercontent.com/Decompollaborate/rabbitizer/3d0221687b587497ed60b1cf1f207a873ade7cf9/docs/r3000gte/gte_macros.s
-RUN cp gte_macros.s /compilers/ps1/gcc2.95.2-mipsel/
-
 RUN echo '#!/bin/bash' >> as
-RUN echo 'python3 $(dirname -- $0)/maspsx/maspsx.py --run-assembler -I${COMPILER_DIR} $@' >> as
-RUN cat as
+RUN echo 'python3 $(dirname -- $0)/maspsx/maspsx.py --run-assembler --no-macro-inc -I${COMPILER_DIR} $@' >> as
 RUN cp as /compilers/ps1/gcc2.95.2-mipsel/
 
 RUN chown -R root:root /compilers/ps1/gcc2.95.2-mipsel/

diff --git a/templates/ps1/maspsx.j2 b/templates/ps1/maspsx.j2
@@ -12,12 +12,8 @@ RUN wget -O maspsx.zip https://github.com/mkst/maspsx/archive/${MASPSX_HASH}.zip
 RUN unzip maspsx.zip
 RUN cp -r maspsx-${MASPSX_HASH} /compilers/{{ platform }}/{{ id }}/maspsx
 
-RUN wget -O gte_macros.s https://raw.githubusercontent.com/Decompollaborate/rabbitizer/3d0221687b587497ed60b1cf1f207a873ade7cf9/docs/r3000gte/gte_macros.s
-RUN cp gte_macros.s /compilers/{{ platform }}/{{ id }}/
-
 RUN echo '#!/bin/bash' >> as
-RUN echo 'python3 $(dirname -- $0)/maspsx/maspsx.py --run-assembler -I${COMPILER_DIR} $@' >> as
-RUN cat as
+RUN echo 'python3 $(dirname -- $0)/maspsx/maspsx.py --run-assembler --no-macro-inc -I${COMPILER_DIR} $@' >> as
 RUN cp as /compilers/{{ platform }}/{{ id }}/
 
 RUN chown -R root:root /compilers/{{ platform }}/{{ id }}/

diff --git a/values.yaml b/values.yaml
@@ -62,7 +62,7 @@ compilers:
   - id: ido5.3
     platform: n64
     template: common/default
-    arch: linux
+    arch: darwin
     file: https://github.com/ethteck/ido-static-recomp/releases/download/v0.6/ido-5.3-recomp-macos-latest.tar.gz
 
   - id: ido5.3_c++