Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions config/tr-release.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@
},
{
"id": "tamriel-data",
"path": "Tamriel Data (SD) 44537 26.08 2026-08-23T18-34Z 9AnoA0Zl/00 Data Files"
"path": "tamriel-data"
},
{
"id": "tamriel-rebuilt-core",
"path": "tamriel/00 Core/Data Files"
"path": "tamriel-rebuilt/00 Core/Data Files"
}
],
"fallbackArchives": [
Expand All @@ -46,11 +46,11 @@
"excludedOptionalModules": [
{
"id": "tr-factions",
"relativePath": "tamriel/01 Faction Integration/Data Files/TR_Factions.esp"
"relativePath": "tamriel-rebuilt/01 Faction Integration/Data Files/TR_Factions.esp"
},
{
"id": "vanilla-firemoth-patch",
"relativePath": "tamriel/02 Firemoth Remover/Data Files/TR_Firemoth_Vanilla_patch.esp"
"relativePath": "tamriel-rebuilt/02 Firemoth Remover/Data Files/TR_Firemoth_Vanilla_patch.esp"
}
],
"regions": [
Expand Down
2 changes: 1 addition & 1 deletion tools/catalog_pipeline/poison.py
Original file line number Diff line number Diff line change
Expand Up @@ -715,7 +715,7 @@ def _parser(repo_root: Path) -> argparse.ArgumentParser:
subparsers = parser.add_subparsers(dest="command", required=True)
default_build = repo_root / "local-data/catalog-production" / DATASET_ID
build = subparsers.add_parser("build")
build.add_argument("--source-root", type=Path, default=repo_root.parent / "morr-dev")
build.add_argument("--source-root", type=Path, default=repo_root / "local-data/inputs")
build.add_argument("--output", type=Path, default=default_build)
validate = subparsers.add_parser("validate")
validate.add_argument("--source", type=Path, default=default_build)
Expand Down
18 changes: 6 additions & 12 deletions tools/land_renderer/spike.py
Original file line number Diff line number Diff line change
Expand Up @@ -77,10 +77,8 @@ def center(self) -> tuple[float, float]:
"bsa/Morrowind.esm",
"bsa/Tribunal.esm",
"bsa/Bloodmoon.esm",
"Tamriel Data (SD) 44537 26.08 2026-08-23T18-34Z 9AnoA0Zl/00 Data Files/Tamriel_Data.esm",
"tamriel/00 Core/Data Files/TR_Mainland.esm",
"tamriel/01 Faction Integration/Data Files/TR_Factions.esp",
"tamriel/02 Firemoth Remover/Data Files/TR_Firemoth_Vanilla_patch.esp",
"tamriel-data/Tamriel_Data.esm",
"tamriel-rebuilt/00 Core/Data Files/TR_Mainland.esm",
)

BSA_PATHS = (
Expand All @@ -90,10 +88,8 @@ def center(self) -> tuple[float, float]:
)

LOOSE_PATHS = (
"Tamriel Data (SD) 44537 26.08 2026-08-23T18-34Z 9AnoA0Zl/00 Data Files",
"tamriel/00 Core/Data Files",
"tamriel/01 Faction Integration/Data Files",
"tamriel/02 Firemoth Remover/Data Files",
"tamriel-data",
"tamriel-rebuilt/00 Core/Data Files",
)

EXPECTED_SHA256 = {
Expand All @@ -105,8 +101,6 @@ def center(self) -> tuple[float, float]:
"bsa/Bloodmoon.bsa": "7c20956791400d958cb407f0b7c1c19ceaf46719df7eb724d0b450299360bd7c",
PLUGIN_PATHS[3]: "e94ca3a5c62e0228ac3782e813cae58c4e10da2e9e8b7611e0a8f5ff9a98d06f",
PLUGIN_PATHS[4]: "661c96c6aa5e517d897f8b9de93c814d2aca16fd17b6e4ce7869486e3737064b",
PLUGIN_PATHS[5]: "5a645aae80d02b9634f5da482f97df87fb1cc77aaf20bf0fdb26c272996b671e",
PLUGIN_PATHS[6]: "c8aa89d6446b1cfb1cacbaf84fe78d62b2fa8b0f804f69f755a8c80f5067bab3",
}

MIM_REFERENCE = {
Expand Down Expand Up @@ -573,8 +567,8 @@ def _parser() -> argparse.ArgumentParser:
parser.add_argument(
"--source-root",
type=Path,
default=Path(__file__).resolve().parents[3] / "morr-dev",
help="Directory containing bsa/, tamriel/ and Tamriel Data 26.08.",
default=Path(__file__).resolve().parents[2] / "local-data/inputs",
help="Directory containing bsa/, tamriel-data/ and tamriel-rebuilt/ (default: local-data/inputs).",
)
parser.add_argument("--output-root", type=Path, default=DEFAULT_OUTPUT)
parser.add_argument("--magick", default="magick", help="ImageMagick executable")
Expand Down
2 changes: 1 addition & 1 deletion tools/openmw_renderer/audit.py
Original file line number Diff line number Diff line change
Expand Up @@ -2567,7 +2567,7 @@ def _parser() -> argparse.ArgumentParser:
subparsers = parser.add_subparsers(dest="command", required=True)
full = subparsers.add_parser("full", help="Run every release quality gate")
full.add_argument("--output", type=Path, default=repo_root / DEFAULT_STABILIZED_OUTPUT)
full.add_argument("--source-root", type=Path, default=repo_root.parent / "morr-dev")
full.add_argument("--source-root", type=Path, default=repo_root / "local-data/inputs")
full.add_argument("--audit-root", type=Path)
full.add_argument("--workers", type=int, default=min(4, os.cpu_count() or 1))
full.add_argument("--render-workers", type=int, default=2)
Expand Down
6 changes: 3 additions & 3 deletions tools/openmw_renderer/production.py
Original file line number Diff line number Diff line change
Expand Up @@ -1909,7 +1909,7 @@ def _add_source_and_cells(parser: argparse.ArgumentParser, repo_root: Path) -> N
parser.add_argument(
"--source-root",
type=Path,
default=repo_root.parent / "morr-dev",
default=repo_root / "local-data/inputs",
)
parser.add_argument(
"--cells",
Expand Down Expand Up @@ -1953,7 +1953,7 @@ def _parse_args(argv: Sequence[str] | None) -> argparse.Namespace:
"provenance",
help="Validate the exact profile/image/encoder and print its resume identity.",
)
provenance.add_argument("--source-root", type=Path, default=repo_root.parent / "morr-dev")
provenance.add_argument("--source-root", type=Path, default=repo_root / "local-data/inputs")
provenance.add_argument("--output", type=Path)
_add_runtime_identity(provenance)

Expand Down Expand Up @@ -1996,7 +1996,7 @@ def _parse_args(argv: Sequence[str] | None) -> argparse.Namespace:
"smoke",
help="Render one explicit nine-target 3x3 shard in one OpenMW process.",
)
smoke.add_argument("--source-root", type=Path, default=repo_root.parent / "morr-dev")
smoke.add_argument("--source-root", type=Path, default=repo_root / "local-data/inputs")
smoke.add_argument("--output", type=Path, default=repo_root / DEFAULT_OUTPUT / "smoke")
smoke.add_argument("--center", type=_parse_cell, default=(-3, -3))
_add_runtime_identity(smoke)
Expand Down
12 changes: 6 additions & 6 deletions tools/openmw_renderer/profile.py
Original file line number Diff line number Diff line change
Expand Up @@ -59,30 +59,30 @@ class SourceInput:
),
SourceInput(
"tamriel-data-esm",
"Tamriel Data (SD) 44537 26.08 2026-08-23T18-34Z 9AnoA0Zl/00 Data Files/Tamriel_Data.esm",
"tamriel-data/Tamriel_Data.esm",
"e94ca3a5c62e0228ac3782e813cae58c4e10da2e9e8b7611e0a8f5ff9a98d06f",
),
SourceInput(
"tamriel-data-scripts",
"Tamriel Data (SD) 44537 26.08 2026-08-23T18-34Z 9AnoA0Zl/00 Data Files/Tamriel_Data.omwscripts",
"tamriel-data/Tamriel_Data.omwscripts",
"468251f4f9f23eab9a97e2bfcd9de9c979ba9b4a3d2d8095e3a6317931a8ef45",
),
SourceInput(
"tr-mainland-esm",
"tamriel/00 Core/Data Files/TR_Mainland.esm",
"tamriel-rebuilt/00 Core/Data Files/TR_Mainland.esm",
"661c96c6aa5e517d897f8b9de93c814d2aca16fd17b6e4ce7869486e3737064b",
),
SourceInput(
"tr-mainland-scripts",
"tamriel/00 Core/Data Files/tamrielrebuilt.omwscripts",
"tamriel-rebuilt/00 Core/Data Files/tamrielrebuilt.omwscripts",
"c5ddb0c00ea906fd52122a17b64ae680c14001813da406b69112441a326644ab",
),
)

DATA_DIRECTORIES = (
"bsa",
"Tamriel Data (SD) 44537 26.08 2026-08-23T18-34Z 9AnoA0Zl/00 Data Files",
"tamriel/00 Core/Data Files",
"tamriel-data",
"tamriel-rebuilt/00 Core/Data Files",
)

FALLBACK_ARCHIVES = (
Expand Down
4 changes: 2 additions & 2 deletions tools/openmw_renderer/spike.py
Original file line number Diff line number Diff line change
Expand Up @@ -1034,8 +1034,8 @@ def _parse_args(argv: Sequence[str] | None) -> argparse.Namespace:
parser.add_argument(
"--source-root",
type=Path,
default=repo_root.parent / "morr-dev",
help="External proprietary game/mod input root (default: ../morr-dev).",
default=repo_root / "local-data/inputs",
help="External proprietary game/mod input root (default: local-data/inputs).",
)
parser.add_argument(
"--output",
Expand Down
18 changes: 9 additions & 9 deletions tools/openmw_renderer/tests/test_profile.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ def test_profile_orders_are_exact_and_optional_modules_are_excluded(self) -> Non
DATA_DIRECTORIES,
(
"bsa",
"Tamriel Data (SD) 44537 26.08 2026-08-23T18-34Z 9AnoA0Zl/00 Data Files",
"tamriel/00 Core/Data Files",
"tamriel-data",
"tamriel-rebuilt/00 Core/Data Files",
),
)
self.assertEqual(
Expand Down Expand Up @@ -72,10 +72,10 @@ def test_source_inputs_follow_the_pinned_profile_without_optional_esps(self) ->
"bsa/Morrowind.bsa",
"bsa/Tribunal.bsa",
"bsa/Bloodmoon.bsa",
"Tamriel Data (SD) 44537 26.08 2026-08-23T18-34Z 9AnoA0Zl/00 Data Files/Tamriel_Data.esm",
"Tamriel Data (SD) 44537 26.08 2026-08-23T18-34Z 9AnoA0Zl/00 Data Files/Tamriel_Data.omwscripts",
"tamriel/00 Core/Data Files/TR_Mainland.esm",
"tamriel/00 Core/Data Files/tamrielrebuilt.omwscripts",
"tamriel-data/Tamriel_Data.esm",
"tamriel-data/Tamriel_Data.omwscripts",
"tamriel-rebuilt/00 Core/Data Files/TR_Mainland.esm",
"tamriel-rebuilt/00 Core/Data Files/tamrielrebuilt.omwscripts",
),
)
self.assertTrue(all(len(source.sha256) == 64 for source in SOURCE_INPUTS))
Expand All @@ -91,8 +91,8 @@ def test_generated_openmw_config_uses_only_container_paths_and_exact_order(self)
"fallback-archive=Tribunal.bsa",
"fallback-archive=Bloodmoon.bsa",
'data="/game/bsa"',
'data="/game/Tamriel Data (SD) 44537 26.08 2026-08-23T18-34Z 9AnoA0Zl/00 Data Files"',
'data="/game/tamriel/00 Core/Data Files"',
'data="/game/tamriel-data"',
'data="/game/tamriel-rebuilt/00 Core/Data Files"',
"content=Morrowind.esm",
"content=Tribunal.esm",
"content=Bloodmoon.esm",
Expand All @@ -101,7 +101,7 @@ def test_generated_openmw_config_uses_only_container_paths_and_exact_order(self)
)
self.assertEqual(generated, "\n".join(expected_lines) + "\n")
self.assertNotIn("/Users/", generated)
self.assertNotIn("morr-dev", generated)
self.assertNotIn("local-data/inputs", generated)
self.assertNotIn("TR_Factions", generated)
self.assertNotIn("Firemoth", generated)
self.assertNotIn(".omwscripts", generated)
Expand Down
9 changes: 3 additions & 6 deletions tools/openmw_renderer/tests/test_spike.py
Original file line number Diff line number Diff line change
Expand Up @@ -129,13 +129,10 @@ def test_command_is_isolated_and_exposes_only_the_expected_paths_and_env(self) -
"--mount",
"type=bind,src=/host/game/bsa,dst=/game/bsa,readonly",
"--mount",
"type=bind,src=/host/game/Tamriel Data (SD) 44537 26.08 "
"2026-08-23T18-34Z 9AnoA0Zl/00 Data Files,dst=/game/Tamriel "
"Data (SD) 44537 26.08 2026-08-23T18-34Z 9AnoA0Zl/00 Data "
"Files,readonly",
"type=bind,src=/host/game/tamriel-data,dst=/game/tamriel-data,readonly",
"--mount",
"type=bind,src=/host/game/tamriel/00 Core/Data Files,"
"dst=/game/tamriel/00 Core/Data Files,readonly",
"type=bind,src=/host/game/tamriel-rebuilt/00 Core/Data Files,"
"dst=/game/tamriel-rebuilt/00 Core/Data Files,readonly",
"--mount",
"type=bind,src=/host/run/profile,dst=/profile",
"--mount",
Expand Down
2 changes: 1 addition & 1 deletion tools/original_renderer/tests/test_original_renderer.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@


REPO_ROOT = Path(__file__).resolve().parents[3]
SOURCE_ROOT = REPO_ROOT.parent / "morr-dev"
SOURCE_ROOT = REPO_ROOT / "local-data/inputs"


def _subprocess_json(source: str) -> dict[str, object]:
Expand Down
4 changes: 2 additions & 2 deletions tools/tr_release/cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -751,7 +751,7 @@ def activate_after_gates() -> int:
argparse.Namespace(
profile=DEFAULT_PROFILE,
lock=DEFAULT_LOCK,
source_root=_repo_root().parent / "morr-dev",
source_root=_repo_root() / "local-data/inputs",
)
)

Expand All @@ -764,7 +764,7 @@ def _parser() -> argparse.ArgumentParser:
common.add_argument("--work-root", type=Path)
common.add_argument("--public-root", type=Path)
common.add_argument("--baseline-public-root", type=Path)
common.add_argument("--source-root", type=Path, default=repo_root.parent / "morr-dev")
common.add_argument("--source-root", type=Path, default=repo_root / "local-data/inputs")
parser = argparse.ArgumentParser(description="Tamriel Rebuilt release workflow")
subparsers = parser.add_subparsers(dest="command", required=True)
for name in (
Expand Down