godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CI: Install master version of psf/black 

Until https://github.com/psf/black/pull/1328 makes it in a stable release,
we have to use the latest from Git.

Apply new style fixes done by latest black.
This commit is contained in:
Rémi Verschelde 2020-07-26 19:38:10 +02:00
parent 326c303fc6
commit f940e5e000
11 changed files with 86 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/static_checks.yml vendored
View File

@ -13,7 +13,7 @@ jobs:
run: | run: |
sudo apt-get update -qq sudo apt-get update -qq
sudo apt-get install -qq dos2unix recode clang-format sudo apt-get install -qq dos2unix recode clang-format
sudo pip3 install black pygments sudo pip3 install git+https://github.com/psf/black@master pygments
- name: File formatting checks (file_format.sh) - name: File formatting checks (file_format.sh)
run: | run: |

5
SConstruct
View File

@ -617,8 +617,9 @@ if selected_platform in platform_list:
editor_module_list = ["regex"] editor_module_list = ["regex"]
if env["tools"] and not env.module_check_dependencies("tools", editor_module_list): if env["tools"] and not env.module_check_dependencies("tools", editor_module_list):
print( print(
"Build option 'module_" + x + "_enabled=no' cannot be used with 'tools=yes' (editor), " "Build option 'module_"
"only with 'tools=no' (export template)." + x
+ "_enabled=no' cannot be used with 'tools=yes' (editor), only with 'tools=no' (export template)."
) )
Exit(255) Exit(255)

51
gles_builders.py
View File

@ -230,59 +230,76 @@ def build_legacygl_header(filename, include, class_suffix, output_attribs, gles2
fd.write("\t_FORCE_INLINE_ int get_uniform(Uniforms p_uniform) const { return _get_uniform(p_uniform); }\n\n") fd.write("\t_FORCE_INLINE_ int get_uniform(Uniforms p_uniform) const { return _get_uniform(p_uniform); }\n\n")
if header_data.conditionals: if header_data.conditionals:
fd.write( fd.write(
"\t_FORCE_INLINE_ void set_conditional(Conditionals p_conditional,bool p_enable) { _set_conditional(p_conditional,p_enable); }\n\n" "\t_FORCE_INLINE_ void set_conditional(Conditionals p_conditional,bool p_enable) {"
" _set_conditional(p_conditional,p_enable); }\n\n"
) )
fd.write("\t#ifdef DEBUG_ENABLED\n ") fd.write("\t#ifdef DEBUG_ENABLED\n ")
fd.write( fd.write(
"\t#define _FU if (get_uniform(p_uniform)<0) return; if (!is_version_valid()) return; ERR_FAIL_COND( get_active()!=this ); \n\n " "\t#define _FU if (get_uniform(p_uniform)<0) return; if (!is_version_valid()) return; ERR_FAIL_COND("
" get_active()!=this ); \n\n "
) )
fd.write("\t#else\n ") fd.write("\t#else\n ")
fd.write("\t#define _FU if (get_uniform(p_uniform)<0) return; \n\n ") fd.write("\t#define _FU if (get_uniform(p_uniform)<0) return; \n\n ")
fd.write("\t#endif\n") fd.write("\t#endif\n")
fd.write( fd.write(
"\t_FORCE_INLINE_ void set_uniform(Uniforms p_uniform, float p_value) { _FU glUniform1f(get_uniform(p_uniform),p_value); }\n\n" "\t_FORCE_INLINE_ void set_uniform(Uniforms p_uniform, float p_value) { _FU"
" glUniform1f(get_uniform(p_uniform),p_value); }\n\n"
) )
fd.write( fd.write(
"\t_FORCE_INLINE_ void set_uniform(Uniforms p_uniform, double p_value) { _FU glUniform1f(get_uniform(p_uniform),p_value); }\n\n" "\t_FORCE_INLINE_ void set_uniform(Uniforms p_uniform, double p_value) { _FU"
" glUniform1f(get_uniform(p_uniform),p_value); }\n\n"
) )
fd.write( fd.write(
"\t_FORCE_INLINE_ void set_uniform(Uniforms p_uniform, uint8_t p_value) { _FU glUniform1i(get_uniform(p_uniform),p_value); }\n\n" "\t_FORCE_INLINE_ void set_uniform(Uniforms p_uniform, uint8_t p_value) { _FU"
" glUniform1i(get_uniform(p_uniform),p_value); }\n\n"
) )
fd.write( fd.write(
"\t_FORCE_INLINE_ void set_uniform(Uniforms p_uniform, int8_t p_value) { _FU glUniform1i(get_uniform(p_uniform),p_value); }\n\n" "\t_FORCE_INLINE_ void set_uniform(Uniforms p_uniform, int8_t p_value) { _FU"
" glUniform1i(get_uniform(p_uniform),p_value); }\n\n"
) )
fd.write( fd.write(
"\t_FORCE_INLINE_ void set_uniform(Uniforms p_uniform, uint16_t p_value) { _FU glUniform1i(get_uniform(p_uniform),p_value); }\n\n" "\t_FORCE_INLINE_ void set_uniform(Uniforms p_uniform, uint16_t p_value) { _FU"
" glUniform1i(get_uniform(p_uniform),p_value); }\n\n"
) )
fd.write( fd.write(
"\t_FORCE_INLINE_ void set_uniform(Uniforms p_uniform, int16_t p_value) { _FU glUniform1i(get_uniform(p_uniform),p_value); }\n\n" "\t_FORCE_INLINE_ void set_uniform(Uniforms p_uniform, int16_t p_value) { _FU"
" glUniform1i(get_uniform(p_uniform),p_value); }\n\n"
) )
fd.write( fd.write(
"\t_FORCE_INLINE_ void set_uniform(Uniforms p_uniform, uint32_t p_value) { _FU glUniform1i(get_uniform(p_uniform),p_value); }\n\n" "\t_FORCE_INLINE_ void set_uniform(Uniforms p_uniform, uint32_t p_value) { _FU"
" glUniform1i(get_uniform(p_uniform),p_value); }\n\n"
) )
fd.write( fd.write(
"\t_FORCE_INLINE_ void set_uniform(Uniforms p_uniform, int32_t p_value) { _FU glUniform1i(get_uniform(p_uniform),p_value); }\n\n" "\t_FORCE_INLINE_ void set_uniform(Uniforms p_uniform, int32_t p_value) { _FU"
" glUniform1i(get_uniform(p_uniform),p_value); }\n\n"
) )
fd.write( fd.write(
"\t_FORCE_INLINE_ void set_uniform(Uniforms p_uniform, const Color& p_color) { _FU GLfloat col[4]={p_color.r,p_color.g,p_color.b,p_color.a}; glUniform4fv(get_uniform(p_uniform),1,col); }\n\n" "\t_FORCE_INLINE_ void set_uniform(Uniforms p_uniform, const Color& p_color) { _FU GLfloat"
" col[4]={p_color.r,p_color.g,p_color.b,p_color.a}; glUniform4fv(get_uniform(p_uniform),1,col); }\n\n"
) )
fd.write( fd.write(
"\t_FORCE_INLINE_ void set_uniform(Uniforms p_uniform, const Vector2& p_vec2) { _FU GLfloat vec2[2]={p_vec2.x,p_vec2.y}; glUniform2fv(get_uniform(p_uniform),1,vec2); }\n\n" "\t_FORCE_INLINE_ void set_uniform(Uniforms p_uniform, const Vector2& p_vec2) { _FU GLfloat"
" vec2[2]={p_vec2.x,p_vec2.y}; glUniform2fv(get_uniform(p_uniform),1,vec2); }\n\n"
) )
fd.write( fd.write(
"\t_FORCE_INLINE_ void set_uniform(Uniforms p_uniform, const Size2i& p_vec2) { _FU GLint vec2[2]={p_vec2.x,p_vec2.y}; glUniform2iv(get_uniform(p_uniform),1,vec2); }\n\n" "\t_FORCE_INLINE_ void set_uniform(Uniforms p_uniform, const Size2i& p_vec2) { _FU GLint"
" vec2[2]={p_vec2.x,p_vec2.y}; glUniform2iv(get_uniform(p_uniform),1,vec2); }\n\n"
) )
fd.write( fd.write(
"\t_FORCE_INLINE_ void set_uniform(Uniforms p_uniform, const Vector3& p_vec3) { _FU GLfloat vec3[3]={p_vec3.x,p_vec3.y,p_vec3.z}; glUniform3fv(get_uniform(p_uniform),1,vec3); }\n\n" "\t_FORCE_INLINE_ void set_uniform(Uniforms p_uniform, const Vector3& p_vec3) { _FU GLfloat"
" vec3[3]={p_vec3.x,p_vec3.y,p_vec3.z}; glUniform3fv(get_uniform(p_uniform),1,vec3); }\n\n"
) )
fd.write( fd.write(
"\t_FORCE_INLINE_ void set_uniform(Uniforms p_uniform, float p_a, float p_b) { _FU glUniform2f(get_uniform(p_uniform),p_a,p_b); }\n\n" "\t_FORCE_INLINE_ void set_uniform(Uniforms p_uniform, float p_a, float p_b) { _FU"
" glUniform2f(get_uniform(p_uniform),p_a,p_b); }\n\n"
) )
fd.write( fd.write(
"\t_FORCE_INLINE_ void set_uniform(Uniforms p_uniform, float p_a, float p_b, float p_c) { _FU glUniform3f(get_uniform(p_uniform),p_a,p_b,p_c); }\n\n" "\t_FORCE_INLINE_ void set_uniform(Uniforms p_uniform, float p_a, float p_b, float p_c) { _FU"
" glUniform3f(get_uniform(p_uniform),p_a,p_b,p_c); }\n\n"
) )
fd.write( fd.write(
"\t_FORCE_INLINE_ void set_uniform(Uniforms p_uniform, float p_a, float p_b, float p_c, float p_d) { _FU glUniform4f(get_uniform(p_uniform),p_a,p_b,p_c,p_d); }\n\n" "\t_FORCE_INLINE_ void set_uniform(Uniforms p_uniform, float p_a, float p_b, float p_c, float p_d) { _FU"
" glUniform4f(get_uniform(p_uniform),p_a,p_b,p_c,p_d); }\n\n"
) )
fd.write( fd.write(

9
methods.py
View File

@ -549,15 +549,18 @@ def generate_vs_project(env, num_jobs):
# in a backslash, so we need to remove this, lest it escape the # in a backslash, so we need to remove this, lest it escape the
# last double quote off, confusing MSBuild # last double quote off, confusing MSBuild
env["MSVSBUILDCOM"] = build_commandline( env["MSVSBUILDCOM"] = build_commandline(
"scons --directory=\"$(ProjectDir.TrimEnd('\\'))\" platform=windows progress=no target=$(Configuration) tools=!tools! -j" "scons --directory=\"$(ProjectDir.TrimEnd('\\'))\" platform=windows progress=no target=$(Configuration)"
" tools=!tools! -j"
+ str(num_jobs) + str(num_jobs)
) )
env["MSVSREBUILDCOM"] = build_commandline( env["MSVSREBUILDCOM"] = build_commandline(
"scons --directory=\"$(ProjectDir.TrimEnd('\\'))\" platform=windows progress=no target=$(Configuration) tools=!tools! vsproj=yes -j" "scons --directory=\"$(ProjectDir.TrimEnd('\\'))\" platform=windows progress=no target=$(Configuration)"
" tools=!tools! vsproj=yes -j"
+ str(num_jobs) + str(num_jobs)
) )
env["MSVSCLEANCOM"] = build_commandline( env["MSVSCLEANCOM"] = build_commandline(
"scons --directory=\"$(ProjectDir.TrimEnd('\\'))\" --clean platform=windows progress=no target=$(Configuration) tools=!tools! -j" "scons --directory=\"$(ProjectDir.TrimEnd('\\'))\" --clean platform=windows progress=no"
" target=$(Configuration) tools=!tools! -j"
+ str(num_jobs) + str(num_jobs)
) )

4
modules/gdnative/gdnative_builders.py
View File

@ -74,7 +74,7 @@ def _build_gdnative_api_struct_header(api):
ret_val += [ ret_val += [
"typedef struct godot_gdnative_core_" "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 {", + "_api_struct {",
"\tunsigned int type;", "\tunsigned int type;",
"\tgodot_gdnative_api_version version;", "\tgodot_gdnative_api_version version;",
@ -185,7 +185,7 @@ def _build_gdnative_api_struct_source(api):
ret_val += [ ret_val += [
"extern const godot_gdnative_core_" "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"] + ",", "\tGDNATIVE_" + core["type"] + ",",
"\t{" + str(core["version"]["major"]) + ", " + str(core["version"]["minor"]) + "},", "\t{" + str(core["version"]["major"]) + ", " + str(core["version"]["minor"]) + "},",

3
modules/mono/build_scripts/mono_configure.py
View File

@ -125,7 +125,8 @@ def configure(env, env_mono):
if not mono_prefix and (os.getenv("MONO32_PREFIX") or os.getenv("MONO64_PREFIX")): if not mono_prefix and (os.getenv("MONO32_PREFIX") or os.getenv("MONO64_PREFIX")):
print( 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, # Although we don't support building with tools for any platform where we currently use static AOT,

11
platform/android/detect.py
View File

@ -115,7 +115,8 @@ def configure(env):
if env["android_arch"] == "x86_64": if env["android_arch"] == "x86_64":
if get_platform(env["ndk_platform"]) < 21: if get_platform(env["ndk_platform"]) < 21:
print( print(
"WARNING: android_arch=x86_64 is not supported by ndk_platform lower than android-21; setting ndk_platform=android-21" "WARNING: android_arch=x86_64 is not supported by ndk_platform lower than android-21; setting"
" ndk_platform=android-21"
) )
env["ndk_platform"] = "android-21" env["ndk_platform"] = "android-21"
env["ARCH"] = "arch-x86_64" env["ARCH"] = "arch-x86_64"
@ -136,7 +137,8 @@ def configure(env):
elif env["android_arch"] == "arm64v8": elif env["android_arch"] == "arm64v8":
if get_platform(env["ndk_platform"]) < 21: if get_platform(env["ndk_platform"]) < 21:
print( print(
"WARNING: android_arch=arm64v8 is not supported by ndk_platform lower than android-21; setting ndk_platform=android-21" "WARNING: android_arch=arm64v8 is not supported by ndk_platform lower than android-21; setting"
" ndk_platform=android-21"
) )
env["ndk_platform"] = "android-21" env["ndk_platform"] = "android-21"
env["ARCH"] = "arch-arm64" env["ARCH"] = "arch-arm64"
@ -231,7 +233,10 @@ def configure(env):
env.Append(CPPDEFINES=[("__ANDROID_API__", str(get_platform(env["ndk_platform"])))]) env.Append(CPPDEFINES=[("__ANDROID_API__", str(get_platform(env["ndk_platform"])))])
env.Append( env.Append(
CCFLAGS="-fpic -ffunction-sections -funwind-tables -fstack-protector-strong -fvisibility=hidden -fno-strict-aliasing".split() CCFLAGS=(
"-fpic -ffunction-sections -funwind-tables -fstack-protector-strong -fvisibility=hidden"
" -fno-strict-aliasing".split()
)
) )
env.Append(CPPDEFINES=["NO_STATVFS", "GLES_ENABLED"]) env.Append(CPPDEFINES=["NO_STATVFS", "GLES_ENABLED"])

22
platform/iphone/detect.py
View File

@ -31,7 +31,8 @@ def get_opts():
("IPHONESDK", "Path to the iPhone SDK", ""), ("IPHONESDK", "Path to the iPhone SDK", ""),
BoolVariable( BoolVariable(
"use_static_mvk", "use_static_mvk",
"Link MoltenVK statically as Level-0 driver (better portability) or use Vulkan ICD loader (enables validation layers)", "Link MoltenVK statically as Level-0 driver (better portability) or use Vulkan ICD loader (enables"
" validation layers)",
False, False,
), ),
BoolVariable("game_center", "Support for game center", True), BoolVariable("game_center", "Support for game center", True),
@ -120,18 +121,31 @@ def configure(env):
CCFLAGS=( CCFLAGS=(
"-arch " "-arch "
+ arch_flag + arch_flag
+ " -fobjc-abi-version=2 -fobjc-legacy-dispatch -fmessage-length=0 -fpascal-strings -fblocks -fasm-blocks -isysroot $IPHONESDK -mios-simulator-version-min=13.0" + " -fobjc-abi-version=2 -fobjc-legacy-dispatch -fmessage-length=0 -fpascal-strings -fblocks"
" -fasm-blocks -isysroot $IPHONESDK -mios-simulator-version-min=13.0"
).split() ).split()
) )
elif env["arch"] == "arm": elif env["arch"] == "arm":
detect_darwin_sdk_path("iphone", env) detect_darwin_sdk_path("iphone", env)
env.Append( env.Append(
CCFLAGS='-fno-objc-arc -arch armv7 -fmessage-length=0 -fno-strict-aliasing -fdiagnostics-print-source-range-info -fdiagnostics-show-category=id -fdiagnostics-parseable-fixits -fpascal-strings -fblocks -isysroot $IPHONESDK -fvisibility=hidden -mthumb "-DIBOutlet=__attribute__((iboutlet))" "-DIBOutletCollection(ClassName)=__attribute__((iboutletcollection(ClassName)))" "-DIBAction=void)__attribute__((ibaction)" -miphoneos-version-min=11.0 -MMD -MT dependencies'.split() CCFLAGS=(
"-fno-objc-arc -arch armv7 -fmessage-length=0 -fno-strict-aliasing"
" -fdiagnostics-print-source-range-info -fdiagnostics-show-category=id -fdiagnostics-parseable-fixits"
" -fpascal-strings -fblocks -isysroot $IPHONESDK -fvisibility=hidden -mthumb"
' "-DIBOutlet=__attribute__((iboutlet))"'
' "-DIBOutletCollection(ClassName)=__attribute__((iboutletcollection(ClassName)))"'
' "-DIBAction=void)__attribute__((ibaction)" -miphoneos-version-min=11.0 -MMD -MT dependencies'.split()
)
) )
elif env["arch"] == "arm64": elif env["arch"] == "arm64":
detect_darwin_sdk_path("iphone", env) detect_darwin_sdk_path("iphone", env)
env.Append( env.Append(
CCFLAGS="-fno-objc-arc -arch arm64 -fmessage-length=0 -fno-strict-aliasing -fdiagnostics-print-source-range-info -fdiagnostics-show-category=id -fdiagnostics-parseable-fixits -fpascal-strings -fblocks -fvisibility=hidden -MMD -MT dependencies -miphoneos-version-min=11.0 -isysroot $IPHONESDK".split() CCFLAGS=(
"-fno-objc-arc -arch arm64 -fmessage-length=0 -fno-strict-aliasing"
" -fdiagnostics-print-source-range-info -fdiagnostics-show-category=id -fdiagnostics-parseable-fixits"
" -fpascal-strings -fblocks -fvisibility=hidden -MMD -MT dependencies -miphoneos-version-min=11.0"
" -isysroot $IPHONESDK".split()
)
) )
env.Append(CPPDEFINES=["NEED_LONG_INT"]) env.Append(CPPDEFINES=["NEED_LONG_INT"])
env.Append(CPPDEFINES=["LIBYUV_DISABLE_NEON"]) env.Append(CPPDEFINES=["LIBYUV_DISABLE_NEON"])

3
platform/osx/detect.py
View File

@ -28,7 +28,8 @@ def get_opts():
("MACOS_SDK_PATH", "Path to the macOS SDK", ""), ("MACOS_SDK_PATH", "Path to the macOS SDK", ""),
BoolVariable( BoolVariable(
"use_static_mvk", "use_static_mvk",
"Link MoltenVK statically as Level-0 driver (better portability) or use Vulkan ICD loader (enables validation layers)", "Link MoltenVK statically as Level-0 driver (better portability) or use Vulkan ICD loader (enables"
" validation layers)",
False, False,
), ),
EnumVariable("debug_symbols", "Add debugging symbols to release builds", "yes", ("yes", "no", "full")), EnumVariable("debug_symbols", "Add debugging symbols to release builds", "yes", ("yes", "no", "full")),

9
platform/uwp/detect.py
View File

@ -120,7 +120,9 @@ def configure(env):
print("Compiled program architecture will be a x86 executable. (forcing bits=32).") print("Compiled program architecture will be a x86 executable. (forcing bits=32).")
else: else:
print( print(
"Failed to detect MSVC compiler architecture version... Defaulting to 32-bit executable settings (forcing bits=32). Compilation attempt will continue, but SCons can not detect for what architecture this build is compiled for. You should check your settings/compilation setup." "Failed to detect MSVC compiler architecture version... Defaulting to 32-bit executable settings"
" (forcing bits=32). Compilation attempt will continue, but SCons can not detect for what architecture"
" this build is compiled for. You should check your settings/compilation setup."
) )
env["bits"] = "32" env["bits"] = "32"
@ -160,7 +162,10 @@ def configure(env):
env.Append(CPPFLAGS=["/AI", vc_base_path + "lib/x86/store/references"]) env.Append(CPPFLAGS=["/AI", vc_base_path + "lib/x86/store/references"])
env.Append( env.Append(
CCFLAGS='/FS /MP /GS /wd"4453" /wd"28204" /wd"4291" /Zc:wchar_t /Gm- /fp:precise /errorReport:prompt /WX- /Zc:forScope /Gd /EHsc /nologo'.split() CCFLAGS=(
'/FS /MP /GS /wd"4453" /wd"28204" /wd"4291" /Zc:wchar_t /Gm- /fp:precise /errorReport:prompt /WX-'
" /Zc:forScope /Gd /EHsc /nologo".split()
)
) )
env.Append(CPPDEFINES=["_UNICODE", "UNICODE", ("WINAPI_FAMILY", "WINAPI_FAMILY_APP")]) env.Append(CPPDEFINES=["_UNICODE", "UNICODE", ("WINAPI_FAMILY", "WINAPI_FAMILY_APP")])
env.Append(CXXFLAGS=["/ZW"]) env.Append(CXXFLAGS=["/ZW"])

4
platform/windows/detect.py
View File

@ -128,7 +128,9 @@ def setup_msvc_manual(env):
print("Compiled program architecture will be a 32 bit executable. (forcing bits=32).") print("Compiled program architecture will be a 32 bit executable. (forcing bits=32).")
else: else:
print( print(
"Failed to manually detect MSVC compiler architecture version... Defaulting to 32bit executable settings (forcing bits=32). Compilation attempt will continue, but SCons can not detect for what architecture this build is compiled for. You should check your settings/compilation setup, or avoid setting VCINSTALLDIR." "Failed to manually detect MSVC compiler architecture version... Defaulting to 32bit executable settings"
" (forcing bits=32). Compilation attempt will continue, but SCons can not detect for what architecture this"
" build is compiled for. You should check your settings/compilation setup, or avoid setting VCINSTALLDIR."
) )