diff options
| author | William Deegan <bill@baddogconsulting.com> | 2020-12-08 21:18:04 (GMT) |
|---|---|---|
| committer | William Deegan <bill@baddogconsulting.com> | 2020-12-08 21:18:04 (GMT) |
| commit | 2b583646718acda52481b71f15c9a6723fb3eb81 (patch) | |
| tree | efee431d6df736c19694039fabd1d0395dbddb75 | |
| parent | f11bf4212220db1ae95cee7a1171085ac8c46777 (diff) | |
| download | SCons-2b583646718acda52481b71f15c9a6723fb3eb81.zip SCons-2b583646718acda52481b71f15c9a6723fb3eb81.tar.gz SCons-2b583646718acda52481b71f15c9a6723fb3eb81.tar.bz2 | |
docstrings and minor code cleanup
| -rw-r--r-- | SCons/Builder.py | 1 | ||||
| -rw-r--r-- | SCons/Defaults.py | 10 | ||||
| -rw-r--r-- | SCons/Environment.py | 2 | ||||
| -rw-r--r-- | SCons/Tool/cyglink.py | 1 |
4 files changed, 12 insertions, 2 deletions
diff --git a/SCons/Builder.py b/SCons/Builder.py index d54ef24..5f51078 100644 --- a/SCons/Builder.py +++ b/SCons/Builder.py @@ -504,6 +504,7 @@ class BuilderBase: splitext = lambda S: self.splitext(S,env) tlist = [ t_from_s(pre, suf, splitext) ] else: + orig_target = target target = self._adjustixes(target, pre, suf, self.ensure_suffix) tlist = env.arg2nodes(target, target_factory, target=target, source=source) diff --git a/SCons/Defaults.py b/SCons/Defaults.py index c23d564..143342e 100644 --- a/SCons/Defaults.py +++ b/SCons/Defaults.py @@ -545,8 +545,14 @@ class Variable_Method_Caller: frame = frame.f_back return None -# if $version_var is not empty, returns env[flags_var], otherwise returns None def __libversionflags(env, version_var, flags_var): + """ + if $version_var is not empty, returns env[flags_var], otherwise returns None + :param env: + :param version_var: + :param flags_var: + :return: + """ try: if env.subst('$'+version_var): return env[flags_var] @@ -554,6 +560,8 @@ def __libversionflags(env, version_var, flags_var): pass return None + + ConstructionEnvironment = { 'BUILDERS' : {}, 'SCANNERS' : [ SCons.Tool.SourceFileScanner ], diff --git a/SCons/Environment.py b/SCons/Environment.py index bb57e37..13eaf3c 100644 --- a/SCons/Environment.py +++ b/SCons/Environment.py @@ -1606,7 +1606,7 @@ class Base(SubstitutionEnvironment): prefix = self.subst('$'+prefix) for path in paths: - dir,name = os.path.split(str(path)) + name = os.path.basename(str(path)) if name[:len(prefix)] == prefix and name[-len(suffix):] == suffix: return path diff --git a/SCons/Tool/cyglink.py b/SCons/Tool/cyglink.py index 363a602..595cc2e 100644 --- a/SCons/Tool/cyglink.py +++ b/SCons/Tool/cyglink.py @@ -120,6 +120,7 @@ def _lib_emitter(target, source, env, **kw): implib_target.attributes.shared = 1 target.append(implib_target) + # Only create the symlinks if there is actually an import library symlinks = ImpLibSymlinkGenerator(env, implib_target, implib_libtype=libtype, generator_libtype=libtype + 'ImpLib') |