Use the pandemonium_headers folder.

This commit is contained in:
Relintai 2023-06-02 10:02:17 +02:00
parent e440d8176c
commit 46707da341
4 changed files with 11 additions and 11 deletions

View File

@ -56,7 +56,7 @@ vars.Add(
default="3.2.2", default="3.2.2",
converter=godot_binary_converter, converter=godot_binary_converter,
) )
vars.Add("godot_headers", "Path to Godot GDnative headers", "") vars.Add("pandemonium_headers", "Path to Godot GDnative headers", "")
vars.Add("debugger", "Run test with a debugger", "") vars.Add("debugger", "Run test with a debugger", "")
vars.Add(BoolVariable("debug", "Compile with debug symbols", False)) vars.Add(BoolVariable("debug", "Compile with debug symbols", False))
vars.Add(BoolVariable("headless", "Run tests in headless mode", False)) vars.Add(BoolVariable("headless", "Run tests in headless mode", False))
@ -135,14 +135,14 @@ Help(vars.GenerateHelpText(env))
# ImportVirtualenv(env) # ImportVirtualenv(env)
if env["godot_headers"]: if env["pandemonium_headers"]:
env["godot_headers"] = Dir(env["godot_headers"]) env["pandemonium_headers"] = Dir(env["pandemonium_headers"])
else: else:
env["godot_headers"] = Dir("godot_headers") env["pandemonium_headers"] = Dir("pandemonium_headers")
env.AppendUnique(CPPPATH=["$godot_headers"]) env.AppendUnique(CPPPATH=["$pandemonium_headers"])
# TODO: not sure why, but CPPPATH scan result for cython modules change between # TODO: not sure why, but CPPPATH scan result for cython modules change between
# first and subsequent runs of scons (module is considered to no longer depend # first and subsequent runs of scons (module is considered to no longer depend
# on godot_headers on subsequent run, so the build redone) # on pandemonium_headers on subsequent run, so the build redone)
SetOption("implicit_cache", 1) SetOption("implicit_cache", 1)

View File

@ -308,8 +308,8 @@ if __name__ == "__main__":
"--input", "--input",
"-i", "-i",
required=True, required=True,
metavar="GODOT_HEADERS_PATH", metavar="PANDEMONIUM_HEADERS_PATH",
help="Path to Godot GDNative headers", help="Path to GDNative headers",
) )
parser.add_argument( parser.add_argument(
"--output", "--output",

View File

@ -38,7 +38,7 @@ env.Depends(
godot_builtins_srcs = env.Command( godot_builtins_srcs = env.Command(
target=("builtins.pyx", "builtins.pxd"), target=("builtins.pyx", "builtins.pxd"),
source=("#/generation/generate_builtins.py", "${godot_headers}/gdnative_api.json"), source=("#/generation/generate_builtins.py", "${pandemonium_headers}/gdnative_api.json"),
action="python ${SOURCES[0]} --input ${SOURCES[1]} --output ${TARGET}", action="python ${SOURCES[0]} --input ${SOURCES[1]} --output ${TARGET}",
) )
env.Depends( env.Depends(
@ -84,7 +84,7 @@ else:
godot_bindings_srcs = bindings_env.Command( godot_bindings_srcs = bindings_env.Command(
target=("bindings.pyx", "bindings.pxd", "bindings.pyi"), target=("bindings.pyx", "bindings.pxd", "bindings.pyi"),
source=("#/generation/generate_bindings.py", "${godot_headers}/api.json"), source=("#/generation/generate_bindings.py", "${pandemonium_headers}/api.json"),
action=("python ${SOURCES[0]} ${opts} --input ${SOURCES[1]} --output ${TARGET} "), action=("python ${SOURCES[0]} ${opts} --input ${SOURCES[1]} --output ${TARGET} "),
opts="--sample" if sample else "", opts="--sample" if sample else "",
) )

View File

@ -20,7 +20,7 @@ env.Install("$DIST_SITE_PACKAGES/godot/_hazmat", pxds)
gdnative_api_struct_pxd = env.Command( gdnative_api_struct_pxd = env.Command(
target="gdnative_api_struct.pxd", target="gdnative_api_struct.pxd",
source=["#/generation/generate_gdnative_api_struct.py", env["godot_headers"]], source=["#/generation/generate_gdnative_api_struct.py", env["pandemonium_headers"]],
action="python ${SOURCES[0]} --input ${SOURCES[1]} --output ${TARGET}", action="python ${SOURCES[0]} --input ${SOURCES[1]} --output ${TARGET}",
) )