Prog.py (scons-4.2.0) | : | Prog.py (SCons-4.3.0) | ||
---|---|---|---|---|
skipping to change at line 28 | skipping to change at line 28 | |||
# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND | # WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND | |||
# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE | # NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE | |||
# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION | # LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION | |||
# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION | # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION | |||
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | |||
"""Dependency scanner for program files.""" | """Dependency scanner for program files.""" | |||
import SCons.Node | import SCons.Node | |||
import SCons.Node.FS | import SCons.Node.FS | |||
import SCons.Scanner | ||||
import SCons.Util | import SCons.Util | |||
from . import ScannerBase, FindPathDirs | ||||
# global, set by --debug=findlibs | # global, set by --debug=findlibs | |||
print_find_libs = None | print_find_libs = None | |||
def ProgramScanner(**kw): | def ProgramScanner(**kwargs): | |||
"""Return a prototype Scanner instance for scanning executable | """Return a prototype Scanner instance for scanning executable | |||
files for static-lib dependencies""" | files for static-lib dependencies""" | |||
kw['path_function'] = SCons.Scanner.FindPathDirs('LIBPATH') | kwargs['path_function'] = FindPathDirs('LIBPATH') | |||
ps = SCons.Scanner.Base(scan, "ProgramScanner", **kw) | ps = ScannerBase(scan, "ProgramScanner", **kwargs) | |||
return ps | return ps | |||
def _subst_libs(env, libs): | def _subst_libs(env, libs): | |||
"""Substitute environment variables and split into list.""" | """Substitute environment variables and split into list.""" | |||
if SCons.Util.is_String(libs): | if SCons.Util.is_String(libs): | |||
libs = env.subst(libs) | libs = env.subst(libs) | |||
if SCons.Util.is_String(libs): | if SCons.Util.is_String(libs): | |||
libs = libs.split() | libs = libs.split() | |||
elif SCons.Util.is_Sequence(libs): | elif SCons.Util.is_Sequence(libs): | |||
_libs = [] | _libs = [] | |||
End of changes. 4 change blocks. | ||||
4 lines changed or deleted | 4 lines changed or added |