pmret/papermario
1
0
Fork 0
mirror of https://github.com/pmret/papermario.git synced 2024-09-08 02:29:49 +02:00
Code Issues Packages Projects Releases Wiki Activity

Require pigment64, use it to build most standalone images (#1088)

Browse Source
This commit is contained in:
Ethan Roseman 2023-07-18 17:53:53 +09:00 committed by GitHub
parent c2c5f15a2a
commit 1118ee8110
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 40 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Jenkinsfile vendored
View File

@ -16,6 +16,7 @@ pipeline {
sh 'curl -L "https://github.com/decompals/mips-gcc-2.7.2/releases/download/main/gcc-2.7.2-linux.tar.gz" | tar zx -C tools/build/cc/gcc2.7.2'
sh 'curl -L "https://github.com/decompals/mips-binutils-2.6/releases/download/main/binutils-2.6-linux.tar.gz" | tar zx -C tools/build/cc/gcc2.7.2'
sh 'pip install -U -r requirements.txt'
sh 'cargo install pigment64'
sh './configure'
}
}

51
tools/build/configure.py
View File

@ -23,9 +23,14 @@ BUILD_TOOLS = Path("tools/build")
YAY0_COMPRESS_TOOL = f"{BUILD_TOOLS}/yay0/Yay0compress"
CRC_TOOL = f"{BUILD_TOOLS}/rom/n64crc"
PIGMENT = "pigment64"
PIGMENT_REQ_VERSION = "0.2.2"
def exec_shell(command: List[str]) -> str:
ret = subprocess.run(command, stdout=subprocess.PIPE, text=True)
ret = subprocess.run(
command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True
)
return ret.stdout
@ -181,6 +186,12 @@ def write_ninja_rules(
command=f"$python {BUILD_TOOLS}/img/build.py $img_type $in $out $img_flags",
)
ninja.rule(
"pigment",
description="img($img_type) $in",
command=f"{PIGMENT} $img_flags $in $img_type -o $out",
)
ninja.rule(
"img_header",
description="img_header $in",
@ -620,7 +631,7 @@ class Configure:
build(
bin_path,
src_paths,
"img",
"pigment",
variables={
"img_type": seg.type,
"img_flags": flags,
@ -660,7 +671,7 @@ class Configure:
build(
bin_path,
src_paths,
"img",
"pigment",
variables={
"img_type": seg.type,
"img_flags": "",
@ -700,7 +711,7 @@ class Configure:
build(
bin_path,
entry.src_paths,
"img",
"pigment",
variables={
"img_type": seg.type,
"img_flags": flags,
@ -719,7 +730,7 @@ class Configure:
build(
bin_path,
entry.src_paths,
"img",
"pigment",
variables={
"img_type": seg.type,
"img_flags": "",
@ -839,7 +850,7 @@ class Configure:
build(
logotype_path,
[src_dir / "title/logotype.png"],
"img",
"pigment",
variables={
"img_type": "rgba32",
"img_flags": "",
@ -848,7 +859,7 @@ class Configure:
build(
press_start_path,
[src_dir / "title/press_start.png"],
"img",
"pigment",
variables={
"img_type": "ia8",
"img_flags": "",
@ -859,7 +870,7 @@ class Configure:
build(
copyright_path,
[src_dir / "title/copyright.png"],
"img",
"pigment",
variables={
"img_type": "ci4",
"img_flags": "",
@ -868,7 +879,7 @@ class Configure:
build(
copyright_pal_path,
[src_dir / "title/copyright.png"],
"img",
"pigment",
variables={
"img_type": "palette",
"img_flags": "",
@ -884,7 +895,7 @@ class Configure:
build(
copyright_path,
[src_dir / "title/copyright.png"],
"img",
"pigment",
variables={
"img_type": "ia8",
"img_flags": "",
@ -975,7 +986,7 @@ class Configure:
build(
out_path,
[src_path],
"img",
"pigment",
variables={
"img_type": "ci4",
"img_flags": "",
@ -999,7 +1010,7 @@ class Configure:
build(
out_path,
[src_path],
"img",
"pigment",
variables={
"img_type": "palette",
"img_flags": "",
@ -1181,6 +1192,22 @@ if __name__ == "__main__":
print(f" ./configure --cpp {gcc_cpps[0]}")
exit(1)
try:
version = exec_shell([PIGMENT, "--version"]).split(" ")[1].strip()
if version < PIGMENT_REQ_VERSION:
print(
f"error: {PIGMENT} version {PIGMENT_REQ_VERSION} or newer is required, system version is {version}\n"
)
exit(1)
except FileNotFoundError:
print(f"error: {PIGMENT} is not installed\n")
print(
"To build and install it, obtain cargo:\n\tcurl https://sh.rustup.rs -sSf | sh"
)
print(f"and then run:\n\tcargo install {PIGMENT}")
exit(1)
# default version behaviour is to only do those that exist
if len(args.version) > 0:
versions = args.version