Unverified Commit 4af5c2a0 by Rémi Verschelde Committed by GitHub

Merge pull request #21553 from bmwiedemann/sort

Sort list of input files
parents b6c17016 83b856c0
...@@ -23,7 +23,7 @@ platform_exporters = [] ...@@ -23,7 +23,7 @@ platform_exporters = []
platform_apis = [] platform_apis = []
global_defaults = [] global_defaults = []
for x in glob.glob("platform/*"): for x in sorted(glob.glob("platform/*")):
if (not os.path.isdir(x) or not os.path.exists(x + "/detect.py")): if (not os.path.isdir(x) or not os.path.exists(x + "/detect.py")):
continue continue
tmppath = "./" + x tmppath = "./" + x
......
...@@ -76,7 +76,8 @@ if env['tools']: ...@@ -76,7 +76,8 @@ if env['tools']:
# Fonts # Fonts
flist = glob.glob(path + "/../thirdparty/fonts/*.ttf") flist = glob.glob(path + "/../thirdparty/fonts/*.ttf")
flist.append(glob.glob(path + "/../thirdparty/fonts/*.otf")) flist.extend(glob.glob(path + "/../thirdparty/fonts/*.otf"))
flist.sort()
env.Depends('#editor/builtin_fonts.gen.h', flist) env.Depends('#editor/builtin_fonts.gen.h', flist)
env.CommandNoCache('#editor/builtin_fonts.gen.h', flist, run_in_subprocess(editor_builders.make_fonts_header)) env.CommandNoCache('#editor/builtin_fonts.gen.h', flist, run_in_subprocess(editor_builders.make_fonts_header))
......
...@@ -13,7 +13,7 @@ def add_source_files(self, sources, filetype, lib_env=None, shared=False): ...@@ -13,7 +13,7 @@ def add_source_files(self, sources, filetype, lib_env=None, shared=False):
if isbasestring(filetype): if isbasestring(filetype):
dir_path = self.Dir('.').abspath dir_path = self.Dir('.').abspath
filetype = glob.glob(dir_path + "/" + filetype) filetype = sorted(glob.glob(dir_path + "/" + filetype))
for path in filetype: for path in filetype:
sources.append(self.Object(path)) sources.append(self.Object(path))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment