install.py (scons-4.2.0) | : | install.py (SCons-4.3.0) | ||
---|---|---|---|---|
skipping to change at line 452 | skipping to change at line 452 | |||
install_sandbox = GetOption('install_sandbox') | install_sandbox = GetOption('install_sandbox') | |||
if install_sandbox: | if install_sandbox: | |||
target_factory = DESTDIR_factory(env, install_sandbox) | target_factory = DESTDIR_factory(env, install_sandbox) | |||
else: | else: | |||
target_factory = env.fs | target_factory = env.fs | |||
BaseInstallBuilder = SCons.Builder.Builder( | BaseInstallBuilder = SCons.Builder.Builder( | |||
action = install_action, | action = install_action, | |||
target_factory = target_factory.Entry, | target_factory = target_factory.Entry, | |||
source_factory = env.fs.Entry, | source_factory = env.fs.Entry, | |||
multi = 1, | multi = True, | |||
emitter = [ add_targets_to_INSTALLED_FILES, ], | emitter = [ add_targets_to_INSTALLED_FILES, ], | |||
source_scanner = SCons.Scanner.Base( {}, name = 'I nstall', recursive = False ), | source_scanner = SCons.Scanner.ScannerBase({}, nam e='Install', recursive=False), | |||
name = 'InstallBuilder') | name = 'InstallBuilder') | |||
global BaseVersionedInstallBuilder | global BaseVersionedInstallBuilder | |||
if BaseVersionedInstallBuilder is None: | if BaseVersionedInstallBuilder is None: | |||
install_sandbox = GetOption('install_sandbox') | install_sandbox = GetOption('install_sandbox') | |||
if install_sandbox: | if install_sandbox: | |||
target_factory = DESTDIR_factory(env, install_sandbox) | target_factory = DESTDIR_factory(env, install_sandbox) | |||
else: | else: | |||
target_factory = env.fs | target_factory = env.fs | |||
BaseVersionedInstallBuilder = SCons.Builder.Builder( | BaseVersionedInstallBuilder = SCons.Builder.Builder( | |||
action = installVerLib_action, | action = installVerLib_action, | |||
target_factory = target_factory.Entry, | target_factory = target_factory.Entry, | |||
source_factory = env.fs.Entry, | source_factory = env.fs.Entry, | |||
multi = 1, | multi = True, | |||
emitter = [ add_versioned_targets_ to_INSTALLED_FILES, ], | emitter = [ add_versioned_targets_ to_INSTALLED_FILES, ], | |||
name = 'InstallVersionedBuilder ') | name = 'InstallVersionedBuilder ') | |||
env['BUILDERS']['_InternalInstall'] = InstallBuilderWrapper | env['BUILDERS']['_InternalInstall'] = InstallBuilderWrapper | |||
env['BUILDERS']['_InternalInstallAs'] = InstallAsBuilderWrapper | env['BUILDERS']['_InternalInstallAs'] = InstallAsBuilderWrapper | |||
env['BUILDERS']['_InternalInstallVersionedLib'] = InstallVersionedBuilderWra pper | env['BUILDERS']['_InternalInstallVersionedLib'] = InstallVersionedBuilderWra pper | |||
# We'd like to initialize this doing something like the following, | # We'd like to initialize this doing something like the following, | |||
# but there isn't yet support for a ${SOURCE.type} expansion that | # but there isn't yet support for a ${SOURCE.type} expansion that | |||
# will print "file" or "directory" depending on what's being | # will print "file" or "directory" depending on what's being | |||
End of changes. 3 change blocks. | ||||
3 lines changed or deleted | 3 lines changed or added |