diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-07-26 20:01:57 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-26 20:01:57 +0200 |
| commit | f5a224ac925cf4ecc3e7844674514ef0fd4e3b20 (patch) | |
| tree | b9b797a96e87410cd895f64a1b29b99d51b88e75 /modules | |
| parent | 326c303fc6818cdbc3dafc6a5d1fc0458f4c5891 (diff) | |
| parent | f940e5e000b30d2cd2d385782a416d547b06b0b2 (diff) | |
Merge pull request #40731 from akien-mga/ci-black-git
CI: Install master version of psf/black
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/gdnative/gdnative_builders.py | 4 | ||||
| -rw-r--r-- | modules/mono/build_scripts/mono_configure.py | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/modules/gdnative/gdnative_builders.py b/modules/gdnative/gdnative_builders.py index a6f8afb85b..28e4957b2f 100644 --- a/modules/gdnative/gdnative_builders.py +++ b/modules/gdnative/gdnative_builders.py @@ -74,7 +74,7 @@ def _build_gdnative_api_struct_header(api): ret_val += [ "typedef struct godot_gdnative_core_" - + ("{0}_{1}".format(core["version"]["major"], core["version"]["minor"])) + + "{0}_{1}".format(core["version"]["major"], core["version"]["minor"]) + "_api_struct {", "\tunsigned int type;", "\tgodot_gdnative_api_version version;", @@ -185,7 +185,7 @@ def _build_gdnative_api_struct_source(api): ret_val += [ "extern const godot_gdnative_core_" - + ("{0}_{1}_api_struct api_{0}_{1}".format(core["version"]["major"], core["version"]["minor"])) + + "{0}_{1}_api_struct api_{0}_{1}".format(core["version"]["major"], core["version"]["minor"]) + " = {", "\tGDNATIVE_" + core["type"] + ",", "\t{" + str(core["version"]["major"]) + ", " + str(core["version"]["minor"]) + "},", diff --git a/modules/mono/build_scripts/mono_configure.py b/modules/mono/build_scripts/mono_configure.py index 80e3b59325..3e771e06f0 100644 --- a/modules/mono/build_scripts/mono_configure.py +++ b/modules/mono/build_scripts/mono_configure.py @@ -125,7 +125,8 @@ def configure(env, env_mono): if not mono_prefix and (os.getenv("MONO32_PREFIX") or os.getenv("MONO64_PREFIX")): print( - "WARNING: The environment variables 'MONO32_PREFIX' and 'MONO64_PREFIX' are deprecated; use the 'mono_prefix' SCons parameter instead" + "WARNING: The environment variables 'MONO32_PREFIX' and 'MONO64_PREFIX' are deprecated; use the" + " 'mono_prefix' SCons parameter instead" ) # Although we don't support building with tools for any platform where we currently use static AOT, |