Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-11-10 14:12:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

PEP3101 applied with changing old type string formatting as new ones

Browse Source 
(cherry picked from commit 78dba05fc0)
This commit is contained in:
BTaskaya 2018-02-14 19:29:25 +03:00 committed by Hein-Pieter van Braam
parent c5388fb0cf
commit 12da8dcdeb
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
editor/icons/SCsub
View File

@ -34,7 +34,7 @@ def make_editor_icons_action(target, source, env):
s.write("/* THIS FILE IS GENERATED DO NOT EDIT */\n") s.write("/* THIS FILE IS GENERATED DO NOT EDIT */\n")
s.write("#ifndef _EDITOR_ICONS_H\n") s.write("#ifndef _EDITOR_ICONS_H\n")
s.write("#define _EDITOR_ICONS_H\n") s.write("#define _EDITOR_ICONS_H\n")
s.write("static const int editor_icons_count = %s;\n" % len(svg_icons)) s.write("static const int editor_icons_count = {};\n".format(len(svg_icons)))
s.write("static const char *editor_icons_sources[] = {\n") s.write("static const char *editor_icons_sources[] = {\n")
s.write(icons_string.getvalue()) s.write(icons_string.getvalue())
s.write('};\n\n') s.write('};\n\n')
@ -57,7 +57,7 @@ def make_editor_icons_action(target, source, env):
if icon_name.endswith("BigThumb"): # don't know a better way to handle this if icon_name.endswith("BigThumb"): # don't know a better way to handle this
thumb_big_indices.append(str(index)) thumb_big_indices.append(str(index))
s.write('\t"%s"' % icon_name) s.write('\t"{0}"'.format(icon_name))
if fname != svg_icons[-1]: if fname != svg_icons[-1]:
s.write(",") s.write(",")
@ -69,13 +69,13 @@ def make_editor_icons_action(target, source, env):
if thumb_medium_indices: if thumb_medium_indices:
s.write("\n\n") s.write("\n\n")
s.write("static const int editor_md_thumbs_count = %s;\n" % len(thumb_medium_indices)) s.write("static const int editor_md_thumbs_count = {};\n".format(len(thumb_medium_indices)))
s.write("static const int editor_md_thumbs_indices[] = {") s.write("static const int editor_md_thumbs_indices[] = {")
s.write(", ".join(thumb_medium_indices)) s.write(", ".join(thumb_medium_indices))
s.write("};\n") s.write("};\n")
if thumb_big_indices: if thumb_big_indices:
s.write("\n\n") s.write("\n\n")
s.write("static const int editor_bg_thumbs_count = %s;\n" % len(thumb_big_indices)) s.write("static const int editor_bg_thumbs_count = {};\n".format(len(thumb_big_indices)))
s.write("static const int editor_bg_thumbs_indices[] = {") s.write("static const int editor_bg_thumbs_indices[] = {")
s.write(", ".join(thumb_big_indices)) s.write(", ".join(thumb_big_indices))
s.write("};\n") s.write("};\n")

6
platform/osx/SCsub
View File

@ -7,10 +7,10 @@ def make_debug(target, source, env):
if (env["macports_clang"] != 'no'): if (env["macports_clang"] != 'no'):
mpprefix = os.environ.get("MACPORTS_PREFIX", "/opt/local") mpprefix = os.environ.get("MACPORTS_PREFIX", "/opt/local")
mpclangver = env["macports_clang"] mpclangver = env["macports_clang"]
os.system(mpprefix + '/libexec/llvm-' + mpclangver + '/bin/llvm-dsymutil %s -o %s.dSYM' % (target[0], target[0])) os.system(mpprefix + '/libexec/llvm-' + mpclangver + '/bin/llvm-dsymutil {0} -o {0}.dSYM'.format(target[0]))
else: else:
os.system('dsymutil %s -o %s.dSYM' % (target[0], target[0])) os.system('dsymutil {0} -o {0}.dSYM'.format(target[0]))
os.system('strip -u -r %s' % (target[0])) os.system('strip -u -r {0}'.format(target[0]))
files = [ files = [
'crash_handler_osx.mm', 'crash_handler_osx.mm',

6
platform/windows/SCsub
View File

@ -9,9 +9,9 @@ def make_debug_mingw(target, source, env):
mingw_prefix = env["mingw_prefix_32"] mingw_prefix = env["mingw_prefix_32"]
else: else:
mingw_prefix = env["mingw_prefix_64"] mingw_prefix = env["mingw_prefix_64"]
os.system(mingw_prefix + 'objcopy --only-keep-debug %s %s.debugsymbols' % (target[0], target[0])) os.system(mingw_prefix + 'objcopy --only-keep-debug {0} {0}.debugsymbols'.format(target[0]))
os.system(mingw_prefix + 'strip --strip-debug --strip-unneeded %s' % (target[0])) os.system(mingw_prefix + 'strip --strip-debug --strip-unneeded {0}'.format(target[0]))
os.system(mingw_prefix + 'objcopy --add-gnu-debuglink=%s.debugsymbols %s' % (target[0], target[0])) os.system(mingw_prefix + 'objcopy --add-gnu-debuglink={0}.debugsymbols {0}'.format(target[0]))
common_win = [ common_win = [
"context_gl_win.cpp", "context_gl_win.cpp",

6
platform/x11/SCsub
View File

@ -4,9 +4,9 @@ import os
Import('env') Import('env')
def make_debug(target, source, env): def make_debug(target, source, env):
os.system('objcopy --only-keep-debug %s %s.debugsymbols' % (target[0], target[0])) os.system('objcopy --only-keep-debug {0} {0}.debugsymbols'.format(target[0]))
os.system('strip --strip-debug --strip-unneeded %s' % (target[0])) os.system('strip --strip-debug --strip-unneeded {0}'.format(target[0]))
os.system('objcopy --add-gnu-debuglink=%s.debugsymbols %s' % (target[0], target[0])) os.system('objcopy --add-gnu-debuglink={0}.debugsymbols {0}'.format(target[0]))
common_x11 = [ common_x11 = [
"context_gl_x11.cpp", "context_gl_x11.cpp",