Selaa lähdekoodia

Merge pull request #21553 from bmwiedemann/sort

Sort list of input files
Rémi Verschelde 7 vuotta sitten
vanhempi
commit
4af5c2a009
3 muutettua tiedostoa jossa 4 lisäystä ja 3 poistoa
  1. 1 1
      SConstruct
  2. 2 1
      editor/SCsub
  3. 1 1
      methods.py

+ 1 - 1
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

+ 2 - 1
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))
 

+ 1 - 1
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))