From 114d4325d2b4efb7ee399d311ef631875a39317d Mon Sep 17 00:00:00 2001 From: LLONSIT <76184758+LLONSIT@users.noreply.github.com> Date: Fri, 13 Jan 2023 23:35:03 -0500 Subject: [PATCH] Add IDO5.3 Pascal (#657) * adding and AeroGauge preset * Update backend/coreapp/compilers.py Co-authored-by: EllipticEllipsis * Update compilers.py * IDO5.3 pascal * Version bump * Changing str order * updating * Another version bump * cache * Updating * update download.py Co-authored-by: LLONSIT Co-authored-by: EllipticEllipsis Co-authored-by: Ethan Roseman --- .github/workflows/ci.yml | 2 +- backend/compilers/download.py | 8 ++++---- backend/coreapp/compilers.py | 15 +++++++++++++++ frontend/src/lib/i18n/locales/en/compilers.json | 5 +++-- 4 files changed, 23 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 09162a3f..21f20b29 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -65,7 +65,7 @@ jobs: uses: actions/cache@v3 with: path: backend/compilers/download_cache - key: ${{ runner.os }}-compilers + key: ${{ runner.os }}-compilers3 - name: Download compilers run: |- cd backend diff --git a/backend/compilers/download.py b/backend/compilers/download.py index 0e30fb34..67d6fe03 100755 --- a/backend/compilers/download.py +++ b/backend/compilers/download.py @@ -21,7 +21,7 @@ class OS: system: str clang_package_name: str n64_gcc_os: str - ido_os: str + ido_pkg: str MACOS = OS( @@ -29,14 +29,14 @@ MACOS = OS( system="darwin", clang_package_name="apple-darwin", n64_gcc_os="mac", - ido_os="macos", + ido_pkg="macos-latest", ) LINUX = OS( name="Linux", system="linux", clang_package_name="linux-gnu-debian8", n64_gcc_os="linux", - ido_os="ubuntu", + ido_pkg="ubuntu-20.04", ) oses: dict[str, OS] = { @@ -369,7 +369,7 @@ def download_n64(): print(f"ido{version} already exists, skipping") else: download_tar( - url=f"https://github.com/ethteck/ido-static-recomp/releases/download/v0.2/ido-{version}-recomp-{host_os.ido_os}-latest.tar.gz", + url=f"https://github.com/ethteck/ido-static-recomp/releases/download/v0.4/ido-{version}-recomp-{host_os.ido_pkg}.tar.gz", dest_name=f"ido{version}", ) diff --git a/backend/coreapp/compilers.py b/backend/coreapp/compilers.py index ae08b55f..56805cc8 100644 --- a/backend/coreapp/compilers.py +++ b/backend/coreapp/compilers.py @@ -316,6 +316,14 @@ IDO53_IRIX = IDOCompiler( base_id="ido5.3", ) +IDO53PASCAL = IDOCompiler( + id="ido5.3Pascal", + platform=IRIX, + cc='IDO_CC="${COMPILER_DIR}/cc" "${COMPILER_DIR}/cc" -c -Xcpluscomm -G0 -non_shared ${COMPILER_FLAGS} -o "${OUTPUT}" "${INPUT}"', + base_id="ido5.3", + language=Language.PASCAL, +) + IDO71_IRIX = IDOCompiler( id="ido7.1_irix", platform=IRIX, @@ -722,6 +730,7 @@ _all_compilers: List[Compiler] = [ GCC281SNCXX, # IRIX IDO53_IRIX, + IDO53PASCAL, IDO71_IRIX, IDO71PASCAL, # GC_WII @@ -951,6 +960,12 @@ _all_presets = [ "-KPIC -mips1 -O2 -fullwarn", diff_flags=["-Mreg-names=32"], ), + Preset( + "IDO 5.3 Pascal", + IDO53PASCAL, + "-KPIC -mips2 -O2 -fullwarn", + diff_flags=["-Mreg-names=32"], + ), Preset( "IDO 7.1 cc", IDO71_IRIX, diff --git a/frontend/src/lib/i18n/locales/en/compilers.json b/frontend/src/lib/i18n/locales/en/compilers.json index 0c515cb3..f5fafe33 100644 --- a/frontend/src/lib/i18n/locales/en/compilers.json +++ b/frontend/src/lib/i18n/locales/en/compilers.json @@ -21,10 +21,11 @@ "gcc2.7.2snew": "GCC 2.7.2 (SN, experimental)", "gcc2.8.1sn-cxx": "GCC 2.8.1 (SN) (C++)", "gcc2.8.1": "GCC 2.8.1", - "ido5.3": "IDO 5.3", - "ido7.1": "IDO 7.1", "ido5.3_irix": "IDO 5.3", "ido7.1_irix": "IDO 7.1", + "ido5.3": "IDO 5.3", + "ido5.3Pascal": "IDO 5.3 Pascal", + "ido7.1": "IDO 7.1", "ido7.1Pascal": "IDO 7.1 Pascal", "mwcc_20_72": "2.0 build 72 (MW 1.2base)", "mwcc_20_79": "2.0 build 79 (MW 1.2sp2)",