Revert "Build All Versions Together (#2873)"

Xeeynamo · Xeeynamo · commit f35e83d50951 · 2025-10-25T12:49:07.000+01:00
This reverts commit ba3ba47.
diff --git a/.github/workflows/validate-and-report.yml b/.github/workflows/validate-and-report.yml
@@ -97,46 +97,6 @@ jobs:
         if: github.ref == 'refs/heads/master' && github.event_name == 'push'
         run: .venv/bin/python3 tools/progress.py --version ${{ matrix.version }}
 
-  # unlike the matrix build above, this task builds all versions of the
-  # game from the same build graph
-  build-all:
-    # Building and testing cannot work if the repository owner is not Xeeynamo
-    # due to the missing secrets to clone the CI dependencies
-    if: github.repository == 'Xeeynamo/sotn-decomp'
-    runs-on: ubuntu-latest
-    env:
-      DISCORD_PROGRESS_WEBHOOK: ${{ secrets.DISCORD_PROGRESS_WEBHOOK }}
-    steps:
-      - name: Install requirements
-        run: sudo apt-get install gcc-mipsel-linux-gnu
-      - name: Clone main repo (PR)
-        if: github.event_name == 'pull_request_target'
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ github.event.pull_request.head.sha }}
-          submodules: false
-      - name: Clone main repo
-        if: github.event_name != 'pull_request_target'
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ github.ref }}
-          submodules: false
-      - name: Install tools requirements
-        run: make update-dependencies
-      - name: Get PSX dependencies
-        uses: actions/cache@v4
-        id: get-dependencies
-        with:
-          path: 'disks/dependencies'
-          key: sotn-pspeu-deps
-      - name: Setting up dependencies
-        working-directory: disks
-        run: cat dependencies/* | tar -zxf -
-      - name: Extract dependencies
-        run: make extract_disk
-      - name: Build binaries and check if they match
-        run: make
-
   generate-duplicates-report:
     strategy:
       matrix:
diff --git a/Makefile b/Makefile
@@ -126,7 +126,7 @@ endif
 
 .PHONY: all
 all: ##@ (Default) build and check
-all: build_all check
+all: build check
 
 .PHONY: extract_assets
 extract_assets:
@@ -157,18 +157,19 @@ build_pspeu: $(SOTNSTR_APP) $(SOTNASSETS) $(ALLEGREX) $(MWCCPSP) $(MWCCGAP_APP)
 	ninja
 .PHONY: build_all
 build_all:
-	$(PYTHON) tools/builds/gen.py
-	ninja
+	$(MAKE) VERSION=us
+	$(MAKE) VERSION=pspeu
+	$(MAKE) VERSION=hd
 
 .PHONY: clean clean_asm
 clean_asm:
 	git clean -fdx $(ASM_DIR)
 clean: ##@ clean extracted files, assets, and build artifacts
 clean: clean_asm
 	git clean -fdx assets/
-	git clean -fdx build/
+	git clean -fdx build/$(VERSION)/
 	git clean -fdx src/**/gen/
-	git clean -fdx config/
+	git clean -fdx config/*$(VERSION)*
 	git clean -fdx function_calls/
 	git clean -fdx sotn_calltree.txt
 
diff --git a/config/assets.pspeu.yaml b/config/assets.pspeu.yaml
@@ -333,7 +333,7 @@ files:
           - [0x2B328, layers, layers]
           - [0x2B608, palette, pal_stained_glass, 16] # 0x204
           - [0x2B628, paldef, palette_def]
-          - [0x2B6F8, gfx_banks, psp/graphics_banks]
+          - [0x2B6F8, gfx_banks, graphics_banks]
           - [0x2B8E0, skip]
           - [0x2BC20, rooms, rooms]
           - [0x2BCF8, cutscene, cutscene_script_it]
@@ -350,7 +350,7 @@ files:
           # These gfx palette assignments are unconfirmed.
           # They match psx, but the .png does not render correctly for psp.
           - [0x2C588, cmpgfx, gfx_stage_name_jp_sm, 128, 128, 4]
-          - [0x2C880, cmpgfx, psp/gfx_stage_name_jp_lg, 128, 128, 4]
+          - [0x2C880, cmpgfx, gfx_stage_name_jp_lg, 128, 128, 4]
           - [0x2CD10, cmpgfx, gfx_confessional, 128, 128, 4]
           - [0x2DF38, cmpgfx, gfx_chair, 128, 128, 4, 0x3ADF0]
           - [0x2EB18, cmpgfx, gfx_corner_guard, 128, 128, 4, 0x3AE50]
diff --git a/config/assets.us.yaml b/config/assets.us.yaml
@@ -257,14 +257,14 @@ files:
           - [0x8C, palette, pal_stained_glass, 16] # 0x204
           - [0xAC, paldef, palette_def]
           - [0x178, layers, layers]
-          - [0x468, gfx_banks, us/graphics_banks]
+          - [0x468, gfx_banks, graphics_banks]
           - [0x670, layout, entity_layouts]
           - [0x818, skip]
           - [0x2358, rooms, rooms]
           - [0x2F44, skip]
           - [0x3A94, cutscene, cutscene_script_psx]
           - [0x3C18, binary, cutscene_data_psx] # May be gfx data, unsure
-          - [0x3F20, cmpgfx, us/gfx_stage_name_jp_lg, 128, 128, 4]
+          - [0x3F20, cmpgfx, gfx_stage_name_jp_lg, 128, 128, 4]
           - [0x8498, cmpgfx, gfx_confessional, 128, 128, 4]
           - [0x96BC, cmpgfx, gfx_chair, 128, 128, 4, 0x1692C]
           - [0xA298, cmpgfx, gfx_corner_guard, 128, 128, 4, 0x16BAC]
diff --git a/src/st/dai/gfx_data.c b/src/st/dai/gfx_data.c
@@ -8,7 +8,7 @@ u8 gfx_stage_name_jp_sm[] = {
 #endif
 
 u8 gfx_stage_name_jp_lg[] = {
-#include GEN_VERSION(gfx_stage_name_jp_lg.h)
+#include "gen/gfx_stage_name_jp_lg.h"
 };
 
 u8 gfx_confessional[] = {
diff --git a/src/st/dai/graphics_banks.c b/src/st/dai/graphics_banks.c
@@ -1,4 +1,4 @@
 // SPDX-License-Identifier: AGPL-3.0-or-later
 #include "dai.h"
 
-#include GEN_VERSION(graphics_banks.h)
+#include "gen/graphics_banks.h"
diff --git a/tools/builds/gen.py b/tools/builds/gen.py
@@ -108,19 +108,11 @@ def add_c_psx(
             "cc_flags": get_cc_flags_for_exceptional_files(version, file_name),
         },
     )
-
-    # this file may be generated by a different
-    # version of the game, but the content will
-    # be identical.
-    if file_name in entries:
-        return output
-    entries[file_name] = {"reason": "generated"}
     nw.build(
         rule="phony",
         outputs=file_name,
         implicit=[f"src/.assets_build_done_{ver}"],
     )
-
     return output
 
 
@@ -158,9 +150,6 @@ def add_copy_psx(
         outputs=[output],
         inputs=[in_file_name],
     )
-    if in_file_name in entries:
-        return output
-    entries[in_file_name] = {"reason": "copied"}
     nw.build(
         rule="phony",
         outputs=[in_file_name],
@@ -241,13 +230,6 @@ def add_c_psp(
             "src_dir": os.path.dirname(file_name),
         },
     )
-
-    # this file may be generated by a different
-    # version of the game, but the content will
-    # be identical.
-    if file_name in entries:
-        return output
-    entries[file_name] = {"reason": "generated"}
     nw.build(
         rule="phony",
         outputs=file_name,
@@ -286,21 +268,18 @@ def add_assets_config(nw: ninja_syntax.Writer, version: str):
 def add_gfx_stage(
     nw: ninja_syntax.Writer, target_path: str, asset_path: str, output_name: str
 ):
-    input_name = f"{asset_path}_0.png"
-    if input_name not in entries:
-        entries[input_name] = {"reason": "gfxtage decoding"}
-        nw.build(
-            rule="gfxstage-decode",
-            outputs=input_name,
-            inputs=target_path,
-            variables={
-                "path": asset_path,
-            },
-        )
+    nw.build(
+        rule="gfxstage-decode",
+        outputs=f"{asset_path}_0.png",
+        inputs=target_path,
+        variables={
+            "path": asset_path,
+        },
+    )
     nw.build(
         rule="gfxstage-encode",
         outputs=[output_name],
-        inputs=[input_name],
+        inputs=[f"{asset_path}_0.png"],
         variables={
             "path": asset_path,
         },
@@ -648,7 +627,7 @@ def add_checksum(nw: ninja_syntax.Writer, version: str, file_name: str):
         )
     nw.build(
         rule="check",
-        outputs=[f"{version} 🆗"],
+        outputs=["🆗"],
         inputs=file_name,
         implicit=binaries,
     )
@@ -804,8 +783,8 @@ def add_checksum(nw: ninja_syntax.Writer, version: str, file_name: str):
 
     actual_version = os.getenv("VERSION")
     if not actual_version:
-        actual_version = "us,hd,pspeu"
-    for version in actual_version.split(","):
+        actual_version = "us"
+    for version in [actual_version]:
         for entry in os.scandir("config/"):
             if not entry.name.startswith(f"splat.{version}."):
                 continue
diff --git a/tools/sotn-assets/assets/cmpgfx/handler.go b/tools/sotn-assets/assets/cmpgfx/handler.go
@@ -65,7 +65,7 @@ func (h *handler) Extract(e assets.ExtractArgs) error {
 	if err := util.WriteFile(assetPathAsRAW(e.AssetDir, e.Name), cmp); err != nil {
 		return fmt.Errorf("error writing file: %v", err)
 	}
-	fout, err := util.CreateAtomicWriter(assetPathAsPNG(e.AssetDir, e.Name))
+	fout, err := os.Create(assetPathAsPNG(e.AssetDir, e.Name))
 	if err != nil {
 		return fmt.Errorf("error creating file: %v", err)
 	}
diff --git a/tools/sotn-assets/assets/headergfx/handler.go b/tools/sotn-assets/assets/headergfx/handler.go
@@ -49,7 +49,7 @@ func (h *handler) Extract(e assets.ExtractArgs) error {
 	if err := os.MkdirAll(e.AssetDir, 0755); err != nil {
 		return fmt.Errorf("error creating directory: %v", err)
 	}
-	fout, err := util.CreateAtomicWriter(assetPath(e.AssetDir, e.Name))
+	fout, err := os.Create(assetPath(e.AssetDir, e.Name))
 	if err != nil {
 		return fmt.Errorf("error creating file: %v", err)
 	}
diff --git a/tools/sotn-assets/assets/palette/palette.go b/tools/sotn-assets/assets/palette/palette.go
@@ -81,7 +81,7 @@ func (h *handler) Extract(e assets.ExtractArgs) error {
 	for i, paletteFileName := range paletteNames {
 		i, paletteFileName := i, paletteFileName
 		eg.Go(func() error {
-			f, err := util.CreateAtomicWriter(filepath.Join(e.AssetDir, paletteFileName))
+			f, err := os.Create(filepath.Join(e.AssetDir, paletteFileName))
 			if err != nil {
 				return err
 			}
diff --git a/tools/sotn-assets/assets/rawgfx/handler.go b/tools/sotn-assets/assets/rawgfx/handler.go
@@ -61,7 +61,7 @@ func (h *handler) Extract(e assets.ExtractArgs) error {
 	if err := os.MkdirAll(filepath.Dir(assetPath(e.AssetDir, e.Name)), 0755); err != nil {
 		return fmt.Errorf("error creating directory: %v", err)
 	}
-	fout, err := util.CreateAtomicWriter(assetPath(e.AssetDir, e.Name))
+	fout, err := os.Create(assetPath(e.AssetDir, e.Name))
 	if err != nil {
 		return fmt.Errorf("error creating file: %v", err)
 	}
diff --git a/tools/sotn-assets/assets/spritesheet/handler.go b/tools/sotn-assets/assets/spritesheet/handler.go
@@ -118,11 +118,10 @@ func (h *handler) Extract(e assets.ExtractArgs) error {
 			if err != nil {
 				return fmt.Errorf("error generating image: %v", err)
 			}
-			f, err := util.CreateAtomicWriter(filepath.Join(e.AssetDir, entry.Name))
+			f, err := os.Create(filepath.Join(e.AssetDir, entry.Name))
 			if err != nil {
 				return err
 			}
-            defer f.Close()
 			if err := util.PngEncode(f, bitmap, w, h, palette); err != nil {
 				return fmt.Errorf("failed to encode %s: %w", entry.Name, err)
 			}
@@ -220,7 +219,7 @@ func (h *handler) Build(e assets.BuildArgs) error {
 	if err := os.MkdirAll(filepath.Dir(dstFile), 0755); err != nil {
 		return fmt.Errorf("failed to create directory: %w", err)
 	}
-	f, err := util.CreateAtomicWriter(dstFile)
+	f, err := os.Create(dstFile)
 	if err != nil {
 		return err
 	}
diff --git a/tools/sotn-assets/assets/tiledef/handler.go b/tools/sotn-assets/assets/tiledef/handler.go
@@ -159,7 +159,7 @@ func Build(inFile, symbol, outDir string) error {
 	if err := os.MkdirAll(filepath.Dir(outFileName), 0755); err != nil {
 		return err
 	}
-	f, err := util.CreateAtomicWriter(outFileName)
+	f, err := os.Create(outFileName)
 	if err != nil {
 		return err
 	}
diff --git a/tools/sotn-assets/util/utils.go b/tools/sotn-assets/util/utils.go
@@ -6,7 +6,6 @@ import (
 	"github.com/xeeynamo/sotn-decomp/tools/sotn-assets/psx"
 	"golang.org/x/exp/constraints"
 	"image/color"
-    "io"
 	"os"
 	"path/filepath"
 	"slices"
@@ -142,19 +141,7 @@ func WriteFile(name string, content []byte) error {
 	if err := os.MkdirAll(dir, 0755); err != nil {
 		return fmt.Errorf("failed to create directory %q: %v\n", dir, err)
 	}
-    return WriteFileAtomic(name, content)
-}
-
-func WriteFileAtomic(name string, content []byte) error {
-    w, err := CreateAtomicWriter(name)
-    if err != nil {
-        return fmt.Errorf("could not create writer for %q: %v\n", name, err)
-    }
-    defer w.Close()
-    if _, err := w.Write(content); err != nil {
-        return fmt.Errorf("could not write  %q: %v\n", name, err)
-    }
-    return nil
+	return os.WriteFile(name, content, 0644)
 }
 
 // WriteJsonFile converts the passed object as a JSON and internally calls WriteFile
@@ -271,52 +258,3 @@ func Make4bppFromBitmap(data []byte) []byte {
 	}
 	return out
 }
-
-type StringWriteCloser interface {
-    io.WriteCloser
-    io.StringWriter
-
-    Name() string
-}
-
-type AtomicWriter struct {
-    name string
-    f *os.File
-}
-
-func CreateAtomicWriter(name string) (StringWriteCloser, error) {
-    base := filepath.Base(name)
-    dir := filepath.Dir(name)
-    f, err := os.CreateTemp(dir, base)
-    if err != nil {
-        return nil, fmt.Errorf("failed to create temp file for %q: %v\n", name, err)
-    }
-
-    a := AtomicWriter { name: name, f: f }
-
-    return a, nil
-}
-
-func (a AtomicWriter) Close() error {
-    a.f.Close()
-    if err := os.Rename(a.f.Name(), a.name); err != nil {
-        // in the common case, a.f will already be renamed
-        // in case it isn't remove the temp file
-        os.Remove(a.f.Name())
-        return fmt.Errorf("failed to move temp file to destination %q: %v\n", a.name, err)
-    }
-
-    return nil
-}
-
-func (a AtomicWriter) Write(p []byte) (int, error) {
-    return a.f.Write(p)
-}
-
-func (a AtomicWriter) WriteString(s string) (int, error) {
-    return a.f.WriteString(s)
-}
-
-func (a AtomicWriter) Name() string {
-    return a.f.Name()
-}

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ func (h *handler) Extract(e assets.ExtractArgs) error {`
`65`	`65`	`if err := util.WriteFile(assetPathAsRAW(e.AssetDir, e.Name), cmp); err != nil {`
`66`	`66`	`return fmt.Errorf("error writing file: %v", err)`
`67`	`67`	`}`
`68`		`- fout, err := util.CreateAtomicWriter(assetPathAsPNG(e.AssetDir, e.Name))`
	`68`	`+ fout, err := os.Create(assetPathAsPNG(e.AssetDir, e.Name))`
`69`	`69`	`if err != nil {`
`70`	`70`	`return fmt.Errorf("error creating file: %v", err)`
`71`	`71`	`}`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ func (h *handler) Extract(e assets.ExtractArgs) error {`
`49`	`49`	`if err := os.MkdirAll(e.AssetDir, 0755); err != nil {`
`50`	`50`	`return fmt.Errorf("error creating directory: %v", err)`
`51`	`51`	`}`
`52`		`- fout, err := util.CreateAtomicWriter(assetPath(e.AssetDir, e.Name))`
	`52`	`+ fout, err := os.Create(assetPath(e.AssetDir, e.Name))`
`53`	`53`	`if err != nil {`
`54`	`54`	`return fmt.Errorf("error creating file: %v", err)`
`55`	`55`	`}`
Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ func (h *handler) Extract(e assets.ExtractArgs) error {`
`81`	`81`	`for i, paletteFileName := range paletteNames {`
`82`	`82`	`i, paletteFileName := i, paletteFileName`
`83`	`83`	`eg.Go(func() error {`
`84`		`- f, err := util.CreateAtomicWriter(filepath.Join(e.AssetDir, paletteFileName))`
	`84`	`+ f, err := os.Create(filepath.Join(e.AssetDir, paletteFileName))`
`85`	`85`	`if err != nil {`
`86`	`86`	`return err`
`87`	`87`	`}`