godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #39125 from Xrayez/py-modules-order-4.0 

SCons: use `OrderedDict` to ensure insertion order of modules
This commit is contained in:
Rémi Verschelde 2020-05-28 20:55:56 +02:00 committed by GitHub
parent 4eef88b2c1 17938fd547
commit 105bef19ff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
SConstruct
View File

@ -8,6 +8,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
@ -181,7 +182,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"):
@ -523,11 +524,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)

3
methods.py
View File

@ -2,6 +2,7 @@ import os
import re import re
import glob import glob
import subprocess import subprocess
from collections import OrderedDict
def add_source_files(self, sources, files, warn_duplicates=True): def add_source_files(self, sources, files, warn_duplicates=True):
@ -138,7 +139,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)