Skip to content
Open
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
2 changes: 1 addition & 1 deletion tools/cache-version.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"version": "v1.2.4",
"version": "v1.2.5",
"urlPrefix": "https://github.com/MonsterDruide1/OdysseyDecompToolsCache/releases/download"
}
2 changes: 1 addition & 1 deletion tools/common
6 changes: 3 additions & 3 deletions tools/nix/artifacts.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"x86_64-linux": {
"filename": "OdysseyDecomp-binaries_x86_64-Linux.tar.xz",
"hash": "sha256-QqhiIn2ERmrzihr8UXqZgoS6Ct+odggVaZ8lGfRagCQ="
"hash": "sha256-cz12/Ov4hHAdXarJ+SR2eudgT3csKDzpdl186ruBIBs="
},
"aarch64-linux": {
"filename": "OdysseyDecomp-binaries_aarch64-Linux.tar.xz",
"hash": "sha256-a24rhpEu8m9USEDwz3EMaPA2ioMNNApa2GpNfbsN/hc="
"hash": "sha256-8TcySS+j5fhNy25wBK0s6C+ya9/OTmRvNiBQM3ib8WE="
},
"aarch64-darwin": {
"filename": "OdysseyDecomp-binaries_arm64-Darwin.tar.xz",
"hash": "sha256-pyhaFNViMrUbrKFNPKnX5j2YoZOVNGzzfSVk7OVoAck="
"hash": "sha256-a1bX1NKb556W6VdUzHzS/a4g5tnsNAVj2fjAf+RewAU="
}
}
13 changes: 3 additions & 10 deletions tools/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,17 +52,10 @@ def prepare_executable(original_nso: Optional[Path]):
if nso_hash != COMPRESSED_V10_HASH and nso_hash != UNCOMPRESSED_V10_HASH:
setup.fail(f"unknown executable: {nso_hash}")

setup._convert_nso_to_elf(original_nso)
setup._convert_nso_to_elf(original_nso, TARGET_ELF_PATH, TARGET_UNCOMPRESSED_NSO_PATH)

converted_elf_path = original_nso.with_suffix(".elf")

if not converted_elf_path.is_file():
setup.fail("internal error while preparing executable (missing ELF) please report")

shutil.move(converted_elf_path, TARGET_ELF_PATH)

uncompressed_nso_path = original_nso.with_suffix(".uncompressed.nso")
shutil.move(uncompressed_nso_path, TARGET_UNCOMPRESSED_NSO_PATH)
if not TARGET_ELF_PATH.is_file() or hashlib.sha256(TARGET_ELF_PATH.read_bytes()).hexdigest() != V10_ELF_HASH:
setup.fail("Internal error while exporting ELF (ELF either doesn't exist or has an incorrect hash) please report")

if not TARGET_UNCOMPRESSED_NSO_PATH.is_file() or hashlib.sha256(TARGET_UNCOMPRESSED_NSO_PATH.read_bytes()).hexdigest() != UNCOMPRESSED_V10_HASH:
setup.fail("Internal error while exporting uncompressed NSO (uncompressed NSO either doesn't exist or has an incorrect hash) please report")
Expand Down
Loading