SCons: use OrderedDict
to ensure insertion order of modules
The insertion order for dictionaries is only a language feature for Python 3.6/3.7+ implementations, and not prior to that. This ensures that the engine won't be rebuilt if the order of detected modules changes in any way, as the `OrderedDict` should guarantee inerstion order.
This commit is contained in:
parent
757d8b5672
commit
0138ba59ac
2 changed files with 6 additions and 4 deletions
|
@ -7,6 +7,7 @@ import glob
|
||||||
import os
|
import os
|
||||||
import pickle
|
import pickle
|
||||||
import sys
|
import sys
|
||||||
|
from collections import OrderedDict
|
||||||
|
|
||||||
# Local
|
# Local
|
||||||
import methods
|
import methods
|
||||||
|
@ -177,7 +178,7 @@ for k in platform_opts.keys():
|
||||||
opts.Add(o)
|
opts.Add(o)
|
||||||
|
|
||||||
# Detect modules.
|
# Detect modules.
|
||||||
modules_detected = {}
|
modules_detected = OrderedDict()
|
||||||
module_search_paths = ["modules"] # Built-in path.
|
module_search_paths = ["modules"] # Built-in path.
|
||||||
|
|
||||||
if ARGUMENTS.get("custom_modules"):
|
if ARGUMENTS.get("custom_modules"):
|
||||||
|
@ -450,11 +451,11 @@ if selected_platform in platform_list:
|
||||||
sys.path.remove(tmppath)
|
sys.path.remove(tmppath)
|
||||||
sys.modules.pop('detect')
|
sys.modules.pop('detect')
|
||||||
|
|
||||||
modules_enabled = {}
|
modules_enabled = OrderedDict()
|
||||||
env.module_icons_paths = []
|
env.module_icons_paths = []
|
||||||
env.doc_class_path = {}
|
env.doc_class_path = {}
|
||||||
|
|
||||||
for name, path in sorted(modules_detected.items()):
|
for name, path in modules_detected.items():
|
||||||
if not env["module_" + name + "_enabled"]:
|
if not env["module_" + name + "_enabled"]:
|
||||||
continue
|
continue
|
||||||
sys.path.insert(0, path)
|
sys.path.insert(0, path)
|
||||||
|
|
|
@ -2,6 +2,7 @@ import os
|
||||||
import re
|
import re
|
||||||
import glob
|
import glob
|
||||||
import subprocess
|
import subprocess
|
||||||
|
from collections import OrderedDict
|
||||||
from compat import iteritems, isbasestring, decode_utf8
|
from compat import iteritems, isbasestring, decode_utf8
|
||||||
|
|
||||||
|
|
||||||
|
@ -131,7 +132,7 @@ def parse_cg_file(fname, uniforms, sizes, conditionals):
|
||||||
|
|
||||||
|
|
||||||
def detect_modules(at_path):
|
def detect_modules(at_path):
|
||||||
module_list = {} # name : path
|
module_list = OrderedDict() # name : path
|
||||||
|
|
||||||
modules_glob = os.path.join(at_path, "*")
|
modules_glob = os.path.join(at_path, "*")
|
||||||
files = glob.glob(modules_glob)
|
files = glob.glob(modules_glob)
|
||||||
|
|
Loading…
Reference in a new issue