diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-08-29 11:35:48 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-29 11:35:48 +0200 |
| commit | 4af5c2a0093500b66a20c5da518884fe0a31f64c (patch) | |
| tree | 77538363418bd2995d6dead0f0c8c709ecac43e2 | |
| parent | b6c170165c09c24f0b3ae224e204ae62ac75c325 (diff) | |
| parent | 83b856c0465c40ecd9768508f31d3e337e1a64e1 (diff) | |
Merge pull request #21553 from bmwiedemann/sort
Sort list of input files
| -rw-r--r-- | SConstruct | 2 | ||||
| -rw-r--r-- | editor/SCsub | 3 | ||||
| -rw-r--r-- | methods.py | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/SConstruct b/SConstruct index 2cc486fd1b..3bbe97bfe7 100644 --- a/SConstruct +++ b/SConstruct @@ -23,7 +23,7 @@ platform_exporters = [] platform_apis = [] 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")): continue tmppath = "./" + x diff --git a/editor/SCsub b/editor/SCsub index 4fa287c33b..d9bdf42d6f 100644 --- a/editor/SCsub +++ b/editor/SCsub @@ -76,7 +76,8 @@ if env['tools']: # Fonts 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.CommandNoCache('#editor/builtin_fonts.gen.h', flist, run_in_subprocess(editor_builders.make_fonts_header)) diff --git a/methods.py b/methods.py index 7aa06f04b8..1bc10954ba 100644 --- a/methods.py +++ b/methods.py @@ -13,7 +13,7 @@ def add_source_files(self, sources, filetype, lib_env=None, shared=False): if isbasestring(filetype): dir_path = self.Dir('.').abspath - filetype = glob.glob(dir_path + "/" + filetype) + filetype = sorted(glob.glob(dir_path + "/" + filetype)) for path in filetype: sources.append(self.Object(path)) |