mslib.py (SCons-4.3.0) | : | mslib.py (SCons-4.4.0) | ||
---|---|---|---|---|
skipping to change at line 44 | skipping to change at line 44 | |||
__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" | __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" | |||
import os | import os | |||
import SCons.Defaults | import SCons.Defaults | |||
import SCons.Tool | import SCons.Tool | |||
import SCons.Tool.msvs | import SCons.Tool.msvs | |||
import SCons.Tool.msvc | import SCons.Tool.msvc | |||
import SCons.Util | import SCons.Util | |||
from .MSCommon import msvc_exists, msvc_setup_env_once | from .MSCommon import msvc_setup_env_tool, msvc_setup_env_once | |||
tool_name = 'mslib' | ||||
def generate(env): | def generate(env): | |||
"""Add Builders and construction variables for lib to an Environment.""" | """Add Builders and construction variables for lib to an Environment.""" | |||
SCons.Tool.createStaticLibBuilder(env) | SCons.Tool.createStaticLibBuilder(env) | |||
# Set-up ms tools paths | # Set-up ms tools paths | |||
msvc_setup_env_once(env) | msvc_setup_env_once(env, tool=tool_name) | |||
env['AR'] = 'lib' | env['AR'] = 'lib' | |||
env['ARFLAGS'] = SCons.Util.CLVar('/nologo') | env['ARFLAGS'] = SCons.Util.CLVar('/nologo') | |||
env['ARCOM'] = "${TEMPFILE('$AR $ARFLAGS /OUT:$TARGET $SOURCES','$ARCO MSTR')}" | env['ARCOM'] = "${TEMPFILE('$AR $ARFLAGS /OUT:$TARGET $SOURCES','$ARCO MSTR')}" | |||
env['LIBPREFIX'] = '' | env['LIBPREFIX'] = '' | |||
env['LIBSUFFIX'] = '.lib' | env['LIBSUFFIX'] = '.lib' | |||
# Issue #3350 | # Issue #3350 | |||
# Change tempfile argument joining character from a space to a newline | # Change tempfile argument joining character from a space to a newline | |||
# mslink will fail if any single line is too long, but is fine with many lin es | # mslink will fail if any single line is too long, but is fine with many lin es | |||
# in a tempfile | # in a tempfile | |||
env['TEMPFILEARGJOIN'] = os.linesep | env['TEMPFILEARGJOIN'] = os.linesep | |||
def exists(env): | def exists(env): | |||
return msvc_exists(env) | return msvc_setup_env_tool(env, tool=tool_name) | |||
# Local Variables: | # Local Variables: | |||
# tab-width:4 | # tab-width:4 | |||
# indent-tabs-mode:nil | # indent-tabs-mode:nil | |||
# End: | # End: | |||
# vim: set expandtab tabstop=4 shiftwidth=4: | # vim: set expandtab tabstop=4 shiftwidth=4: | |||
End of changes. 3 change blocks. | ||||
3 lines changed or deleted | 5 lines changed or added |