diff options
Diffstat (limited to 'src/engine/SCons/Environment.py')
| -rw-r--r-- | src/engine/SCons/Environment.py | 53 |
1 files changed, 6 insertions, 47 deletions
diff --git a/src/engine/SCons/Environment.py b/src/engine/SCons/Environment.py index e3d29eb..f317556 100644 --- a/src/engine/SCons/Environment.py +++ b/src/engine/SCons/Environment.py @@ -141,34 +141,6 @@ class BuilderDict(UserDict): for i, v in dict.items(): self.__setitem__(i, v) -_rm = re.compile(r'\$[()]') - -class _lister: - """This class is used to implement dummy targets and sources - for signature calculation.""" - def __init__(self, fmt): - self.fmt = fmt - def _format(self, index): - # For some reason, I originally made the fake names of - # the targets and sources 1-based (['__t1__, '__t2__']), - # not 0-based. We preserve this behavior by adding one - # to the returned item names, so everyone's targets - # won't get recompiled if they were using an old - # version. - return self.fmt % (index + 1) - def __getitem__(self, index): - return SCons.Util.PathList([self._format(index)])[0] - def __getslice__(self, i, j): - slice = [] - for x in range(i, j): - slice.append(self._format(x)) - return SCons.Util.PathList(slice) - def __getattr__(self, name): - # If we don't find an attribute in this class, let's - # look in PathList. self[0:2] returns a PathList instance - # via __getslice__ - return getattr(self[0:2], name) - class Environment: """Base class for construction Environments. These are the primary objects used to communicate dependency and @@ -442,20 +414,20 @@ class Environment: trailing characters. """ if raw: - regex_remove = None + mode = SCons.Util.SUBST_RAW else: - regex_remove = _rm - return SCons.Util.scons_subst(string, self, regex_remove, + mode = SCons.Util.SUBST_CMD + return SCons.Util.scons_subst(string, self, mode, target, source) def subst_list(self, string, raw=0, target=None, source=None): """Calls through to SCons.Util.scons_subst_list(). See the documentation for that function.""" if raw: - regex_remove = None + mode = SCons.Util.SUBST_RAW else: - regex_remove = _rm - return SCons.Util.scons_subst_list(string, self, regex_remove, + mode = SCons.Util.SUBST_CMD + return SCons.Util.scons_subst_list(string, self, mode, target, source) def get_scanner(self, skey): @@ -571,16 +543,3 @@ class Environment: if name[-len(old_suffix):] == old_suffix: name = name[:-len(old_suffix)] return os.path.join(dir, new_prefix+name+new_suffix) - - def sig_dict(self): - """Supply a dictionary for use in computing signatures. - - This fills in static TARGET, TARGETS, SOURCE and SOURCES - variables so that signatures stay the same every time. - """ - dict = self._dict.copy() - dict['TARGETS'] = _lister('__t%d__') - dict['TARGET'] = dict['TARGETS'][0] - dict['SOURCES'] = _lister('__s%d__') - dict['SOURCE'] = dict['SOURCES'][0] - return dict |