Allow order in which SConscript files are read to be set. #20
Conversation
| if b.startswith(item): | ||
| bi = i | ||
| return cmp(ai, bi) | ||
| scripts.sort(cmp=cmpOrder) |
There was a problem hiding this comment.
Future deprecation warning: cmp is not allowed in Python 3 sort. Use key instead.
There was a problem hiding this comment.
Does key take a function in Python 3? This implementation won't work at all unless that's the case.
There was a problem hiding this comment.
There was a problem hiding this comment.
Oh, I'm an idiot. I knew how key worked - I just thought we needed it to work like cmp to implement this sorting, which is what I meant to ask. Obviously that's not the case. Fixed to use key.
TallJimbo
force-pushed
the
tickets/DM-7179
branch
from
7a5c657
to
ba4f778
Compare
| @@ -102,15 +109,26 @@ def initialize(cls, packageName, versionString=None, eupsProduct=None, eupsProdu | |||
| except TypeError: | |||
| pass | |||
| state.targets["version"] = state.env.VersionModule(versionModuleName) | |||
| scripts = [] | |||
| for root, dirs, files in os.walk("."): | |||
| if "SConstruct" in files and root != ".": | |||
| dirs[:] = [] | |||
| continue | |||
| dirs[:] = [d for d in dirs if not d.startswith('.')] | |||
| dirs.sort() # happy coincidence that include < libs < python < tests | |||
There was a problem hiding this comment.
Is this happy coincidence still relevant?
There was a problem hiding this comment.
Good catch; I'd meant to remove that whole line (and I will now). It should not be relevant.
TallJimbo
force-pushed
the
tickets/DM-7179
branch
from
97bad48
to
1780e04
Compare
TallJimbo
force-pushed
the
tickets/DM-7179
branch
from
1780e04
to
9b20f32
Compare
No description provided.