Skip to content

Python 3.9 compatibility #501

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
samtremblo wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Python 3.9 compatibility #501

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
124 changes: 55 additions & 69 deletions configure.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2661,75 +2661,61 @@ def MatchingFor(*versions):
def emit_build_rule(asset):
steps = config.custom_build_steps.setdefault("pre-compile", [])

match asset.get("custom_type"):
case None:
return

case "pal16":
steps.append(
{
"rule": "convert_pal16",
"inputs": out_dir / "bin" / asset["binary"],
"outputs": out_dir / "include" / asset["header"],
"variables": {
"symbol": asset["symbol"],
},
"implicit": Path("tools/converters/pal16dis.py"),
}
)

case "pal16c":
# Run the script in scan mode first to generate a .dd file
input = out_dir / "bin" / asset["binary"]
out_base = out_dir / "include" / asset["header"]
dyndep = out_dir / "include" / f"{asset['header']}.dd"
# We need a stamp file to use as a marker for ninja
stamp = out_dir / "include" / f"{asset['header']}.stamp"
steps.append(
{
"rule": "scan_pal16_chunked",
"inputs": input,
"outputs": dyndep,
"variables": {
"base": out_base,
"stamp": stamp,
"symbol": asset["symbol"],
},
"implicit": Path("tools/converters/pal16dis_chunked.py"),
}
)
# Now the script will generate all the dynamic outputs and stamp file
steps.append(
{
"rule": "convert_pal16_chunked",
"inputs": input,
"outputs": stamp,
"variables": {
"base": out_base,
"symbol": asset["symbol"],
},
"implicit": Path("tools/converters/pal16dis_chunked.py"),
"dyndep": dyndep,
"order_only": dyndep,
}
)

case "vtx":
steps.append(
{
"rule": "convert_vtx",
"inputs": out_dir / "bin" / asset["binary"],
"outputs": out_dir / "include" / asset["header"],
"variables": {
"symbol": asset["symbol"],
},
"implicit": Path("tools/converters/vtxdis.py"),
}
)

case _:
print("Unknown asset type: " + asset["custom_type"])

custom_type = asset.get("custom_type")
if custom_type is None:
return
elif custom_type == "pal16":
steps.append({
"rule": "convert_pal16",
"inputs": out_dir / "bin" / asset["binary"],
"outputs": out_dir / "include" / asset["header"],
"variables": {
"symbol": asset["symbol"],
},
"implicit": Path("tools/converters/pal16dis.py"),
})
elif custom_type == "pal16c":
# Run the script in scan mode first to generate a .dd file
input = out_dir / "bin" / asset["binary"]
out_base = out_dir / "include" / asset["header"]
dyndep = out_dir / "include" / f"{asset['header']}.dd"
# We need a stamp file to use as a marker for ninja
stamp = out_dir / "include" / f"{asset['header']}.stamp"
steps.append({
"rule": "scan_pal16_chunked",
"inputs": input,
"outputs": dyndep,
"variables": {
"base": out_base,
"stamp": stamp,
"symbol": asset["symbol"],
},
"implicit": Path("tools/converters/pal16dis_chunked.py"),
})
steps.append({
"rule": "convert_pal16_chunked",
"inputs": input,
"outputs": stamp,
"variables": {
"base": out_base,
"symbol": asset["symbol"],
},
"implicit": Path("tools/converters/pal16dis_chunked.py"),
"dyndep": dyndep,
"order_only": dyndep,
})
elif custom_type == "vtx":
steps.append({
"rule": "convert_vtx",
"inputs": out_dir / "bin" / asset["binary"],
"outputs": out_dir / "include" / asset["header"],
"variables": {
"symbol": asset["symbol"],
},
"implicit": Path("tools/converters/vtxdis.py"),
})
else:
print("Unknown asset type: " + custom_type)

# Parse the config and create the build rules for all our assets
config_path = out_dir / "config.json"
Expand Down
4 changes: 2 additions & 2 deletions tools/project.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
import os
import platform
import sys
from typing import Union
from pathlib import Path
from typing import IO, Any, Dict, Iterable, List, Optional, Set, Tuple, Union, cast

Expand Down Expand Up @@ -657,8 +658,7 @@ def write_custom_step(step: str, prev_step: Optional[str] = None) -> None:
if config.custom_build_steps and step in config.custom_build_steps:
n.comment(f"Custom build steps ({step})")
for custom_step in config.custom_build_steps[step]:
outputs = cast(List[str | Path], custom_step.get("outputs"))

outputs = cast(List[Union[str, Path]], custom_step.get("outputs"))
if isinstance(outputs, list):
implicit.extend(outputs)
else:
Expand Down
Loading