You've already forked godot
mirror of
https://github.com/godotengine/godot.git
synced 2025-11-04 12:00:25 +00:00
style: Fix PEP8 whitespace issues in Python files
Done with `autopep8 --select=E2,W2`, fixes: - E201 - Remove extraneous whitespace. - E202 - Remove extraneous whitespace. - E203 - Remove extraneous whitespace. - E211 - Remove extraneous whitespace. - E221 - Fix extraneous whitespace around keywords. - E222 - Fix extraneous whitespace around keywords. - E223 - Fix extraneous whitespace around keywords. - E224 - Remove extraneous whitespace around operator. - E225 - Fix missing whitespace around operator. - E226 - Fix missing whitespace around operator. - E227 - Fix missing whitespace around operator. - E228 - Fix missing whitespace around operator. - E231 - Add missing whitespace. - E231 - Fix various deprecated code (via lib2to3). - E241 - Fix extraneous whitespace around keywords. - E242 - Remove extraneous whitespace around operator. - E251 - Remove whitespace around parameter '=' sign. - E261 - Fix spacing after comment hash. - E262 - Fix spacing after comment hash. - E265 - Format block comments. - E271 - Fix extraneous whitespace around keywords. - E272 - Fix extraneous whitespace around keywords. - E273 - Fix extraneous whitespace around keywords. - E274 - Fix extraneous whitespace around keywords. - W291 - Remove trailing whitespace. - W293 - Remove trailing whitespace.
This commit is contained in:
Rémi Verschelde
@@ -85,7 +85,7 @@
|
||||
|
||||
#####
|
||||
# TODO :
|
||||
#
|
||||
#
|
||||
# - finish to cleanup this script to remove all the remains of previous hacks and workarounds
|
||||
# - make it work with the Windows7 SDK that is supposed to enable 64bits compilation for MSVC2010-Express
|
||||
# - confirm it works well with other Visual Studio versions.
|
||||
@@ -107,21 +107,21 @@ def get_name():
|
||||
|
||||
def can_build():
|
||||
|
||||
if (os.name=="nt"):
|
||||
#building natively on windows!
|
||||
if ( os.getenv("VCINSTALLDIR") ):
|
||||
if (os.name == "nt"):
|
||||
# building natively on windows!
|
||||
if (os.getenv("VCINSTALLDIR")):
|
||||
return True
|
||||
else:
|
||||
print("\nMSVC not detected, attempting Mingw.")
|
||||
mingw32 = ""
|
||||
mingw64 = ""
|
||||
if ( os.getenv("MINGW32_PREFIX") ) :
|
||||
if (os.getenv("MINGW32_PREFIX")):
|
||||
mingw32 = os.getenv("MINGW32_PREFIX")
|
||||
if ( os.getenv("MINGW64_PREFIX") ) :
|
||||
if (os.getenv("MINGW64_PREFIX")):
|
||||
mingw64 = os.getenv("MINGW64_PREFIX")
|
||||
|
||||
test = "gcc --version > NUL 2>&1"
|
||||
if os.system(test)!= 0 and os.system(mingw32+test)!=0 and os.system(mingw64+test)!=0 :
|
||||
if os.system(test) != 0 and os.system(mingw32 + test) != 0 and os.system(mingw64 + test) != 0:
|
||||
print("- could not detect gcc.")
|
||||
print("Please, make sure a path to a Mingw /bin directory is accessible into the environment PATH.\n")
|
||||
return False
|
||||
@@ -130,57 +130,57 @@ def can_build():
|
||||
|
||||
return True
|
||||
|
||||
if (os.name=="posix"):
|
||||
if (os.name == "posix"):
|
||||
|
||||
mingw = "i586-mingw32msvc-"
|
||||
mingw64 = "x86_64-w64-mingw32-"
|
||||
mingw32 = "i686-w64-mingw32-"
|
||||
|
||||
if (os.getenv("MINGW32_PREFIX")):
|
||||
mingw32=os.getenv("MINGW32_PREFIX")
|
||||
mingw32 = os.getenv("MINGW32_PREFIX")
|
||||
mingw = mingw32
|
||||
if (os.getenv("MINGW64_PREFIX")):
|
||||
mingw64=os.getenv("MINGW64_PREFIX")
|
||||
mingw64 = os.getenv("MINGW64_PREFIX")
|
||||
|
||||
test = "gcc --version &>/dev/null"
|
||||
if (os.system(mingw+test) == 0 or os.system(mingw64+test) == 0 or os.system(mingw32+test) == 0):
|
||||
if (os.system(mingw + test) == 0 or os.system(mingw64 + test) == 0 or os.system(mingw32 + test) == 0):
|
||||
return True
|
||||
|
||||
return False
|
||||
|
||||
def get_opts():
|
||||
|
||||
mingw=""
|
||||
mingw32=""
|
||||
mingw64=""
|
||||
if ( os.name == "posix" ):
|
||||
mingw = ""
|
||||
mingw32 = ""
|
||||
mingw64 = ""
|
||||
if (os.name == "posix"):
|
||||
mingw = "i586-mingw32msvc-"
|
||||
mingw32 = "i686-w64-mingw32-"
|
||||
mingw64 = "x86_64-w64-mingw32-"
|
||||
|
||||
if os.system(mingw32+"gcc --version &>/dev/null") != 0 :
|
||||
if os.system(mingw32 + "gcc --version &>/dev/null") != 0:
|
||||
mingw32 = mingw
|
||||
|
||||
if (os.getenv("MINGW32_PREFIX")):
|
||||
mingw32=os.getenv("MINGW32_PREFIX")
|
||||
mingw32 = os.getenv("MINGW32_PREFIX")
|
||||
mingw = mingw32
|
||||
if (os.getenv("MINGW64_PREFIX")):
|
||||
mingw64=os.getenv("MINGW64_PREFIX")
|
||||
mingw64 = os.getenv("MINGW64_PREFIX")
|
||||
|
||||
|
||||
return [
|
||||
('mingw_prefix','Mingw Prefix',mingw32),
|
||||
('mingw_prefix_64','Mingw Prefix 64 bits',mingw64),
|
||||
('mingw_prefix', 'Mingw Prefix', mingw32),
|
||||
('mingw_prefix_64', 'Mingw Prefix 64 bits', mingw64),
|
||||
]
|
||||
|
||||
def get_flags():
|
||||
|
||||
return [
|
||||
('builtin_zlib', 'yes'),
|
||||
('openssl','builtin'), #use builtin openssl
|
||||
('openssl', 'builtin'), # use builtin openssl
|
||||
]
|
||||
|
||||
def build_res_file( target, source, env ):
|
||||
def build_res_file(target, source, env):
|
||||
|
||||
cmdbase = ""
|
||||
if (env["bits"] == "32"):
|
||||
@@ -193,7 +193,7 @@ def build_res_file( target, source, env ):
|
||||
for x in range(len(source)):
|
||||
cmd = cmdbase + '-i ' + str(source[x]) + ' -o ' + str(target[x])
|
||||
try:
|
||||
out = subprocess.Popen(cmd,shell = True,stderr = subprocess.PIPE).communicate()
|
||||
out = subprocess.Popen(cmd, shell=True, stderr=subprocess.PIPE).communicate()
|
||||
if len(out[1]):
|
||||
return 1
|
||||
except:
|
||||
@@ -203,66 +203,66 @@ def build_res_file( target, source, env ):
|
||||
def configure(env):
|
||||
|
||||
env.Append(CPPPATH=['#platform/windows'])
|
||||
env['is_mingw']=False
|
||||
if (os.name=="nt" and os.getenv("VCINSTALLDIR") ):
|
||||
#build using visual studio
|
||||
env['is_mingw'] = False
|
||||
if (os.name == "nt" and os.getenv("VCINSTALLDIR")):
|
||||
# build using visual studio
|
||||
env['ENV']['TMP'] = os.environ['TMP']
|
||||
env.Append(CPPPATH=['#platform/windows/include'])
|
||||
env.Append(LIBPATH=['#platform/windows/lib'])
|
||||
|
||||
|
||||
if (env["target"]=="release"):
|
||||
if (env["target"] == "release"):
|
||||
|
||||
env.Append(CCFLAGS=['/O2'])
|
||||
env.Append(LINKFLAGS=['/SUBSYSTEM:WINDOWS'])
|
||||
env.Append(LINKFLAGS=['/ENTRY:mainCRTStartup'])
|
||||
|
||||
elif (env["target"]=="release_debug"):
|
||||
elif (env["target"] == "release_debug"):
|
||||
|
||||
env.Append(CCFLAGS=['/O2','/DDEBUG_ENABLED'])
|
||||
env.Append(CCFLAGS=['/O2', '/DDEBUG_ENABLED'])
|
||||
env.Append(LINKFLAGS=['/SUBSYSTEM:CONSOLE'])
|
||||
elif (env["target"]=="debug_release"):
|
||||
elif (env["target"] == "debug_release"):
|
||||
|
||||
env.Append(CCFLAGS=['/Z7','/Od'])
|
||||
env.Append(CCFLAGS=['/Z7', '/Od'])
|
||||
env.Append(LINKFLAGS=['/DEBUG'])
|
||||
env.Append(LINKFLAGS=['/SUBSYSTEM:WINDOWS'])
|
||||
env.Append(LINKFLAGS=['/ENTRY:mainCRTStartup'])
|
||||
|
||||
elif (env["target"]=="debug"):
|
||||
elif (env["target"] == "debug"):
|
||||
|
||||
env.Append(CCFLAGS=['/Z7','/DDEBUG_ENABLED','/DDEBUG_MEMORY_ENABLED','/DD3D_DEBUG_INFO','/Od'])
|
||||
env.Append(CCFLAGS=['/Z7', '/DDEBUG_ENABLED', '/DDEBUG_MEMORY_ENABLED', '/DD3D_DEBUG_INFO', '/Od'])
|
||||
env.Append(LINKFLAGS=['/SUBSYSTEM:CONSOLE'])
|
||||
env.Append(LINKFLAGS=['/DEBUG'])
|
||||
|
||||
|
||||
env.Append(CCFLAGS=['/MT','/Gd','/GR','/nologo'])
|
||||
env.Append(CCFLAGS=['/MT', '/Gd', '/GR', '/nologo'])
|
||||
env.Append(CXXFLAGS=['/TP'])
|
||||
env.Append(CPPFLAGS=['/DMSVC', '/GR', ])
|
||||
env.Append(CCFLAGS=['/I'+os.getenv("WindowsSdkDir")+"/Include"])
|
||||
env.Append(CCFLAGS=['/I' + os.getenv("WindowsSdkDir") + "/Include"])
|
||||
env.Append(CCFLAGS=['/DWINDOWS_ENABLED'])
|
||||
env.Append(CCFLAGS=['/DRTAUDIO_ENABLED'])
|
||||
env.Append(CCFLAGS=['/DWIN32'])
|
||||
env.Append(CCFLAGS=['/DTYPED_METHOD_BIND'])
|
||||
|
||||
env.Append(CCFLAGS=['/DGLES2_ENABLED'])
|
||||
LIBS=['winmm','opengl32','dsound','kernel32','ole32','oleaut32','user32','gdi32', 'IPHLPAPI','Shlwapi', 'wsock32','Ws2_32', 'shell32','advapi32','dinput8','dxguid']
|
||||
env.Append(LINKFLAGS=[p+env["LIBSUFFIX"] for p in LIBS])
|
||||
LIBS = ['winmm', 'opengl32', 'dsound', 'kernel32', 'ole32', 'oleaut32', 'user32', 'gdi32', 'IPHLPAPI', 'Shlwapi', 'wsock32', 'Ws2_32', 'shell32', 'advapi32', 'dinput8', 'dxguid']
|
||||
env.Append(LINKFLAGS=[p + env["LIBSUFFIX"] for p in LIBS])
|
||||
|
||||
env.Append(LIBPATH=[os.getenv("WindowsSdkDir")+"/Lib"])
|
||||
env.Append(LIBPATH=[os.getenv("WindowsSdkDir") + "/Lib"])
|
||||
if (os.getenv("DXSDK_DIR")):
|
||||
DIRECTX_PATH=os.getenv("DXSDK_DIR")
|
||||
DIRECTX_PATH = os.getenv("DXSDK_DIR")
|
||||
else:
|
||||
DIRECTX_PATH="C:/Program Files/Microsoft DirectX SDK (March 2009)"
|
||||
DIRECTX_PATH = "C:/Program Files/Microsoft DirectX SDK (March 2009)"
|
||||
|
||||
if (os.getenv("VCINSTALLDIR")):
|
||||
VC_PATH=os.getenv("VCINSTALLDIR")
|
||||
VC_PATH = os.getenv("VCINSTALLDIR")
|
||||
else:
|
||||
VC_PATH=""
|
||||
VC_PATH = ""
|
||||
|
||||
env.Append(CCFLAGS=["/I" + p for p in os.getenv("INCLUDE").split(";")])
|
||||
env.Append(LIBPATH=[p for p in os.getenv("LIB").split(";")])
|
||||
env.Append(CCFLAGS=["/I"+DIRECTX_PATH+"/Include"])
|
||||
env.Append(LIBPATH=[DIRECTX_PATH+"/Lib/x86"])
|
||||
env.Append(CCFLAGS=["/I" + DIRECTX_PATH + "/Include"])
|
||||
env.Append(LIBPATH=[DIRECTX_PATH + "/Lib/x86"])
|
||||
env['ENV'] = os.environ;
|
||||
|
||||
# This detection function needs the tools env (that is env['ENV'], not SCons's env), and that is why it's this far bellow in the code
|
||||
@@ -272,26 +272,26 @@ def configure(env):
|
||||
if(env["bits"] != "default"):
|
||||
print "Error: bits argument is disabled for MSVC"
|
||||
print ("Bits argument is not supported for MSVC compilation. Architecture depends on the Native/Cross Compile Tools Prompt/Developer Console (or Visual Studio settings)"
|
||||
+" that is being used to run SCons. As a consequence, bits argument is disabled. Run scons again without bits argument (example: scons p=windows) and SCons will attempt to detect what MSVC compiler"
|
||||
+" will be executed and inform you.")
|
||||
+ " that is being used to run SCons. As a consequence, bits argument is disabled. Run scons again without bits argument (example: scons p=windows) and SCons will attempt to detect what MSVC compiler"
|
||||
+ " will be executed and inform you.")
|
||||
sys.exit()
|
||||
|
||||
# Forcing bits argument because MSVC does not have a flag to set this through SCons... it's different compilers (cl.exe's) called from the propper command prompt
|
||||
# that decide the architecture that is build for. Scons can only detect the os.getenviron (because vsvarsall.bat sets a lot of stuff for cl.exe to work with)
|
||||
env["bits"]="32"
|
||||
env["x86_libtheora_opt_vc"]=True
|
||||
env["bits"] = "32"
|
||||
env["x86_libtheora_opt_vc"] = True
|
||||
|
||||
print "Detected MSVC compiler: "+compiler_version_str
|
||||
print "Detected MSVC compiler: " + compiler_version_str
|
||||
# If building for 64bit architecture, disable assembly optimisations for 32 bit builds (theora as of writting)... vc compiler for 64bit can not compile _asm
|
||||
if(compiler_version_str == "amd64" or compiler_version_str == "x86_amd64"):
|
||||
env["bits"]="64"
|
||||
env["x86_libtheora_opt_vc"]=False
|
||||
env["bits"] = "64"
|
||||
env["x86_libtheora_opt_vc"] = False
|
||||
print "Compiled program architecture will be a 64 bit executable (forcing bits=64)."
|
||||
elif (compiler_version_str=="x86" or compiler_version_str == "amd64_x86"):
|
||||
elif (compiler_version_str == "x86" or compiler_version_str == "amd64_x86"):
|
||||
print "Compiled program architecture will be a 32 bit executable. (forcing bits=32)."
|
||||
else:
|
||||
print "Failed to 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."
|
||||
if env["bits"]=="64":
|
||||
if env["bits"] == "64":
|
||||
env.Append(CCFLAGS=['/D_WIN64'])
|
||||
|
||||
# Incremental linking fix
|
||||
@@ -304,32 +304,32 @@ def configure(env):
|
||||
# http://www.scons.org/wiki/LongCmdLinesOnWin32
|
||||
env.use_windows_spawn_fix()
|
||||
|
||||
#build using mingw
|
||||
if (os.name=="nt"):
|
||||
env['ENV']['TMP'] = os.environ['TMP'] #way to go scons, you can be so stupid sometimes
|
||||
# build using mingw
|
||||
if (os.name == "nt"):
|
||||
env['ENV']['TMP'] = os.environ['TMP'] # way to go scons, you can be so stupid sometimes
|
||||
else:
|
||||
env["PROGSUFFIX"]=env["PROGSUFFIX"]+".exe" # for linux cross-compilation
|
||||
env["PROGSUFFIX"] = env["PROGSUFFIX"] + ".exe" # for linux cross-compilation
|
||||
|
||||
mingw_prefix=""
|
||||
mingw_prefix = ""
|
||||
|
||||
if (env["bits"]=="default"):
|
||||
env["bits"]="32"
|
||||
if (env["bits"] == "default"):
|
||||
env["bits"] = "32"
|
||||
|
||||
if (env["bits"]=="32"):
|
||||
if (env["bits"] == "32"):
|
||||
env.Append(LINKFLAGS=['-static'])
|
||||
env.Append(LINKFLAGS=['-static-libgcc'])
|
||||
env.Append(LINKFLAGS=['-static-libstdc++'])
|
||||
mingw_prefix=env["mingw_prefix"];
|
||||
mingw_prefix = env["mingw_prefix"];
|
||||
else:
|
||||
env.Append(LINKFLAGS=['-static'])
|
||||
mingw_prefix=env["mingw_prefix_64"];
|
||||
mingw_prefix = env["mingw_prefix_64"];
|
||||
|
||||
nulstr=""
|
||||
nulstr = ""
|
||||
|
||||
if (os.name=="posix"):
|
||||
nulstr=">/dev/null"
|
||||
if (os.name == "posix"):
|
||||
nulstr = ">/dev/null"
|
||||
else:
|
||||
nulstr=">nul"
|
||||
nulstr = ">nul"
|
||||
|
||||
|
||||
|
||||
@@ -338,42 +338,42 @@ def configure(env):
|
||||
# print("Can't find Windows compiler: "+mingw_prefix)
|
||||
# sys.exit(255)
|
||||
|
||||
if (env["target"]=="release"):
|
||||
if (env["target"] == "release"):
|
||||
|
||||
env.Append(CCFLAGS=['-msse2'])
|
||||
|
||||
if (env["bits"]=="64"):
|
||||
if (env["bits"] == "64"):
|
||||
env.Append(CCFLAGS=['-O3'])
|
||||
else:
|
||||
env.Append(CCFLAGS=['-O2'])
|
||||
|
||||
env.Append(LINKFLAGS=['-Wl,--subsystem,windows'])
|
||||
|
||||
elif (env["target"]=="release_debug"):
|
||||
elif (env["target"] == "release_debug"):
|
||||
|
||||
env.Append(CCFLAGS=['-O2','-DDEBUG_ENABLED'])
|
||||
env.Append(CCFLAGS=['-O2', '-DDEBUG_ENABLED'])
|
||||
|
||||
elif (env["target"]=="debug"):
|
||||
elif (env["target"] == "debug"):
|
||||
|
||||
env.Append(CCFLAGS=['-g', '-Wall','-DDEBUG_ENABLED','-DDEBUG_MEMORY_ENABLED'])
|
||||
env.Append(CCFLAGS=['-g', '-Wall', '-DDEBUG_ENABLED', '-DDEBUG_MEMORY_ENABLED'])
|
||||
|
||||
|
||||
|
||||
env["CC"]=mingw_prefix+"gcc"
|
||||
env['AS']=mingw_prefix+"as"
|
||||
env['CXX'] = mingw_prefix+"g++"
|
||||
env['AR'] = mingw_prefix+"ar"
|
||||
env['RANLIB'] = mingw_prefix+"ranlib"
|
||||
env['LD'] = mingw_prefix+"g++"
|
||||
env["x86_libtheora_opt_gcc"]=True
|
||||
env["CC"] = mingw_prefix + "gcc"
|
||||
env['AS'] = mingw_prefix + "as"
|
||||
env['CXX'] = mingw_prefix + "g++"
|
||||
env['AR'] = mingw_prefix + "ar"
|
||||
env['RANLIB'] = mingw_prefix + "ranlib"
|
||||
env['LD'] = mingw_prefix + "g++"
|
||||
env["x86_libtheora_opt_gcc"] = True
|
||||
|
||||
#env['CC'] = "winegcc"
|
||||
#env['CXX'] = "wineg++"
|
||||
|
||||
env.Append(CCFLAGS=['-DWINDOWS_ENABLED','-mwindows'])
|
||||
env.Append(CCFLAGS=['-DWINDOWS_ENABLED', '-mwindows'])
|
||||
env.Append(CPPFLAGS=['-DRTAUDIO_ENABLED'])
|
||||
env.Append(CCFLAGS=['-DGLES2_ENABLED'])
|
||||
env.Append(LIBS=['mingw32','opengl32', 'dsound', 'ole32', 'd3d9','winmm','gdi32','iphlpapi','shlwapi','wsock32','ws2_32','kernel32', 'oleaut32', 'dinput8', 'dxguid'])
|
||||
env.Append(LIBS=['mingw32', 'opengl32', 'dsound', 'ole32', 'd3d9', 'winmm', 'gdi32', 'iphlpapi', 'shlwapi', 'wsock32', 'ws2_32', 'kernel32', 'oleaut32', 'dinput8', 'dxguid'])
|
||||
|
||||
# if (env["bits"]=="32"):
|
||||
# env.Append(LIBS=['gcc_s'])
|
||||
@@ -386,13 +386,13 @@ def configure(env):
|
||||
|
||||
#'d3dx9d'
|
||||
env.Append(CPPFLAGS=['-DMINGW_ENABLED'])
|
||||
#env.Append(LINKFLAGS=['-g'])
|
||||
# env.Append(LINKFLAGS=['-g'])
|
||||
|
||||
# resrc
|
||||
env['is_mingw']=True
|
||||
env.Append( BUILDERS = { 'RES' : env.Builder(action = build_res_file, suffix = '.o',src_suffix = '.rc') } )
|
||||
env['is_mingw'] = True
|
||||
env.Append(BUILDERS={'RES': env.Builder(action=build_res_file, suffix='.o', src_suffix='.rc')})
|
||||
|
||||
env.Append( BUILDERS = { 'GLSL120' : env.Builder(action = methods.build_legacygl_headers, suffix = 'glsl.h',src_suffix = '.glsl') } )
|
||||
env.Append( BUILDERS = { 'GLSL' : env.Builder(action = methods.build_glsl_headers, suffix = 'glsl.h',src_suffix = '.glsl') } )
|
||||
env.Append( BUILDERS = { 'HLSL9' : env.Builder(action = methods.build_hlsl_dx9_headers, suffix = 'hlsl.h',src_suffix = '.hlsl') } )
|
||||
env.Append( BUILDERS = { 'GLSL120GLES' : env.Builder(action = methods.build_gles2_headers, suffix = 'glsl.h',src_suffix = '.glsl') } )
|
||||
env.Append(BUILDERS={'GLSL120': env.Builder(action=methods.build_legacygl_headers, suffix='glsl.h', src_suffix='.glsl')})
|
||||
env.Append(BUILDERS={'GLSL': env.Builder(action=methods.build_glsl_headers, suffix='glsl.h', src_suffix='.glsl')})
|
||||
env.Append(BUILDERS={'HLSL9': env.Builder(action=methods.build_hlsl_dx9_headers, suffix='hlsl.h', src_suffix='.hlsl')})
|
||||
env.Append(BUILDERS={'GLSL120GLES': env.Builder(action=methods.build_gles2_headers, suffix='glsl.h', src_suffix='.glsl')})
|
||||
|
||||
Reference in New Issue
Block a user