diff --git a/scons/scons-configure-cache.py b/scons/scons-configure-cache.py index faf32ede2..e5c5bf294 100644 --- a/scons/scons-configure-cache.py +++ b/scons/scons-configure-cache.py @@ -32,15 +32,15 @@ The files are split into directories named by the first few digits of the signature. The prefix length used for directory names can be changed by this script. """ -__revision__ = "scripts/scons-configure-cache.py 265be6883fadbb5a545612265acc919595158366 Sun, 17 Mar 2024 17:33:54 -0700 bdbaddog" +__revision__ = "scripts/scons-configure-cache.py 7c688f694c644b61342670ce92977bf4a396c0d4 Sun, 07 Jul 2024 16:52:07 -0700 bdbaddog" -__version__ = "4.7.0" +__version__ = "4.8.0" -__build__ = "265be6883fadbb5a545612265acc919595158366" +__build__ = "7c688f694c644b61342670ce92977bf4a396c0d4" __buildsys__ = "M1Dog2021" -__date__ = "Sun, 17 Mar 2024 17:33:54 -0700" +__date__ = "Sun, 07 Jul 2024 16:52:07 -0700" __developer__ = "bdbaddog" @@ -51,7 +51,7 @@ import sys # python compatibility check if sys.version_info < (3, 6, 0): msg = "scons: *** SCons version %s does not run under Python version %s.\n\ -Python >= 3.5 is required.\n" +Python >= 3.6.0 is required.\n" sys.stderr.write(msg % (__version__, sys.version.split()[0])) sys.exit(1) diff --git a/scons/scons-local-4.7.0/SCons/Variables/EnumVariable.py b/scons/scons-local-4.7.0/SCons/Variables/EnumVariable.py deleted file mode 100644 index 1a4f3fbde..000000000 --- a/scons/scons-local-4.7.0/SCons/Variables/EnumVariable.py +++ /dev/null @@ -1,110 +0,0 @@ -# MIT License -# -# Copyright The SCons Foundation -# -# Permission is hereby granted, free of charge, to any person obtaining -# a copy of this software and associated documentation files (the -# "Software"), to deal in the Software without restriction, including -# without limitation the rights to use, copy, modify, merge, publish, -# distribute, sublicense, and/or sell copies of the Software, and to -# permit persons to whom the Software is furnished to do so, subject to -# the following conditions: -# -# The above copyright notice and this permission notice shall be included -# in all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY -# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE -# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -"""Variable type for enumeration Variables. - -Enumeration variables allow selection of one from a specified set of values. - -Usage example:: - - opts = Variables() - opts.Add( - EnumVariable( - 'debug', - help='debug output and symbols', - default='no', - allowed_values=('yes', 'no', 'full'), - map={}, - ignorecase=2, - ) - ) - ... - if env['debug'] == 'full': - ... -""" - -from typing import Tuple, Callable - -import SCons.Errors - -__all__ = ['EnumVariable',] - - -def _validator(key, val, env, vals) -> None: - if val not in vals: - raise SCons.Errors.UserError( - 'Invalid value for option %s: %s. Valid values are: %s' % (key, val, vals)) - - -def EnumVariable(key, help, default, allowed_values, map={}, ignorecase: int=0) -> Tuple[str, str, str, Callable, Callable]: - """Return a tuple describing an enumaration SCons Variable. - - The input parameters describe an option with only certain values - allowed. Returns A tuple including an appropriate converter and - validator. The result is usable as input to :meth:`Add`. - - *key* and *default* are passed directly on to :meth:`Add`. - - *help* is the descriptive part of the help text, - and will have the allowed values automatically appended. - - *allowed_values* is a list of strings, which are the allowed values - for this option. - - The *map*-dictionary may be used for converting the input value - into canonical values (e.g. for aliases). - - The value of *ignorecase* defines the behaviour of the validator: - - * 0: the validator/converter are case-sensitive. - * 1: the validator/converter are case-insensitive. - * 2: the validator/converter is case-insensitive and the - converted value will always be lower-case. - - The *validator* tests whether the value is in the list of allowed values. - The *converter* converts input values according to the given - *map*-dictionary (unmapped input values are returned unchanged). - """ - - help = '%s (%s)' % (help, '|'.join(allowed_values)) - # define validator - if ignorecase: - validator = lambda key, val, env: \ - _validator(key, val.lower(), env, allowed_values) - else: - validator = lambda key, val, env: \ - _validator(key, val, env, allowed_values) - # define converter - if ignorecase == 2: - converter = lambda val: map.get(val.lower(), val).lower() - elif ignorecase == 1: - converter = lambda val: map.get(val.lower(), val) - else: - converter = lambda val: map.get(val, val) - return (key, help, default, validator, converter) - -# Local Variables: -# tab-width:4 -# indent-tabs-mode:nil -# End: -# vim: set expandtab tabstop=4 shiftwidth=4: diff --git a/scons/scons-local-4.7.0/SCons/Variables/ListVariable.py b/scons/scons-local-4.7.0/SCons/Variables/ListVariable.py deleted file mode 100644 index a0640e634..000000000 --- a/scons/scons-local-4.7.0/SCons/Variables/ListVariable.py +++ /dev/null @@ -1,152 +0,0 @@ -# MIT License -# -# Copyright The SCons Foundation -# -# Permission is hereby granted, free of charge, to any person obtaining -# a copy of this software and associated documentation files (the -# "Software"), to deal in the Software without restriction, including -# without limitation the rights to use, copy, modify, merge, publish, -# distribute, sublicense, and/or sell copies of the Software, and to -# permit persons to whom the Software is furnished to do so, subject to -# the following conditions: -# -# The above copyright notice and this permission notice shall be included -# in all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY -# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE -# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -"""Variable type for list Variables. - -A 'list' option may either be 'all', 'none' or a list of names -separated by comma. After the option has been processed, the option -value holds either the named list elements, all list elements or no -list elements at all. - -Usage example:: - - list_of_libs = Split('x11 gl qt ical') - - opts = Variables() - opts.Add( - ListVariable( - 'shared', - help='libraries to build as shared libraries', - default='all', - elems=list_of_libs, - ) - ) - ... - for lib in list_of_libs: - if lib in env['shared']: - env.SharedObject(...) - else: - env.Object(...) -""" - -# Known Bug: This should behave like a Set-Type, but does not really, -# since elements can occur twice. - -import collections -from typing import Tuple, Callable - -import SCons.Util - -__all__ = ['ListVariable',] - - -class _ListVariable(collections.UserList): - def __init__(self, initlist=None, allowedElems=None) -> None: - if initlist is None: - initlist = [] - if allowedElems is None: - allowedElems = [] - super().__init__([_f for _f in initlist if _f]) - self.allowedElems = sorted(allowedElems) - - def __cmp__(self, other): - return NotImplemented - - def __eq__(self, other): - return NotImplemented - - def __ge__(self, other): - return NotImplemented - - def __gt__(self, other): - return NotImplemented - - def __le__(self, other): - return NotImplemented - - def __lt__(self, other): - return NotImplemented - - def __str__(self) -> str: - if not len(self): - return 'none' - self.data.sort() - if self.data == self.allowedElems: - return 'all' - else: - return ','.join(self) - - def prepare_to_store(self): - return self.__str__() - -def _converter(val, allowedElems, mapdict) -> _ListVariable: - """ """ - if val == 'none': - val = [] - elif val == 'all': - val = allowedElems - else: - val = [_f for _f in val.split(',') if _f] - val = [mapdict.get(v, v) for v in val] - notAllowed = [v for v in val if v not in allowedElems] - if notAllowed: - raise ValueError( - "Invalid value(s) for option: %s" % ','.join(notAllowed) - ) - return _ListVariable(val, allowedElems) - - -# def _validator(key, val, env) -> None: -# """ """ -# # TODO: write validator for pgk list -# pass - - -def ListVariable(key, help, default, names, map={}) -> Tuple[str, str, str, None, Callable]: - """Return a tuple describing a list SCons Variable. - - The input parameters describe a 'list' option. Returns - a tuple including the correct converter and validator. - The result is usable for input to :meth:`Add`. - - *help* will have text appended indicating the legal values - (not including any extra names from *map*). - - *map* can be used to map alternative names to the ones in *names* - - that is, a form of alias. - - A 'list' option may either be 'all', 'none' or a list of - names (separated by commas). - """ - names_str = 'allowed names: %s' % ' '.join(names) - if SCons.Util.is_List(default): - default = ','.join(default) - help = '\n '.join( - (help, '(all|none|comma-separated list of names)', names_str)) - return (key, help, default, None, lambda val: _converter(val, names, map)) - -# Local Variables: -# tab-width:4 -# indent-tabs-mode:nil -# End: -# vim: set expandtab tabstop=4 shiftwidth=4: diff --git a/scons/scons-local-4.7.0/SCons/Variables/__init__.py b/scons/scons-local-4.7.0/SCons/Variables/__init__.py deleted file mode 100644 index fe1b4982f..000000000 --- a/scons/scons-local-4.7.0/SCons/Variables/__init__.py +++ /dev/null @@ -1,336 +0,0 @@ -# MIT License -# -# Copyright The SCons Foundation -# -# Permission is hereby granted, free of charge, to any person obtaining -# a copy of this software and associated documentation files (the -# "Software"), to deal in the Software without restriction, including -# without limitation the rights to use, copy, modify, merge, publish, -# distribute, sublicense, and/or sell copies of the Software, and to -# permit persons to whom the Software is furnished to do so, subject to -# the following conditions: -# -# The above copyright notice and this permission notice shall be included -# in all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY -# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE -# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -"""Adds user-friendly customizable variables to an SCons build. """ - -import os.path -import sys -from functools import cmp_to_key - -import SCons.Environment -import SCons.Errors -import SCons.Util -import SCons.Warnings - -from .BoolVariable import BoolVariable # okay -from .EnumVariable import EnumVariable # okay -from .ListVariable import ListVariable # naja -from .PackageVariable import PackageVariable # naja -from .PathVariable import PathVariable # okay - - -class Variables: - """ - Holds all the options, updates the environment with the variables, - and renders the help text. - - If *is_global* is true, this is a singleton, create only once. - - Args: - files (optional): List of option configuration files to load - (backward compatibility). If a single string is passed it is - automatically placed in a file list (Default value = None) - args (optional): dictionary to override values set from *files*. - (Default value = None) - is_global (optional): global instance? (Default value = True) - - """ - instance = None - - def __init__(self, files=None, args=None, is_global: bool=True) -> None: - if args is None: - args = {} - self.options = [] - self.args = args - if not SCons.Util.is_List(files): - if files: - files = [files,] - else: - files = [] - self.files = files - self.unknown = {} - - # create the singleton instance - if is_global: - self = Variables.instance - if not Variables.instance: - Variables.instance=self - - def _do_add(self, key, help: str="", default=None, validator=None, converter=None, **kwargs) -> None: - - class Variable: - pass - - option = Variable() - - # If we get a list or a tuple, we take the first element as the - # option key and store the remaining in aliases. - if SCons.Util.is_List(key) or SCons.Util.is_Tuple(key): - option.key = key[0] - option.aliases = list(key[1:]) - else: - option.key = key - # TODO: normalize to not include key in aliases. Currently breaks tests. - option.aliases = [key,] - if not SCons.Environment.is_valid_construction_var(option.key): - raise SCons.Errors.UserError("Illegal Variables key `%s'" % str(option.key)) - option.help = help - option.default = default - option.validator = validator - option.converter = converter - - self.options.append(option) - - # options might be added after the 'unknown' dict has been set up, - # so we remove the key and all its aliases from that dict - for alias in option.aliases + [option.key,]: - if alias in self.unknown: - del self.unknown[alias] - - def keys(self) -> list: - """Returns the keywords for the options.""" - return [o.key for o in self.options] - - def Add(self, key, *args, **kwargs) -> None: - r""" Adds an option. - - Arguments: - key: the name of the variable, or a 5-tuple (or list). - If a tuple, and there are no additional arguments, - the tuple is unpacked into the four named kwargs from below. - If a tuple and there are additional arguments, the first word - of the tuple is taken as the key, and the remainder as aliases. - *args: optional positional arguments, corresponding to the four - named kwargs below. - - Keyword Args: - help: help text for the options (Default value = "") - default: default value for option (Default value = None) - validator: function called to validate the option's value - (Default value = None) - converter: function to be called to convert the option's - value before putting it in the environment. (Default value = None) - **kwargs: arbitrary keyword arguments used by the variable itself. - - """ - if SCons.Util.is_List(key) or SCons.Util.is_Tuple(key): - if not (len(args) or len(kwargs)): - return self._do_add(*key) - - return self._do_add(key, *args, **kwargs) - - def AddVariables(self, *optlist) -> None: - """ Adds a list of options. - - Each list element is a tuple/list of arguments to be passed on - to the underlying method for adding options. - - Example:: - - opt.AddVariables( - ('debug', '', 0), - ('CC', 'The C compiler'), - ('VALIDATE', 'An option for testing validation', 'notset', validator, None), - ) - - """ - - for o in optlist: - self._do_add(*o) - - def Update(self, env, args=None) -> None: - """ Updates an environment with the option variables. - - Args: - env: the environment to update. - args (optional): a dictionary of keys and values to update - in *env*. If omitted, uses the variables from the commandline. - """ - - values = {} - - # first set the defaults: - for option in self.options: - if option.default is not None: - values[option.key] = option.default - - # next set the value specified in the options file - for filename in self.files: - if os.path.exists(filename): - dir = os.path.split(os.path.abspath(filename))[0] - if dir: - sys.path.insert(0, dir) - try: - values['__name__'] = filename - with open(filename) as f: - contents = f.read() - exec(contents, {}, values) - finally: - if dir: - del sys.path[0] - del values['__name__'] - - # set the values specified on the command line - if args is None: - args = self.args - - for arg, value in args.items(): - added = False - for option in self.options: - if arg in option.aliases + [option.key,]: - values[option.key] = value - added = True - if not added: - self.unknown[arg] = value - - # put the variables in the environment: - # (don't copy over variables that are not declared as options) - for option in self.options: - try: - env[option.key] = values[option.key] - except KeyError: - pass - - # apply converters - for option in self.options: - if option.converter and option.key in values: - value = env.subst('${%s}'%option.key) - try: - try: - env[option.key] = option.converter(value) - except TypeError: - env[option.key] = option.converter(value, env) - except ValueError as x: - raise SCons.Errors.UserError('Error converting option: %s\n%s'%(option.key, x)) - - - # apply validators - for option in self.options: - if option.validator and option.key in values: - option.validator(option.key, env.subst('${%s}'%option.key), env) - - def UnknownVariables(self) -> dict: - """ Returns unknown variables. - - Identifies options that were not known, declared options in this object. - """ - return self.unknown - - def Save(self, filename, env) -> None: - """ Save the options to a file. - - Saves all the options which have non-default settings - to the given file as Python expressions. This file can - then be used to load the options for a subsequent run. - This can be used to create an option cache file. - - Args: - filename: Name of the file to save into - env: the environment get the option values from - """ - - # Create the file and write out the header - try: - with open(filename, 'w') as fh: - # Make an assignment in the file for each option - # within the environment that was assigned a value - # other than the default. We don't want to save the - # ones set to default: in case the SConscript settings - # change you would then pick up old defaults. - for option in self.options: - try: - value = env[option.key] - try: - prepare = value.prepare_to_store - except AttributeError: - try: - eval(repr(value)) - except KeyboardInterrupt: - raise - except: - # Convert stuff that has a repr() that - # cannot be evaluated into a string - value = SCons.Util.to_String(value) - else: - value = prepare() - - defaultVal = env.subst(SCons.Util.to_String(option.default)) - if option.converter: - try: - defaultVal = option.converter(defaultVal) - except TypeError: - defaultVal = option.converter(defaultVal, env) - - if str(env.subst('${%s}' % option.key)) != str(defaultVal): - fh.write('%s = %s\n' % (option.key, repr(value))) - except KeyError: - pass - except OSError as x: - raise SCons.Errors.UserError('Error writing options to file: %s\n%s' % (filename, x)) - - def GenerateHelpText(self, env, sort=None) -> str: - """ Generates the help text for the options. - - Args: - env: an environment that is used to get the current values - of the options. - sort: Either a comparison function used for sorting - (must take two arguments and return -1, 0 or 1) - or a boolean to indicate if it should be sorted. - """ - - if callable(sort): - options = sorted(self.options, key=cmp_to_key(lambda x, y: sort(x.key, y.key))) - elif sort is True: - options = sorted(self.options, key=lambda x: x.key) - else: - options = self.options - - def format_opt(opt, self=self, env=env) -> str: - if opt.key in env: - actual = env.subst('${%s}' % opt.key) - else: - actual = None - return self.FormatVariableHelpText(env, opt.key, opt.help, opt.default, actual, opt.aliases) - - lines = [_f for _f in map(format_opt, options) if _f] - return ''.join(lines) - - fmt = '\n%s: %s\n default: %s\n actual: %s\n' - aliasfmt = '\n%s: %s\n default: %s\n actual: %s\n aliases: %s\n' - - def FormatVariableHelpText(self, env, key, help, default, actual, aliases=None) -> str: - if aliases is None: - aliases = [] - # Don't display the key name itself as an alias. - aliases = [a for a in aliases if a != key] - if aliases: - return self.aliasfmt % (key, help, default, actual, aliases) - else: - return self.fmt % (key, help, default, actual) - -# Local Variables: -# tab-width:4 -# indent-tabs-mode:nil -# End: -# vim: set expandtab tabstop=4 shiftwidth=4: diff --git a/scons/scons-local-4.7.0/SCons/Action.py b/scons/scons-local-4.8.0/SCons/Action.py similarity index 98% rename from scons/scons-local-4.7.0/SCons/Action.py rename to scons/scons-local-4.8.0/SCons/Action.py index afa1d91dd..567f66cef 100644 --- a/scons/scons-local-4.7.0/SCons/Action.py +++ b/scons/scons-local-4.8.0/SCons/Action.py @@ -892,10 +892,10 @@ def scons_subproc_run(scons_env, *args, **kwargs) -> subprocess.CompletedProcess kwargs['check'] = check # TODO: Python version-compat stuff: remap/remove too-new args if needed - if 'text' in kwargs and sys.version_info[:3] < (3, 7): + if 'text' in kwargs and sys.version_info < (3, 7): kwargs['universal_newlines'] = kwargs.pop('text') - if 'capture_output' in kwargs and sys.version_info[:3] < (3, 7): + if 'capture_output' in kwargs and sys.version_info < (3, 7): capture_output = kwargs.pop('capture_output') if capture_output: kwargs['stdout'] = kwargs['stderr'] = PIPE @@ -1454,16 +1454,6 @@ class FunctionAction(_ActionAction): except TypeError: result.command=self.strfunction(target, source, env) - # FIXME: This maintains backward compatibility with respect to - # which type of exceptions were returned by raising an - # exception and which ones were returned by value. It would - # probably be best to always return them by value here, but - # some codes do not check the return value of Actions and I do - # not have the time to modify them at this point. - if (exc_info[1] and - not isinstance(exc_info[1], EnvironmentError)): - raise result - return result finally: # Break the cycle between the traceback object and this diff --git a/scons/scons-local-4.7.0/SCons/Builder.py b/scons/scons-local-4.8.0/SCons/Builder.py similarity index 99% rename from scons/scons-local-4.7.0/SCons/Builder.py rename to scons/scons-local-4.8.0/SCons/Builder.py index 75cebc070..3efcc8271 100644 --- a/scons/scons-local-4.7.0/SCons/Builder.py +++ b/scons/scons-local-4.8.0/SCons/Builder.py @@ -387,7 +387,7 @@ class BuilderBase: target_scanner = None, source_scanner = None, emitter = None, - multi: int = 0, + multi: bool = False, env = None, single_source: bool = False, name = None, diff --git a/scons/scons-local-4.7.0/SCons/CacheDir.py b/scons/scons-local-4.8.0/SCons/CacheDir.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/CacheDir.py rename to scons/scons-local-4.8.0/SCons/CacheDir.py diff --git a/scons/scons-local-4.7.0/SCons/Conftest.py b/scons/scons-local-4.8.0/SCons/Conftest.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Conftest.py rename to scons/scons-local-4.8.0/SCons/Conftest.py diff --git a/scons/scons-local-4.7.0/SCons/Debug.py b/scons/scons-local-4.8.0/SCons/Debug.py similarity index 98% rename from scons/scons-local-4.7.0/SCons/Debug.py rename to scons/scons-local-4.8.0/SCons/Debug.py index 9397fdeda..9a6433ee8 100644 --- a/scons/scons-local-4.7.0/SCons/Debug.py +++ b/scons/scons-local-4.8.0/SCons/Debug.py @@ -23,10 +23,10 @@ """Code for debugging SCons internal things. -Shouldn't be needed by most users. Quick shortcuts: +Shouldn't be needed by most users. Quick shortcuts:: -from SCons.Debug import caller_trace -caller_trace() + from SCons.Debug import caller_trace + caller_trace() """ import atexit diff --git a/scons/scons-local-4.7.0/SCons/Defaults.py b/scons/scons-local-4.8.0/SCons/Defaults.py similarity index 98% rename from scons/scons-local-4.7.0/SCons/Defaults.py rename to scons/scons-local-4.8.0/SCons/Defaults.py index 32e9da3f2..a5d49fc76 100644 --- a/scons/scons-local-4.7.0/SCons/Defaults.py +++ b/scons/scons-local-4.8.0/SCons/Defaults.py @@ -291,7 +291,15 @@ def copy_func(dest, src, symlinks: bool=True) -> int: elif os.path.islink(src): if symlinks: - os.symlink(os.readlink(src), dest) + try: + os.symlink(os.readlink(src), dest) + except FileExistsError: + raise SCons.Errors.BuildError( + errstr=( + f'Error: Copy() called to create symlink at "{dest}",' + ' but a file already exists at that location.' + ) + ) return 0 return copy_func(dest, os.path.realpath(src)) diff --git a/scons/scons-local-4.7.0/SCons/Environment.py b/scons/scons-local-4.8.0/SCons/Environment.py similarity index 93% rename from scons/scons-local-4.7.0/SCons/Environment.py rename to scons/scons-local-4.8.0/SCons/Environment.py index 3e57498ed..932245062 100644 --- a/scons/scons-local-4.7.0/SCons/Environment.py +++ b/scons/scons-local-4.8.0/SCons/Environment.py @@ -35,9 +35,9 @@ import os import sys import re import shlex -from collections import UserDict, deque +from collections import UserDict, UserList, deque from subprocess import PIPE, DEVNULL -from typing import Optional +from typing import Callable, Collection, Optional, Sequence, Union import SCons.Action import SCons.Builder @@ -510,13 +510,6 @@ class BuilderDict(UserDict): self.__setitem__(i, v) -_is_valid_var = re.compile(r'[_a-zA-Z]\w*$') - -def is_valid_construction_var(varstr) -> bool: - """Return True if *varstr* is a legitimate construction variable.""" - return _is_valid_var.match(varstr) - - class SubstitutionEnvironment: """Base class for different flavors of construction environments. @@ -587,26 +580,20 @@ class SubstitutionEnvironment: return self._dict[key] def __setitem__(self, key, value): - # This is heavily used. This implementation is the best we have - # according to the timings in bench/env.__setitem__.py. - # - # The "key in self._special_set_keys" test here seems to perform - # pretty well for the number of keys we have. A hard-coded - # list worked a little better in Python 2.5, but that has the - # disadvantage of maybe getting out of sync if we ever add more - # variable names. - # So right now it seems like a good trade-off, but feel free to - # revisit this with bench/env.__setitem__.py as needed (and - # as newer versions of Python come out). if key in self._special_set_keys: self._special_set[key](self, key, value) else: - # If we already have the entry, then it's obviously a valid - # key and we don't need to check. If we do check, using a - # global, pre-compiled regular expression directly is more - # efficient than calling another function or a method. - if key not in self._dict and not _is_valid_var.match(key): - raise UserError("Illegal construction variable `%s'" % key) + # Performance: since this is heavily used, try to avoid checking + # if the variable is valid unless necessary. bench/__setitem__.py + # times a bunch of different approaches. Based the most recent + # run, against Python 3.6-3.13(beta), the best we can do across + # different combinations of actions is to use a membership test + # to see if we already have the variable, if so it must already + # have been checked, so skip; if we do check, "isidentifier()" + # (new in Python 3 so wasn't in benchmark until recently) + # on the key is the best. + if key not in self._dict and not key.isidentifier(): + raise UserError(f"Illegal construction variable {key!r}") self._dict[key] = value def get(self, key, default=None): @@ -881,11 +868,11 @@ class SubstitutionEnvironment: 'RPATH' : [], } - def do_parse(arg) -> None: - # if arg is a sequence, recurse with each element + def do_parse(arg: Union[str, Sequence]) -> None: if not arg: return + # if arg is a sequence, recurse with each element if not is_String(arg): for t in arg: do_parse(t) return @@ -902,7 +889,7 @@ class SubstitutionEnvironment: else: mapping['CPPDEFINES'].append([t[0], '='.join(t[1:])]) - # Loop through the flags and add them to the appropriate option. + # Loop through the flags and add them to the appropriate variable. # This tries to strike a balance between checking for all possible # flags and keeping the logic to a finite size, so it doesn't # check for some that don't occur often. It particular, if the @@ -926,6 +913,8 @@ class SubstitutionEnvironment: append_next_arg_to = None # for multi-word args for arg in params: if append_next_arg_to: + # these are the second pass for options where the + # option-argument follows as a second word. if append_next_arg_to == 'CPPDEFINES': append_define(arg) elif append_next_arg_to == '-include': @@ -1022,6 +1011,8 @@ class SubstitutionEnvironment: else: key = 'CFLAGS' mapping[key].append(arg) + elif arg.startswith('-stdlib='): + mapping['CXXFLAGS'].append(arg) elif arg[0] == '+': mapping['CCFLAGS'].append(arg) mapping['LINKFLAGS'].append(arg) @@ -1250,9 +1241,11 @@ class Base(SubstitutionEnvironment): SCons.Tool.Initializers(self) if tools is None: - tools = self._dict.get('TOOLS', None) - if tools is None: - tools = ['default'] + tools = self._dict.get('TOOLS', ['default']) + else: + # for a new env, if we didn't use TOOLS, make sure it starts empty + # so it only shows tools actually initialized. + self._dict['TOOLS'] = [] apply_tools(self, tools, toolpath) # Now restore the passed-in and customized variables @@ -1562,16 +1555,28 @@ class Base(SubstitutionEnvironment): self._dict[key] = dk + val self.scanner_map_delete(kw) - def Clone(self, tools=[], toolpath=None, parse_flags = None, **kw): + def Clone(self, tools=[], toolpath=None, variables=None, parse_flags=None, **kw): """Return a copy of a construction Environment. - The copy is like a Python "deep copy"--that is, independent - copies are made recursively of each objects--except that - a reference is copied when an object is not deep-copyable - (like a function). There are no references to any mutable - objects in the original Environment. - """ + The copy is like a Python "deep copy": independent copies are made + recursively of each object, except that a reference is copied when + an object is not deep-copyable (like a function). There are no + references to any mutable objects in the original environment. + Unrecognized keyword arguments are taken as construction variable + assignments. + + Arguments: + tools: list of tools to initialize. + toolpath: list of paths to search for tools. + variables: a :class:`~SCons.Variables.Variables` object to + use to populate construction variables from command-line + variables. + parse_flags: option strings to parse into construction variables. + + .. versionadded:: 4.8.0 + The optional *variables* parameter was added. + """ builders = self._dict.get('BUILDERS', {}) clone = copy.copy(self) @@ -1597,6 +1602,8 @@ class Base(SubstitutionEnvironment): for key, value in kw.items(): new[key] = SCons.Subst.scons_subst_once(value, self, key) clone.Replace(**new) + if variables: + variables.Update(clone) apply_tools(clone, tools, toolpath) @@ -1687,17 +1694,23 @@ class Base(SubstitutionEnvironment): return dlist - def Dump(self, key=None, format: str='pretty'): - """ Return construction variables serialized to a string. + def Dump(self, key: Optional[str] = None, format: str = 'pretty') -> str: + """ Returns a dump of serialized construction variables. + + The display formats are intended for humaan readers when + debugging - none of the supported formats produce a result that + SCons itself can directly make use of. Objects that cannot + directly be represented get a placeholder like + ```` or ``<>``. Args: - key (optional): if None, format the whole dict of variables. - Else format the value of `key` (Default value = None) - format (str, optional): specify the format to serialize to. - `"pretty"` generates a pretty-printed string, - `"json"` a JSON-formatted string. - (Default value = `"pretty"`) + key: if ``None``, format the whole dict of variables, + else format just the value of *key*. + format: specify the format to serialize to. ``"pretty"`` generates + a pretty-printed string, ``"json"`` a JSON-formatted string. + Raises: + ValueError: *format* is not a recognized serialization format. """ if key: cvars = self.Dictionary(key) @@ -1707,9 +1720,9 @@ class Base(SubstitutionEnvironment): fmt = format.lower() if fmt == 'pretty': - import pprint - pp = pprint.PrettyPrinter(indent=2) + import pprint # pylint: disable=import-outside-toplevel + pp = pprint.PrettyPrinter(indent=2) # TODO: pprint doesn't do a nice job on path-style values # if the paths contain spaces (i.e. Windows), because the # algorithm tries to break lines on spaces, while breaking @@ -1718,26 +1731,33 @@ class Base(SubstitutionEnvironment): return pp.pformat(cvars) elif fmt == 'json': - import json - def non_serializable(obj): - return '<>' % type(obj).__qualname__ - return json.dumps(cvars, indent=4, default=non_serializable) + import json # pylint: disable=import-outside-toplevel + + class DumpEncoder(json.JSONEncoder): + """SCons special json Dump formatter.""" + def default(self, obj): + if isinstance(obj, (UserList, UserDict)): + return obj.data + return f'<>' + + return json.dumps(cvars, indent=4, cls=DumpEncoder, sort_keys=True) else: raise ValueError("Unsupported serialization format: %s." % fmt) - def FindIxes(self, paths, prefix, suffix): - """Search a list of paths for something that matches the prefix and suffix. + def FindIxes(self, paths: Sequence[str], prefix: str, suffix: str) -> Optional[str]: + """Search *paths* for a path that has *prefix* and *suffix*. - Args: - paths: the list of paths or nodes. - prefix: construction variable for the prefix. - suffix: construction variable for the suffix. + Returns on first match. - Returns: the matched path or None + Arguments: + paths: the list of paths or nodes. + prefix: construction variable for the prefix. + suffix: construction variable for the suffix. + Returns: + The matched path or ``None`` """ - suffix = self.subst('$'+suffix) prefix = self.subst('$'+prefix) @@ -2001,11 +2021,20 @@ class Base(SubstitutionEnvironment): def _find_toolpath_dir(self, tp): return self.fs.Dir(self.subst(tp)).srcnode().get_abspath() - def Tool(self, tool, toolpath=None, **kwargs) -> SCons.Tool.Tool: + def Tool( + self, tool: Union[str, Callable], toolpath: Optional[Collection[str]] = None, **kwargs + ) -> Callable: """Find and run tool module *tool*. + *tool* is generally a string, but can also be a callable object, + in which case it is just called, without any of the setup. + The skipped setup includes storing *kwargs* into the created + :class:`~SCons.Tool.Tool` instance, which is extracted and used + when the instance is called, so in the skip case, the called + object will not get the *kwargs*. + .. versionchanged:: 4.2 - returns the tool module rather than ``None``. + returns the tool object rather than ``None``. """ if is_String(tool): tool = self.subst(tool) @@ -2180,52 +2209,44 @@ class Base(SubstitutionEnvironment): return SCons.SConf.SConf(*nargs, **nkw) def Command(self, target, source, action, **kw): - """Builds the supplied target files from the supplied - source files using the supplied action. Action may - be any type that the Builder constructor will accept - for an action.""" + """Set up a one-off build command. + + Builds *target* from *source* using *action*, which may be + be any type that the Builder factory will accept for an action. + Generates an anonymous builder and calls it, to add the details + to the build graph. The builder is not named, added to ``BUILDERS``, + or otherwise saved. + + Recognizes the :func:`~SCons.Builder.Builder` keywords + ``source_scanner``, ``target_scanner``, ``source_factory`` and + ``target_factory``. All other arguments from *kw* are passed on + to the builder when it is called. + """ + # Build a kwarg dict for the builder construction bkw = { 'action': action, 'target_factory': self.fs.Entry, 'source_factory': self.fs.Entry, } - # source scanner - try: - bkw['source_scanner'] = kw['source_scanner'] - except KeyError: - pass - else: - del kw['source_scanner'] - # target scanner - try: - bkw['target_scanner'] = kw['target_scanner'] - except KeyError: - pass - else: - del kw['target_scanner'] - - # source factory - try: - bkw['source_factory'] = kw['source_factory'] - except KeyError: - pass - else: - del kw['source_factory'] - - # target factory - try: - bkw['target_factory'] = kw['target_factory'] - except KeyError: - pass - else: - del kw['target_factory'] + # Recognize these kwargs for the builder construction and take + # them out of the args for the subsequent builder call. + for arg in [ + 'source_scanner', + 'target_scanner', + 'source_factory', + 'target_factory', + ]: + try: + bkw[arg] = kw.pop(arg) + except KeyError: + pass bld = SCons.Builder.Builder(**bkw) return bld(self, target, source, **kw) def Depends(self, target, dependency): - """Explicity specify that 'target's depend on 'dependency'.""" + """Explicity specify that *target* depends on *dependency*.""" tlist = self.arg2nodes(target, self.fs.Entry) dlist = self.arg2nodes(dependency, self.fs.Entry) for t in tlist: @@ -2253,7 +2274,7 @@ class Base(SubstitutionEnvironment): return self.fs.PyPackageDir(s) def NoClean(self, *targets): - """Tags a target so that it will not be cleaned by -c""" + """Tag target(s) so that it will not be cleaned by -c.""" tlist = [] for t in targets: tlist.extend(self.arg2nodes(t, self.fs.Entry)) @@ -2262,7 +2283,7 @@ class Base(SubstitutionEnvironment): return tlist def NoCache(self, *targets): - """Tags a target so that it will not be cached""" + """Tag target(s) so that it will not be cached.""" tlist = [] for t in targets: tlist.extend(self.arg2nodes(t, self.fs.Entry)) @@ -2551,8 +2572,12 @@ class OverrideEnvironment(Base): return self.__dict__['__subject'].__getitem__(key) def __setitem__(self, key, value): - if not is_valid_construction_var(key): - raise UserError("Illegal construction variable `%s'" % key) + # This doesn't have the same performance equation as a "real" + # environment: in an override you're basically just writing + # new stuff; it's not a common case to be changing values already + # set in the override dict, so don't spend time checking for existance. + if not key.isidentifier(): + raise UserError(f"Illegal construction variable {key!r}") self.__dict__['overrides'][key] = value def __delitem__(self, key): diff --git a/scons/scons-local-4.7.0/SCons/EnvironmentValues.py b/scons/scons-local-4.8.0/SCons/EnvironmentValues.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/EnvironmentValues.py rename to scons/scons-local-4.8.0/SCons/EnvironmentValues.py diff --git a/scons/scons-local-4.7.0/SCons/EnvironmentValuesTest.py b/scons/scons-local-4.8.0/SCons/EnvironmentValuesTest.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/EnvironmentValuesTest.py rename to scons/scons-local-4.8.0/SCons/EnvironmentValuesTest.py diff --git a/scons/scons-local-4.7.0/SCons/Errors.py b/scons/scons-local-4.8.0/SCons/Errors.py similarity index 97% rename from scons/scons-local-4.7.0/SCons/Errors.py rename to scons/scons-local-4.8.0/SCons/Errors.py index e489c58a0..a2efc9708 100644 --- a/scons/scons-local-4.7.0/SCons/Errors.py +++ b/scons/scons-local-4.8.0/SCons/Errors.py @@ -177,8 +177,12 @@ def convert_to_BuildError(status, exc_info=None): # (for example, failure to create the directory in which the # target file will appear). filename = getattr(status, 'filename', None) - strerror = getattr(status, 'strerror', str(status)) - errno = getattr(status, 'errno', 2) + strerror = getattr(status, 'strerror', None) + if strerror is None: + strerror = str(status) + errno = getattr(status, 'errno', None) + if errno is None: + errno = 2 buildError = BuildError( errstr=strerror, diff --git a/scons/scons-local-4.7.0/SCons/Executor.py b/scons/scons-local-4.8.0/SCons/Executor.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Executor.py rename to scons/scons-local-4.8.0/SCons/Executor.py diff --git a/scons/scons-local-4.7.0/SCons/Memoize.py b/scons/scons-local-4.8.0/SCons/Memoize.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Memoize.py rename to scons/scons-local-4.8.0/SCons/Memoize.py diff --git a/scons/scons-local-4.7.0/SCons/Node/Alias.py b/scons/scons-local-4.8.0/SCons/Node/Alias.py similarity index 79% rename from scons/scons-local-4.7.0/SCons/Node/Alias.py rename to scons/scons-local-4.8.0/SCons/Node/Alias.py index f36a4ecd5..4de222999 100644 --- a/scons/scons-local-4.7.0/SCons/Node/Alias.py +++ b/scons/scons-local-4.8.0/SCons/Node/Alias.py @@ -57,38 +57,6 @@ class AliasNodeInfo(SCons.Node.NodeInfoBase): def str_to_node(self, s): return default_ans.Alias(s) - def __getstate__(self): - """ - Return all fields that shall be pickled. Walk the slots in the class - hierarchy and add those to the state dictionary. If a '__dict__' slot is - available, copy all entries to the dictionary. Also include the version - id, which is fixed for all instances of a class. - """ - state = getattr(self, '__dict__', {}).copy() - for obj in type(self).mro(): - for name in getattr(obj,'__slots__',()): - if hasattr(self, name): - state[name] = getattr(self, name) - - state['_version_id'] = self.current_version_id - try: - del state['__weakref__'] - except KeyError: - pass - - return state - - def __setstate__(self, state) -> None: - """ - Restore the attributes from a pickled state. - """ - # TODO check or discard version - del state['_version_id'] - for key, value in state.items(): - if key not in ('__weakref__',): - setattr(self, key, value) - - class AliasBuildInfo(SCons.Node.BuildInfoBase): __slots__ = () current_version_id = 2 diff --git a/scons/scons-local-4.7.0/SCons/Node/FS.py b/scons/scons-local-4.8.0/SCons/Node/FS.py similarity index 98% rename from scons/scons-local-4.7.0/SCons/Node/FS.py rename to scons/scons-local-4.8.0/SCons/Node/FS.py index 8694ad759..3cd7720c0 100644 --- a/scons/scons-local-4.7.0/SCons/Node/FS.py +++ b/scons/scons-local-4.8.0/SCons/Node/FS.py @@ -120,30 +120,31 @@ def save_strings(val) -> None: global Save_Strings Save_Strings = val -# -# Avoid unnecessary function calls by recording a Boolean value that -# tells us whether or not os.path.splitdrive() actually does anything -# on this system, and therefore whether we need to bother calling it -# when looking up path names in various methods below. -# do_splitdrive = None -_my_splitdrive =None +_my_splitdrive = None def initialize_do_splitdrive() -> None: - global do_splitdrive - global has_unc - drive, path = os.path.splitdrive('X:/foo') - # splitunc is removed from python 3.7 and newer - # so we can also just test if splitdrive works with UNC - has_unc = (hasattr(os.path, 'splitunc') - or os.path.splitdrive(r'\\split\drive\test')[0] == r'\\split\drive') + """Set up splitdrive usage. - do_splitdrive = not not drive or has_unc + Avoid unnecessary function calls by recording a flag that tells us whether + or not :func:`os.path.splitdrive` actually does anything on this system, + and therefore whether we need to bother calling it when looking up path + names in various methods below. - global _my_splitdrive - if has_unc: - def splitdrive(p): + If :data:`do_splitdrive` is True, :func:`_my_splitdrive` will be a real + function which we can call. As all supported Python versions' ntpath module + now handle UNC paths correctly, we no longer special-case that. + + Deferring the setup of ``_my_splitdrive`` also lets unit tests do + their thing and test UNC path handling on a POSIX host. + """ + global do_splitdrive, _my_splitdrive + + do_splitdrive = bool(os.path.splitdrive('X:/foo')[0]) + + if do_splitdrive: + def _my_splitdrive(p): if p[1:2] == ':': return p[:2], p[2:] if p[0:2] == '//': @@ -151,12 +152,9 @@ def initialize_do_splitdrive() -> None: # because UNC paths are always absolute. return '//', p[1:] return '', p - else: - def splitdrive(p): - if p[1:2] == ':': - return p[:2], p[2:] - return '', p - _my_splitdrive = splitdrive + # TODO: the os routine should work and be better debugged than ours, + # but unit test test_unc_path fails on POSIX platforms. Resolve someday. + # _my_splitdrive = os.path.splitdrive # Keep some commonly used values in global variables to skip to # module look-up costs. @@ -328,7 +326,11 @@ LocalCopy = SCons.Action.Action(LinkFunc, LocalString) def UnlinkFunc(target, source, env) -> int: t = target[0] - t.fs.unlink(t.get_abspath()) + file = t.get_abspath() + try: + t.fs.unlink(file) + except FileNotFoundError: + pass return 0 Unlink = SCons.Action.Action(UnlinkFunc, None) @@ -1238,7 +1240,10 @@ class FS(LocalFS): self.pathTop = os.getcwd() else: self.pathTop = path - self.defaultDrive = _my_normcase(_my_splitdrive(self.pathTop)[0]) + if do_splitdrive: + self.defaultDrive = _my_normcase(_my_splitdrive(self.pathTop)[0]) + else: + self.defaultDrive = "" self.Top = self.Dir(self.pathTop) self.Top._path = '.' @@ -1554,11 +1559,15 @@ class DirNodeInfo(SCons.Node.NodeInfoBase): def str_to_node(self, s): top = self.fs.Top root = top.root + # Python 3.13/Win changed isabs() - after you split C:/foo/bar, + # the path part is no longer considerd absolute. Save the passed + # path for the isabs check so we can get the right answer. + path = s if do_splitdrive: drive, s = _my_splitdrive(s) if drive: root = self.fs.get_root(drive) - if not os.path.isabs(s): + if not os.path.isabs(path): s = top.get_labspath() + '/' + s return root._lookup_abs(s, Entry) @@ -2380,7 +2389,7 @@ class RootDir(Dir): # The // entry is necessary because os.path.normpath() # preserves double slashes at the beginning of a path on Posix # platforms. - if not has_unc: + if not do_splitdrive: self._lookupDict['//'] = self def _morph(self) -> None: @@ -2511,45 +2520,18 @@ class FileNodeInfo(SCons.Node.NodeInfoBase): def str_to_node(self, s): top = self.fs.Top root = top.root + # Python 3.13/Win changed isabs() - after you split C:/foo/bar, + # the path part is no longer considerd absolute. Save the passed + # path for the isabs check so we can get the right answer. + path = s if do_splitdrive: drive, s = _my_splitdrive(s) if drive: root = self.fs.get_root(drive) - if not os.path.isabs(s): + if not os.path.isabs(path): s = top.get_labspath() + '/' + s return root._lookup_abs(s, Entry) - def __getstate__(self): - """ - Return all fields that shall be pickled. Walk the slots in the class - hierarchy and add those to the state dictionary. If a '__dict__' slot is - available, copy all entries to the dictionary. Also include the version - id, which is fixed for all instances of a class. - """ - state = getattr(self, '__dict__', {}).copy() - for obj in type(self).mro(): - for name in getattr(obj, '__slots__', ()): - if hasattr(self, name): - state[name] = getattr(self, name) - - state['_version_id'] = self.current_version_id - try: - del state['__weakref__'] - except KeyError: - pass - - return state - - def __setstate__(self, state) -> None: - """ - Restore the attributes from a pickled state. - """ - # TODO check or discard version - del state['_version_id'] - for key, value in state.items(): - if key not in ('__weakref__',): - setattr(self, key, value) - def __eq__(self, other): return self.csig == other.csig and self.timestamp == other.timestamp and self.size == other.size @@ -2986,7 +2968,7 @@ class File(Base): # created. self.dir._create() - def push_to_cache(self) -> None: + def push_to_cache(self) -> bool: """Try to push the node into a cache """ # This should get called before the Nodes' .built() method is @@ -2997,10 +2979,10 @@ class File(Base): # the node to cache so that the memoization of the self.exists() # return value doesn't interfere. if self.nocache: - return + return None self.clear_memoized_values() if self.exists(): - self.get_build_env().get_CacheDir().push(self) + return self.get_build_env().get_CacheDir().push(self) def retrieve_from_cache(self) -> bool: """Try to retrieve the node's content from a cache @@ -3176,12 +3158,16 @@ class File(Base): return None def do_duplicate(self, src): + """Create a duplicate of this file from the specified source.""" self._createDir() if SCons.Node.print_duplicate: print(f"dup: relinking variant '{self}' from '{src}'") Unlink(self, None, None) - e = Link(self, src, None) - if isinstance(e, SCons.Errors.BuildError): + try: + e = Link(self, src, None) + if isinstance(e, SCons.Errors.BuildError): + raise e + except SCons.Errors.BuildError as e: raise SCons.Errors.StopError(f"Cannot duplicate `{src.get_internal_path()}' in `{self.dir._path}': {e.errstr}.") self.linked = 1 # The Link() action may or may not have actually @@ -3534,7 +3520,7 @@ class File(Base): In all cases self is the target we're checking to see if it's up to date """ - T = 0 + T = False if T: Trace('is_up_to_date(%s):' % self) if not self.exists(): if T: Trace(' not self.exists():') @@ -3730,7 +3716,10 @@ class FileFinder: if fd is None: fd = self.default_filedir dir, name = os.path.split(fd) - drive, d = _my_splitdrive(dir) + if do_splitdrive: + drive, d = _my_splitdrive(dir) + else: + drive, d = "", dir if not name and d[:1] in ('/', OS_SEP): #return p.fs.get_root(drive).dir_on_disk(name) return p.fs.get_root(drive) diff --git a/scons/scons-local-4.7.0/SCons/Node/Python.py b/scons/scons-local-4.8.0/SCons/Node/Python.py similarity index 83% rename from scons/scons-local-4.7.0/SCons/Node/Python.py rename to scons/scons-local-4.8.0/SCons/Node/Python.py index 2f285b40b..c057b8d5c 100644 --- a/scons/scons-local-4.7.0/SCons/Node/Python.py +++ b/scons/scons-local-4.8.0/SCons/Node/Python.py @@ -37,37 +37,6 @@ class ValueNodeInfo(SCons.Node.NodeInfoBase): def str_to_node(self, s): return ValueWithMemo(s) - def __getstate__(self): - """ - Return all fields that shall be pickled. Walk the slots in the class - hierarchy and add those to the state dictionary. If a '__dict__' slot - is available, copy all entries to the dictionary. Also include the - version id, which is fixed for all instances of a class. - """ - state = getattr(self, '__dict__', {}).copy() - for obj in type(self).mro(): - for name in getattr(obj, '__slots__', ()): - if hasattr(self, name): - state[name] = getattr(self, name) - - state['_version_id'] = self.current_version_id - try: - del state['__weakref__'] - except KeyError: - pass - - return state - - def __setstate__(self, state) -> None: - """ - Restore the attributes from a pickled state. - """ - # TODO check or discard version - del state['_version_id'] - for key, value in state.items(): - if key not in ('__weakref__',): - setattr(self, key, value) - class ValueBuildInfo(SCons.Node.BuildInfoBase): __slots__ = () diff --git a/scons/scons-local-4.7.0/SCons/Node/__init__.py b/scons/scons-local-4.8.0/SCons/Node/__init__.py similarity index 99% rename from scons/scons-local-4.7.0/SCons/Node/__init__.py rename to scons/scons-local-4.8.0/SCons/Node/__init__.py index 630490e53..00bf4ac3b 100644 --- a/scons/scons-local-4.7.0/SCons/Node/__init__.py +++ b/scons/scons-local-4.8.0/SCons/Node/__init__.py @@ -678,7 +678,7 @@ class Node(metaclass=NoSlotsPyPy): except AttributeError: pass - def push_to_cache(self) -> None: + def push_to_cache(self) -> bool: """Try to push a node into a cache """ pass @@ -1063,6 +1063,7 @@ class Node(metaclass=NoSlotsPyPy): # Don't bother scanning non-derived files, because we don't # care what their dependencies are. # Don't scan again, if we already have scanned. + T = False if self.implicit is not None: return self.implicit = [] @@ -1087,7 +1088,12 @@ class Node(metaclass=NoSlotsPyPy): # essentially short-circuits an N*M scan of the # sources for each individual target, which is a hell # of a lot more efficient. + def print_nodelist(n): + tgts = [f"{t.path!r}" for t in n] + return f"[{', '.join(tgts)}]" + for tgt in executor.get_all_targets(): + if T: Trace(f"adding implicit {print_nodelist(implicit)} to {tgt!s}\n") tgt.add_to_implicit(implicit) if implicit_deps_unchanged or self.is_up_to_date(): @@ -1472,8 +1478,8 @@ class Node(metaclass=NoSlotsPyPy): @see: FS.File.changed(), FS.File.release_target_info() """ - t = 0 - if t: Trace('changed(%s [%s], %s)' % (self, classname(self), node)) + T = False + if T: Trace('changed(%s [%s], %s)' % (self, classname(self), node)) if node is None: node = self @@ -1491,25 +1497,24 @@ class Node(metaclass=NoSlotsPyPy): # entries to equal the new dependency list, for the benefit # of the loop below that updates node information. then.extend([None] * diff) - if t: Trace(': old %s new %s' % (len(then), len(children))) + if T: Trace(': old %s new %s' % (len(then), len(children))) result = True for child, prev_ni in zip(children, then): if _decider_map[child.changed_since_last_build](child, self, prev_ni, node): - if t: Trace(': %s changed' % child) + if T: Trace(f": '{child!s}' changed") result = True if self.has_builder(): contents = self.get_executor().get_contents() newsig = hash_signature(contents) if bi.bactsig != newsig: - if t: Trace(': bactsig %s != newsig %s' % (bi.bactsig, newsig)) + if T: Trace(': bactsig %s != newsig %s' % (bi.bactsig, newsig)) result = True if not result: - if t: Trace(': up to date') - - if t: Trace('\n') + if T: Trace(': up to date') + if T: Trace('\n') return result diff --git a/scons/scons-local-4.7.0/SCons/PathList.py b/scons/scons-local-4.8.0/SCons/PathList.py similarity index 70% rename from scons/scons-local-4.7.0/SCons/PathList.py rename to scons/scons-local-4.8.0/SCons/PathList.py index 33ac7e58b..fcda3c59a 100644 --- a/scons/scons-local-4.7.0/SCons/PathList.py +++ b/scons/scons-local-4.8.0/SCons/PathList.py @@ -23,7 +23,7 @@ """Handle lists of directory paths. -These are the path lists that get set as CPPPATH, LIBPATH, +These are the path lists that get set as ``CPPPATH``, ``LIBPATH``, etc.) with as much caching of data and efficiency as we can, while still keeping the evaluation delayed so that we Do the Right Thing (almost) regardless of how the variable is specified. @@ -47,10 +47,10 @@ def node_conv(obj): """ This is the "string conversion" routine that we have our substitutions use to return Nodes, not strings. This relies on the fact that an - EntryProxy object has a get() method that returns the underlying - Node that it wraps, which is a bit of architectural dependence - that we might need to break or modify in the future in response to - additional requirements. + :class:`~SCons.Node.FS.EntryProxy` object has a ``get()`` method that + returns the underlying Node that it wraps, which is a bit of + architectural dependence that we might need to break or modify in the + future in response to additional requirements. """ try: get = obj.get @@ -64,34 +64,35 @@ def node_conv(obj): return result class _PathList: - """An actual PathList object.""" + """An actual PathList object. + + Initializes a :class:`PathList` object, canonicalizing the input and + pre-processing it for quicker substitution later. + + The stored representation of the :class:`PathList` is a list of tuples + containing (type, value), where the "type" is one of the ``TYPE_*`` + variables defined above. We distinguish between: + + * Strings that contain no ``$`` and therefore need no + delayed-evaluation string substitution (we expect that there + will be many of these and that we therefore get a pretty + big win from avoiding string substitution) + + * Strings that contain ``$`` and therefore need substitution + (the hard case is things like ``${TARGET.dir}/include``, + which require re-evaluation for every target + source) + + * Other objects (which may be something like an + :class:`~SCons.Node.FS.EntryProxy` + that needs a method called to return a Node) + + Pre-identifying the type of each element in the :class:`PathList` + up-front and storing the type in the list of tuples is intended to + reduce the amount of calculation when we actually do the substitution + over and over for each target. + """ def __init__(self, pathlist, split=True) -> None: - """ - Initializes a PathList object, canonicalizing the input and - pre-processing it for quicker substitution later. - - The stored representation of the PathList is a list of tuples - containing (type, value), where the "type" is one of the TYPE_* - variables defined above. We distinguish between: - - strings that contain no '$' and therefore need no - delayed-evaluation string substitution (we expect that there - will be many of these and that we therefore get a pretty - big win from avoiding string substitution) - - strings that contain '$' and therefore need substitution - (the hard case is things like '${TARGET.dir}/include', - which require re-evaluation for every target + source) - - other objects (which may be something like an EntryProxy - that needs a method called to return a Node) - - Pre-identifying the type of each element in the PathList up-front - and storing the type in the list of tuples is intended to reduce - the amount of calculation when we actually do the substitution - over and over for each target. - """ if SCons.Util.is_String(pathlist): if split: pathlist = pathlist.split(os.pathsep) @@ -152,34 +153,33 @@ class PathListCache: use the same Memoizer pattern that we use elsewhere to count cache hits and misses, which is very valuable. - Lookup keys in the cache are computed by the _PathList_key() method. + Lookup keys in the cache are computed by the :meth:`_PathList_key` method. Cache lookup should be quick, so we don't spend cycles canonicalizing - all forms of the same lookup key. For example, 'x:y' and ['x', - 'y'] logically represent the same list, but we don't bother to + all forms of the same lookup key. For example, ``x:y`` and ``['x', 'y']`` + logically represent the same list, but we don't bother to split string representations and treat those two equivalently. (Note, however, that we do, treat lists and tuples the same.) The main type of duplication we're trying to catch will come from looking up the same path list from two different clones of the - same construction environment. That is, given + same construction environment. That is, given:: env2 = env1.Clone() - both env1 and env2 will have the same CPPPATH value, and we can - cheaply avoid re-parsing both values of CPPPATH by using the + both ``env1`` and ``env2`` will have the same ``CPPPATH`` value, and we can + cheaply avoid re-parsing both values of ``CPPPATH`` by using the common value from this cache. """ def __init__(self) -> None: self._memo = {} def _PathList_key(self, pathlist): - """ - Returns the key for memoization of PathLists. + """Returns the key for memoization of PathLists. Note that we want this to be pretty quick, so we don't completely canonicalize all forms of the same list. For example, - 'dir1:$ROOT/dir2' and ['$ROOT/dir1', 'dir'] may logically - represent the same list if you're executing from $ROOT, but + ``dir1:$ROOT/dir2`` and ``['$ROOT/dir1', 'dir']`` may logically + represent the same list if you're executing from ``$ROOT``, but we're not going to bother splitting strings into path elements, or massaging strings into Nodes, to identify that equivalence. We just want to eliminate obvious redundancy from the normal @@ -191,9 +191,10 @@ class PathListCache: @SCons.Memoize.CountDictCall(_PathList_key) def PathList(self, pathlist, split=True): - """ - Returns the cached _PathList object for the specified pathlist, - creating and caching a new object as necessary. + """Entry point for getting PathLists. + + Returns the cached :class:`_PathList` object for the specified + pathlist, creating and caching a new object as necessary. """ pathlist = self._PathList_key(pathlist) try: @@ -215,7 +216,8 @@ class PathListCache: PathList = PathListCache().PathList - +# TODO: removing the class object here means Sphinx doesn't pick up its +# docstrings: they're fine for reading here, but are not in API Docs. del PathListCache # Local Variables: diff --git a/scons/scons-local-4.7.0/SCons/Platform/__init__.py b/scons/scons-local-4.8.0/SCons/Platform/__init__.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Platform/__init__.py rename to scons/scons-local-4.8.0/SCons/Platform/__init__.py diff --git a/scons/scons-local-4.7.0/SCons/Platform/aix.py b/scons/scons-local-4.8.0/SCons/Platform/aix.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Platform/aix.py rename to scons/scons-local-4.8.0/SCons/Platform/aix.py diff --git a/scons/scons-local-4.7.0/SCons/Platform/cygwin.py b/scons/scons-local-4.8.0/SCons/Platform/cygwin.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Platform/cygwin.py rename to scons/scons-local-4.8.0/SCons/Platform/cygwin.py diff --git a/scons/scons-local-4.7.0/SCons/Platform/darwin.py b/scons/scons-local-4.8.0/SCons/Platform/darwin.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Platform/darwin.py rename to scons/scons-local-4.8.0/SCons/Platform/darwin.py diff --git a/scons/scons-local-4.7.0/SCons/Platform/hpux.py b/scons/scons-local-4.8.0/SCons/Platform/hpux.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Platform/hpux.py rename to scons/scons-local-4.8.0/SCons/Platform/hpux.py diff --git a/scons/scons-local-4.7.0/SCons/Platform/irix.py b/scons/scons-local-4.8.0/SCons/Platform/irix.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Platform/irix.py rename to scons/scons-local-4.8.0/SCons/Platform/irix.py diff --git a/scons/scons-local-4.7.0/SCons/Platform/mingw.py b/scons/scons-local-4.8.0/SCons/Platform/mingw.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Platform/mingw.py rename to scons/scons-local-4.8.0/SCons/Platform/mingw.py diff --git a/scons/scons-local-4.7.0/SCons/Platform/os2.py b/scons/scons-local-4.8.0/SCons/Platform/os2.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Platform/os2.py rename to scons/scons-local-4.8.0/SCons/Platform/os2.py diff --git a/scons/scons-local-4.7.0/SCons/Platform/posix.py b/scons/scons-local-4.8.0/SCons/Platform/posix.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Platform/posix.py rename to scons/scons-local-4.8.0/SCons/Platform/posix.py diff --git a/scons/scons-local-4.7.0/SCons/Platform/sunos.py b/scons/scons-local-4.8.0/SCons/Platform/sunos.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Platform/sunos.py rename to scons/scons-local-4.8.0/SCons/Platform/sunos.py diff --git a/scons/scons-local-4.7.0/SCons/Platform/virtualenv.py b/scons/scons-local-4.8.0/SCons/Platform/virtualenv.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Platform/virtualenv.py rename to scons/scons-local-4.8.0/SCons/Platform/virtualenv.py diff --git a/scons/scons-local-4.7.0/SCons/Platform/win32.py b/scons/scons-local-4.8.0/SCons/Platform/win32.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Platform/win32.py rename to scons/scons-local-4.8.0/SCons/Platform/win32.py diff --git a/scons/scons-local-4.7.0/SCons/SConf.py b/scons/scons-local-4.8.0/SCons/SConf.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/SConf.py rename to scons/scons-local-4.8.0/SCons/SConf.py diff --git a/scons/scons-local-4.7.0/SCons/SConsign.py b/scons/scons-local-4.8.0/SCons/SConsign.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/SConsign.py rename to scons/scons-local-4.8.0/SCons/SConsign.py diff --git a/scons/scons-local-4.7.0/SCons/Scanner/C.py b/scons/scons-local-4.8.0/SCons/Scanner/C.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Scanner/C.py rename to scons/scons-local-4.8.0/SCons/Scanner/C.py diff --git a/scons/scons-local-4.7.0/SCons/Scanner/D.py b/scons/scons-local-4.8.0/SCons/Scanner/D.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Scanner/D.py rename to scons/scons-local-4.8.0/SCons/Scanner/D.py diff --git a/scons/scons-local-4.7.0/SCons/Scanner/Dir.py b/scons/scons-local-4.8.0/SCons/Scanner/Dir.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Scanner/Dir.py rename to scons/scons-local-4.8.0/SCons/Scanner/Dir.py diff --git a/scons/scons-local-4.7.0/SCons/Scanner/Fortran.py b/scons/scons-local-4.8.0/SCons/Scanner/Fortran.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Scanner/Fortran.py rename to scons/scons-local-4.8.0/SCons/Scanner/Fortran.py diff --git a/scons/scons-local-4.7.0/SCons/Scanner/IDL.py b/scons/scons-local-4.8.0/SCons/Scanner/IDL.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Scanner/IDL.py rename to scons/scons-local-4.8.0/SCons/Scanner/IDL.py diff --git a/scons/scons-local-4.7.0/SCons/Scanner/Java.py b/scons/scons-local-4.8.0/SCons/Scanner/Java.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Scanner/Java.py rename to scons/scons-local-4.8.0/SCons/Scanner/Java.py diff --git a/scons/scons-local-4.7.0/SCons/Scanner/LaTeX.py b/scons/scons-local-4.8.0/SCons/Scanner/LaTeX.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Scanner/LaTeX.py rename to scons/scons-local-4.8.0/SCons/Scanner/LaTeX.py diff --git a/scons/scons-local-4.7.0/SCons/Scanner/Prog.py b/scons/scons-local-4.8.0/SCons/Scanner/Prog.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Scanner/Prog.py rename to scons/scons-local-4.8.0/SCons/Scanner/Prog.py diff --git a/scons/scons-local-4.7.0/SCons/Scanner/Python.py b/scons/scons-local-4.8.0/SCons/Scanner/Python.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Scanner/Python.py rename to scons/scons-local-4.8.0/SCons/Scanner/Python.py diff --git a/scons/scons-local-4.7.0/SCons/Scanner/RC.py b/scons/scons-local-4.8.0/SCons/Scanner/RC.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Scanner/RC.py rename to scons/scons-local-4.8.0/SCons/Scanner/RC.py diff --git a/scons/scons-local-4.7.0/SCons/Scanner/SWIG.py b/scons/scons-local-4.8.0/SCons/Scanner/SWIG.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Scanner/SWIG.py rename to scons/scons-local-4.8.0/SCons/Scanner/SWIG.py diff --git a/scons/scons-local-4.7.0/SCons/Scanner/__init__.py b/scons/scons-local-4.8.0/SCons/Scanner/__init__.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Scanner/__init__.py rename to scons/scons-local-4.8.0/SCons/Scanner/__init__.py diff --git a/scons/scons-local-4.7.0/SCons/Script/Interactive.py b/scons/scons-local-4.8.0/SCons/Script/Interactive.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Script/Interactive.py rename to scons/scons-local-4.8.0/SCons/Script/Interactive.py diff --git a/scons/scons-local-4.7.0/SCons/Script/Main.py b/scons/scons-local-4.8.0/SCons/Script/Main.py similarity index 96% rename from scons/scons-local-4.7.0/SCons/Script/Main.py rename to scons/scons-local-4.8.0/SCons/Script/Main.py index af7e3ff1f..6b2418436 100644 --- a/scons/scons-local-4.7.0/SCons/Script/Main.py +++ b/scons/scons-local-4.8.0/SCons/Script/Main.py @@ -41,7 +41,7 @@ import time import traceback import platform import threading -from typing import Optional, List +from typing import Optional, List, TYPE_CHECKING import SCons.CacheDir import SCons.Debug @@ -59,15 +59,17 @@ import SCons.Taskmaster import SCons.Util import SCons.Warnings import SCons.Script.Interactive +if TYPE_CHECKING: + from SCons.Script import SConsOption from SCons.Util.stats import count_stats, memory_stats, time_stats, ENABLE_JSON, write_scons_stats_file, JSON_OUTPUT_FILE from SCons import __version__ as SConsVersion # these define the range of versions SCons supports minimum_python_version = (3, 6, 0) -deprecated_python_version = (3, 6, 0) +deprecated_python_version = (3, 7, 0) # the first non-deprecated version -# ordered list of SConsctruct names to look for if there is no -f flag +# ordered list of SConstruct names to look for if there is no -f flag KNOWN_SCONSTRUCT_NAMES = [ 'SConstruct', 'Sconstruct', @@ -84,7 +86,11 @@ KNOWN_SCONSCRIPTS = [ "Sconstruct", "sconstruct", "SConscript", + "Sconscript", "sconscript", + "SCsub", # Uncommon alternative to SConscript + "Scsub", + "scsub", ] # Global variables @@ -174,6 +180,7 @@ class Progressor: ProgressObject = SCons.Util.Null() def Progress(*args, **kw) -> None: + """Show progress during building - Public API.""" global ProgressObject ProgressObject = Progressor(*args, **kw) @@ -501,29 +508,47 @@ class FakeOptionParser: # TODO: to quiet checkers, FakeOptionParser should also define # raise_exception_on_error, preserve_unknown_options, largs and parse_args - def add_local_option(self, *args, **kw) -> None: + def add_local_option(self, *args, **kw) -> "SConsOption": pass OptionsParser = FakeOptionParser() -def AddOption(*args, **kw): +def AddOption(*args, settable: bool = False, **kw) -> "SConsOption": + """Add a local option to the option parser - Public API. + + If the *settable* parameter is true, the option will be included in the + list of settable options; all other keyword arguments are passed on to + :meth:`~SCons.Script.SConsOptions.SConsOptionParser.add_local_option`. + + .. versionchanged:: 4.8.0 + The *settable* parameter added to allow including the new option + to the table of options eligible to use :func:`SetOption`. + + """ if 'default' not in kw: kw['default'] = None + kw['settable'] = settable result = OptionsParser.add_local_option(*args, **kw) return result -def GetOption(name): +def GetOption(name: str): + """Get the value from an option - Public API.""" return getattr(OptionsParser.values, name) -def SetOption(name, value): +def SetOption(name: str, value): + """Set the value of an option - Public API.""" return OptionsParser.values.set_option(name, value) -def DebugOptions(json=None): - """ - API to allow specifying options to SCons debug logic - Currently only json is supported which changes the - json file written by --debug=json from the default +def DebugOptions(json: Optional[str] = None) -> None: + """Specify options to SCons debug logic - Public API. + + Currently only *json* is supported, which changes the JSON file + written to if the ``--debug=json`` command-line option is specified + to the value supplied. + + .. versionadded:: 4.6.0 + """ if json is not None: json_node = SCons.Defaults.DefaultEnvironment().arg2nodes(json) @@ -540,7 +565,7 @@ def DebugOptions(json=None): raise SCons.Errors.UserError(f"Unable to create directory for JSON debug output file: {SCons.Util.stats.JSON_OUTPUT_FILE}") -def ValidateOptions(throw_exception: bool=False) -> None: +def ValidateOptions(throw_exception: bool = False) -> None: """Validate options passed to SCons on the command line. Checks that all options given on the command line are known to this @@ -1104,11 +1129,13 @@ def _main(parser): # warning about deprecated Python versions--delayed until here # in case they disabled the warning in the SConscript files. if python_version_deprecated(): - msg = "Support for pre-%s Python version (%s) is deprecated.\n" + \ - " If this will cause hardship, contact scons-dev@scons.org" deprecated_version_string = ".".join(map(str, deprecated_python_version)) - SCons.Warnings.warn(SCons.Warnings.PythonVersionWarning, - msg % (deprecated_version_string, python_version_string())) + msg = ( + f"Support for Python older than {deprecated_version_string}" + f" is deprecated ({python_version_string()} detected).\n" + " If this will cause hardship, contact scons-dev@scons.org" + ) + SCons.Warnings.warn(SCons.Warnings.PythonVersionWarning, msg) if not options.help: # [ ] Clarify why we need to create Builder here at all, and @@ -1396,6 +1423,10 @@ def _exec_main(parser, values) -> None: sconscript files that don't have the suffix. .. versionadded:: 4.6.0 + + .. versionchanged:: 4.8.0 + The additional name ``SCsub`` (with spelling variants) + is also recognized - Godot uses this name. """ if os.path.isabs(filename) and os.path.exists(filename): return filename diff --git a/scons/scons-local-4.7.0/SCons/Script/SConsOptions.py b/scons/scons-local-4.8.0/SCons/Script/SConsOptions.py similarity index 90% rename from scons/scons-local-4.7.0/SCons/Script/SConsOptions.py rename to scons/scons-local-4.8.0/SCons/Script/SConsOptions.py index e8e5cbf4e..d4cc99268 100644 --- a/scons/scons-local-4.7.0/SCons/Script/SConsOptions.py +++ b/scons/scons-local-4.8.0/SCons/Script/SConsOptions.py @@ -66,17 +66,14 @@ def diskcheck_convert(value): class SConsValues(optparse.Values): - """ - Holder class for uniform access to SCons options, regardless - of whether they can be set on the command line or in the - SConscript files (using the SetOption() function). + """Holder class for uniform access to SCons options. A SCons option value can originate three different ways: - 1) set on the command line; - 2) set in an SConscript file; - 3) the default setting (from the the op.add_option() - calls in the Parser() function, below). + 1. set on the command line. + 2. set in an SConscript file via :func:`~SCons.Script.Main.SetOption`. + 3. the default setting (from the the ``op.add_option()`` + calls in the :func:`Parser` function, below). The command line always overrides a value set in a SConscript file, which in turn always overrides default settings. Because we want @@ -87,15 +84,15 @@ class SConsValues(optparse.Values): The solution implemented in this class is to keep these different sets of settings separate (command line, SConscript file, and default) - and to override the __getattr__() method to check them in turn. - This should allow the rest of the code to just fetch values as - attributes of an instance of this class, without having to worry - about where they came from. + and to override the :meth:`__getattr__` method to check them in turn. + This allows the rest of the code to just fetch values as attributes of + an instance of this class, without having to worry about where they + came from (the scheme is similar to a ``ChainMap``). Note that not all command line options are settable from SConscript files, and the ones that are must be explicitly added to the - "settable" list in this class, and optionally validated and coerced - in the set_option() method. + :attr:`settable` list in this class, and optionally validated and coerced + in the :meth:`set_option` method. """ def __init__(self, defaults) -> None: @@ -103,28 +100,24 @@ class SConsValues(optparse.Values): self.__SConscript_settings__ = {} def __getattr__(self, attr): - """ - Fetches an options value, checking first for explicit settings - from the command line (which are direct attributes), then the - SConscript file settings, then the default values. + """Fetch an options value, respecting priority rules. + + This is a little tricky: since we're answering questions + about outselves, we have avoid lookups that would send us into + into infinite recursion, thus the ``__dict__`` stuff. """ try: - return self.__dict__[attr] + return self.__dict__[attr] except KeyError: try: return self.__dict__['__SConscript_settings__'][attr] except KeyError: try: return getattr(self.__dict__['__defaults__'], attr) - except KeyError: - # Added because with py3 this is a new class, - # not a classic class, and due to the way - # In that case it will create an object without - # __defaults__, and then query for __setstate__ - # which will throw an exception of KeyError - # deepcopy() is expecting AttributeError if __setstate__ - # is not available. - raise AttributeError(attr) + except KeyError as exc: + # Need to respond with AttributeError because + # deepcopy expects that if __setstate__ is not available. + raise AttributeError(attr) from exc # keep this list in sync with the SetOption doc in SCons/Script/Main.xml # search for UPDATE_SETOPTION_DOCS there. @@ -148,26 +141,26 @@ class SConsValues(optparse.Values): 'silent', 'stack_size', 'warn', - - # TODO: Remove these once we update the AddOption() API to allow setting - # added flag as settable. - # Requested settable flag in : https://github.com/SCons/scons/issues/3983 - # From experimental ninja - 'disable_execute_ninja', - 'disable_ninja', - 'skip_ninja_regen' ] - def set_option(self, name, value): - """Sets an option from an SConscript file. + def set_option(self, name: str, value) -> None: + """Sets an option *name* from an SConscript file. + + Vvalidation steps for known (that is, defined in SCons itself) + options are in-line here. Validation should be along the same + lines as for options processed from the command line - + it's kind of a pain to have to duplicate. Project-defined options + can specify callbacks for the command-line version, but will have + no inbuilt validation here. It's up to the build system maintainer + to make sure :func:`~SCons.Script.Main.SetOption` is being used + correctly, we can't really do any better here. Raises: - UserError: invalid or malformed option ("error in your script") + UserError: the option is not settable. """ - if name not in self.settable: raise SCons.Errors.UserError( - "This option is not settable from a SConscript file: %s" % name + f"This option is not settable from an SConscript file: {name!r}" ) # the following are for options that need some extra processing @@ -247,7 +240,6 @@ class SConsOption(optparse.Option): return tuple([self.check_value(opt, v) for v in value]) def process(self, opt, value, values, parser): - # First, convert the value(s) to the right type. Howl if any # value(s) are bogus. value = self.convert_value(opt, value) @@ -313,9 +305,7 @@ class SConsOptionParser(optparse.OptionParser): raise_exception_on_error = False def error(self, msg): - """ - overridden OptionValueError exception handler - """ + """Overridden OptionValueError exception handler.""" if self.raise_exception_on_error: raise SConsBadOptionError(msg, self) else: @@ -397,46 +387,46 @@ class SConsOptionParser(optparse.OptionParser): option.process(opt, value, values, self) def reparse_local_options(self) -> None: - """ Re-parse the leftover command-line options. + """Re-parse the leftover command-line options. - Parse options stored in `self.largs`, so that any value + Leftover options are stored in ``self.largs``, so that any value overridden on the command line is immediately available - if the user turns around and does a :func:`GetOption` right away. + if the user turns around and does a :func:`~SCons.Script.Main.GetOption` + right away. We mimic the processing of the single args in the original OptionParser :func:`_process_args`, but here we allow exact matches for long-opts only (no partial argument names!). - Otherwise there could be problems in :func:`add_local_option` + Otherwise there could be problems in :meth:`add_local_option` below. When called from there, we try to reparse the command-line arguments that 1. haven't been processed so far (`self.largs`), but 2. are possibly not added to the list of options yet. - So, when we only have a value for "--myargument" so far, - a command-line argument of "--myarg=test" would set it, + So, when we only have a value for ``--myargument`` so far, + a command-line argument of ``--myarg=test`` would set it, per the behaviour of :func:`_match_long_opt`, which allows for partial matches of the option name, as long as the common prefix appears to be unique. This would lead to further confusion, because we might want - to add another option "--myarg" later on (see issue #2929). - + to add another option ``--myarg`` later on (see issue #2929). """ rargs = [] largs_restore = [] # Loop over all remaining arguments skip = False - for l in self.largs: + for larg in self.largs: if skip: # Accept all remaining arguments as they are - largs_restore.append(l) + largs_restore.append(larg) else: - if len(l) > 2 and l[0:2] == "--": + if len(larg) > 2 and larg[0:2] == "--": # Check long option - lopt = (l,) - if "=" in l: + lopt = [larg] + if "=" in larg: # Split into option and value - lopt = l.split("=", 1) + lopt = larg.split("=", 1) if lopt[0] in self._long_opt: # Argument is already known @@ -445,26 +435,35 @@ class SConsOptionParser(optparse.OptionParser): # Not known yet, so reject for now largs_restore.append('='.join(lopt)) else: - if l == "--" or l == "-": + if larg in("--", "-"): # Stop normal processing and don't # process the rest of the command-line opts - largs_restore.append(l) + largs_restore.append(larg) skip = True else: - rargs.append(l) + rargs.append(larg) # Parse the filtered list self.parse_args(rargs, self.values) - # Restore the list of remaining arguments for the + # Restore the list of leftover arguments for the # next call of AddOption/add_local_option... self.largs = self.largs + largs_restore - def add_local_option(self, *args, **kw): + def add_local_option(self, *args, **kw) -> SConsOption: """ Adds a local option to the parser. - This is initiated by an :func:`AddOption` call to add a user-defined - command-line option. We add the option to a separate option - group for the local options, creating the group if necessary. + This is initiated by an :func:`~SCons.Script.Main.AddOption` call to + add a user-defined command-line option. Add the option to a separate + option group for the local options, creating the group if necessary. + + The keyword argument *settable* is recognized specially (and + removed from *kw*). If true, the option is marked as modifiable; + by default "local" (project-added) options are not eligible for + for :func:`~SCons.Script.Main.SetOption` calls. + + .. versionchanged:: 4.8.0 + Added special handling of *settable*. + """ try: group = self.local_option_group @@ -473,6 +472,7 @@ class SConsOptionParser(optparse.OptionParser): group = self.add_option_group(group) self.local_option_group = group + settable = kw.pop('settable') result = group.add_option(*args, **kw) if result: # The option was added successfully. We now have to add the @@ -485,6 +485,8 @@ class SConsOptionParser(optparse.OptionParser): # right away. setattr(self.values.__defaults__, result.dest, result.default) self.reparse_local_options() + if settable: + SConsValues.settable.append(result.dest) return result @@ -614,7 +616,8 @@ class SConsIndentedHelpFormatter(optparse.IndentedHelpFormatter): """Local-only version of store_option_strings. We need to replicate this so the formatter will be set up - properly if we didn't go through the "normal" store_option_strings + properly if we didn't go through the "normal" + :math:`~optparse.HelpFormatter.store_option_strings`. .. versionadded:: 4.6.0 """ @@ -633,15 +636,18 @@ def Parser(version): """Returns a parser object initialized with the standard SCons options. Add options in the order we want them to show up in the ``-H`` help - text, basically alphabetical. Each ``op.add_option()`` call - should have a consistent format:: + text, basically alphabetical. For readability, Each + :meth:`~optparse.OptionContainer.add_option` call should have a + consistent format:: - op.add_option("-L", "--long-option-name", - nargs=1, type="string", - dest="long_option_name", default='foo', - action="callback", callback=opt_long_option, - help="help text goes here", - metavar="VAR") + op.add_option( + "-L", "--long-option-name", + nargs=1, type="string", + dest="long_option_name", default='foo', + action="callback", callback=opt_long_option, + help="help text goes here", + metavar="VAR" + ) Even though the :mod:`optparse` module constructs reasonable default destination names from the long option names, we're going to be diff --git a/scons/scons-local-4.7.0/SCons/Script/SConscript.py b/scons/scons-local-4.8.0/SCons/Script/SConscript.py similarity index 98% rename from scons/scons-local-4.7.0/SCons/Script/SConscript.py rename to scons/scons-local-4.8.0/SCons/Script/SConscript.py index 85070ab05..a2ef3b9d5 100644 --- a/scons/scons-local-4.7.0/SCons/Script/SConscript.py +++ b/scons/scons-local-4.8.0/SCons/Script/SConscript.py @@ -45,6 +45,7 @@ import re import sys import traceback import time +from typing import Tuple class SConscriptReturn(Exception): pass @@ -385,7 +386,7 @@ class SConsEnvironment(SCons.Environment.Base): # Private methods of an SConsEnvironment. # @staticmethod - def _get_major_minor_revision(version_string): + def _get_major_minor_revision(version_string: str) -> Tuple[int, int, int]: """Split a version string into major, minor and (optionally) revision parts. @@ -484,15 +485,22 @@ class SConsEnvironment(SCons.Environment.Base): SCons.Script._Set_Default_Targets(self, targets) @staticmethod - def EnsureSConsVersion(major, minor, revision: int=0) -> None: + def GetSConsVersion() -> Tuple[int, int, int]: + """Return the current SCons version. + + .. versionadded:: 4.8.0 + """ + return SConsEnvironment._get_major_minor_revision(SCons.__version__) + + @staticmethod + def EnsureSConsVersion(major: int, minor: int, revision: int = 0) -> None: """Exit abnormally if the SCons version is not late enough.""" # split string to avoid replacement during build process if SCons.__version__ == '__' + 'VERSION__': SCons.Warnings.warn(SCons.Warnings.DevelopmentVersionWarning, "EnsureSConsVersion is ignored for development version") return - scons_ver = SConsEnvironment._get_major_minor_revision(SCons.__version__) - if scons_ver < (major, minor, revision): + if SConsEnvironment.GetSConsVersion() < (major, minor, revision): if revision: scons_ver_string = '%d.%d.%d' % (major, minor, revision) else: diff --git a/scons/scons-local-4.7.0/SCons/Script/__init__.py b/scons/scons-local-4.8.0/SCons/Script/__init__.py similarity index 99% rename from scons/scons-local-4.7.0/SCons/Script/__init__.py rename to scons/scons-local-4.8.0/SCons/Script/__init__.py index a62650f7f..ce0105573 100644 --- a/scons/scons-local-4.7.0/SCons/Script/__init__.py +++ b/scons/scons-local-4.8.0/SCons/Script/__init__.py @@ -297,6 +297,7 @@ def Variables(files=None, args=ARGUMENTS): # # Static functions that do not trigger initialization of # DefaultEnvironment() and don't use its state. +GetSConsVersion = _SConscript.SConsEnvironment.GetSConsVersion EnsureSConsVersion = _SConscript.SConsEnvironment.EnsureSConsVersion EnsurePythonVersion = _SConscript.SConsEnvironment.EnsurePythonVersion Exit = _SConscript.SConsEnvironment.Exit diff --git a/scons/scons-local-4.7.0/SCons/Subst.py b/scons/scons-local-4.8.0/SCons/Subst.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Subst.py rename to scons/scons-local-4.8.0/SCons/Subst.py diff --git a/scons/scons-local-4.7.0/SCons/Taskmaster/Job.py b/scons/scons-local-4.8.0/SCons/Taskmaster/Job.py similarity index 99% rename from scons/scons-local-4.7.0/SCons/Taskmaster/Job.py rename to scons/scons-local-4.8.0/SCons/Taskmaster/Job.py index 73ec0df45..fae985e16 100644 --- a/scons/scons-local-4.7.0/SCons/Taskmaster/Job.py +++ b/scons/scons-local-4.8.0/SCons/Taskmaster/Job.py @@ -278,9 +278,8 @@ class ThreadPool: try: prev_size = threading.stack_size(stack_size * 1024) - except AttributeError as e: - # Only print a warning if the stack size has been - # explicitly set. + except RuntimeError as e: + # Only print a warning if the stack size has been explicitly set. if explicit_stack_size is not None: msg = "Setting stack size is unsupported by this version of Python:\n " + \ e.args[0] diff --git a/scons/scons-local-4.7.0/SCons/Taskmaster/__init__.py b/scons/scons-local-4.8.0/SCons/Taskmaster/__init__.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Taskmaster/__init__.py rename to scons/scons-local-4.8.0/SCons/Taskmaster/__init__.py diff --git a/scons/scons-local-4.7.0/SCons/Tool/386asm.py b/scons/scons-local-4.8.0/SCons/Tool/386asm.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/386asm.py rename to scons/scons-local-4.8.0/SCons/Tool/386asm.py diff --git a/scons/scons-local-4.7.0/SCons/Tool/DCommon.py b/scons/scons-local-4.8.0/SCons/Tool/DCommon.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/DCommon.py rename to scons/scons-local-4.8.0/SCons/Tool/DCommon.py diff --git a/scons/scons-local-4.7.0/SCons/Tool/FortranCommon.py b/scons/scons-local-4.8.0/SCons/Tool/FortranCommon.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/FortranCommon.py rename to scons/scons-local-4.8.0/SCons/Tool/FortranCommon.py diff --git a/scons/scons-local-4.7.0/SCons/Tool/GettextCommon.py b/scons/scons-local-4.8.0/SCons/Tool/GettextCommon.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/GettextCommon.py rename to scons/scons-local-4.8.0/SCons/Tool/GettextCommon.py diff --git a/scons/scons-local-4.7.0/SCons/Tool/JavaCommon.py b/scons/scons-local-4.8.0/SCons/Tool/JavaCommon.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/JavaCommon.py rename to scons/scons-local-4.8.0/SCons/Tool/JavaCommon.py diff --git a/scons/scons-local-4.7.0/SCons/Tool/MSCommon/MSVC/Dispatcher.py b/scons/scons-local-4.8.0/SCons/Tool/MSCommon/MSVC/Dispatcher.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/MSCommon/MSVC/Dispatcher.py rename to scons/scons-local-4.8.0/SCons/Tool/MSCommon/MSVC/Dispatcher.py diff --git a/scons/scons-local-4.7.0/SCons/Tool/MSCommon/MSVC/Exceptions.py b/scons/scons-local-4.8.0/SCons/Tool/MSCommon/MSVC/Exceptions.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/MSCommon/MSVC/Exceptions.py rename to scons/scons-local-4.8.0/SCons/Tool/MSCommon/MSVC/Exceptions.py diff --git a/scons/scons-local-4.8.0/SCons/Tool/MSCommon/MSVC/Kind.py b/scons/scons-local-4.8.0/SCons/Tool/MSCommon/MSVC/Kind.py new file mode 100644 index 000000000..47d4a25d9 --- /dev/null +++ b/scons/scons-local-4.8.0/SCons/Tool/MSCommon/MSVC/Kind.py @@ -0,0 +1,668 @@ +# MIT License +# +# Copyright The SCons Foundation +# +# Permission is hereby granted, free of charge, to any person obtaining +# a copy of this software and associated documentation files (the +# "Software"), to deal in the Software without restriction, including +# without limitation the rights to use, copy, modify, merge, publish, +# distribute, sublicense, and/or sell copies of the Software, and to +# permit persons to whom the Software is furnished to do so, subject to +# the following conditions: +# +# The above copyright notice and this permission notice shall be included +# in all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY +# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE +# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +""" +Version kind categorization for Microsoft Visual C/C++. +""" + +import os +import re + +from collections import ( + namedtuple, +) + +from ..common import ( + debug, +) + +from . import Registry +from . import Util + +from . import Dispatcher +Dispatcher.register_modulename(__name__) + + +# use express install for non-express msvc_version if no other installations found +USE_EXPRESS_FOR_NONEXPRESS = True + +# productdir kind + +VCVER_KIND_UNKNOWN = 0 # undefined +VCVER_KIND_DEVELOP = 1 # devenv binary +VCVER_KIND_EXPRESS = 2 # express binary +VCVER_KIND_BTDISPATCH = 3 # no ide binaries (buildtools dispatch folder) +VCVER_KIND_VCFORPYTHON = 4 # no ide binaries (2008/9.0) +VCVER_KIND_EXPRESS_WIN = 5 # express for windows binary (VSWinExpress) +VCVER_KIND_EXPRESS_WEB = 6 # express for web binary (VWDExpress) +VCVER_KIND_SDK = 7 # no ide binaries +VCVER_KIND_CMDLINE = 8 # no ide binaries + +VCVER_KIND_STR = { + VCVER_KIND_UNKNOWN: '', + VCVER_KIND_DEVELOP: 'Develop', + VCVER_KIND_EXPRESS: 'Express', + VCVER_KIND_BTDISPATCH: 'BTDispatch', + VCVER_KIND_VCFORPYTHON: 'VCForPython', + VCVER_KIND_EXPRESS_WIN: 'Express-Win', + VCVER_KIND_EXPRESS_WEB: 'Express-Web', + VCVER_KIND_SDK: 'SDK', + VCVER_KIND_CMDLINE: 'CmdLine', +} + +BITFIELD_KIND_DEVELOP = 0b_1000 +BITFIELD_KIND_EXPRESS = 0b_0100 +BITFIELD_KIND_EXPRESS_WIN = 0b_0010 +BITFIELD_KIND_EXPRESS_WEB = 0b_0001 + +VCVER_KIND_PROGRAM = namedtuple("VCVerKindProgram", [ + 'kind', # relpath from pdir to vsroot + 'program', # ide binaries + 'bitfield', +]) + +# + +IDE_PROGRAM_DEVENV_COM = VCVER_KIND_PROGRAM( + kind=VCVER_KIND_DEVELOP, + program='devenv.com', + bitfield=BITFIELD_KIND_DEVELOP, +) + +IDE_PROGRAM_MSDEV_COM = VCVER_KIND_PROGRAM( + kind=VCVER_KIND_DEVELOP, + program='msdev.com', + bitfield=BITFIELD_KIND_DEVELOP, +) + +IDE_PROGRAM_WDEXPRESS_EXE = VCVER_KIND_PROGRAM( + kind=VCVER_KIND_EXPRESS, + program='WDExpress.exe', + bitfield=BITFIELD_KIND_EXPRESS, +) + +IDE_PROGRAM_VCEXPRESS_EXE = VCVER_KIND_PROGRAM( + kind=VCVER_KIND_EXPRESS, + program='VCExpress.exe', + bitfield=BITFIELD_KIND_EXPRESS, +) + +IDE_PROGRAM_VSWINEXPRESS_EXE = VCVER_KIND_PROGRAM( + kind=VCVER_KIND_EXPRESS_WIN, + program='VSWinExpress.exe', + bitfield=BITFIELD_KIND_EXPRESS_WIN, +) + +IDE_PROGRAM_VWDEXPRESS_EXE = VCVER_KIND_PROGRAM( + kind=VCVER_KIND_EXPRESS_WEB, + program='VWDExpress.exe', + bitfield=BITFIELD_KIND_EXPRESS_WEB, +) + +# detection configuration + +VCVER_KIND_DETECT = namedtuple("VCVerKindDetect", [ + 'root', # relpath from pdir to vsroot + 'path', # vsroot to ide dir + 'programs', # ide binaries +]) + +# detected binaries + +VCVER_DETECT_BINARIES = namedtuple("VCVerDetectBinaries", [ + 'bitfields', # detect values + 'have_dev', # develop ide binary + 'have_exp', # express ide binary + 'have_exp_win', # express windows ide binary + 'have_exp_web', # express web ide binary +]) + + +VCVER_DETECT_KIND = namedtuple("VCVerDetectKind", [ + 'skip', # skip vs root + 'save', # save in case no other kind found + 'kind', # internal kind + 'binaries_t', + 'extended', +]) + +# unknown value + +_VCVER_DETECT_KIND_UNKNOWN = VCVER_DETECT_KIND( + skip=True, + save=False, + kind=VCVER_KIND_UNKNOWN, + binaries_t=VCVER_DETECT_BINARIES( + bitfields=0b0, + have_dev=False, + have_exp=False, + have_exp_win=False, + have_exp_web=False, + ), + extended={}, +) + +# + +_msvc_pdir_func = None + +def register_msvc_version_pdir_func(func): + global _msvc_pdir_func + if func: + _msvc_pdir_func = func + +_cache_vcver_kind_map = {} + +def msvc_version_register_kind(msvc_version, kind_t) -> None: + global _cache_vcver_kind_map + if kind_t is None: + kind_t = _VCVER_DETECT_KIND_UNKNOWN + debug('msvc_version=%s, kind=%s', repr(msvc_version), repr(VCVER_KIND_STR[kind_t.kind])) + _cache_vcver_kind_map[msvc_version] = kind_t + +def _msvc_version_kind_lookup(msvc_version, env=None): + global _cache_vcver_kind_map + global _msvc_pdir_func + if msvc_version not in _cache_vcver_kind_map: + _msvc_pdir_func(msvc_version, env) + kind_t = _cache_vcver_kind_map.get(msvc_version, _VCVER_DETECT_KIND_UNKNOWN) + debug( + 'kind=%s, dev=%s, exp=%s, msvc_version=%s', + repr(VCVER_KIND_STR[kind_t.kind]), + kind_t.binaries_t.have_dev, kind_t.binaries_t.have_exp, + repr(msvc_version) + ) + return kind_t + +def msvc_version_is_btdispatch(msvc_version, env=None): + kind_t = _msvc_version_kind_lookup(msvc_version, env) + is_btdispatch = bool(kind_t.kind == VCVER_KIND_BTDISPATCH) + debug( + 'is_btdispatch=%s, kind:%s, msvc_version=%s', + repr(is_btdispatch), repr(VCVER_KIND_STR[kind_t.kind]), repr(msvc_version) + ) + return is_btdispatch + +def msvc_version_is_express(msvc_version, env=None): + kind_t = _msvc_version_kind_lookup(msvc_version, env) + is_express = bool(kind_t.kind == VCVER_KIND_EXPRESS) + debug( + 'is_express=%s, kind:%s, msvc_version=%s', + repr(is_express), repr(VCVER_KIND_STR[kind_t.kind]), repr(msvc_version) + ) + return is_express + +def msvc_version_is_vcforpython(msvc_version, env=None): + kind_t = _msvc_version_kind_lookup(msvc_version, env) + is_vcforpython = bool(kind_t.kind == VCVER_KIND_VCFORPYTHON) + debug( + 'is_vcforpython=%s, kind:%s, msvc_version=%s', + repr(is_vcforpython), repr(VCVER_KIND_STR[kind_t.kind]), repr(msvc_version) + ) + return is_vcforpython + +def msvc_version_skip_uwp_target(env, msvc_version): + + vernum = float(Util.get_msvc_version_prefix(msvc_version)) + vernum_int = int(vernum * 10) + + if vernum_int != 140: + return False + + kind_t = _msvc_version_kind_lookup(msvc_version, env) + if kind_t.kind != VCVER_KIND_EXPRESS: + return False + + target_arch = env.get('TARGET_ARCH') + + uwp_is_supported = kind_t.extended.get('uwp_is_supported', {}) + is_supported = uwp_is_supported.get(target_arch, True) + + if is_supported: + return False + + return True + +def _pdir_detect_binaries(pdir, detect): + + vs_root = os.path.join(pdir, detect.root) + ide_path = os.path.join(vs_root, detect.path) + + bitfields = 0b_0000 + for ide_program in detect.programs: + prog = os.path.join(ide_path, ide_program.program) + if not os.path.exists(prog): + continue + bitfields |= ide_program.bitfield + + have_dev = bool(bitfields & BITFIELD_KIND_DEVELOP) + have_exp = bool(bitfields & BITFIELD_KIND_EXPRESS) + have_exp_win = bool(bitfields & BITFIELD_KIND_EXPRESS_WIN) + have_exp_web = bool(bitfields & BITFIELD_KIND_EXPRESS_WEB) + + binaries_t = VCVER_DETECT_BINARIES( + bitfields=bitfields, + have_dev=have_dev, + have_exp=have_exp, + have_exp_win=have_exp_win, + have_exp_web=have_exp_web, + ) + + debug( + 'vs_root=%s, dev=%s, exp=%s, exp_win=%s, exp_web=%s, pdir=%s', + repr(vs_root), + binaries_t.have_dev, binaries_t.have_exp, + binaries_t.have_exp_win, binaries_t.have_exp_web, + repr(pdir) + ) + + return vs_root, binaries_t + +_cache_pdir_vswhere_kind = {} + +def msvc_version_pdir_vswhere_kind(msvc_version, pdir, detect_t): + global _cache_pdir_vswhere_kind + + vc_dir = os.path.normcase(os.path.normpath(pdir)) + cache_key = (msvc_version, vc_dir) + + rval = _cache_pdir_vswhere_kind.get(cache_key) + if rval is not None: + debug('cache=%s', repr(rval)) + return rval + + extended = {} + + prefix, suffix = Util.get_msvc_version_prefix_suffix(msvc_version) + + vs_root, binaries_t = _pdir_detect_binaries(pdir, detect_t) + + if binaries_t.have_dev: + kind = VCVER_KIND_DEVELOP + elif binaries_t.have_exp: + kind = VCVER_KIND_EXPRESS + else: + kind = VCVER_KIND_CMDLINE + + skip = False + save = False + + if suffix != 'Exp' and kind == VCVER_KIND_EXPRESS: + skip = True + save = USE_EXPRESS_FOR_NONEXPRESS + elif suffix == 'Exp' and kind != VCVER_KIND_EXPRESS: + skip = True + + kind_t = VCVER_DETECT_KIND( + skip=skip, + save=save, + kind=kind, + binaries_t=binaries_t, + extended=extended, + ) + + debug( + 'skip=%s, save=%s, kind=%s, msvc_version=%s, pdir=%s', + kind_t.skip, kind_t.save, repr(VCVER_KIND_STR[kind_t.kind]), + repr(msvc_version), repr(pdir) + ) + + _cache_pdir_vswhere_kind[cache_key] = kind_t + + return kind_t + +# VS2015 buildtools batch file call detection +# vs2015 buildtools do not support sdk_version or UWP arguments + +_VS2015BT_PATH = r'..\Microsoft Visual C++ Build Tools\vcbuildtools.bat' + +_VS2015BT_REGEX_STR = ''.join([ + r'^\s*if\s+exist\s+', + re.escape(fr'"%~dp0..\{_VS2015BT_PATH}"'), + r'\s+goto\s+setup_buildsku\s*$', +]) + +_VS2015BT_VCVARS_BUILDTOOLS = re.compile(_VS2015BT_REGEX_STR, re.IGNORECASE) +_VS2015BT_VCVARS_STOP = re.compile(r'^\s*[:]Setup_VS\s*$', re.IGNORECASE) + +def _vs_buildtools_2015_vcvars(vcvars_file): + have_buildtools_vcvars = False + with open(vcvars_file) as fh: + for line in fh: + if _VS2015BT_VCVARS_BUILDTOOLS.match(line): + have_buildtools_vcvars = True + break + if _VS2015BT_VCVARS_STOP.match(line): + break + return have_buildtools_vcvars + +def _vs_buildtools_2015(vs_root, vc_dir): + + is_btdispatch = False + + do_once = True + while do_once: + do_once = False + + buildtools_file = os.path.join(vs_root, _VS2015BT_PATH) + have_buildtools = os.path.exists(buildtools_file) + debug('have_buildtools=%s', have_buildtools) + if not have_buildtools: + break + + vcvars_file = os.path.join(vc_dir, 'vcvarsall.bat') + have_vcvars = os.path.exists(vcvars_file) + debug('have_vcvars=%s', have_vcvars) + if not have_vcvars: + break + + have_buildtools_vcvars = _vs_buildtools_2015_vcvars(vcvars_file) + debug('have_buildtools_vcvars=%s', have_buildtools_vcvars) + if not have_buildtools_vcvars: + break + + is_btdispatch = True + + debug('is_btdispatch=%s', is_btdispatch) + return is_btdispatch + +_VS2015EXP_VCVARS_LIBPATH = re.compile( + ''.join([ + r'^\s*\@if\s+exist\s+\"\%VCINSTALLDIR\%LIB\\store\\(amd64|arm)"\s+', + r'set (LIB|LIBPATH)=\%VCINSTALLDIR\%LIB\\store\\(amd64|arm);.*\%(LIB|LIBPATH)\%\s*$' + ]), + re.IGNORECASE +) + +_VS2015EXP_VCVARS_STOP = re.compile(r'^\s*[:]GetVSCommonToolsDir\s*$', re.IGNORECASE) + +def _vs_express_2015_vcvars(vcvars_file): + n_libpath = 0 + with open(vcvars_file) as fh: + for line in fh: + if _VS2015EXP_VCVARS_LIBPATH.match(line): + n_libpath += 1 + elif _VS2015EXP_VCVARS_STOP.match(line): + break + have_uwp_fix = n_libpath >= 2 + return have_uwp_fix + +def _vs_express_2015(pdir): + + have_uwp_amd64 = False + have_uwp_arm = False + + vcvars_file = os.path.join(pdir, r'vcvarsall.bat') + if os.path.exists(vcvars_file): + + vcvars_file = os.path.join(pdir, r'bin\x86_amd64\vcvarsx86_amd64.bat') + if os.path.exists(vcvars_file): + have_uwp_fix = _vs_express_2015_vcvars(vcvars_file) + if have_uwp_fix: + have_uwp_amd64 = True + + vcvars_file = os.path.join(pdir, r'bin\x86_arm\vcvarsx86_arm.bat') + if os.path.exists(vcvars_file): + have_uwp_fix = _vs_express_2015_vcvars(vcvars_file) + if have_uwp_fix: + have_uwp_arm = True + + debug('have_uwp_amd64=%s, have_uwp_arm=%s', have_uwp_amd64, have_uwp_arm) + return have_uwp_amd64, have_uwp_arm + +# winsdk installed 2010 [7.1], 2008 [7.0, 6.1] folders + +_REGISTRY_WINSDK_VERSIONS = {'10.0', '9.0'} + +_cache_pdir_registry_winsdk = {} + +def _msvc_version_pdir_registry_winsdk(msvc_version, pdir): + global _cache_pdir_registry_winsdk + + # detect winsdk-only installations + # + # registry keys: + # [prefix]\VisualStudio\SxS\VS7\10.0 + # [prefix]\VisualStudio\SxS\VC7\10.0 product directory + # [prefix]\VisualStudio\SxS\VS7\9.0 + # [prefix]\VisualStudio\SxS\VC7\9.0 product directory + # + # winsdk notes: + # - winsdk installs do not define the common tools env var + # - the product dir is detected but the vcvars batch files will fail + # - regular installations populate the VS7 registry keys + # + + vc_dir = os.path.normcase(os.path.normpath(pdir)) + cache_key = (msvc_version, vc_dir) + + rval = _cache_pdir_registry_winsdk.get(cache_key) + if rval is not None: + debug('cache=%s', repr(rval)) + return rval + + if msvc_version not in _REGISTRY_WINSDK_VERSIONS: + + is_sdk = False + + debug('is_sdk=%s, msvc_version=%s', is_sdk, repr(msvc_version)) + + else: + + vc_dir = os.path.normcase(os.path.normpath(pdir)) + + vc_suffix = Registry.vstudio_sxs_vc7(msvc_version) + vc_qresults = [record[0] for record in Registry.microsoft_query_paths(vc_suffix)] + vc_root = os.path.normcase(os.path.normpath(vc_qresults[0])) if vc_qresults else None + + if vc_dir != vc_root: + # registry vc path is not the current pdir + + is_sdk = False + + debug( + 'is_sdk=%s, msvc_version=%s, pdir=%s, vc_root=%s', + is_sdk, repr(msvc_version), repr(vc_dir), repr(vc_root) + ) + + else: + # registry vc path is the current pdir + + vs_suffix = Registry.vstudio_sxs_vs7(msvc_version) + vs_qresults = [record[0] for record in Registry.microsoft_query_paths(vs_suffix)] + vs_root = vs_qresults[0] if vs_qresults else None + + is_sdk = bool(not vs_root and vc_root) + + debug( + 'is_sdk=%s, msvc_version=%s, vs_root=%s, vc_root=%s', + is_sdk, repr(msvc_version), repr(vs_root), repr(vc_root) + ) + + _cache_pdir_registry_winsdk[cache_key] = is_sdk + + return is_sdk + +_cache_pdir_registry_kind = {} + +def msvc_version_pdir_registry_kind(msvc_version, pdir, detect_t, is_vcforpython=False): + global _cache_pdir_registry_kind + + vc_dir = os.path.normcase(os.path.normpath(pdir)) + cache_key = (msvc_version, vc_dir) + + rval = _cache_pdir_registry_kind.get(cache_key) + if rval is not None: + debug('cache=%s', repr(rval)) + return rval + + extended = {} + + prefix, suffix = Util.get_msvc_version_prefix_suffix(msvc_version) + + vs_root, binaries_t = _pdir_detect_binaries(pdir, detect_t) + + if binaries_t.have_dev: + kind = VCVER_KIND_DEVELOP + elif binaries_t.have_exp: + kind = VCVER_KIND_EXPRESS + elif msvc_version == '14.0' and _vs_buildtools_2015(vs_root, pdir): + kind = VCVER_KIND_BTDISPATCH + elif msvc_version == '9.0' and is_vcforpython: + kind = VCVER_KIND_VCFORPYTHON + elif binaries_t.have_exp_win: + kind = VCVER_KIND_EXPRESS_WIN + elif binaries_t.have_exp_web: + kind = VCVER_KIND_EXPRESS_WEB + elif _msvc_version_pdir_registry_winsdk(msvc_version, pdir): + kind = VCVER_KIND_SDK + else: + kind = VCVER_KIND_CMDLINE + + skip = False + save = False + + if kind in (VCVER_KIND_EXPRESS_WIN, VCVER_KIND_EXPRESS_WEB, VCVER_KIND_SDK): + skip = True + elif suffix != 'Exp' and kind == VCVER_KIND_EXPRESS: + skip = True + save = USE_EXPRESS_FOR_NONEXPRESS + elif suffix == 'Exp' and kind != VCVER_KIND_EXPRESS: + skip = True + + if prefix == '14.0' and kind == VCVER_KIND_EXPRESS: + have_uwp_amd64, have_uwp_arm = _vs_express_2015(pdir) + uwp_is_supported = { + 'x86': True, + 'amd64': have_uwp_amd64, + 'arm': have_uwp_arm, + } + extended['uwp_is_supported'] = uwp_is_supported + + kind_t = VCVER_DETECT_KIND( + skip=skip, + save=save, + kind=kind, + binaries_t=binaries_t, + extended=extended, + ) + + debug( + 'skip=%s, save=%s, kind=%s, msvc_version=%s, pdir=%s', + kind_t.skip, kind_t.save, repr(VCVER_KIND_STR[kind_t.kind]), + repr(msvc_version), repr(pdir) + ) + + _cache_pdir_registry_kind[cache_key] = kind_t + + return kind_t + +# queries + +def get_msvc_version_kind(msvc_version, env=None): + kind_t = _msvc_version_kind_lookup(msvc_version, env) + kind_str = VCVER_KIND_STR[kind_t.kind] + debug( + 'kind=%s, kind_str=%s, msvc_version=%s', + repr(kind_t.kind), repr(kind_str), repr(msvc_version) + ) + return (kind_t.kind, kind_str) + +def msvc_version_sdk_version_is_supported(msvc_version, env=None): + + vernum = float(Util.get_msvc_version_prefix(msvc_version)) + vernum_int = int(vernum * 10) + + kind_t = _msvc_version_kind_lookup(msvc_version, env) + + if vernum_int >= 141: + # VS2017 and later + is_supported = True + elif vernum_int == 140: + # VS2015: + # True: Develop, CmdLine + # False: Express, BTDispatch + is_supported = True + if kind_t.kind == VCVER_KIND_EXPRESS: + is_supported = False + elif kind_t.kind == VCVER_KIND_BTDISPATCH: + is_supported = False + else: + # VS2013 and earlier + is_supported = False + + debug( + 'is_supported=%s, msvc_version=%s, kind=%s', + is_supported, repr(msvc_version), repr(VCVER_KIND_STR[kind_t.kind]) + ) + return is_supported + +def msvc_version_uwp_is_supported(msvc_version, target_arch=None, env=None): + + vernum = float(Util.get_msvc_version_prefix(msvc_version)) + vernum_int = int(vernum * 10) + + kind_t = _msvc_version_kind_lookup(msvc_version, env) + + is_target = False + + if vernum_int >= 141: + # VS2017 and later + is_supported = True + elif vernum_int == 140: + # VS2015: + # True: Develop, CmdLine + # Maybe: Express + # False: BTDispatch + is_supported = True + if kind_t.kind == VCVER_KIND_EXPRESS: + uwp_is_supported = kind_t.extended.get('uwp_is_supported', {}) + is_supported = uwp_is_supported.get(target_arch, True) + is_target = True + elif kind_t.kind == VCVER_KIND_BTDISPATCH: + is_supported = False + else: + # VS2013 and earlier + is_supported = False + + debug( + 'is_supported=%s, is_target=%s, msvc_version=%s, kind=%s, target_arch=%s', + is_supported, is_target, repr(msvc_version), repr(VCVER_KIND_STR[kind_t.kind]), repr(target_arch) + ) + + return is_supported, is_target + +# reset cache + +def reset() -> None: + global _cache_vcver_kind_map + global _cache_pdir_vswhere_kind + global _cache_pdir_registry_kind + global _cache_pdir_registry_winsdk + + debug('') + + _cache_vcver_kind_map = {} + _cache_pdir_vswhere_kind = {} + _cache_pdir_registry_kind = {} + _cache_pdir_registry_winsdk = {} diff --git a/scons/scons-local-4.7.0/SCons/Tool/MSCommon/MSVC/Policy.py b/scons/scons-local-4.8.0/SCons/Tool/MSCommon/MSVC/Policy.py similarity index 91% rename from scons/scons-local-4.7.0/SCons/Tool/MSCommon/MSVC/Policy.py rename to scons/scons-local-4.8.0/SCons/Tool/MSCommon/MSVC/Policy.py index fe8da3156..7e11a63ba 100644 --- a/scons/scons-local-4.7.0/SCons/Tool/MSCommon/MSVC/Policy.py +++ b/scons/scons-local-4.8.0/SCons/Tool/MSCommon/MSVC/Policy.py @@ -38,6 +38,10 @@ from collections import ( namedtuple, ) +from contextlib import ( + contextmanager, +) + import SCons.Warnings from ..common import ( @@ -215,6 +219,18 @@ def msvc_notfound_handler(env, msg): else: SCons.Warnings.warn(SCons.Warnings.VisualCMissingWarning, msg) +@contextmanager +def msvc_notfound_policy_contextmanager(MSVC_NOTFOUND_POLICY=None): + """ Temporarily change the MSVC not found policy within a context. + + Args: + MSVC_NOTFOUND_POLICY: + string representing the policy behavior + when MSVC is not found or None + """ + prev_policy = msvc_set_notfound_policy(MSVC_NOTFOUND_POLICY) + yield + msvc_set_notfound_policy(prev_policy) def _msvc_scripterror_policy_lookup(symbol): @@ -299,3 +315,16 @@ def msvc_scripterror_handler(env, msg): else: SCons.Warnings.warn(MSVCScriptExecutionWarning, msg) +@contextmanager +def msvc_scripterror_policy_contextmanager(MSVC_SCRIPTERROR_POLICY=None): + """ Temporarily change the msvc batch execution errors policy within a context. + + Args: + MSVC_SCRIPTERROR_POLICY: + string representing the policy behavior + when msvc batch file execution errors are detected or None + """ + prev_policy = msvc_set_scripterror_policy(MSVC_SCRIPTERROR_POLICY) + yield + msvc_set_scripterror_policy(prev_policy) + diff --git a/scons/scons-local-4.7.0/SCons/Tool/MSCommon/MSVC/Registry.py b/scons/scons-local-4.8.0/SCons/Tool/MSCommon/MSVC/Registry.py similarity index 97% rename from scons/scons-local-4.7.0/SCons/Tool/MSCommon/MSVC/Registry.py rename to scons/scons-local-4.8.0/SCons/Tool/MSCommon/MSVC/Registry.py index f9e544c6f..b5b72c42f 100644 --- a/scons/scons-local-4.7.0/SCons/Tool/MSCommon/MSVC/Registry.py +++ b/scons/scons-local-4.8.0/SCons/Tool/MSCommon/MSVC/Registry.py @@ -110,6 +110,9 @@ def windows_kit_query_paths(version): q = windows_kits(version) return microsoft_query_paths(q) +def vstudio_sxs_vs7(version): + return '\\'.join([r'VisualStudio\SxS\VS7', version]) + def vstudio_sxs_vc7(version): return '\\'.join([r'VisualStudio\SxS\VC7', version]) diff --git a/scons/scons-local-4.7.0/SCons/Tool/MSCommon/MSVC/ScriptArguments.py b/scons/scons-local-4.8.0/SCons/Tool/MSCommon/MSVC/ScriptArguments.py similarity index 82% rename from scons/scons-local-4.7.0/SCons/Tool/MSCommon/MSVC/ScriptArguments.py rename to scons/scons-local-4.8.0/SCons/Tool/MSCommon/MSVC/ScriptArguments.py index 8848095cf..2c766fed4 100644 --- a/scons/scons-local-4.7.0/SCons/Tool/MSCommon/MSVC/ScriptArguments.py +++ b/scons/scons-local-4.8.0/SCons/Tool/MSCommon/MSVC/ScriptArguments.py @@ -42,6 +42,7 @@ from . import Util from . import Config from . import Registry from . import WinSDK +from . import Kind from .Exceptions import ( MSVCInternalError, @@ -172,6 +173,12 @@ MSVC_VERSION_ARGS_DEFINITION = namedtuple('MSVCVersionArgsDefinition', [ 'vs_def', ]) +TOOLSET_VERSION_ARGS_DEFINITION = namedtuple('ToolsetVersionArgsDefinition', [ + 'version', # full version (e.g., '14.1Exp', '14.32.31326') + 'vc_buildtools_def', + 'is_user', +]) + def _msvc_version(version): verstr = Util.get_msvc_version_prefix(version) @@ -184,19 +191,22 @@ def _msvc_version(version): return version_args -def _toolset_version(version): +def _toolset_version(version, is_user=False): - verstr = Util.get_msvc_version_prefix(version) - vs_def = Config.MSVC_VERSION_INTERNAL[verstr] + vc_series = Util.get_msvc_version_prefix(version) - version_args = MSVC_VERSION_ARGS_DEFINITION( + vc_buildseries_def = Config.MSVC_BUILDSERIES_EXTERNAL[vc_series] + vc_buildtools_def = Config.VC_BUILDTOOLS_MAP[vc_buildseries_def.vc_buildseries] + + version_args = TOOLSET_VERSION_ARGS_DEFINITION( version = version, - vs_def = vs_def, + vc_buildtools_def = vc_buildtools_def, + is_user = is_user, ) return version_args -def _msvc_script_argument_uwp(env, msvc, arglist): +def _msvc_script_argument_uwp(env, msvc, arglist, target_arch): uwp_app = env['MSVC_UWP_APP'] debug('MSVC_VERSION=%s, MSVC_UWP_APP=%s', repr(msvc.version), repr(uwp_app)) @@ -207,17 +217,34 @@ def _msvc_script_argument_uwp(env, msvc, arglist): if uwp_app not in _ARGUMENT_BOOLEAN_TRUE_LEGACY: return None - if msvc.vs_def.vc_buildtools_def.vc_version_numeric < VS2015.vc_buildtools_def.vc_version_numeric: + if msvc.vs_def.vc_buildtools_def.msvc_version_numeric < VS2015.vc_buildtools_def.msvc_version_numeric: debug( 'invalid: msvc version constraint: %s < %s VS2015', - repr(msvc.vs_def.vc_buildtools_def.vc_version_numeric), - repr(VS2015.vc_buildtools_def.vc_version_numeric) + repr(msvc.vs_def.vc_buildtools_def.msvc_version_numeric), + repr(VS2015.vc_buildtools_def.msvc_version_numeric) ) err_msg = "MSVC_UWP_APP ({}) constraint violation: MSVC_VERSION {} < {} VS2015".format( - repr(uwp_app), repr(msvc.version), repr(VS2015.vc_buildtools_def.vc_version) + repr(uwp_app), repr(msvc.version), repr(VS2015.vc_buildtools_def.msvc_version) ) raise MSVCArgumentError(err_msg) + is_supported, is_target = Kind.msvc_version_uwp_is_supported(msvc.version, target_arch, env) + if not is_supported: + _, kind_str = Kind.get_msvc_version_kind(msvc.version) + debug( + 'invalid: msvc_version constraint: %s %s %s', + repr(msvc.version), repr(kind_str), repr(target_arch) + ) + if is_target and target_arch: + err_msg = "MSVC_UWP_APP ({}) TARGET_ARCH ({}) is not supported for MSVC_VERSION {} ({})".format( + repr(uwp_app), repr(target_arch), repr(msvc.version), repr(kind_str) + ) + else: + err_msg = "MSVC_UWP_APP ({}) is not supported for MSVC_VERSION {} ({})".format( + repr(uwp_app), repr(msvc.version), repr(kind_str) + ) + raise MSVCArgumentError(err_msg) + # VS2017+ rewrites uwp => store for 14.0 toolset uwp_arg = msvc.vs_def.vc_uwp @@ -250,16 +277,24 @@ def _user_script_argument_uwp(env, uwp, user_argstr) -> bool: raise MSVCArgumentError(err_msg) -def _msvc_script_argument_sdk_constraints(msvc, sdk_version): +def _msvc_script_argument_sdk_constraints(msvc, sdk_version, env): - if msvc.vs_def.vc_buildtools_def.vc_version_numeric < VS2015.vc_buildtools_def.vc_version_numeric: + if msvc.vs_def.vc_buildtools_def.msvc_version_numeric < VS2015.vc_buildtools_def.msvc_version_numeric: debug( 'invalid: msvc_version constraint: %s < %s VS2015', - repr(msvc.vs_def.vc_buildtools_def.vc_version_numeric), - repr(VS2015.vc_buildtools_def.vc_version_numeric) + repr(msvc.vs_def.vc_buildtools_def.msvc_version_numeric), + repr(VS2015.vc_buildtools_def.msvc_version_numeric) ) err_msg = "MSVC_SDK_VERSION ({}) constraint violation: MSVC_VERSION {} < {} VS2015".format( - repr(sdk_version), repr(msvc.version), repr(VS2015.vc_buildtools_def.vc_version) + repr(sdk_version), repr(msvc.version), repr(VS2015.vc_buildtools_def.msvc_version) + ) + return err_msg + + if not Kind.msvc_version_sdk_version_is_supported(msvc.version, env): + _, kind_str = Kind.get_msvc_version_kind(msvc.version) + debug('invalid: msvc_version constraint: %s %s', repr(msvc.version), repr(kind_str)) + err_msg = "MSVC_SDK_VERSION ({}) is not supported for MSVC_VERSION {} ({})".format( + repr(sdk_version), repr(msvc.version), repr(kind_str) ) return err_msg @@ -277,23 +312,23 @@ def _msvc_script_argument_sdk_platform_constraints(msvc, toolset, sdk_version, p if sdk_version == '8.1' and platform_def.is_uwp: - vs_def = toolset.vs_def if toolset else msvc.vs_def + vc_buildtools_def = toolset.vc_buildtools_def if toolset else msvc.vs_def.vc_buildtools_def - if vs_def.vc_buildtools_def.vc_version_numeric > VS2015.vc_buildtools_def.vc_version_numeric: + if vc_buildtools_def.msvc_version_numeric > VS2015.vc_buildtools_def.msvc_version_numeric: debug( 'invalid: uwp/store SDK 8.1 msvc_version constraint: %s > %s VS2015', - repr(vs_def.vc_buildtools_def.vc_version_numeric), - repr(VS2015.vc_buildtools_def.vc_version_numeric) + repr(vc_buildtools_def.msvc_version_numeric), + repr(VS2015.vc_buildtools_def.msvc_version_numeric) ) - if toolset and toolset.vs_def != msvc.vs_def: - err_msg = "MSVC_SDK_VERSION ({}) and platform type ({}) constraint violation: toolset version {} > {} VS2015".format( + if toolset and toolset.is_user: + err_msg = "MSVC_SDK_VERSION ({}) and platform type ({}) constraint violation: toolset {} MSVC_VERSION {} > {} VS2015".format( repr(sdk_version), repr(platform_def.vc_platform), - repr(toolset.version), repr(VS2015.vc_buildtools_def.vc_version) + repr(toolset.version), repr(msvc.version), repr(VS2015.vc_buildtools_def.msvc_version) ) else: err_msg = "MSVC_SDK_VERSION ({}) and platform type ({}) constraint violation: MSVC_VERSION {} > {} VS2015".format( repr(sdk_version), repr(platform_def.vc_platform), - repr(msvc.version), repr(VS2015.vc_buildtools_def.vc_version) + repr(msvc.version), repr(VS2015.vc_buildtools_def.msvc_version) ) return err_msg @@ -310,7 +345,7 @@ def _msvc_script_argument_sdk(env, msvc, toolset, platform_def, arglist): if not sdk_version: return None - err_msg = _msvc_script_argument_sdk_constraints(msvc, sdk_version) + err_msg = _msvc_script_argument_sdk_constraints(msvc, sdk_version, env) if err_msg: raise MSVCArgumentError(err_msg) @@ -333,7 +368,10 @@ def _msvc_script_argument_sdk(env, msvc, toolset, platform_def, arglist): def _msvc_script_default_sdk(env, msvc, platform_def, arglist, force_sdk: bool=False): - if msvc.vs_def.vc_buildtools_def.vc_version_numeric < VS2015.vc_buildtools_def.vc_version_numeric: + if msvc.vs_def.vc_buildtools_def.msvc_version_numeric < VS2015.vc_buildtools_def.msvc_version_numeric: + return None + + if not Kind.msvc_version_sdk_version_is_supported(msvc.version, env): return None sdk_list = WinSDK.get_sdk_version_list(msvc.vs_def, platform_def) @@ -415,10 +453,11 @@ def _msvc_sxs_toolset_folder(msvc, sxs_folder): if Util.is_toolset_sxs(sxs_folder): return sxs_folder, sxs_folder - key = (msvc.vs_def.vc_buildtools_def.vc_version, sxs_folder) - if key in _msvc_sxs_bugfix_folder: - sxs_version = _msvc_sxs_bugfix_folder[key] - return sxs_folder, sxs_version + for vc_buildseries_def in msvc.vs_def.vc_buildtools_def.vc_buildseries_list: + key = (vc_buildseries_def.vc_version, sxs_folder) + sxs_version = _msvc_sxs_bugfix_folder.get(key) + if sxs_version: + return sxs_folder, sxs_version debug('sxs folder: ignore version=%s', repr(sxs_folder)) return None, None @@ -574,49 +613,60 @@ def _msvc_version_toolset_vcvars(msvc, vc_dir, toolset_version): def _msvc_script_argument_toolset_constraints(msvc, toolset_version): - if msvc.vs_def.vc_buildtools_def.vc_version_numeric < VS2017.vc_buildtools_def.vc_version_numeric: + if msvc.vs_def.vc_buildtools_def.msvc_version_numeric < VS2017.vc_buildtools_def.msvc_version_numeric: debug( 'invalid: msvc version constraint: %s < %s VS2017', - repr(msvc.vs_def.vc_buildtools_def.vc_version_numeric), - repr(VS2017.vc_buildtools_def.vc_version_numeric) + repr(msvc.vs_def.vc_buildtools_def.msvc_version_numeric), + repr(VS2017.vc_buildtools_def.msvc_version_numeric) ) err_msg = "MSVC_TOOLSET_VERSION ({}) constraint violation: MSVC_VERSION {} < {} VS2017".format( - repr(toolset_version), repr(msvc.version), repr(VS2017.vc_buildtools_def.vc_version) + repr(toolset_version), repr(msvc.version), repr(VS2017.vc_buildtools_def.msvc_version) ) return err_msg - toolset_verstr = Util.get_msvc_version_prefix(toolset_version) + toolset_series = Util.get_msvc_version_prefix(toolset_version) - if not toolset_verstr: + if not toolset_series: debug('invalid: msvc version: toolset_version=%s', repr(toolset_version)) err_msg = 'MSVC_TOOLSET_VERSION {} format is not supported'.format( repr(toolset_version) ) return err_msg - toolset_vernum = float(toolset_verstr) - - if toolset_vernum < VS2015.vc_buildtools_def.vc_version_numeric: - debug( - 'invalid: toolset version constraint: %s < %s VS2015', - repr(toolset_vernum), repr(VS2015.vc_buildtools_def.vc_version_numeric) - ) - err_msg = "MSVC_TOOLSET_VERSION ({}) constraint violation: toolset version {} < {} VS2015".format( - repr(toolset_version), repr(toolset_verstr), repr(VS2015.vc_buildtools_def.vc_version) + toolset_buildseries_def = Config.MSVC_BUILDSERIES_EXTERNAL.get(toolset_series) + if not toolset_buildseries_def: + debug('invalid: msvc version: toolset_version=%s', repr(toolset_version)) + err_msg = 'MSVC_TOOLSET_VERSION {} build series {} is not supported'.format( + repr(toolset_version), repr(toolset_series) ) return err_msg - if toolset_vernum > msvc.vs_def.vc_buildtools_def.vc_version_numeric: + toolset_buildtools_def = Config.VC_BUILDTOOLS_MAP[toolset_buildseries_def.vc_buildseries] + + toolset_verstr = toolset_buildtools_def.msvc_version + toolset_vernum = toolset_buildtools_def.msvc_version_numeric + + if toolset_vernum < VS2015.vc_buildtools_def.msvc_version_numeric: + debug( + 'invalid: toolset version constraint: %s < %s VS2015', + repr(toolset_vernum), repr(VS2015.vc_buildtools_def.msvc_version_numeric) + ) + err_msg = "MSVC_TOOLSET_VERSION ({}) constraint violation: toolset msvc version {} < {} VS2015".format( + repr(toolset_version), repr(toolset_verstr), repr(VS2015.vc_buildtools_def.msvc_version) + ) + return err_msg + + if toolset_vernum > msvc.vs_def.vc_buildtools_def.msvc_version_numeric: debug( 'invalid: toolset version constraint: toolset %s > %s msvc', - repr(toolset_vernum), repr(msvc.vs_def.vc_buildtools_def.vc_version_numeric) + repr(toolset_vernum), repr(msvc.vs_def.vc_buildtools_def.msvc_version_numeric) ) - err_msg = "MSVC_TOOLSET_VERSION ({}) constraint violation: toolset version {} > {} MSVC_VERSION".format( + err_msg = "MSVC_TOOLSET_VERSION ({}) constraint violation: toolset msvc version {} > {} MSVC_VERSION".format( repr(toolset_version), repr(toolset_verstr), repr(msvc.version) ) return err_msg - if toolset_vernum == VS2015.vc_buildtools_def.vc_version_numeric: + if toolset_vernum == VS2015.vc_buildtools_def.msvc_version_numeric: # tooset = 14.0 if Util.is_toolset_full(toolset_version): if not Util.is_toolset_140(toolset_version): @@ -624,7 +674,7 @@ def _msvc_script_argument_toolset_constraints(msvc, toolset_version): 'invalid: toolset version 14.0 constraint: %s != 14.0', repr(toolset_version) ) - err_msg = "MSVC_TOOLSET_VERSION ({}) constraint violation: toolset version {} != '14.0'".format( + err_msg = "MSVC_TOOLSET_VERSION ({}) constraint violation: toolset msvc version {} != '14.0'".format( repr(toolset_version), repr(toolset_version) ) return err_msg @@ -688,7 +738,7 @@ def _msvc_script_argument_toolset(env, msvc, vc_dir, arglist): def _msvc_script_default_toolset(env, msvc, vc_dir, arglist, force_toolset: bool=False): - if msvc.vs_def.vc_buildtools_def.vc_version_numeric < VS2017.vc_buildtools_def.vc_version_numeric: + if msvc.vs_def.vc_buildtools_def.msvc_version_numeric < VS2017.vc_buildtools_def.msvc_version_numeric: return None toolset_default = _msvc_default_toolset(msvc, vc_dir) @@ -729,26 +779,26 @@ def _user_script_argument_toolset(env, toolset_version, user_argstr): def _msvc_script_argument_spectre_constraints(msvc, toolset, spectre_libs, platform_def): - if msvc.vs_def.vc_buildtools_def.vc_version_numeric < VS2017.vc_buildtools_def.vc_version_numeric: + if msvc.vs_def.vc_buildtools_def.msvc_version_numeric < VS2017.vc_buildtools_def.msvc_version_numeric: debug( 'invalid: msvc version constraint: %s < %s VS2017', - repr(msvc.vs_def.vc_buildtools_def.vc_version_numeric), - repr(VS2017.vc_buildtools_def.vc_version_numeric) + repr(msvc.vs_def.vc_buildtools_def.msvc_version_numeric), + repr(VS2017.vc_buildtools_def.msvc_version_numeric) ) err_msg = "MSVC_SPECTRE_LIBS ({}) constraint violation: MSVC_VERSION {} < {} VS2017".format( - repr(spectre_libs), repr(msvc.version), repr(VS2017.vc_buildtools_def.vc_version) + repr(spectre_libs), repr(msvc.version), repr(VS2017.vc_buildtools_def.msvc_version) ) return err_msg if toolset: - if toolset.vs_def.vc_buildtools_def.vc_version_numeric < VS2017.vc_buildtools_def.vc_version_numeric: + if toolset.vc_buildtools_def.msvc_version_numeric < VS2017.vc_buildtools_def.msvc_version_numeric: debug( 'invalid: toolset version constraint: %s < %s VS2017', - repr(toolset.vs_def.vc_buildtools_def.vc_version_numeric), - repr(VS2017.vc_buildtools_def.vc_version_numeric) + repr(toolset.vc_buildtools_def.msvc_version_numeric), + repr(VS2017.vc_buildtools_def.msvc_version_numeric) ) err_msg = "MSVC_SPECTRE_LIBS ({}) constraint violation: toolset version {} < {} VS2017".format( - repr(spectre_libs), repr(toolset.version), repr(VS2017.vc_buildtools_def.vc_version) + repr(spectre_libs), repr(toolset.version), repr(VS2017.vc_buildtools_def.msvc_version) ) return err_msg @@ -836,14 +886,14 @@ def _msvc_script_argument_user(env, msvc, arglist): if not script_args: return None - if msvc.vs_def.vc_buildtools_def.vc_version_numeric < VS2015.vc_buildtools_def.vc_version_numeric: + if msvc.vs_def.vc_buildtools_def.msvc_version_numeric < VS2015.vc_buildtools_def.msvc_version_numeric: debug( 'invalid: msvc version constraint: %s < %s VS2015', - repr(msvc.vs_def.vc_buildtools_def.vc_version_numeric), - repr(VS2015.vc_buildtools_def.vc_version_numeric) + repr(msvc.vs_def.vc_buildtools_def.msvc_version_numeric), + repr(VS2015.vc_buildtools_def.msvc_version_numeric) ) err_msg = "MSVC_SCRIPT_ARGS ({}) constraint violation: MSVC_VERSION {} < {} VS2015".format( - repr(script_args), repr(msvc.version), repr(VS2015.vc_buildtools_def.vc_version) + repr(script_args), repr(msvc.version), repr(VS2015.vc_buildtools_def.msvc_version) ) raise MSVCArgumentError(err_msg) @@ -873,7 +923,18 @@ def _msvc_process_construction_variables(env) -> bool: return False -def msvc_script_arguments(env, version, vc_dir, arg): +def msvc_script_arguments_has_uwp(env): + + if not _msvc_process_construction_variables(env): + return False + + uwp_app = env.get('MSVC_UWP_APP') + is_uwp = bool(uwp_app and uwp_app in _ARGUMENT_BOOLEAN_TRUE_LEGACY) + + debug('is_uwp=%s', is_uwp) + return is_uwp + +def msvc_script_arguments(env, version, vc_dir, arg=None): arguments = [arg] if arg else [] @@ -889,10 +950,12 @@ def msvc_script_arguments(env, version, vc_dir, arg): if _msvc_process_construction_variables(env): + target_arch = env.get('TARGET_ARCH') + # MSVC_UWP_APP if 'MSVC_UWP_APP' in env: - uwp = _msvc_script_argument_uwp(env, msvc, arglist) + uwp = _msvc_script_argument_uwp(env, msvc, arglist, target_arch) else: uwp = None @@ -926,7 +989,7 @@ def msvc_script_arguments(env, version, vc_dir, arg): if user_toolset: toolset = None elif toolset_version: - toolset = _toolset_version(toolset_version) + toolset = _toolset_version(toolset_version, is_user=True) elif default_toolset: toolset = _toolset_version(default_toolset) else: @@ -958,7 +1021,7 @@ def msvc_script_arguments(env, version, vc_dir, arg): if user_argstr: _user_script_argument_spectre(env, spectre, user_argstr) - if msvc.vs_def.vc_buildtools_def.vc_version == '14.0': + if msvc.vs_def.vc_buildtools_def.msvc_version == '14.0': if user_uwp and sdk_version and len(arglist) == 2: # VS2015 toolset argument order issue: SDK store => store SDK arglist_reverse = True @@ -1003,6 +1066,14 @@ def _msvc_toolset_versions_internal(msvc_version, vc_dir, full: bool=True, sxs: return toolset_versions +def _msvc_version_toolsets_internal(msvc_version, vc_dir): + + msvc = _msvc_version(msvc_version) + + toolsets_sxs, toolsets_full = _msvc_version_toolsets(msvc, vc_dir) + + return toolsets_sxs, toolsets_full + def _msvc_toolset_versions_spectre_internal(msvc_version, vc_dir): msvc = _msvc_version(msvc_version) diff --git a/scons/scons-local-4.7.0/SCons/Tool/MSCommon/MSVC/SetupEnvDefault.py b/scons/scons-local-4.8.0/SCons/Tool/MSCommon/MSVC/SetupEnvDefault.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/MSCommon/MSVC/SetupEnvDefault.py rename to scons/scons-local-4.8.0/SCons/Tool/MSCommon/MSVC/SetupEnvDefault.py diff --git a/scons/scons-local-4.7.0/SCons/Tool/MSCommon/MSVC/Util.py b/scons/scons-local-4.8.0/SCons/Tool/MSCommon/MSVC/Util.py similarity index 84% rename from scons/scons-local-4.7.0/SCons/Tool/MSCommon/MSVC/Util.py rename to scons/scons-local-4.8.0/SCons/Tool/MSCommon/MSVC/Util.py index 6fd188bc3..0da58e1e4 100644 --- a/scons/scons-local-4.7.0/SCons/Tool/MSCommon/MSVC/Util.py +++ b/scons/scons-local-4.8.0/SCons/Tool/MSCommon/MSVC/Util.py @@ -37,6 +37,15 @@ from ..common import debug from . import Config + +# call _initialize method upon class definition completion + +class AutoInitialize: + def __init_subclass__(cls, **kwargs): + super().__init_subclass__(**kwargs) + if hasattr(cls, '_initialize') and callable(getattr(cls, '_initialize', None)): + cls._initialize() + # path utilities # windows drive specification (e.g., 'C:') @@ -234,6 +243,26 @@ def get_msvc_version_prefix(version): rval = m.group('version') return rval +def get_msvc_version_prefix_suffix(version): + """ + Get the msvc version number prefix and suffix from a string. + + Args: + version: str + version specification + + Returns: + (str, str): the msvc version prefix and suffix + + """ + prefix = suffix = '' + if version: + m = re_msvc_version.match(version) + if m: + prefix = m.group('msvc_version') + suffix = m.group('suffix') if m.group('suffix') else '' + return prefix, suffix + # toolset version query utilities def is_toolset_full(toolset_version) -> bool: @@ -322,15 +351,21 @@ def msvc_version_components(vcver): return msvc_version_components_def _MSVC_EXTENDED_VERSION_COMPONENTS_DEFINITION = namedtuple('MSVCExtendedVersionComponentsDefinition', [ - 'msvc_version', # msvc version (e.g., '14.1Exp') - 'msvc_verstr', # msvc version numeric string (e.g., '14.1') - 'msvc_suffix', # msvc version component type (e.g., 'Exp') - 'msvc_vernum', # msvc version floating point number (e.g, 14.1) - 'msvc_major', # msvc major version integer number (e.g., 14) - 'msvc_minor', # msvc minor version integer number (e.g., 1) - 'msvc_comps', # msvc version components tuple (e.g., ('14', '1')) + 'msvc_version', # msvc version (e.g., '14.1Exp') + 'msvc_verstr', # msvc version numeric string (e.g., '14.1') + 'msvc_suffix', # msvc version component type (e.g., 'Exp') + 'msvc_suffix_rank', # msvc version component rank (0, 1) + 'msvc_vernum', # msvc version floating point number (e.g, 14.1) + 'msvc_major', # msvc major version integer number (e.g., 14) + 'msvc_minor', # msvc minor version integer number (e.g., 1) + 'msvc_comps', # msvc version components tuple (e.g., ('14', '1')) + 'msvc_buildtools', # msvc build tools + 'msvc_buildtools_num', # msvc build tools integer number + 'msvc_buildseries', # msvc build series + 'msvc_buildseries_num', # msvc build series floating point number 'msvc_toolset_version', # msvc toolset version 'msvc_toolset_comps', # msvc toolset version components + 'msvc_toolset_is_sxs', # msvc toolset version is sxs 'version', # msvc version or msvc toolset version ]) @@ -355,11 +390,19 @@ def msvc_extended_version_components(version): msvc_toolset_version = m.group('version') msvc_toolset_comps = tuple(msvc_toolset_version.split('.')) + msvc_toolset_is_sxs = is_toolset_sxs(msvc_toolset_version) - msvc_verstr = get_msvc_version_prefix(msvc_toolset_version) - if not msvc_verstr: + vc_verstr = get_msvc_version_prefix(msvc_toolset_version) + if not vc_verstr: return None + vc_buildseries_def = Config.MSVC_BUILDSERIES_EXTERNAL.get(vc_verstr) + if not vc_buildseries_def: + return None + + vc_buildtools_def = Config.VC_BUILDTOOLS_MAP[vc_buildseries_def.vc_buildseries] + + msvc_verstr = vc_buildtools_def.msvc_version msvc_suffix = m.group('suffix') if m.group('suffix') else '' msvc_version = msvc_verstr + msvc_suffix @@ -376,12 +419,18 @@ def msvc_extended_version_components(version): msvc_version = msvc_version, msvc_verstr = msvc_verstr, msvc_suffix = msvc_suffix, + msvc_suffix_rank = 0 if not msvc_suffix else 1, msvc_vernum = msvc_vernum, msvc_major = msvc_major, msvc_minor = msvc_minor, msvc_comps = msvc_comps, + msvc_buildtools = vc_buildtools_def.msvc_version, + msvc_buildtools_num = vc_buildtools_def.msvc_version_numeric, + msvc_buildseries = vc_buildseries_def.vc_version, + msvc_buildseries_num = vc_buildseries_def.vc_version_numeric, msvc_toolset_version = msvc_toolset_version, msvc_toolset_comps = msvc_toolset_comps, + msvc_toolset_is_sxs = msvc_toolset_is_sxs, version = version, ) diff --git a/scons/scons-local-4.7.0/SCons/Tool/MSCommon/MSVC/Warnings.py b/scons/scons-local-4.8.0/SCons/Tool/MSCommon/MSVC/Warnings.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/MSCommon/MSVC/Warnings.py rename to scons/scons-local-4.8.0/SCons/Tool/MSCommon/MSVC/Warnings.py diff --git a/scons/scons-local-4.7.0/SCons/Tool/MSCommon/MSVC/WinSDK.py b/scons/scons-local-4.8.0/SCons/Tool/MSCommon/MSVC/WinSDK.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/MSCommon/MSVC/WinSDK.py rename to scons/scons-local-4.8.0/SCons/Tool/MSCommon/MSVC/WinSDK.py diff --git a/scons/scons-local-4.7.0/SCons/Tool/MSCommon/MSVC/__init__.py b/scons/scons-local-4.8.0/SCons/Tool/MSCommon/MSVC/__init__.py similarity index 98% rename from scons/scons-local-4.7.0/SCons/Tool/MSCommon/MSVC/__init__.py rename to scons/scons-local-4.8.0/SCons/Tool/MSCommon/MSVC/__init__.py index 766894d9b..f87b0f1d8 100644 --- a/scons/scons-local-4.7.0/SCons/Tool/MSCommon/MSVC/__init__.py +++ b/scons/scons-local-4.8.0/SCons/Tool/MSCommon/MSVC/__init__.py @@ -40,6 +40,7 @@ from . import Exceptions # noqa: F401 from . import Config # noqa: F401 from . import Util # noqa: F401 from . import Registry # noqa: F401 +from . import Kind # noqa: F401 from . import SetupEnvDefault # noqa: F401 from . import Policy # noqa: F401 from . import WinSDK # noqa: F401 diff --git a/scons/scons-local-4.7.0/SCons/Tool/MSCommon/README.rst b/scons/scons-local-4.8.0/SCons/Tool/MSCommon/README.rst similarity index 53% rename from scons/scons-local-4.7.0/SCons/Tool/MSCommon/README.rst rename to scons/scons-local-4.8.0/SCons/Tool/MSCommon/README.rst index 5ab07ad63..b37f409d3 100644 --- a/scons/scons-local-4.7.0/SCons/Tool/MSCommon/README.rst +++ b/scons/scons-local-4.8.0/SCons/Tool/MSCommon/README.rst @@ -27,16 +27,176 @@ Design Notes ``MSCommon/vc.py`` and are available via the ``SCons.Tool.MSCommon`` namespace. +MSVC Detection Priority +======================= + +For msvc version specifications without an 'Exp' suffix, an express +installation is used only when no other installation is detected. + ++---------+---------+----------------------------------------------------------+ +| Product | VCVer | Priority | ++=========+=========+==========================================================+ +| VS2022 | 14.3 | Enterprise, Professional, Community, BuildTools | ++---------+---------+----------------------------------------------------------+ +| VS2019 | 14.2 | Enterprise, Professional, Community, BuildTools | ++---------+---------+----------------------------------------------------------+ +| VS2017 | 14.1 | Enterprise, Professional, Community, BuildTools, Express | ++---------+---------+----------------------------------------------------------+ +| VS2017 | 14.1Exp | Express | ++---------+---------+----------------------------------------------------------+ +| VS2015 | 14.0 | [Develop, BuildTools, CmdLine], Express | ++---------+---------+----------------------------------------------------------+ +| VS2015 | 14.0Exp | Express | ++---------+---------+----------------------------------------------------------+ +| VS2013 | 12.0 | Develop, Express | ++---------+---------+----------------------------------------------------------+ +| VS2013 | 12.0Exp | Express | ++---------+---------+----------------------------------------------------------+ +| VS2012 | 11.0 | Develop, Express | ++---------+---------+----------------------------------------------------------+ +| VS2012 | 11.0Exp | Express | ++---------+---------+----------------------------------------------------------+ +| VS2010 | 10.0 | Develop, Express | ++---------+---------+----------------------------------------------------------+ +| VS2010 | 10.0Exp | Express | ++---------+---------+----------------------------------------------------------+ +| VS2008 | 9.0 | Develop, VCForPython, Express | ++---------+---------+----------------------------------------------------------+ +| VS2008 | 9.0Exp | Express | ++---------+---------+----------------------------------------------------------+ +| VS2005 | 8.0 | Develop, Express | ++---------+---------+----------------------------------------------------------+ +| VS2005 | 8.0Exp | Express | ++---------+---------+----------------------------------------------------------+ +| VS2003 | 7.1 | Develop | ++---------+---------+----------------------------------------------------------+ +| VS2002 | 7.0 | Develop | ++---------+---------+----------------------------------------------------------+ +| VS6.0 | 6.0 | Develop | ++---------+---------+----------------------------------------------------------+ + +Legend: + + Develop + devenv.com or msdev.com is detected. + + Express + WDExpress.exe or VCExpress.exe is detected. + + BuildTools [VS2015] + The vcvarsall batch file dispatches to the buildtools batch file. + + CmdLine [VS2015] + Neither Develop, Express, or BuildTools. + +VS2015 Edition Limitations +========================== + +VS2015 BuildTools +----------------- + +The VS2015 BuildTools stand-alone batch file does not support the ``sdk version`` argument. + +The VS2015 BuildTools stand-alone batch file does not support the ``store`` argument. + +These arguments appear to be silently ignored and likely would result in compiler +and/or linker build failures. + +The VS2015 BuildTools ``vcvarsall.bat`` batch file dispatches to the stand-alone buildtools +batch file under certain circumstances. A fragment from the vcvarsall batch file is: + +:: + + if exist "%~dp0..\common7\IDE\devenv.exe" goto setup_VS + if exist "%~dp0..\common7\IDE\wdexpress.exe" goto setup_VS + if exist "%~dp0..\..\Microsoft Visual C++ Build Tools\vcbuildtools.bat" goto setup_buildsku + + :setup_VS + + ... + + :setup_buildsku + if not exist "%~dp0..\..\Microsoft Visual C++ Build Tools\vcbuildtools.bat" goto usage + set CurrentDir=%CD% + call "%~dp0..\..\Microsoft Visual C++ Build Tools\vcbuildtools.bat" %1 %2 + cd /d %CurrentDir% + goto :eof + +VS2015 Express +-------------- + +The VS2015 Express batch file does not support the ``sdk version`` argument. + +The VS2015 Express batch file does not support the ``store`` argument for the ``amd64`` and +``arm`` target architectures + +amd64 Target Architecture +^^^^^^^^^^^^^^^^^^^^^^^^^ + +As installed, VS2015 Express does not support the ``store`` argument for the ``amd64`` target +architecture. The generated ``store`` library paths include directories that do not exist. + +The store library paths appear in two places in the ``vcvarsx86_amd64`` batch file: + +:: + + :setstorelib + @if exist "%VCINSTALLDIR%LIB\amd64\store" set LIB=%VCINSTALLDIR%LIB\amd64\store;%LIB% + ... + :setstorelibpath + @if exist "%VCINSTALLDIR%LIB\amd64\store" set LIBPATH=%VCINSTALLDIR%LIB\amd64\store;%LIBPATH% + +The correct store library paths would be: + +:: + + :setstorelib + @if exist "%VCINSTALLDIR%LIB\store\amd64" set LIB=%VCINSTALLDIR%LIB\store\amd64;%LIB% + ... + :setstorelibpath + @if exist "%VCINSTALLDIR%LIB\store\amd64" set LIBPATH=%VCINSTALLDIR%LIB\store\amd64;%LIBPATH% + +arm Target Architecture +^^^^^^^^^^^^^^^^^^^^^^^ + +As installed, VS2015 Express does not support the ``store`` argument for the ``arm`` target +architecture. The generated ``store`` library paths include directories that do not exist. + +The store library paths appear in two places in the ``vcvarsx86_arm`` batch file: + +:: + + :setstorelib + @if exist "%VCINSTALLDIR%LIB\ARM\store" set LIB=%VCINSTALLDIR%LIB\ARM\store;%LIB% + ... + :setstorelibpath + @if exist "%VCINSTALLDIR%LIB\ARM\store" set LIBPATH=%VCINSTALLDIR%LIB\ARM\store;%LIBPATH% + +The correct store library paths would be file: + +:: + + :setstorelib + @if exist "%VCINSTALLDIR%LIB\store\ARM" set LIB=%VCINSTALLDIR%LIB\store\ARM;%LIB% + ... + :setstorelibpath + @if exist "%VCINSTALLDIR%LIB\store\ARM" set LIBPATH=%VCINSTALLDIR%LIB\store\ARM;%LIBPATH% + + Known Issues ============ The following issues are known to exist: * Using ``MSVC_USE_SCRIPT`` and ``MSVC_USE_SCRIPT_ARGS`` to call older Microsoft SDK - ``SetEnv.cmd`` batch files may result in build failures. Some of these batch files - require delayed expansion to be enabled which is not usually the Windows default. - One solution would be to launch the MSVC batch file command in a new command interpreter - instance with delayed expansion enabled via command-line options. + ``SetEnv.cmd`` batch files may result in build failures. + + Typically, the reasons for build failures with SDK batch files are one, or both, of: + + * The batch files require delayed expansion to be enabled which is not usually the Windows default. + + * The batch files inspect environment variables that are not defined in the minimal subprocess + environment in which the batch files are invoked. * The code to suppress the "No versions of the MSVC compiler were found" warning for the default environment was moved from ``MSCommon/vc.py`` to ``MSCommon/MSVC/SetupEnvDefault.py``. @@ -47,20 +207,24 @@ The following issues are known to exist: Experimental Features ===================== -msvc_query_version_toolset(version=None, prefer_newest=True) ------------------------------------------------------------- +msvc_query_version_toolset(version=None, prefer_newest=True, vswhere_exe=None) +------------------------------------------------------------------------------ The experimental function ``msvc_query_version_toolset`` was added to ``MSCommon/vc.py`` -and is available via the ``SCons.Tool.MSCommon`` namespace. This function takes a version -specification or a toolset version specification and a product preference as arguments and -returns the msvc version and the msvc toolset version for the corresponding version specification. +and is available via the ``SCons.Tool.MSCommon`` namespace. + +This function takes a version specification or a toolset version specification, an optional product +preference, and an optional vswhere executable location as arguments and returns the msvc version and +the msvc toolset version for the corresponding version specification. This is a proxy for using the toolset version for selection until that functionality can be added. Example usage: + :: for version in [ + '14.4', '14.3', '14.2', '14.1', @@ -90,6 +254,7 @@ Example usage: print('{}Query: {} version={}, prefer_newest={}'.format(newline, msg, version, prefer_newest)) Example output fragment + :: Build: _build003 {'MSVC_VERSION': '14.3', 'MSVC_TOOLSET_VERSION': '14.29.30133'} @@ -117,6 +282,7 @@ added to the batch file argument list. This is intended to make the cache more updates that may change the default toolset version and/or the default SDK version. Example usage: + :: @echo Enabling scons cache ... @@ -139,6 +305,7 @@ Enabling warnings to be produced for detected msvc batch file errors may provide for build failures. Refer to the documentation for details. Change the default policy: + :: from SCons.Tool.MSCommon import msvc_set_scripterror_policy @@ -146,6 +313,7 @@ Change the default policy: msvc_set_scripterror_policy('Warning') Specify the policy per-environment: + :: env = Environment(MSVC_VERSION='14.3', MSVC_SPECTRE_LIBS=True, MSVC_SCRIPTERROR_POLICY='Warning') @@ -171,6 +339,7 @@ On occasion, the raw vswhere output may prove useful especially if there are sus detection of installed msvc instances. Windows command-line sample invocations: + :: @rem 64-Bit Windows @@ -188,31 +357,37 @@ Batch File Arguments Supported MSVC batch file arguments by product: -======= === === ======= ======= -Product UWP SDK Toolset Spectre -======= === === ======= ======= -VS2022 X X X X -------- --- --- ------- ------- -VS2019 X X X X -------- --- --- ------- ------- -VS2017 X X X X -------- --- --- ------- ------- -VS2015 X X -======= === === ======= ======= ++---------+---------+--------+---------+---------+ +| Product | UWP | SDK | Toolset | Spectre | ++=========+=========+========+=========+=========+ +| VS2022 | X | X | X | X | ++---------+---------+--------+---------+---------+ +| VS2019 | X | X | X | X | ++---------+---------+--------+---------+---------+ +| VS2017 | X | X | X | X | ++---------+---------+--------+---------+---------+ +| VS2015 | X [1] | X [2] | | | ++---------+---------+--------+---------+---------+ + +Notes: + +1) The BuildTools edition does not support the ``store`` argument. The Express edition + supports the ``store`` argument for the ``x86`` target only. +2) The ``sdk version`` argument is not supported in the BuildTools and Express editions. Supported MSVC batch file arguments in SCons: -======== ====================================== =================================================== -Argument Construction Variable Script Argument Equivalent -======== ====================================== =================================================== -UWP ``MSVC_UWP_APP=True`` ``MSVC_SCRIPT_ARGS='store'`` --------- -------------------------------------- --------------------------------------------------- -SDK ``MSVC_SDK_VERSION='10.0.20348.0'`` ``MSVC_SCRIPT_ARGS='10.0.20348.0'`` --------- -------------------------------------- --------------------------------------------------- -Toolset ``MSVC_TOOLSET_VERSION='14.31.31103'`` ``MSVC_SCRIPT_ARGS='-vcvars_ver=14.31.31103'`` --------- -------------------------------------- --------------------------------------------------- -Spectre ``MSVC_SPECTRE_LIBS=True`` ``MSVC_SCRIPT_ARGS='-vcvars_spectre_libs=spectre'`` -======== ====================================== =================================================== ++----------+----------------------------------------+-----------------------------------------------------+ +| Argument | Construction Variable | Script Argument Equivalent | ++==========+========================================+=====================================================+ +| UWP | ``MSVC_UWP_APP=True`` | ``MSVC_SCRIPT_ARGS='store'`` | ++----------+----------------------------------------+-----------------------------------------------------+ +| SDK | ``MSVC_SDK_VERSION='10.0.20348.0'`` | ``MSVC_SCRIPT_ARGS='10.0.20348.0'`` | ++----------+----------------------------------------+-----------------------------------------------------+ +| Toolset | ``MSVC_TOOLSET_VERSION='14.31.31103'`` | ``MSVC_SCRIPT_ARGS='-vcvars_ver=14.31.31103'`` | ++----------+----------------------------------------+-----------------------------------------------------+ +| Spectre | ``MSVC_SPECTRE_LIBS=True`` | ``MSVC_SCRIPT_ARGS='-vcvars_spectre_libs=spectre'`` | ++----------+----------------------------------------+-----------------------------------------------------+ **MSVC_SCRIPT_ARGS contents are not validated. Utilizing script arguments that have construction variable equivalents is discouraged and may lead to difficult to diagnose build errors.** @@ -244,6 +419,7 @@ that the msvc batch files would return. When using ``MSVC_SCRIPT_ARGS``, the toolset specification should be omitted entirely. Local installation and summary test results: + :: VS2022\VC\Auxiliary\Build\Microsoft.VCToolsVersion.v143.default.txt @@ -253,6 +429,7 @@ Local installation and summary test results: 14.32.31326 Toolset version summary: + :: 14.31.31103 Environment() @@ -268,6 +445,7 @@ Toolset version summary: 14.32.31326 Environment(MSVC_SCRIPT_ARGS=['-vcvars_ver=14.32']) VS2022\\Common7\\Tools\\vsdevcmd\\ext\\vcvars.bat usage fragment: + :: @echo -vcvars_ver=version : Version of VC++ Toolset to select @@ -289,6 +467,7 @@ VS2022\\Common7\\Tools\\vsdevcmd\\ext\\vcvars.bat usage fragment: @echo SxS toolset to [VSInstallDir]\VC\MSVC\Tools\ directory. VS2022 batch file fragment to determine the default toolset version: + :: @REM Add MSVC @@ -315,75 +494,114 @@ Visual Studio Version Notes SDK Versions ------------ -==== ============ -SDK Format -==== ============ -10.0 10.0.XXXXX.Y ----- ------------ -8.1 8.1 -==== ============ ++------+-------------------+ +| SDK | Format | ++======+===================+ +| 10.0 | 10.0.XXXXX.Y [1] | ++------+-------------------+ +| 8.1 | 8.1 | ++------+-------------------+ + +Notes: + +1) The Windows 10 SDK version number is 10.0.20348.0 and earlier. + + The Windows 11 SDK version number is 10.0.22000.194 and later. + +BuildSeries Versions +-------------------- + ++-------------+-------+-------+ +| BuildSeries | VCVER | CLVER | ++=============+=======+=======+ +| 14.4 | 14.4X | 19.4 | ++-------------+-------+-------+ +| 14.3 | 14.3X | 19.3 | ++-------------+-------+-------+ +| 14.2 | 14.2X | 19.2 | ++-------------+-------+-------+ +| 14.1 | 14.1X | 19.1 | ++-------------+-------+-------+ +| 14.0 | 14.0 | 19.0 | ++-------------+-------+-------+ +| 12.0 | 12.0 | 18.0 | ++-------------+-------+-------+ +| 11.0 | 11.0 | 17.0 | ++-------------+-------+-------+ +| 10.0 | 10.0 | 16.0 | ++-------------+-------+-------+ +| 9.0 | 9.0 | 15.0 | ++-------------+-------+-------+ +| 8.0 | 8.0 | 14.0 | ++-------------+-------+-------+ +| 7.1 | 7.1 | 13.1 | ++-------------+-------+-------+ +| 7.0 | 7.0 | 13.0 | ++-------------+-------+-------+ +| 6.0 | 6.0 | 12.0 | ++-------------+-------+-------+ BuildTools Versions ------------------- -========== ===== ===== ======== -BuildTools VCVER CLVER MSVCRT -========== ===== ===== ======== -v143 14.3 19.3 140/ucrt ----------- ----- ----- -------- -v142 14.2 19.2 140/ucrt ----------- ----- ----- -------- -v141 14.1 19.1 140/ucrt ----------- ----- ----- -------- -v140 14.0 19.0 140/ucrt ----------- ----- ----- -------- -v120 12.0 18.0 120 ----------- ----- ----- -------- -v110 11.0 17.0 110 ----------- ----- ----- -------- -v100 10.0 16.0 100 ----------- ----- ----- -------- -v90 9.0 15.0 90 ----------- ----- ----- -------- -v80 8.0 14.0 80 ----------- ----- ----- -------- -v71 7.1 13.1 71 ----------- ----- ----- -------- -v70 7.0 13.0 70 ----------- ----- ----- -------- -v60 6.0 12.0 60 -========== ===== ===== ======== ++------------+-------------+----------+ +| BuildTools | BuildSeries | MSVCRT | ++============+=============+==========+ +| v143 | 14.4, 14.3 | 140/ucrt | ++------------+-------------+----------+ +| v142 | 14.2 | 140/ucrt | ++------------+-------------+----------+ +| v141 | 14.1 | 140/ucrt | ++------------+-------------+----------+ +| v140 | 14.0 | 140/ucrt | ++------------+-------------+----------+ +| v120 | 12.0 | 120 | ++------------+-------------+----------+ +| v110 | 11.0 | 110 | ++------------+-------------+----------+ +| v100 | 10.0 | 100 | ++------------+-------------+----------+ +| v90 | 9.0 | 90 | ++------------+-------------+----------+ +| v80 | 8.0 | 80 | ++------------+-------------+----------+ +| v71 | 7.1 | 71 | ++------------+-------------+----------+ +| v70 | 7.0 | 70 | ++------------+-------------+----------+ +| v60 | 6.0 | 60 | ++------------+-------------+----------+ Product Versions ---------------- -======== ===== ========= ====================== -Product VSVER SDK BuildTools -======== ===== ========= ====================== -2022 17.0 10.0, 8.1 v143, v142, v141, v140 --------- ----- --------- ---------------------- -2019 16.0 10.0, 8.1 v142, v141, v140 --------- ----- --------- ---------------------- -2017 15.0 10.0, 8.1 v141, v140 --------- ----- --------- ---------------------- -2015 14.0 10.0, 8.1 v140 --------- ----- --------- ---------------------- -2013 12.0 v120 --------- ----- --------- ---------------------- -2012 11.0 v110 --------- ----- --------- ---------------------- -2010 10.0 v100 --------- ----- --------- ---------------------- -2008 9.0 v90 --------- ----- --------- ---------------------- -2005 8.0 v80 --------- ----- --------- ---------------------- -2003.NET 7.1 v71 --------- ----- --------- ---------------------- -2002.NET 7.0 v70 --------- ----- --------- ---------------------- -6.0 6.0 v60 -======== ===== ========= ====================== ++----------+-------+-------+-----------+------------------------+ +| Product | VSVER | SCons | SDK | BuildTools | ++==========+=======+=======+===========+========================+ +| 2022 | 17.0 | 14.3 | 10.0, 8.1 | v143, v142, v141, v140 | ++----------+-------+-------+-----------+------------------------+ +| 2019 | 16.0 | 14.2 | 10.0, 8.1 | v142, v141, v140 | ++----------+-------+-------+-----------+------------------------+ +| 2017 | 15.0 | 14.1 | 10.0, 8.1 | v141, v140 | ++----------+-------+-------+-----------+------------------------+ +| 2015 | 14.0 | 14.0 | 10.0, 8.1 | v140 | ++----------+-------+-------+-----------+------------------------+ +| 2013 | 12.0 | 12.0 | | v120 | ++----------+-------+-------+-----------+------------------------+ +| 2012 | 11.0 | 11.0 | | v110 | ++----------+-------+-------+-----------+------------------------+ +| 2010 | 10.0 | 10.0 | | v100 | ++----------+-------+-------+-----------+------------------------+ +| 2008 | 9.0 | 9.0 | | v90 | ++----------+-------+-------+-----------+------------------------+ +| 2005 | 8.0 | 8.0 | | v80 | ++----------+-------+-------+-----------+------------------------+ +| 2003.NET | 7.1 | 7.1 | | v71 | ++----------+-------+-------+-----------+------------------------+ +| 2002.NET | 7.0 | 7.0 | | v70 | ++----------+-------+-------+-----------+------------------------+ +| 6.0 | 6.0 | 6.0 | | v60 | ++----------+-------+-------+-----------+------------------------+ SCons Implementation Notes diff --git a/scons/scons-local-4.7.0/SCons/Tool/MSCommon/__init__.py b/scons/scons-local-4.8.0/SCons/Tool/MSCommon/__init__.py similarity index 92% rename from scons/scons-local-4.7.0/SCons/Tool/MSCommon/__init__.py rename to scons/scons-local-4.8.0/SCons/Tool/MSCommon/__init__.py index c3078ac63..63f9ae4de 100644 --- a/scons/scons-local-4.7.0/SCons/Tool/MSCommon/__init__.py +++ b/scons/scons-local-4.8.0/SCons/Tool/MSCommon/__init__.py @@ -45,6 +45,9 @@ from SCons.Tool.MSCommon.vc import ( # noqa: F401 msvc_toolset_versions, msvc_toolset_versions_spectre, msvc_query_version_toolset, + vswhere_register_executable, + vswhere_get_executable, + vswhere_freeze_executable, ) from SCons.Tool.MSCommon.vs import ( # noqa: F401 @@ -60,6 +63,8 @@ from .MSVC.Policy import ( # noqa: F401 msvc_get_notfound_policy, msvc_set_scripterror_policy, msvc_get_scripterror_policy, + msvc_notfound_policy_contextmanager, + msvc_scripterror_policy_contextmanager, ) from .MSVC.Exceptions import ( # noqa: F401 @@ -78,7 +83,9 @@ from .vc import ( # noqa: F401 MSVCUnsupportedHostArch, MSVCUnsupportedTargetArch, MSVCScriptNotFound, + MSVCUseScriptError, MSVCUseSettingsError, + VSWhereUserError, ) from .MSVC.Util import ( # noqa: F401 diff --git a/scons/scons-local-4.7.0/SCons/Tool/MSCommon/arch.py b/scons/scons-local-4.8.0/SCons/Tool/MSCommon/arch.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/MSCommon/arch.py rename to scons/scons-local-4.8.0/SCons/Tool/MSCommon/arch.py diff --git a/scons/scons-local-4.7.0/SCons/Tool/MSCommon/common.py b/scons/scons-local-4.8.0/SCons/Tool/MSCommon/common.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/MSCommon/common.py rename to scons/scons-local-4.8.0/SCons/Tool/MSCommon/common.py diff --git a/scons/scons-local-4.7.0/SCons/Tool/MSCommon/netframework.py b/scons/scons-local-4.8.0/SCons/Tool/MSCommon/netframework.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/MSCommon/netframework.py rename to scons/scons-local-4.8.0/SCons/Tool/MSCommon/netframework.py diff --git a/scons/scons-local-4.7.0/SCons/Tool/MSCommon/sdk.py b/scons/scons-local-4.8.0/SCons/Tool/MSCommon/sdk.py similarity index 99% rename from scons/scons-local-4.7.0/SCons/Tool/MSCommon/sdk.py rename to scons/scons-local-4.8.0/SCons/Tool/MSCommon/sdk.py index c6600f3a5..a06dfacfc 100644 --- a/scons/scons-local-4.7.0/SCons/Tool/MSCommon/sdk.py +++ b/scons/scons-local-4.8.0/SCons/Tool/MSCommon/sdk.py @@ -372,7 +372,7 @@ def mssdk_setup_env(env): return msvs_version = env.subst(msvs_version) from . import vs - msvs = vs.get_vs_by_version(msvs_version) + msvs = vs.get_vs_by_version(msvs_version, env) debug('mssdk_setup_env:msvs is :%s', msvs) if not msvs: debug('mssdk_setup_env: no VS version detected, bailingout:%s', msvs) diff --git a/scons/scons-local-4.7.0/SCons/Tool/MSCommon/vc.py b/scons/scons-local-4.8.0/SCons/Tool/MSCommon/vc.py similarity index 54% rename from scons/scons-local-4.7.0/SCons/Tool/MSCommon/vc.py rename to scons/scons-local-4.8.0/SCons/Tool/MSCommon/vc.py index e43c618cb..032dbf202 100644 --- a/scons/scons-local-4.7.0/SCons/Tool/MSCommon/vc.py +++ b/scons/scons-local-4.8.0/SCons/Tool/MSCommon/vc.py @@ -25,9 +25,6 @@ MS Compilers: Visual C/C++ detection and configuration. # TODO: -# * gather all the information from a single vswhere call instead -# of calling repeatedly (use json format?) -# * support passing/setting location for vswhere in env. # * supported arch for versions: for old versions of batch file without # argument, giving bogus argument cannot be detected, so we have to hardcode # this here @@ -52,19 +49,26 @@ from collections import ( namedtuple, OrderedDict, ) +import json +from functools import cmp_to_key +import enum import SCons.Util import SCons.Warnings from SCons.Tool import find_program_path from . import common -from .common import CONFIG_CACHE, debug +from .common import ( + CONFIG_CACHE, + debug, +) from .sdk import get_installed_sdks from . import MSVC from .MSVC.Exceptions import ( VisualCException, + MSVCInternalError, MSVCUserError, MSVCArgumentError, MSVCToolsetVersionNotFound, @@ -81,9 +85,15 @@ class MSVCUnsupportedTargetArch(VisualCException): class MSVCScriptNotFound(MSVCUserError): pass +class MSVCUseScriptError(MSVCUserError): + pass + class MSVCUseSettingsError(MSVCUserError): pass +class VSWhereUserError(MSVCUserError): + pass + # internal exceptions class UnsupportedVersion(VisualCException): @@ -102,8 +112,8 @@ _ARM32_ON_ARM64_SKIP_SENDTELEMETRY = True # MSVC 9.0 preferred query order: # True: VCForPython, VisualStudio -# FAlse: VisualStudio, VCForPython -_VC90_Prefer_VCForPython = True +# False: VisualStudio, VCForPython +_VC90_Prefer_VCForPython = False # Dict to 'canonalize' the arch _ARCH_TO_CANONICAL = { @@ -393,7 +403,7 @@ _LE2019_HOST_TARGET_CFG = _host_target_config_factory( # debug("_LE2019_HOST_TARGET_CFG: %s", _LE2019_HOST_TARGET_CFG) -# 14.0 (VS2015) to 8.0 (VS2005) +# 14.0 (VS2015) to 10.0 (VS2010) # Given a (host, target) tuple, return a tuple containing the argument for # the batch file and a tuple of the path components to find cl.exe. @@ -402,23 +412,23 @@ _LE2019_HOST_TARGET_CFG = _host_target_config_factory( # bin directory (i.e., /VC/bin). Any other tools are in subdirectory # named for the the host/target pair or a single name if the host==target. -_LE2015_HOST_TARGET_BATCHARG_CLPATHCOMPS = { +_LE2015_HOST_TARGET_BATCHARG_BATCHFILE_CLPATHCOMPS = { - ('amd64', 'amd64') : ('amd64', ('bin', 'amd64')), - ('amd64', 'x86') : ('amd64_x86', ('bin', 'amd64_x86')), - ('amd64', 'arm') : ('amd64_arm', ('bin', 'amd64_arm')), + ('amd64', 'amd64') : ('amd64', 'vcvars64.bat', ('bin', 'amd64')), + ('amd64', 'x86') : ('amd64_x86', 'vcvarsamd64_x86.bat', ('bin', 'amd64_x86')), + ('amd64', 'arm') : ('amd64_arm', 'vcvarsamd64_arm.bat', ('bin', 'amd64_arm')), - ('x86', 'amd64') : ('x86_amd64', ('bin', 'x86_amd64')), - ('x86', 'x86') : ('x86', ('bin', )), - ('x86', 'arm') : ('x86_arm', ('bin', 'x86_arm')), - ('x86', 'ia64') : ('x86_ia64', ('bin', 'x86_ia64')), + ('x86', 'amd64') : ('x86_amd64', 'vcvarsx86_amd64.bat', ('bin', 'x86_amd64')), + ('x86', 'x86') : ('x86', 'vcvars32.bat', ('bin', )), + ('x86', 'arm') : ('x86_arm', 'vcvarsx86_arm.bat', ('bin', 'x86_arm')), + ('x86', 'ia64') : ('x86_ia64', 'vcvarsx86_ia64.bat', ('bin', 'x86_ia64')), - ('arm64', 'amd64') : ('amd64', ('bin', 'amd64')), - ('arm64', 'x86') : ('amd64_x86', ('bin', 'amd64_x86')), - ('arm64', 'arm') : ('amd64_arm', ('bin', 'amd64_arm')), + ('arm64', 'amd64') : ('amd64', 'vcvars64.bat', ('bin', 'amd64')), + ('arm64', 'x86') : ('amd64_x86', 'vcvarsamd64_x86.bat', ('bin', 'amd64_x86')), + ('arm64', 'arm') : ('amd64_arm', 'vcvarsamd64_arm.bat', ('bin', 'amd64_arm')), - ('arm', 'arm') : ('arm', ('bin', 'arm')), - ('ia64', 'ia64') : ('ia64', ('bin', 'ia64')), + ('arm', 'arm') : ('arm', 'vcvarsarm.bat', ('bin', 'arm')), + ('ia64', 'ia64') : ('ia64', 'vcvars64.bat', ('bin', 'ia64')), } @@ -454,6 +464,53 @@ _LE2015_HOST_TARGET_CFG = _host_target_config_factory( # debug("_LE2015_HOST_TARGET_CFG: %s", _LE2015_HOST_TARGET_CFG) +# 9.0 (VS2008) to 8.0 (VS2005) + +_LE2008_HOST_TARGET_BATCHARG_BATCHFILE_CLPATHCOMPS = { + + ('amd64', 'amd64') : ('amd64', 'vcvarsamd64.bat', ('bin', 'amd64')), + ('amd64', 'x86') : ('x86', 'vcvars32.bat', ('bin', )), + + ('x86', 'amd64') : ('x86_amd64', 'vcvarsx86_amd64.bat', ('bin', 'x86_amd64')), + ('x86', 'x86') : ('x86', 'vcvars32.bat', ('bin', )), + ('x86', 'ia64') : ('x86_ia64', 'vcvarsx86_ia64.bat', ('bin', 'x86_ia64')), + + ('arm64', 'amd64') : ('amd64', 'vcvarsamd64.bat', ('bin', 'amd64')), + ('arm64', 'x86') : ('x86', 'vcvars32.bat', ('bin', )), + + ('ia64', 'ia64') : ('ia64', 'vcvarsia64.bat', ('bin', 'ia64')), + +} + +_LE2008_HOST_TARGET_CFG = _host_target_config_factory( + + label = 'LE2008', + + host_all_hosts = OrderedDict([ + ('amd64', ['amd64', 'x86']), + ('x86', ['x86']), + ('arm64', ['amd64', 'x86']), + ('ia64', ['ia64']), + ]), + + host_all_targets = { + 'amd64': ['amd64', 'x86'], + 'x86': ['x86', 'amd64', 'ia64'], + 'arm64': ['amd64', 'x86'], + 'ia64': ['ia64'], + }, + + host_def_targets = { + 'amd64': ['amd64', 'x86'], + 'x86': ['x86'], + 'arm64': ['amd64', 'x86'], + 'ia64': ['ia64'], + }, + +) + +# debug("_LE2008_HOST_TARGET_CFG: %s", _LE2008_HOST_TARGET_CFG) + # 7.1 (VS2003) and earlier # For 7.1 (VS2003) and earlier, there are only x86 targets and the batch files @@ -487,6 +544,8 @@ _LE2003_HOST_TARGET_CFG = _host_target_config_factory( _CL_EXE_NAME = 'cl.exe' +_VSWHERE_EXE = 'vswhere.exe' + def get_msvc_version_numeric(msvc_version): """Get the raw version numbers from a MSVC_VERSION string, so it could be cast to float or other numeric values. For example, '14.0Exp' @@ -566,9 +625,12 @@ def get_host_target(env, msvc_version, all_host_targets: bool=False): elif 143 > vernum_int >= 141: # 14.2 (VS2019) to 14.1 (VS2017) host_target_cfg = _LE2019_HOST_TARGET_CFG - elif 141 > vernum_int >= 80: - # 14.0 (VS2015) to 8.0 (VS2005) + elif 141 > vernum_int >= 100: + # 14.0 (VS2015) to 10.0 (VS2010) host_target_cfg = _LE2015_HOST_TARGET_CFG + elif 100 > vernum_int >= 80: + # 9.0 (VS2008) to 8.0 (VS2005) + host_target_cfg = _LE2008_HOST_TARGET_CFG else: # 80 > vernum_int # 7.1 (VS2003) and earlier host_target_cfg = _LE2003_HOST_TARGET_CFG @@ -687,49 +749,72 @@ _VCVER = [ "7.0", "6.0"] -# if using vswhere, configure command line arguments to probe for installed VC editions -_VCVER_TO_VSWHERE_VER = { - '14.3': [ - ["-version", "[17.0, 18.0)"], # default: Enterprise, Professional, Community (order unpredictable?) - ["-version", "[17.0, 18.0)", "-products", "Microsoft.VisualStudio.Product.BuildTools"], # BuildTools - ], - '14.2': [ - ["-version", "[16.0, 17.0)"], # default: Enterprise, Professional, Community (order unpredictable?) - ["-version", "[16.0, 17.0)", "-products", "Microsoft.VisualStudio.Product.BuildTools"], # BuildTools - ], - '14.1': [ - ["-version", "[15.0, 16.0)"], # default: Enterprise, Professional, Community (order unpredictable?) - ["-version", "[15.0, 16.0)", "-products", "Microsoft.VisualStudio.Product.BuildTools"], # BuildTools - ], - '14.1Exp': [ - ["-version", "[15.0, 16.0)", "-products", "Microsoft.VisualStudio.Product.WDExpress"], # Express - ], -} +# VS2017 and later: use a single vswhere json query to find all installations +# vswhere query: +# map vs major version to vc version (no suffix) +# build set of supported vc versions (including suffix) + +_VSWHERE_VSMAJOR_TO_VCVERSION = {} +_VSWHERE_SUPPORTED_VCVER = set() + +for vs_major, vc_version, vc_ver_list in ( + ('17', '14.3', None), + ('16', '14.2', None), + ('15', '14.1', ['14.1Exp']), +): + _VSWHERE_VSMAJOR_TO_VCVERSION[vs_major] = vc_version + _VSWHERE_SUPPORTED_VCVER.add(vc_version) + if vc_ver_list: + for vc_ver in vc_ver_list: + _VSWHERE_SUPPORTED_VCVER.add(vc_ver) + +# vwhere query: +# build of set of candidate component ids +# preferred ranking: Enterprise, Professional, Community, BuildTools, Express +# Ent, Pro, Com, BT, Exp are in the same list +# Exp also has it's own list +# currently, only the express (Exp) suffix is expected + +_VSWHERE_COMPONENTID_CANDIDATES = set() +_VSWHERE_COMPONENTID_RANKING = {} +_VSWHERE_COMPONENTID_SUFFIX = {} +_VSWHERE_COMPONENTID_SCONS_SUFFIX = {} + +for component_id, component_rank, component_suffix, scons_suffix in ( + ('Enterprise', 140, 'Ent', ''), + ('Professional', 130, 'Pro', ''), + ('Community', 120, 'Com', ''), + ('BuildTools', 110, 'BT', ''), + ('WDExpress', 100, 'Exp', 'Exp'), +): + _VSWHERE_COMPONENTID_CANDIDATES.add(component_id) + _VSWHERE_COMPONENTID_RANKING[component_id] = component_rank + _VSWHERE_COMPONENTID_SUFFIX[component_id] = component_suffix + _VSWHERE_COMPONENTID_SCONS_SUFFIX[component_id] = scons_suffix + +# VS2015 and earlier: configure registry queries to probe for installed VC editions _VCVER_TO_PRODUCT_DIR = { - '14.3': [ - (SCons.Util.HKEY_LOCAL_MACHINE, r'')], # not set by this version - '14.2': [ - (SCons.Util.HKEY_LOCAL_MACHINE, r'')], # not set by this version - '14.1': [ - (SCons.Util.HKEY_LOCAL_MACHINE, r'')], # not set by this version - '14.1Exp': [ - (SCons.Util.HKEY_LOCAL_MACHINE, r'')], # not set by this version '14.0': [ - (SCons.Util.HKEY_LOCAL_MACHINE, r'Microsoft\VisualStudio\14.0\Setup\VC\ProductDir')], + (SCons.Util.HKEY_LOCAL_MACHINE, r'Microsoft\VisualStudio\14.0\Setup\VC\ProductDir') + ], '14.0Exp': [ (SCons.Util.HKEY_LOCAL_MACHINE, r'Microsoft\WDExpress\14.0\Setup\VS\ProductDir'), - (SCons.Util.HKEY_LOCAL_MACHINE, r'Microsoft\VCExpress\14.0\Setup\VC\ProductDir')], + (SCons.Util.HKEY_LOCAL_MACHINE, r'Microsoft\VCExpress\14.0\Setup\VC\ProductDir'), + (SCons.Util.HKEY_LOCAL_MACHINE, r'Microsoft\VisualStudio\14.0\Setup\VC\ProductDir') + ], '12.0': [ (SCons.Util.HKEY_LOCAL_MACHINE, r'Microsoft\VisualStudio\12.0\Setup\VC\ProductDir'), ], '12.0Exp': [ + (SCons.Util.HKEY_LOCAL_MACHINE, r'Microsoft\WDExpress\12.0\Setup\VS\ProductDir'), (SCons.Util.HKEY_LOCAL_MACHINE, r'Microsoft\VCExpress\12.0\Setup\VC\ProductDir'), ], '11.0': [ (SCons.Util.HKEY_LOCAL_MACHINE, r'Microsoft\VisualStudio\11.0\Setup\VC\ProductDir'), ], '11.0Exp': [ + (SCons.Util.HKEY_LOCAL_MACHINE, r'Microsoft\WDExpress\11.0\Setup\VS\ProductDir'), (SCons.Util.HKEY_LOCAL_MACHINE, r'Microsoft\VCExpress\11.0\Setup\VC\ProductDir'), ], '10.0': [ @@ -739,17 +824,20 @@ _VCVER_TO_PRODUCT_DIR = { (SCons.Util.HKEY_LOCAL_MACHINE, r'Microsoft\VCExpress\10.0\Setup\VC\ProductDir'), ], '9.0': [ - (SCons.Util.HKEY_CURRENT_USER, r'Microsoft\DevDiv\VCForPython\9.0\installdir',), + (SCons.Util.HKEY_CURRENT_USER, r'Microsoft\DevDiv\VCForPython\9.0\installdir',), # vs root + (SCons.Util.HKEY_LOCAL_MACHINE, r'Microsoft\DevDiv\VCForPython\9.0\installdir',), # vs root (SCons.Util.HKEY_LOCAL_MACHINE, r'Microsoft\VisualStudio\9.0\Setup\VC\ProductDir',), ] if _VC90_Prefer_VCForPython else [ (SCons.Util.HKEY_LOCAL_MACHINE, r'Microsoft\VisualStudio\9.0\Setup\VC\ProductDir',), - (SCons.Util.HKEY_CURRENT_USER, r'Microsoft\DevDiv\VCForPython\9.0\installdir',), + (SCons.Util.HKEY_CURRENT_USER, r'Microsoft\DevDiv\VCForPython\9.0\installdir',), # vs root + (SCons.Util.HKEY_LOCAL_MACHINE, r'Microsoft\DevDiv\VCForPython\9.0\installdir',), # vs root ], '9.0Exp': [ (SCons.Util.HKEY_LOCAL_MACHINE, r'Microsoft\VCExpress\9.0\Setup\VC\ProductDir'), ], '8.0': [ (SCons.Util.HKEY_LOCAL_MACHINE, r'Microsoft\VisualStudio\8.0\Setup\VC\ProductDir'), + (SCons.Util.HKEY_LOCAL_MACHINE, r'Microsoft\VCExpress\8.0\Setup\VC\ProductDir'), ], '8.0Exp': [ (SCons.Util.HKEY_LOCAL_MACHINE, r'Microsoft\VCExpress\8.0\Setup\VC\ProductDir'), @@ -765,6 +853,62 @@ _VCVER_TO_PRODUCT_DIR = { ] } +# detect ide binaries + +VS2022_VS2002_DEV = ( + MSVC.Kind.IDE_PROGRAM_DEVENV_COM, # devenv.com +) + +VS1998_DEV = ( + MSVC.Kind.IDE_PROGRAM_MSDEV_COM, # MSDEV.COM +) + +VS2017_EXP = ( + MSVC.Kind.IDE_PROGRAM_WDEXPRESS_EXE, # WDExpress.exe +) + +VS2015_VS2012_EXP = ( + MSVC.Kind.IDE_PROGRAM_WDEXPRESS_EXE, # WDExpress.exe [Desktop] + MSVC.Kind.IDE_PROGRAM_VSWINEXPRESS_EXE, # VSWinExpress.exe [Windows] + MSVC.Kind.IDE_PROGRAM_VWDEXPRESS_EXE, # VWDExpress.exe [Web] +) + +VS2010_VS2005_EXP = ( + MSVC.Kind.IDE_PROGRAM_VCEXPRESS_EXE, +) + +# detect productdir kind + +_DETECT = MSVC.Kind.VCVER_KIND_DETECT + +_VCVER_KIND_DETECT = { + + # 'VCVer': (relpath from pdir to vsroot, path from vsroot to ide binaries, ide binaries) + + '14.3': _DETECT(root='..', path=r'Common7\IDE', programs=VS2022_VS2002_DEV), # 2022 + '14.2': _DETECT(root='..', path=r'Common7\IDE', programs=VS2022_VS2002_DEV), # 2019 + '14.1': _DETECT(root='..', path=r'Common7\IDE', programs=VS2022_VS2002_DEV + VS2017_EXP), # 2017 + '14.1Exp': _DETECT(root='..', path=r'Common7\IDE', programs=VS2022_VS2002_DEV + VS2017_EXP), # 2017 + + '14.0': _DETECT(root='..', path=r'Common7\IDE', programs=VS2022_VS2002_DEV + VS2015_VS2012_EXP), # 2015 + '14.0Exp': _DETECT(root='..', path=r'Common7\IDE', programs=VS2022_VS2002_DEV + VS2015_VS2012_EXP), # 2015 + '12.0': _DETECT(root='..', path=r'Common7\IDE', programs=VS2022_VS2002_DEV + VS2015_VS2012_EXP), # 2013 + '12.0Exp': _DETECT(root='..', path=r'Common7\IDE', programs=VS2022_VS2002_DEV + VS2015_VS2012_EXP), # 2013 + '11.0': _DETECT(root='..', path=r'Common7\IDE', programs=VS2022_VS2002_DEV + VS2015_VS2012_EXP), # 2012 + '11.0Exp': _DETECT(root='..', path=r'Common7\IDE', programs=VS2022_VS2002_DEV + VS2015_VS2012_EXP), # 2012 + + '10.0': _DETECT(root='..', path=r'Common7\IDE', programs=VS2022_VS2002_DEV + VS2010_VS2005_EXP), # 2010 + '10.0Exp': _DETECT(root='..', path=r'Common7\IDE', programs=VS2022_VS2002_DEV + VS2010_VS2005_EXP), # 2010 + '9.0': _DETECT(root='..', path=r'Common7\IDE', programs=VS2022_VS2002_DEV + VS2010_VS2005_EXP), # 2008 + '9.0Exp': _DETECT(root='..', path=r'Common7\IDE', programs=VS2022_VS2002_DEV + VS2010_VS2005_EXP), # 2008 + '8.0': _DETECT(root='..', path=r'Common7\IDE', programs=VS2022_VS2002_DEV + VS2010_VS2005_EXP), # 2005 + '8.0Exp': _DETECT(root='..', path=r'Common7\IDE', programs=VS2022_VS2002_DEV + VS2010_VS2005_EXP), # 2005 + + '7.1': _DETECT(root='..', path=r'Common7\IDE', programs=VS2022_VS2002_DEV), # 2003 + '7.0': _DETECT(root='..', path=r'Common7\IDE', programs=VS2022_VS2002_DEV), # 2001 + + '6.0': _DETECT(root='..', path=r'Common\MSDev98\Bin', programs=VS1998_DEV), # 1998 +} def msvc_version_to_maj_min(msvc_version): msvc_version_numeric = get_msvc_version_numeric(msvc_version) @@ -780,33 +924,581 @@ def msvc_version_to_maj_min(msvc_version): raise ValueError("Unrecognized version %s (%s)" % (msvc_version,msvc_version_numeric)) from None -VSWHERE_PATHS = [os.path.join(p,'vswhere.exe') for p in [ - os.path.expandvars(r"%ProgramFiles(x86)%\Microsoft Visual Studio\Installer"), - os.path.expandvars(r"%ProgramFiles%\Microsoft Visual Studio\Installer"), - os.path.expandvars(r"%ChocolateyInstall%\bin"), -]] - -def msvc_find_vswhere(): - """ Find the location of vswhere """ +_VSWHERE_EXEGROUP_MSVS = [os.path.join(p, _VSWHERE_EXE) for p in [ # For bug 3333: support default location of vswhere for both # 64 and 32 bit windows installs. # For bug 3542: also accommodate not being on C: drive. + os.path.expandvars(r"%ProgramFiles(x86)%\Microsoft Visual Studio\Installer"), + os.path.expandvars(r"%ProgramFiles%\Microsoft Visual Studio\Installer"), +]] + +_VSWHERE_EXEGROUP_PKGMGR = [os.path.join(p, _VSWHERE_EXE) for p in [ + os.path.expandvars(r"%ChocolateyInstall%\bin"), + os.path.expandvars(r"%LOCALAPPDATA%\Microsoft\WinGet\Links"), + os.path.expanduser(r"~\scoop\shims"), + os.path.expandvars(r"%SCOOP%\shims"), +]] + +_VSWhereBinary = namedtuple('_VSWhereBinary', [ + 'vswhere_exe', + 'vswhere_norm', +]) + +class VSWhereBinary(_VSWhereBinary, MSVC.Util.AutoInitialize): + + _UNDEFINED_VSWHERE_BINARY = None + + _cache_vswhere_paths = {} + + @classmethod + def _initialize(cls): + vswhere_binary = cls( + vswhere_exe=None, + vswhere_norm=None, + ) + cls._UNDEFINED_VSWHERE_BINARY = vswhere_binary + for symbol in (None, ''): + cls._cache_vswhere_paths[symbol] = vswhere_binary + + @classmethod + def factory(cls, vswhere_exe): + + if not vswhere_exe: + return cls._UNDEFINED_VSWHERE_BINARY + + vswhere_binary = cls._cache_vswhere_paths.get(vswhere_exe) + if vswhere_binary: + return vswhere_binary + + vswhere_norm = MSVC.Util.normalize_path(vswhere_exe) + + vswhere_binary = cls._cache_vswhere_paths.get(vswhere_norm) + if vswhere_binary: + return vswhere_binary + + vswhere_binary = cls( + vswhere_exe=vswhere_exe, + vswhere_norm=vswhere_norm, + ) + + cls._cache_vswhere_paths[vswhere_exe] = vswhere_binary + cls._cache_vswhere_paths[vswhere_norm] = vswhere_binary + + return vswhere_binary + +class _VSWhereExecutable(MSVC.Util.AutoInitialize): + + debug_extra = None + + class _VSWhereUserPriority(enum.IntEnum): + HIGH = 0 # before msvs locations + DEFAULT = enum.auto() # after msvs locations and before pkgmgr locations + LOW = enum.auto() # after pkgmgr locations + + priority_default = _VSWhereUserPriority.DEFAULT + priority_map = {} + priority_symbols = [] + priority_indmap = {} + + for e in _VSWhereUserPriority: + for symbol in (e.name.lower(), e.name.lower().capitalize(), e.name): + priority_map[symbol] = e.value + priority_symbols.append(symbol) + priority_indmap[e.value] = e.name + + UNDEFINED_VSWHERE_BINARY = VSWhereBinary.factory(None) + + @classmethod + def reset(cls): + + cls._vswhere_exegroups = None + cls._vswhere_exegroups_user = None + cls._vswhere_exegroup_msvs = None + cls._vswhere_exegroup_pkgmgr = None + + cls.vswhere_frozen_flag = False + cls.vswhere_frozen_binary = None + + @classmethod + def _initialize(cls): + cls.debug_extra = common.debug_extra(cls) + cls.reset() + + @classmethod + def _vswhere_exegroup_binaries(cls, vswhere_exe_list, label): + vswhere_binaries = [] + for vswhere_exe in vswhere_exe_list: + if not os.path.exists(vswhere_exe): + continue + vswhere_binary = VSWhereBinary.factory(vswhere_exe) + vswhere_binaries.append(vswhere_binary) + debug( + "insert exegroup=%s, vswhere_binary=%s", + label, vswhere_binary, extra=cls.debug_extra + ) + return vswhere_binaries + + @classmethod + def _get_vswhere_exegroups(cls): + + if cls._vswhere_exegroups is None: + + cls._vswhere_exegroup_msvs = cls._vswhere_exegroup_binaries(_VSWHERE_EXEGROUP_MSVS, 'MSVS') + cls._vswhere_exegroup_pkgmgr = cls._vswhere_exegroup_binaries(_VSWHERE_EXEGROUP_PKGMGR, 'PKGMGR') + + cls._vswhere_exegroups_user = [ + [] for e in cls._VSWhereUserPriority + ] + + vswhere_exegroups = [ + cls._vswhere_exegroups_user[cls._VSWhereUserPriority.HIGH], + cls._vswhere_exegroup_msvs, + cls._vswhere_exegroups_user[cls._VSWhereUserPriority.DEFAULT], + cls._vswhere_exegroup_pkgmgr, + cls._vswhere_exegroups_user[cls._VSWhereUserPriority.LOW], + ] + + cls._vswhere_exegroups = vswhere_exegroups + + return cls._vswhere_exegroups + + @classmethod + def _get_vswhere_exegroups_user(cls): + + if cls._vswhere_exegroups_user is None: + cls._get_vswhere_exegroups() + + return cls._vswhere_exegroups_user + + @classmethod + def _vswhere_exegroup_binary(cls, exegroup): + # first vswhere binary in group or UNDEFINED_VSWHERE_BINARY + vswhere_binary = exegroup[0] if exegroup else cls.UNDEFINED_VSWHERE_BINARY + return vswhere_binary + + @classmethod + def _vswhere_current_binary(cls): + # first vswhere binary in priority order or UNDEFINED_VSWHERE_BINARY + vswhere_binary = cls.UNDEFINED_VSWHERE_BINARY + vswhere_exegroups = cls._get_vswhere_exegroups() + for exegroup in vswhere_exegroups: + binary = cls._vswhere_exegroup_binary(exegroup) + if binary == cls.UNDEFINED_VSWHERE_BINARY: + continue + vswhere_binary = binary + break + return vswhere_binary + + @classmethod + def _vswhere_all_executables(cls): + # unique vswhere executables in priority order + vswhere_exe_list = [] + vswhere_norm_set = set() + vswhere_exegroups = cls._get_vswhere_exegroups() + for exegroup in vswhere_exegroups: + for vswhere_binary in exegroup: + if vswhere_binary.vswhere_norm in vswhere_norm_set: + continue + vswhere_norm_set.add(vswhere_binary.vswhere_norm) + vswhere_exe_list.append(vswhere_binary.vswhere_exe) + return vswhere_exe_list + + @classmethod + def is_frozen(cls) -> bool: + rval = bool(cls.vswhere_frozen_flag) + return rval + + @classmethod + def freeze_vswhere_binary(cls): + if not cls.vswhere_frozen_flag: + cls.vswhere_frozen_flag = True + cls.vswhere_frozen_binary = cls._vswhere_current_binary() + debug("freeze=%s", cls.vswhere_frozen_binary, extra=cls.debug_extra) + return cls.vswhere_frozen_binary + + @classmethod + def freeze_vswhere_executable(cls): + vswhere_binary = cls.freeze_vswhere_binary() + vswhere_exe = vswhere_binary.vswhere_exe + return vswhere_exe + + @classmethod + def get_vswhere_executable(cls): + if cls.vswhere_frozen_flag: + vswhere_binary = cls.vswhere_frozen_binary + else: + vswhere_binary = cls._vswhere_current_binary() + vswhere_exe = vswhere_binary.vswhere_exe + debug("vswhere_exe=%s", repr(vswhere_exe), extra=cls.debug_extra) + return vswhere_exe + + @classmethod + def _vswhere_priority_group(cls, priority): + if not priority: + group = cls.priority_default + else: + group = cls.priority_map.get(priority) + if group is None: + msg = f'Value specified for vswhere executable priority is not supported: {priority!r}:\n' \ + f' Valid values are: {cls.priority_symbols}' + debug(f'VSWhereUserError: {msg}', extra=cls.debug_extra) + raise VSWhereUserError(msg) + return group + + @classmethod + def register_vswhere_executable(cls, vswhere_exe, priority=None): + + vswhere_binary = cls.UNDEFINED_VSWHERE_BINARY + + if not vswhere_exe: + # ignore: None or empty + return vswhere_binary + + if not os.path.exists(vswhere_exe): + msg = f'Specified vswhere executable not found: {vswhere_exe!r}.' + debug(f'VSWhereUserError: {msg}', extra=cls.debug_extra) + raise VSWhereUserError(msg) + + group = cls._vswhere_priority_group(priority) + + vswhere_binary = VSWhereBinary.factory(vswhere_exe) + + if cls.vswhere_frozen_flag: + + if vswhere_binary.vswhere_norm == cls.vswhere_frozen_binary.vswhere_norm: + # ignore: user executable == frozen executable + return vswhere_binary + + msg = 'A different vswhere execuable cannot be requested after initial detetection:\n' \ + f' initial vswhere executable: {cls.vswhere_frozen_binary.vswhere_exe!r}\n' \ + f' request vswhere executable: {vswhere_binary.vswhere_exe!r}' + + debug(f'VSWhereUserError: {msg}', extra=cls.debug_extra) + raise VSWhereUserError(msg) + + vswhere_exegroups_user = cls._get_vswhere_exegroups_user() + + exegroup = vswhere_exegroups_user[group] + group_binary = cls._vswhere_exegroup_binary(exegroup) + + if vswhere_binary.vswhere_norm == group_binary.vswhere_norm: + # ignore: user executable == exegroup[0] executable + return vswhere_binary + + exegroup.insert(0, vswhere_binary) + debug( + "insert exegroup=user[%s], vswhere_binary=%s", + cls.priority_indmap[group], vswhere_binary, extra=cls.debug_extra + ) + + return vswhere_binary + + @classmethod + def vswhere_freeze_executable(cls, vswhere_exe): + vswhere_binary = cls.register_vswhere_executable(vswhere_exe, priority='high') + frozen_binary = cls.freeze_vswhere_binary() + return frozen_binary, vswhere_binary + + @classmethod + def vswhere_freeze_env(cls, env): + + if env is None: + # no environment, VSWHERE undefined + vswhere_exe = None + write_vswhere = False + elif not env.get('VSWHERE'): + # environment, VSWHERE undefined/none/empty + vswhere_exe = None + write_vswhere = True + else: + # environment, VSWHERE defined + vswhere_exe = env.subst('$VSWHERE') + write_vswhere = False + + frozen_binary, vswhere_binary = cls.vswhere_freeze_executable(vswhere_exe) + + if write_vswhere and frozen_binary.vswhere_norm != vswhere_binary.vswhere_norm: + env['VSWHERE'] = frozen_binary.vswhere_exe + debug( + "env['VSWHERE']=%s", + repr(frozen_binary.vswhere_exe), extra=cls.debug_extra + ) + + return frozen_binary, vswhere_binary + +# external use + +def vswhere_register_executable(vswhere_exe, priority=None, freeze=False): + debug( + 'register vswhere_exe=%s, priority=%s, freeze=%s', + repr(vswhere_exe), repr(priority), repr(freeze) + ) + _VSWhereExecutable.register_vswhere_executable(vswhere_exe, priority=priority) + if freeze: + _VSWhereExecutable.freeze_vswhere_executable() + rval = _VSWhereExecutable.get_vswhere_executable() + debug('current vswhere_exe=%s, is_frozen=%s', repr(rval), _VSWhereExecutable.is_frozen()) + return vswhere_exe + +def vswhere_get_executable(): + debug('') + vswhere_exe = _VSWhereExecutable.get_vswhere_executable() + return vswhere_exe + +def vswhere_freeze_executable(): + debug('') + vswhere_exe = _VSWhereExecutable.freeze_vswhere_executable() + return vswhere_exe + +# internal use only +vswhere_freeze_env = _VSWhereExecutable.vswhere_freeze_env + +def msvc_find_vswhere(): + """ Find the location of vswhere """ # NB: this gets called from testsuite on non-Windows platforms. # Whether that makes sense or not, don't break it for those. - vswhere_path = None - for pf in VSWHERE_PATHS: - if os.path.exists(pf): - vswhere_path = pf - break - + vswhere_path = _VSWhereExecutable.get_vswhere_executable() return vswhere_path -def find_vc_pdir_vswhere(msvc_version, env=None): +_MSVCInstance = namedtuple('_MSVCInstance', [ + 'vc_path', + 'vc_version', + 'vc_version_numeric', + 'vc_version_scons', + 'vc_release', + 'vc_component_id', + 'vc_component_rank', + 'vc_component_suffix', +]) + +class MSVCInstance(_MSVCInstance): + + @staticmethod + def msvc_instances_default_order(a, b): + # vc version numeric: descending order + if a.vc_version_numeric != b.vc_version_numeric: + return 1 if a.vc_version_numeric < b.vc_version_numeric else -1 + # vc release: descending order (release, preview) + if a.vc_release != b.vc_release: + return 1 if a.vc_release < b.vc_release else -1 + # component rank: descending order + if a.vc_component_rank != b.vc_component_rank: + return 1 if a.vc_component_rank < b.vc_component_rank else -1 + return 0 + +class _VSWhere(MSVC.Util.AutoInitialize): + + debug_extra = None + + @classmethod + def reset(cls): + + cls.seen_vswhere = set() + cls.seen_root = set() + + cls.msvc_instances = [] + cls.msvc_map = {} + + @classmethod + def _initialize(cls): + cls.debug_extra = common.debug_extra(cls) + cls.reset() + + @classmethod + def _filter_vswhere_binary(cls, vswhere_binary): + + vswhere_norm = None + + if vswhere_binary.vswhere_norm not in cls.seen_vswhere: + cls.seen_vswhere.add(vswhere_binary.vswhere_norm) + vswhere_norm = vswhere_binary.vswhere_norm + + return vswhere_norm + + @classmethod + def _new_roots_discovered(cls): + if len(cls.seen_vswhere) > 1: + raise MSVCInternalError(f'vswhere discovered new msvc installations after initial detection') + + @classmethod + def _vswhere_query_json_output(cls, vswhere_exe, vswhere_args): + + vswhere_json = None + + once = True + while once: + once = False + # using break for single exit (unless exception) + + vswhere_cmd = [vswhere_exe] + vswhere_args + ['-format', 'json', '-utf8'] + debug("running: %s", vswhere_cmd, extra=cls.debug_extra) + + try: + cp = subprocess.run(vswhere_cmd, stdout=PIPE, stderr=PIPE, check=True) + except OSError as e: + errmsg = str(e) + debug("%s: %s", type(e).__name__, errmsg, extra=cls.debug_extra) + break + except Exception as e: + errmsg = str(e) + debug("%s: %s", type(e).__name__, errmsg, extra=cls.debug_extra) + raise + + if not cp.stdout: + debug("no vswhere information returned", extra=cls.debug_extra) + break + + vswhere_output = cp.stdout.decode('utf8', errors='replace') + if not vswhere_output: + debug("no vswhere information output", extra=cls.debug_extra) + break + + try: + vswhere_output_json = json.loads(vswhere_output) + except json.decoder.JSONDecodeError: + debug("json decode exception loading vswhere output", extra=cls.debug_extra) + break + + vswhere_json = vswhere_output_json + break + + debug( + 'vswhere_json=%s, vswhere_exe=%s', + bool(vswhere_json), repr(vswhere_exe), extra=cls.debug_extra + ) + + return vswhere_json + + @classmethod + def vswhere_update_msvc_map(cls, vswhere_exe): + + frozen_binary, vswhere_binary = _VSWhereExecutable.vswhere_freeze_executable(vswhere_exe) + + vswhere_norm = cls._filter_vswhere_binary(frozen_binary) + if not vswhere_norm: + return cls.msvc_map + + debug('vswhere_norm=%s', repr(vswhere_norm), extra=cls.debug_extra) + + vswhere_json = cls._vswhere_query_json_output( + vswhere_norm, + ['-all', '-products', '*'] + ) + + if not vswhere_json: + return cls.msvc_map + + n_instances = len(cls.msvc_instances) + + for instance in vswhere_json: + + #print(json.dumps(instance, indent=4, sort_keys=True)) + + installation_path = instance.get('installationPath') + if not installation_path or not os.path.exists(installation_path): + continue + + vc_path = os.path.join(installation_path, 'VC') + if not os.path.exists(vc_path): + continue + + vc_root = MSVC.Util.normalize_path(vc_path) + if vc_root in cls.seen_root: + continue + cls.seen_root.add(vc_root) + + installation_version = instance.get('installationVersion') + if not installation_version: + continue + + vs_major = installation_version.split('.')[0] + if not vs_major in _VSWHERE_VSMAJOR_TO_VCVERSION: + debug('ignore vs_major: %s', vs_major, extra=cls.debug_extra) + continue + + vc_version = _VSWHERE_VSMAJOR_TO_VCVERSION[vs_major] + + product_id = instance.get('productId') + if not product_id: + continue + + component_id = product_id.split('.')[-1] + if component_id not in _VSWHERE_COMPONENTID_CANDIDATES: + debug('ignore component_id: %s', component_id, extra=cls.debug_extra) + continue + + component_rank = _VSWHERE_COMPONENTID_RANKING.get(component_id,0) + if component_rank == 0: + raise MSVCInternalError(f'unknown component_rank for component_id: {component_id!r}') + + scons_suffix = _VSWHERE_COMPONENTID_SCONS_SUFFIX[component_id] + + if scons_suffix: + vc_version_scons = vc_version + scons_suffix + else: + vc_version_scons = vc_version + + is_prerelease = True if instance.get('isPrerelease', False) else False + is_release = False if is_prerelease else True + + msvc_instance = MSVCInstance( + vc_path = vc_path, + vc_version = vc_version, + vc_version_numeric = float(vc_version), + vc_version_scons = vc_version_scons, + vc_release = is_release, + vc_component_id = component_id, + vc_component_rank = component_rank, + vc_component_suffix = component_suffix, + ) + + cls.msvc_instances.append(msvc_instance) + + new_roots = bool(len(cls.msvc_instances) > n_instances) + if new_roots: + + cls.msvc_instances = sorted( + cls.msvc_instances, + key=cmp_to_key(MSVCInstance.msvc_instances_default_order) + ) + + cls.msvc_map = {} + + for msvc_instance in cls.msvc_instances: + + debug( + 'msvc instance: msvc_version=%s, is_release=%s, component_id=%s, vc_path=%s', + repr(msvc_instance.vc_version_scons), msvc_instance.vc_release, + repr(msvc_instance.vc_component_id), repr(msvc_instance.vc_path), + extra=cls.debug_extra + ) + + key = (msvc_instance.vc_version_scons, msvc_instance.vc_release) + cls.msvc_map.setdefault(key,[]).append(msvc_instance) + + if msvc_instance.vc_version_scons == msvc_instance.vc_version: + continue + + key = (msvc_instance.vc_version, msvc_instance.vc_release) + cls.msvc_map.setdefault(key,[]).append(msvc_instance) + + cls._new_roots_discovered() + + debug( + 'new_roots=%s, msvc_instances=%s', + new_roots, len(cls.msvc_instances), extra=cls.debug_extra + ) + + return cls.msvc_map + +_cache_pdir_vswhere_queries = {} + +def _find_vc_pdir_vswhere(msvc_version, vswhere_exe): """ Find the MSVC product directory using the vswhere program. Args: msvc_version: MSVC version to search for - env: optional to look up VSWHERE variable + vswhere_exe: vswhere executable or None Returns: MSVC install dir or None @@ -815,57 +1507,178 @@ def find_vc_pdir_vswhere(msvc_version, env=None): UnsupportedVersion: if the version is not known by this file """ + global _cache_pdir_vswhere_queries + + msvc_map = _VSWhere.vswhere_update_msvc_map(vswhere_exe) + if not msvc_map: + return None + + rval = _cache_pdir_vswhere_queries.get(msvc_version, UNDEFINED) + if rval != UNDEFINED: + debug('msvc_version=%s, pdir=%s', repr(msvc_version), repr(rval)) + return rval + + if msvc_version not in _VSWHERE_SUPPORTED_VCVER: + debug("Unknown version of MSVC: %s", msvc_version) + raise UnsupportedVersion("Unknown version %s" % msvc_version) + + is_release = True + key = (msvc_version, is_release) + + msvc_instances = msvc_map.get(key, UNDEFINED) + if msvc_instances == UNDEFINED: + debug( + 'msvc instances lookup failed: msvc_version=%s, is_release=%s', + repr(msvc_version), repr(is_release) + ) + msvc_instances = [] + + save_pdir_kind = [] + + pdir = None + kind_t = None + + for msvc_instance in msvc_instances: + + vcdir = msvc_instance.vc_path + + vckind_t = MSVC.Kind.msvc_version_pdir_vswhere_kind(msvc_version, vcdir, _VCVER_KIND_DETECT[msvc_version]) + if vckind_t.skip: + if vckind_t.save: + debug('save kind: msvc_version=%s, pdir=%s', repr(msvc_version), repr(vcdir)) + save_pdir_kind.append((vcdir, vckind_t)) + else: + debug('skip kind: msvc_version=%s, pdir=%s', repr(msvc_version), repr(vcdir)) + continue + + pdir = vcdir + kind_t = vckind_t + break + + if not pdir and not kind_t: + if save_pdir_kind: + pdir, kind_t = save_pdir_kind[0] + + MSVC.Kind.msvc_version_register_kind(msvc_version, kind_t) + + debug('msvc_version=%s, pdir=%s', repr(msvc_version), repr(pdir)) + _cache_pdir_vswhere_queries[msvc_version] = pdir + + return pdir + +_cache_pdir_registry_queries = {} + +def _find_vc_pdir_registry(msvc_version): + """ Find the MSVC product directory using the registry. + + Args: + msvc_version: MSVC version to search for + + Returns: + MSVC install dir or None + + Raises: + UnsupportedVersion: if the version is not known by this file + + """ + global _cache_pdir_registry_queries + + rval = _cache_pdir_registry_queries.get(msvc_version, UNDEFINED) + if rval != UNDEFINED: + debug('msvc_version=%s, pdir=%s', repr(msvc_version), repr(rval)) + return rval + try: - vswhere_version = _VCVER_TO_VSWHERE_VER[msvc_version] + regkeys = _VCVER_TO_PRODUCT_DIR[msvc_version] except KeyError: debug("Unknown version of MSVC: %s", msvc_version) raise UnsupportedVersion("Unknown version %s" % msvc_version) from None - if env is None or not env.get('VSWHERE'): - vswhere_path = msvc_find_vswhere() - else: - vswhere_path = env.subst('$VSWHERE') + save_pdir_kind = [] - if vswhere_path is None: - return None + is_win64 = common.is_win64() - debug('VSWHERE: %s', vswhere_path) - for vswhere_version_args in vswhere_version: + pdir = None + kind_t = None - vswhere_cmd = [vswhere_path] + vswhere_version_args + ["-property", "installationPath"] + root = 'Software\\' + for hkroot, key in regkeys: - debug("running: %s", vswhere_cmd) + if not hkroot or not key: + continue - # TODO: Python 3.7 - # cp = subprocess.run(vswhere_cmd, capture_output=True, check=True) # 3.7+ only - cp = subprocess.run(vswhere_cmd, stdout=PIPE, stderr=PIPE, check=True) - - if cp.stdout: - # vswhere could return multiple lines, e.g. if Build Tools - # and {Community,Professional,Enterprise} are both installed. - # We could define a way to pick the one we prefer, but since - # this data is currently only used to make a check for existence, - # returning the first hit should be good enough. - lines = cp.stdout.decode("mbcs").splitlines() - return os.path.join(lines[0], 'VC') + if is_win64: + msregkeys = [root + 'Wow6432Node\\' + key, root + key] else: - # We found vswhere, but no install info available for this version - pass + msregkeys = [root + key] - return None + vcdir = None + for msregkey in msregkeys: + debug('trying VC registry key %s', repr(msregkey)) + try: + vcdir = common.read_reg(msregkey, hkroot) + except OSError: + continue + if vcdir: + break + if not vcdir: + debug('no VC registry key %s', repr(key)) + continue -def find_vc_pdir(env, msvc_version): + is_vcforpython = False + + is_vsroot = False + if msvc_version == '9.0' and key.lower().endswith('\\vcforpython\\9.0\\installdir'): + # Visual C++ for Python registry key is VS installdir (root) not VC productdir + is_vsroot = True + is_vcforpython = True + elif msvc_version in ('14.0Exp', '12.0Exp', '11.0Exp') and key.lower().endswith('\\setup\\vs\\productdir'): + # Visual Studio 2015/2013/2012 Express is VS productdir (root) not VC productdir + is_vsroot = True + + if is_vsroot: + vcdir = os.path.join(vcdir, 'VC') + debug('convert vs root to vc dir: %s', repr(vcdir)) + + if not os.path.exists(vcdir): + debug('reg says dir is %s, but it does not exist. (ignoring)', repr(vcdir)) + continue + + vckind_t = MSVC.Kind.msvc_version_pdir_registry_kind(msvc_version, vcdir, _VCVER_KIND_DETECT[msvc_version], is_vcforpython) + if vckind_t.skip: + if vckind_t.save: + debug('save kind: msvc_version=%s, pdir=%s', repr(msvc_version), repr(vcdir)) + save_pdir_kind.append((vcdir, vckind_t)) + else: + debug('skip kind: msvc_version=%s, pdir=%s', repr(msvc_version), repr(vcdir)) + continue + + pdir = vcdir + kind_t = vckind_t + break + + if not pdir and not kind_t: + if save_pdir_kind: + pdir, kind_t = save_pdir_kind[0] + + MSVC.Kind.msvc_version_register_kind(msvc_version, kind_t) + + debug('msvc_version=%s, pdir=%s', repr(msvc_version), repr(pdir)) + _cache_pdir_registry_queries[msvc_version] = pdir + + return pdir + +def _find_vc_pdir(msvc_version, vswhere_exe): """Find the MSVC product directory for the given version. - Tries to look up the path using a registry key from the table - _VCVER_TO_PRODUCT_DIR; if there is no key, calls find_vc_pdir_wshere - for help instead. - Args: msvc_version: str msvc version (major.minor, e.g. 10.0) + vswhere_exe: str + vswhere executable or None + Returns: str: Path found in registry, or None @@ -875,52 +1688,66 @@ def find_vc_pdir(env, msvc_version): UnsupportedVersion inherits from VisualCException. """ - root = 'Software\\' - try: - hkeys = _VCVER_TO_PRODUCT_DIR[msvc_version] - except KeyError: - debug("Unknown version of MSVC: %s", msvc_version) - raise UnsupportedVersion("Unknown version %s" % msvc_version) from None - for hkroot, key in hkeys: - try: - comps = None - if not key: - comps = find_vc_pdir_vswhere(msvc_version, env) - if not comps: - debug('no VC found for version %s', repr(msvc_version)) - raise OSError - debug('VC found: %s', repr(msvc_version)) - return comps - else: - if common.is_win64(): - try: - # ordinarily at win64, try Wow6432Node first. - comps = common.read_reg(root + 'Wow6432Node\\' + key, hkroot) - except OSError: - # at Microsoft Visual Studio for Python 2.7, value is not in Wow6432Node - pass - if not comps: - # not Win64, or Microsoft Visual Studio for Python 2.7 - comps = common.read_reg(root + key, hkroot) - except OSError: - debug('no VC registry key %s', repr(key)) - else: - if msvc_version == '9.0': - if key.lower().endswith('\\vcforpython\\9.0\\installdir'): - # Visual C++ for Python registry key is installdir (root) not productdir (vc) - comps = os.path.join(comps, 'VC') - elif msvc_version == '14.0Exp': - if key.lower().endswith('\\setup\\vs\\productdir'): - # Visual Studio 14.0 Express registry key is installdir (root) not productdir (vc) - comps = os.path.join(comps, 'VC') - debug('found VC in registry: %s', comps) - if os.path.exists(comps): - return comps - else: - debug('reg says dir is %s, but it does not exist. (ignoring)', comps) + if msvc_version in _VSWHERE_SUPPORTED_VCVER: + + pdir = _find_vc_pdir_vswhere(msvc_version, vswhere_exe) + if pdir: + debug('VC found: %s, dir=%s', repr(msvc_version), repr(pdir)) + return pdir + + elif msvc_version in _VCVER_TO_PRODUCT_DIR: + + pdir = _find_vc_pdir_registry(msvc_version) + if pdir: + debug('VC found: %s, dir=%s', repr(msvc_version), repr(pdir)) + return pdir + + else: + + debug("Unknown version of MSVC: %s", repr(msvc_version)) + raise UnsupportedVersion("Unknown version %s" % repr(msvc_version)) from None + + debug('no VC found for version %s', repr(msvc_version)) return None +def find_vc_pdir(msvc_version, env=None): + """Find the MSVC product directory for the given version. + + Args: + msvc_version: str + msvc version (major.minor, e.g. 10.0) + env: + optional to look up VSWHERE variable + + Returns: + str: Path found in registry, or None + + Raises: + UnsupportedVersion: if the version is not known by this file. + + UnsupportedVersion inherits from VisualCException. + + """ + + frozen_binary, _ = _VSWhereExecutable.vswhere_freeze_env(env) + + pdir = _find_vc_pdir(msvc_version, frozen_binary.vswhere_exe) + debug('pdir=%s', repr(pdir)) + + return pdir + +# register find_vc_pdir function with Kind routines +# in case of unknown msvc_version (just in case) +MSVC.Kind.register_msvc_version_pdir_func(find_vc_pdir) + +def _reset_vc_pdir(): + debug('reset pdir caches') + global _cache_pdir_vswhere_queries + global _cache_pdir_registry_queries + _cache_pdir_vswhere_queries = {} + _cache_pdir_registry_queries = {} + def find_batch_file(msvc_version, host_arch, target_arch, pdir): """ Find the location of the batch script which should set up the compiler @@ -940,6 +1767,7 @@ def find_batch_file(msvc_version, host_arch, target_arch, pdir): arg = '' vcdir = None clexe = None + depbat = None if vernum_int >= 143: # 14.3 (VS2022) and later @@ -953,15 +1781,26 @@ def find_batch_file(msvc_version, host_arch, target_arch, pdir): batfile, _ = _LE2019_HOST_TARGET_BATCHFILE_CLPATHCOMPS[(host_arch, target_arch)] batfilename = os.path.join(batfiledir, batfile) vcdir = pdir - elif 141 > vernum_int >= 80: - # 14.0 (VS2015) to 8.0 (VS2005) - arg, cl_path_comps = _LE2015_HOST_TARGET_BATCHARG_CLPATHCOMPS[(host_arch, target_arch)] + elif 141 > vernum_int >= 100: + # 14.0 (VS2015) to 10.0 (VS2010) + arg, batfile, cl_path_comps = _LE2015_HOST_TARGET_BATCHARG_BATCHFILE_CLPATHCOMPS[(host_arch, target_arch)] batfilename = os.path.join(pdir, "vcvarsall.bat") - if msvc_version == '9.0' and not os.path.exists(batfilename): - # Visual C++ for Python batch file is in installdir (root) not productdir (vc) - batfilename = os.path.normpath(os.path.join(pdir, os.pardir, "vcvarsall.bat")) - # Visual C++ for Python sdk batch files do not point to the VCForPython installation + depbat = os.path.join(pdir, *cl_path_comps, batfile) + clexe = os.path.join(pdir, *cl_path_comps, _CL_EXE_NAME) + elif 100 > vernum_int >= 80: + # 9.0 (VS2008) to 8.0 (VS2005) + arg, batfile, cl_path_comps = _LE2008_HOST_TARGET_BATCHARG_BATCHFILE_CLPATHCOMPS[(host_arch, target_arch)] + if vernum_int == 90 and MSVC.Kind.msvc_version_is_vcforpython(msvc_version): + # 9.0 (VS2008) Visual C++ for Python: + # sdk batch files do not point to the VCForPython installation + # vcvarsall batch file is in installdir not productdir (e.g., vc\..\vcvarsall.bat) + # dependency batch files are not called from vcvarsall.bat sdk_pdir = None + batfilename = os.path.join(pdir, os.pardir, "vcvarsall.bat") + depbat = None + else: + batfilename = os.path.join(pdir, "vcvarsall.bat") + depbat = os.path.join(pdir, *cl_path_comps, batfile) clexe = os.path.join(pdir, *cl_path_comps, _CL_EXE_NAME) else: # 80 > vernum_int # 7.1 (VS2003) and earlier @@ -974,7 +1813,11 @@ def find_batch_file(msvc_version, host_arch, target_arch, pdir): batfilename = None if clexe and not os.path.exists(clexe): - debug("cl.exe not found: %s", clexe) + debug("%s not found: %s", _CL_EXE_NAME, clexe) + batfilename = None + + if depbat and not os.path.exists(depbat): + debug("dependency batch file not found: %s", depbat) batfilename = None return batfilename, arg, vcdir, sdk_pdir @@ -999,16 +1842,23 @@ def find_batch_file_sdk(host_arch, target_arch, sdk_pdir): return None __INSTALLED_VCS_RUN = None + +def _reset_installed_vcs(): + global __INSTALLED_VCS_RUN + debug('reset __INSTALLED_VCS_RUN') + __INSTALLED_VCS_RUN = None + _VC_TOOLS_VERSION_FILE_PATH = ['Auxiliary', 'Build', 'Microsoft.VCToolsVersion.default.txt'] _VC_TOOLS_VERSION_FILE = os.sep.join(_VC_TOOLS_VERSION_FILE_PATH) -def _check_cl_exists_in_vc_dir(env, vc_dir, msvc_version) -> bool: - """Return status of finding a cl.exe to use. +def _check_files_exist_in_vc_dir(env, vc_dir, msvc_version) -> bool: + """Return status of finding batch file and cl.exe to use. - Locates cl in the vc_dir depending on TARGET_ARCH, HOST_ARCH and the - msvc version. TARGET_ARCH and HOST_ARCH can be extracted from the - passed env, unless the env is None, in which case the native platform is - assumed for the host and all associated targets. + Locates required vcvars batch files and cl in the vc_dir depending on + TARGET_ARCH, HOST_ARCH and the msvc version. TARGET_ARCH and HOST_ARCH + can be extracted from the passed env, unless the env is None, in which + case the native platform is assumed for the host and all associated + targets. Args: env: Environment @@ -1067,33 +1917,72 @@ def _check_cl_exists_in_vc_dir(env, vc_dir, msvc_version) -> bool: debug('unsupported host/target platform combo: (%s,%s)', host_platform, target_platform) continue - _, cl_path_comps = batchfile_clpathcomps - cl_path = os.path.join(vc_dir, 'Tools', 'MSVC', vc_specific_version, *cl_path_comps, _CL_EXE_NAME) - debug('checking for %s at %s', _CL_EXE_NAME, cl_path) + batfile, cl_path_comps = batchfile_clpathcomps - if os.path.exists(cl_path): - debug('found %s!', _CL_EXE_NAME) - return True + batfile_path = os.path.join(vc_dir, "Auxiliary", "Build", batfile) + if not os.path.exists(batfile_path): + debug("batch file not found: %s", batfile_path) + continue + + cl_path = os.path.join(vc_dir, 'Tools', 'MSVC', vc_specific_version, *cl_path_comps, _CL_EXE_NAME) + if not os.path.exists(cl_path): + debug("%s not found: %s", _CL_EXE_NAME, cl_path) + continue + + debug('%s found: %s', _CL_EXE_NAME, cl_path) + return True elif 141 > vernum_int >= 80: # 14.0 (VS2015) to 8.0 (VS2005) + if vernum_int >= 100: + # 14.0 (VS2015) to 10.0 (VS2010) + host_target_batcharg_batchfile_clpathcomps = _LE2015_HOST_TARGET_BATCHARG_BATCHFILE_CLPATHCOMPS + else: + # 9.0 (VS2008) to 8.0 (VS2005) + host_target_batcharg_batchfile_clpathcomps = _LE2008_HOST_TARGET_BATCHARG_BATCHFILE_CLPATHCOMPS + + if vernum_int == 90 and MSVC.Kind.msvc_version_is_vcforpython(msvc_version): + # 9.0 (VS2008) Visual C++ for Python: + # vcvarsall batch file is in installdir not productdir (e.g., vc\..\vcvarsall.bat) + # dependency batch files are not called from vcvarsall.bat + batfile_path = os.path.join(vc_dir, os.pardir, "vcvarsall.bat") + check_depbat = False + else: + batfile_path = os.path.join(vc_dir, "vcvarsall.bat") + check_depbat = True + + if not os.path.exists(batfile_path): + debug("batch file not found: %s", batfile_path) + return False + for host_platform, target_platform in host_target_list: debug('host platform %s, target platform %s for version %s', host_platform, target_platform, msvc_version) - batcharg_clpathcomps = _LE2015_HOST_TARGET_BATCHARG_CLPATHCOMPS.get((host_platform, target_platform), None) - if batcharg_clpathcomps is None: + batcharg_batchfile_clpathcomps = host_target_batcharg_batchfile_clpathcomps.get( + (host_platform, target_platform), None + ) + + if batcharg_batchfile_clpathcomps is None: debug('unsupported host/target platform combo: (%s,%s)', host_platform, target_platform) continue - _, cl_path_comps = batcharg_clpathcomps - cl_path = os.path.join(vc_dir, *cl_path_comps, _CL_EXE_NAME) - debug('checking for %s at %s', _CL_EXE_NAME, cl_path) + _, batfile, cl_path_comps = batcharg_batchfile_clpathcomps - if os.path.exists(cl_path): - debug('found %s', _CL_EXE_NAME) - return True + if check_depbat: + batfile_path = os.path.join(vc_dir, *cl_path_comps, batfile) + if not os.path.exists(batfile_path): + debug("batch file not found: %s", batfile_path) + continue + + cl_path = os.path.join(vc_dir, *cl_path_comps, _CL_EXE_NAME) + if not os.path.exists(cl_path): + debug("%s not found: %s", _CL_EXE_NAME, cl_path) + continue + + debug('%s found: %s', _CL_EXE_NAME, cl_path) + return True elif 80 > vernum_int >= 60: # 7.1 (VS2003) to 6.0 (VS6) @@ -1110,7 +1999,7 @@ def _check_cl_exists_in_vc_dir(env, vc_dir, msvc_version) -> bool: for cl_dir in cl_dirs: cl_path = os.path.join(cl_root, cl_dir, _CL_EXE_NAME) if os.path.exists(cl_path): - debug('%s found %s', _CL_EXE_NAME, cl_path) + debug('%s found: %s', _CL_EXE_NAME, cl_path) return True return False @@ -1123,6 +2012,8 @@ def _check_cl_exists_in_vc_dir(env, vc_dir, msvc_version) -> bool: def get_installed_vcs(env=None): global __INSTALLED_VCS_RUN + _VSWhereExecutable.vswhere_freeze_env(env) + if __INSTALLED_VCS_RUN is not None: return __INSTALLED_VCS_RUN @@ -1138,17 +2029,17 @@ def get_installed_vcs(env=None): for ver in _VCVER: debug('trying to find VC %s', ver) try: - VC_DIR = find_vc_pdir(env, ver) + VC_DIR = find_vc_pdir(ver, env) if VC_DIR: debug('found VC %s', ver) - if _check_cl_exists_in_vc_dir(env, VC_DIR, ver): + if _check_files_exist_in_vc_dir(env, VC_DIR, ver): installed_versions.append(ver) else: debug('no compiler found %s', ver) else: debug('return None for ver %s', ver) - except (MSVCUnsupportedTargetArch, MSVCUnsupportedHostArch): - # Allow this exception to propagate further as it should cause + except (MSVCUnsupportedTargetArch, MSVCUnsupportedHostArch, VSWhereUserError): + # Allow these exceptions to propagate further as it should cause # SCons to exit with an error code raise except VisualCException as e: @@ -1164,8 +2055,10 @@ def get_installed_vcs(env=None): def reset_installed_vcs() -> None: """Make it try again to find VC. This is just for the tests.""" - global __INSTALLED_VCS_RUN - __INSTALLED_VCS_RUN = None + _reset_installed_vcs() + _reset_vc_pdir() + _VSWhereExecutable.reset() + _VSWhere.reset() MSVC._reset() def msvc_default_version(env=None): @@ -1341,7 +2234,7 @@ def msvc_find_valid_batch_script(env, version): # Find the product directory pdir = None try: - pdir = find_vc_pdir(env, version) + pdir = find_vc_pdir(version, env) except UnsupportedVersion: # Unsupported msvc version (raise MSVCArgumentError?) pass @@ -1386,6 +2279,13 @@ def msvc_find_valid_batch_script(env, version): if not vc_script: continue + if not target_platform and MSVC.ScriptArguments.msvc_script_arguments_has_uwp(env): + # no target arch specified and is a store/uwp build + if MSVC.Kind.msvc_version_skip_uwp_target(env, version): + # store/uwp may not be supported for all express targets (prevent constraint error) + debug('skip uwp target arch: version=%s, target=%s', repr(version), repr(target_arch)) + continue + # Try to use the located batch file for this host/target platform combo arg = MSVC.ScriptArguments.msvc_script_arguments(env, version, vc_dir, arg) debug('trying vc_script:%s, vc_script_args:%s', repr(vc_script), arg) @@ -1483,6 +2383,9 @@ def get_use_script_use_settings(env): def msvc_setup_env(env): debug('called') + + _VSWhereExecutable.vswhere_freeze_env(env) + version = get_default_version(env) if version is None: if not msvc_setup_env_user(env): @@ -1616,13 +2519,17 @@ def msvc_sdk_versions(version=None, msvc_uwp_app: bool=False): msg = f'Unsupported version {version!r}' raise MSVCArgumentError(msg) - rval = MSVC.WinSDK.get_msvc_sdk_version_list(version, msvc_uwp_app) + rval = MSVC.WinSDK.get_msvc_sdk_version_list(version_def.msvc_version, msvc_uwp_app) return rval -def msvc_toolset_versions(msvc_version=None, full: bool=True, sxs: bool=False): - debug('msvc_version=%s, full=%s, sxs=%s', repr(msvc_version), repr(full), repr(sxs)) +def msvc_toolset_versions(msvc_version=None, full: bool=True, sxs: bool=False, vswhere_exe=None): + debug( + 'msvc_version=%s, full=%s, sxs=%s, vswhere_exe=%s', + repr(msvc_version), repr(full), repr(sxs), repr(vswhere_exe) + ) + + _VSWhereExecutable.vswhere_freeze_executable(vswhere_exe) - env = None rval = [] if not msvc_version: @@ -1636,7 +2543,7 @@ def msvc_toolset_versions(msvc_version=None, full: bool=True, sxs: bool=False): msg = f'Unsupported msvc version {msvc_version!r}' raise MSVCArgumentError(msg) - vc_dir = find_vc_pdir(env, msvc_version) + vc_dir = _find_vc_pdir(msvc_version, vswhere_exe) if not vc_dir: debug('VC folder not found for version %s', repr(msvc_version)) return rval @@ -1644,10 +2551,11 @@ def msvc_toolset_versions(msvc_version=None, full: bool=True, sxs: bool=False): rval = MSVC.ScriptArguments._msvc_toolset_versions_internal(msvc_version, vc_dir, full=full, sxs=sxs) return rval -def msvc_toolset_versions_spectre(msvc_version=None): - debug('msvc_version=%s', repr(msvc_version)) +def msvc_toolset_versions_spectre(msvc_version=None, vswhere_exe=None): + debug('msvc_version=%s, vswhere_exe=%s', repr(msvc_version), repr(vswhere_exe)) + + _VSWhereExecutable.vswhere_freeze_executable(vswhere_exe) - env = None rval = [] if not msvc_version: @@ -1661,7 +2569,7 @@ def msvc_toolset_versions_spectre(msvc_version=None): msg = f'Unsupported msvc version {msvc_version!r}' raise MSVCArgumentError(msg) - vc_dir = find_vc_pdir(env, msvc_version) + vc_dir = _find_vc_pdir(msvc_version, vswhere_exe) if not vc_dir: debug('VC folder not found for version %s', repr(msvc_version)) return rval @@ -1669,30 +2577,91 @@ def msvc_toolset_versions_spectre(msvc_version=None): rval = MSVC.ScriptArguments._msvc_toolset_versions_spectre_internal(msvc_version, vc_dir) return rval -def msvc_query_version_toolset(version=None, prefer_newest: bool=True): +_InstalledVersionToolset = namedtuple('_InstalledVersionToolset', [ + 'msvc_version_def', + 'toolset_version_def', +]) + +_InstalledVCSToolsetsComponents = namedtuple('_InstalledVCSToolsetComponents', [ + 'sxs_map', + 'toolset_vcs', + 'msvc_toolset_component_defs', +]) + +def get_installed_vcs_toolsets_components(vswhere_exe=None): + debug('vswhere_exe=%s', repr(vswhere_exe)) + + _VSWhereExecutable.vswhere_freeze_executable(vswhere_exe) + + sxs_map = {} + toolset_vcs = set() + msvc_toolset_component_defs = [] + + vcs = get_installed_vcs() + for msvc_version in vcs: + + vc_dir = _find_vc_pdir(msvc_version, vswhere_exe) + if not vc_dir: + continue + + msvc_version_def = MSVC.Util.msvc_version_components(msvc_version) + toolset_vcs.add(msvc_version_def.msvc_version) + + if msvc_version_def.msvc_vernum > 14.0: + + toolsets_sxs, toolsets_full = MSVC.ScriptArguments._msvc_version_toolsets_internal( + msvc_version, vc_dir + ) + + debug('msvc_version=%s, toolset_sxs=%s', repr(msvc_version), repr(toolsets_sxs)) + sxs_map.update(toolsets_sxs) + + else: + + toolsets_full = [msvc_version_def.msvc_verstr] + + for toolset_version in toolsets_full: + debug('msvc_version=%s, toolset_version=%s', repr(msvc_version), repr(toolset_version)) + + toolset_version_def = MSVC.Util.msvc_extended_version_components(toolset_version) + if not toolset_version_def: + continue + toolset_vcs.add(toolset_version_def.msvc_version) + + rval = _InstalledVersionToolset( + msvc_version_def=msvc_version_def, + toolset_version_def=toolset_version_def, + ) + msvc_toolset_component_defs.append(rval) + + installed_vcs_toolsets_components = _InstalledVCSToolsetsComponents( + sxs_map=sxs_map, + toolset_vcs=toolset_vcs, + msvc_toolset_component_defs=msvc_toolset_component_defs, + ) + + return installed_vcs_toolsets_components + +def msvc_query_version_toolset(version=None, prefer_newest: bool=True, vswhere_exe=None): """ - Returns an msvc version and a toolset version given a version + Return an msvc version and a toolset version given a version specification. This is an EXPERIMENTAL proxy for using a toolset version to perform msvc instance selection. This function will be removed when toolset version is taken into account during msvc instance selection. - Search for an installed Visual Studio instance that supports the - specified version. + This function searches for an installed Visual Studio instance that + contains the requested version. A component suffix (e.g., Exp) is not + supported for toolset version specifications (e.g., 14.39). - When the specified version contains a component suffix (e.g., Exp), - the msvc version is returned and the toolset version is None. No - search if performed. + An MSVCArgumentError is raised when argument validation fails. An + MSVCToolsetVersionNotFound exception is raised when the requested + version is not found. - When the specified version does not contain a component suffix, the - version is treated as a toolset version specification. A search is - performed for the first msvc instance that contains the toolset - version. - - Only Visual Studio 2017 and later support toolset arguments. For - Visual Studio 2015 and earlier, the msvc version is returned and - the toolset version is None. + For Visual Studio 2015 and earlier, the msvc version is returned and + the toolset version is None. For Visual Studio 2017 and later, the + selected toolset version is returned. Args: @@ -1706,6 +2675,9 @@ def msvc_query_version_toolset(version=None, prefer_newest: bool=True): the native Visual Studio instance is not detected, prefer newer Visual Studio instances. + vswhere_exe: str + A vswhere executable location or None. + Returns: tuple: A tuple containing the msvc version and the msvc toolset version. The msvc toolset version may be None. @@ -1714,112 +2686,140 @@ def msvc_query_version_toolset(version=None, prefer_newest: bool=True): MSVCToolsetVersionNotFound: when the specified version is not found. MSVCArgumentError: when argument validation fails. """ - debug('version=%s, prefer_newest=%s', repr(version), repr(prefer_newest)) + debug( + 'version=%s, prefer_newest=%s, vswhere_exe=%s', + repr(version), repr(prefer_newest), repr(vswhere_exe) + ) + + _VSWhereExecutable.vswhere_freeze_executable(vswhere_exe) - env = None msvc_version = None msvc_toolset_version = None - if not version: - version = msvc_default_version() + with MSVC.Policy.msvc_notfound_policy_contextmanager('suppress'): - if not version: - debug('no msvc versions detected') - return msvc_version, msvc_toolset_version + vcs = get_installed_vcs() - version_def = MSVC.Util.msvc_extended_version_components(version) + if not version: + version = msvc_default_version() - if not version_def: - msg = f'Unsupported msvc version {version!r}' - raise MSVCArgumentError(msg) + if not version: + msg = f'No versions of the MSVC compiler were found' + debug(f'MSVCToolsetVersionNotFound: {msg}') + raise MSVCToolsetVersionNotFound(msg) - if version_def.msvc_suffix: - if version_def.msvc_verstr != version_def.msvc_toolset_version: - # toolset version with component suffix - msg = f'Unsupported toolset version {version!r}' + version_def = MSVC.Util.msvc_extended_version_components(version) + + if not version_def: + msg = f'Unsupported MSVC version {version!r}' + debug(f'MSVCArgumentError: {msg}') raise MSVCArgumentError(msg) - if version_def.msvc_vernum > 14.0: - # VS2017 and later - force_toolset_msvc_version = False - else: - # VS2015 and earlier - force_toolset_msvc_version = True - extended_version = version_def.msvc_verstr + '0.00000' - if not extended_version.startswith(version_def.msvc_toolset_version): - # toolset not equivalent to msvc version - msg = 'Unsupported toolset version {} (expected {})'.format( - repr(version), repr(extended_version) - ) - raise MSVCArgumentError(msg) + msvc_version = version_def.msvc_version - msvc_version = version_def.msvc_version + if version_def.msvc_suffix: - if msvc_version not in MSVC.Config.MSVC_VERSION_TOOLSET_SEARCH_MAP: - # VS2013 and earlier - debug( - 'ignore: msvc_version=%s, msvc_toolset_version=%s', - repr(msvc_version), repr(msvc_toolset_version) - ) - return msvc_version, msvc_toolset_version + if version_def.msvc_verstr != version_def.msvc_toolset_version: + # toolset version with component suffix + msg = f'Unsupported MSVC toolset version {version!r}' + debug(f'MSVCArgumentError: {msg}') + raise MSVCArgumentError(msg) - if force_toolset_msvc_version: - query_msvc_toolset_version = version_def.msvc_verstr - else: - query_msvc_toolset_version = version_def.msvc_toolset_version + if msvc_version not in vcs: + msg = f'MSVC version {msvc_version!r} not found' + debug(f'MSVCToolsetVersionNotFound: {msg}') + raise MSVCToolsetVersionNotFound(msg) - if prefer_newest: - query_version_list = MSVC.Config.MSVC_VERSION_TOOLSET_SEARCH_MAP[msvc_version] - else: - query_version_list = MSVC.Config.MSVC_VERSION_TOOLSET_DEFAULTS_MAP[msvc_version] + \ - MSVC.Config.MSVC_VERSION_TOOLSET_SEARCH_MAP[msvc_version] + if msvc_version not in MSVC.Config.MSVC_VERSION_TOOLSET_SEARCH_MAP: + debug( + 'suffix: msvc_version=%s, msvc_toolset_version=%s', + repr(msvc_version), repr(msvc_toolset_version) + ) + return msvc_version, msvc_toolset_version - seen_msvc_version = set() - for query_msvc_version in query_version_list: + if version_def.msvc_vernum > 14.0: + # VS2017 and later + force_toolset_msvc_version = False + else: + # VS2015 and earlier + force_toolset_msvc_version = True + extended_version = version_def.msvc_verstr + '0.00000' + if not extended_version.startswith(version_def.msvc_toolset_version): + # toolset not equivalent to msvc version + msg = 'Unsupported MSVC toolset version {} (expected {})'.format( + repr(version), repr(extended_version) + ) + debug(f'MSVCArgumentError: {msg}') + raise MSVCArgumentError(msg) - if query_msvc_version in seen_msvc_version: - continue - seen_msvc_version.add(query_msvc_version) + if msvc_version not in MSVC.Config.MSVC_VERSION_TOOLSET_SEARCH_MAP: - vc_dir = find_vc_pdir(env, query_msvc_version) - if not vc_dir: - continue + # VS2013 and earlier + + if msvc_version not in vcs: + msg = f'MSVC version {version!r} not found' + debug(f'MSVCToolsetVersionNotFound: {msg}') + raise MSVCToolsetVersionNotFound(msg) - if query_msvc_version.startswith('14.0'): - # VS2015 does not support toolset version argument - msvc_toolset_version = None debug( - 'found: msvc_version=%s, msvc_toolset_version=%s', - repr(query_msvc_version), repr(msvc_toolset_version) + 'earlier: msvc_version=%s, msvc_toolset_version=%s', + repr(msvc_version), repr(msvc_toolset_version) ) - return query_msvc_version, msvc_toolset_version + return msvc_version, msvc_toolset_version - try: - toolset_vcvars = MSVC.ScriptArguments._msvc_toolset_internal(query_msvc_version, query_msvc_toolset_version, vc_dir) - if toolset_vcvars: - msvc_toolset_version = toolset_vcvars + if force_toolset_msvc_version: + query_msvc_toolset_version = version_def.msvc_verstr + else: + query_msvc_toolset_version = version_def.msvc_toolset_version + + if prefer_newest: + query_version_list = MSVC.Config.MSVC_VERSION_TOOLSET_SEARCH_MAP[msvc_version] + else: + query_version_list = MSVC.Config.MSVC_VERSION_TOOLSET_DEFAULTS_MAP[msvc_version] + \ + MSVC.Config.MSVC_VERSION_TOOLSET_SEARCH_MAP[msvc_version] + + seen_msvc_version = set() + for query_msvc_version in query_version_list: + + if query_msvc_version in seen_msvc_version: + continue + seen_msvc_version.add(query_msvc_version) + + vc_dir = _find_vc_pdir(query_msvc_version, vswhere_exe) + if not vc_dir: + continue + + if query_msvc_version.startswith('14.0'): + # VS2015 does not support toolset version argument + msvc_toolset_version = None debug( 'found: msvc_version=%s, msvc_toolset_version=%s', repr(query_msvc_version), repr(msvc_toolset_version) ) return query_msvc_version, msvc_toolset_version - except MSVCToolsetVersionNotFound: - pass + try: + toolset_vcvars = MSVC.ScriptArguments._msvc_toolset_internal(query_msvc_version, query_msvc_toolset_version, vc_dir) + if toolset_vcvars: + msvc_toolset_version = toolset_vcvars + debug( + 'found: msvc_version=%s, msvc_toolset_version=%s', + repr(query_msvc_version), repr(msvc_toolset_version) + ) + return query_msvc_version, msvc_toolset_version - msvc_toolset_version = query_msvc_toolset_version + except MSVCToolsetVersionNotFound: + pass + + msvc_toolset_version = query_msvc_toolset_version debug( 'not found: msvc_version=%s, msvc_toolset_version=%s', repr(msvc_version), repr(msvc_toolset_version) ) - if version_def.msvc_verstr == msvc_toolset_version: - msg = f'MSVC version {version!r} was not found' - MSVC.Policy.msvc_notfound_handler(None, msg) - return msvc_version, msvc_toolset_version - msg = f'MSVC toolset version {version!r} not found' + debug(f'MSVCToolsetVersionNotFound: {msg}') raise MSVCToolsetVersionNotFound(msg) diff --git a/scons/scons-local-4.7.0/SCons/Tool/MSCommon/vs.py b/scons/scons-local-4.8.0/SCons/Tool/MSCommon/vs.py similarity index 94% rename from scons/scons-local-4.7.0/SCons/Tool/MSCommon/vs.py rename to scons/scons-local-4.8.0/SCons/Tool/MSCommon/vs.py index af0fd26e5..34fb670b5 100644 --- a/scons/scons-local-4.7.0/SCons/Tool/MSCommon/vs.py +++ b/scons/scons-local-4.8.0/SCons/Tool/MSCommon/vs.py @@ -28,7 +28,6 @@ MS Compilers: detect Visual Studio and/or Visual C/C++ import os import SCons.Errors -import SCons.Tool.MSCommon.vc import SCons.Util from .common import ( @@ -40,6 +39,19 @@ from .common import ( read_reg, ) +from .vc import ( + find_vc_pdir, + get_msvc_version_numeric, + reset_installed_vcs, + vswhere_freeze_env, +) + + +# Visual Studio express version policy when unqualified version is not installed: +# True: use express version for unqualified version (e.g., use 12.0Exp for 12.0) +# False: do not use express version for unqualified version +_VSEXPRESS_USE_VERSTR = True + class VisualStudio: """ @@ -48,6 +60,9 @@ class VisualStudio: """ def __init__(self, version, **kw) -> None: self.version = version + self.verstr = get_msvc_version_numeric(version) + self.vernum = float(self.verstr) + self.is_express = True if self.verstr != self.version else False kw['vc_version'] = kw.get('vc_version', version) kw['sdk_version'] = kw.get('sdk_version', version) self.__dict__.update(kw) @@ -66,7 +81,7 @@ class VisualStudio: return batch_file def find_vs_dir_by_vc(self, env): - dir = SCons.Tool.MSCommon.vc.find_vc_pdir(env, self.vc_version) + dir = find_vc_pdir(self.vc_version, env) if not dir: debug('no installed VC %s', self.vc_version) return None @@ -428,6 +443,7 @@ InstalledVSMap = None def get_installed_visual_studios(env=None): global InstalledVSList global InstalledVSMap + vswhere_freeze_env(env) if InstalledVSList is None: InstalledVSList = [] InstalledVSMap = {} @@ -436,12 +452,21 @@ def get_installed_visual_studios(env=None): if vs.get_executable(env): debug('found VS %s', vs.version) InstalledVSList.append(vs) + if vs.is_express and vs.verstr not in InstalledVSMap: + if _VSEXPRESS_USE_VERSTR: + InstalledVSMap[vs.verstr] = vs InstalledVSMap[vs.version] = vs return InstalledVSList +def _get_installed_vss(env=None): + get_installed_visual_studios(env) + versions = list(InstalledVSMap.keys()) + return versions + def reset_installed_visual_studios() -> None: global InstalledVSList global InstalledVSMap + debug('') InstalledVSList = None InstalledVSMap = None for vs in SupportedVSList: @@ -449,7 +474,7 @@ def reset_installed_visual_studios() -> None: # Need to clear installed VC's as well as they are used in finding # installed VS's - SCons.Tool.MSCommon.vc.reset_installed_vcs() + reset_installed_vcs() # We may be asked to update multiple construction environments with @@ -487,7 +512,7 @@ def reset_installed_visual_studios() -> None: def msvs_exists(env=None) -> bool: return len(get_installed_visual_studios(env)) > 0 -def get_vs_by_version(msvs): +def get_vs_by_version(msvs, env=None): global InstalledVSMap global SupportedVSMap @@ -495,7 +520,7 @@ def get_vs_by_version(msvs): if msvs not in SupportedVSMap: msg = "Visual Studio version %s is not supported" % repr(msvs) raise SCons.Errors.UserError(msg) - get_installed_visual_studios() + get_installed_visual_studios(env) vs = InstalledVSMap.get(msvs) debug('InstalledVSMap:%s', InstalledVSMap) debug('found vs:%s', vs) @@ -524,7 +549,7 @@ def get_default_version(env): """ if 'MSVS' not in env or not SCons.Util.is_Dict(env['MSVS']): # get all versions, and remember them for speed later - versions = [vs.version for vs in get_installed_visual_studios()] + versions = _get_installed_vss(env) env['MSVS'] = {'VERSIONS' : versions} else: versions = env['MSVS'].get('VERSIONS', []) @@ -570,7 +595,7 @@ def merge_default_version(env) -> None: # TODO: refers to versions and arch which aren't defined; called nowhere. Drop? def msvs_setup_env(env) -> None: - msvs = get_vs_by_version(version) + msvs = get_vs_by_version(version, env) if msvs is None: return batfilename = msvs.get_batch_file() @@ -582,7 +607,7 @@ def msvs_setup_env(env) -> None: vars = ('LIB', 'LIBPATH', 'PATH', 'INCLUDE') - msvs_list = get_installed_visual_studios() + msvs_list = get_installed_visual_studios(env) vscommonvarnames = [vs.common_tools_var for vs in msvs_list] save_ENV = env['ENV'] nenv = normalize_env(env['ENV'], @@ -597,11 +622,10 @@ def msvs_setup_env(env) -> None: for k, v in vars.items(): env.PrependENVPath(k, v, delete_existing=1) -def query_versions(): +def query_versions(env=None): """Query the system to get available versions of VS. A version is considered when a batfile is found.""" - msvs_list = get_installed_visual_studios() - versions = [msvs.version for msvs in msvs_list] + versions = _get_installed_vss(env) return versions # Local Variables: diff --git a/scons/scons-local-4.7.0/SCons/Tool/PharLapCommon.py b/scons/scons-local-4.8.0/SCons/Tool/PharLapCommon.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/PharLapCommon.py rename to scons/scons-local-4.8.0/SCons/Tool/PharLapCommon.py diff --git a/scons/scons-local-4.7.0/SCons/Tool/__init__.py b/scons/scons-local-4.8.0/SCons/Tool/__init__.py similarity index 99% rename from scons/scons-local-4.7.0/SCons/Tool/__init__.py rename to scons/scons-local-4.8.0/SCons/Tool/__init__.py index 3681235f6..474414e3d 100644 --- a/scons/scons-local-4.7.0/SCons/Tool/__init__.py +++ b/scons/scons-local-4.8.0/SCons/Tool/__init__.py @@ -251,7 +251,7 @@ class Tool: kw.update(call_kw) else: kw = self.init_kw - env.Append(TOOLS=[self.name]) + env.AppendUnique(TOOLS=[self.name]) if hasattr(self, 'options'): import SCons.Variables if 'options' not in env: diff --git a/scons/scons-local-4.7.0/SCons/Tool/aixc++.py b/scons/scons-local-4.8.0/SCons/Tool/aixc++.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/aixc++.py rename to scons/scons-local-4.8.0/SCons/Tool/aixc++.py diff --git a/scons/scons-local-4.7.0/SCons/Tool/aixcc.py b/scons/scons-local-4.8.0/SCons/Tool/aixcc.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/aixcc.py rename to scons/scons-local-4.8.0/SCons/Tool/aixcc.py diff --git a/scons/scons-local-4.7.0/SCons/Tool/aixcxx.py b/scons/scons-local-4.8.0/SCons/Tool/aixcxx.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/aixcxx.py rename to scons/scons-local-4.8.0/SCons/Tool/aixcxx.py diff --git a/scons/scons-local-4.7.0/SCons/Tool/aixf77.py b/scons/scons-local-4.8.0/SCons/Tool/aixf77.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/aixf77.py rename to scons/scons-local-4.8.0/SCons/Tool/aixf77.py diff --git a/scons/scons-local-4.7.0/SCons/Tool/aixlink.py b/scons/scons-local-4.8.0/SCons/Tool/aixlink.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/aixlink.py rename to scons/scons-local-4.8.0/SCons/Tool/aixlink.py diff --git a/scons/scons-local-4.7.0/SCons/Tool/applelink.py b/scons/scons-local-4.8.0/SCons/Tool/applelink.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/applelink.py rename to scons/scons-local-4.8.0/SCons/Tool/applelink.py diff --git a/scons/scons-local-4.7.0/SCons/Tool/ar.py b/scons/scons-local-4.8.0/SCons/Tool/ar.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/ar.py rename to scons/scons-local-4.8.0/SCons/Tool/ar.py diff --git a/scons/scons-local-4.7.0/SCons/Tool/as.py b/scons/scons-local-4.8.0/SCons/Tool/as.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/as.py rename to scons/scons-local-4.8.0/SCons/Tool/as.py diff --git a/scons/scons-local-4.7.0/SCons/Tool/asm.py b/scons/scons-local-4.8.0/SCons/Tool/asm.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/asm.py rename to scons/scons-local-4.8.0/SCons/Tool/asm.py diff --git a/scons/scons-local-4.7.0/SCons/Tool/bcc32.py b/scons/scons-local-4.8.0/SCons/Tool/bcc32.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/bcc32.py rename to scons/scons-local-4.8.0/SCons/Tool/bcc32.py diff --git a/scons/scons-local-4.7.0/SCons/Tool/c++.py b/scons/scons-local-4.8.0/SCons/Tool/c++.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/c++.py rename to scons/scons-local-4.8.0/SCons/Tool/c++.py diff --git a/scons/scons-local-4.7.0/SCons/Tool/cc.py b/scons/scons-local-4.8.0/SCons/Tool/cc.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/cc.py rename to scons/scons-local-4.8.0/SCons/Tool/cc.py diff --git a/scons/scons-local-4.7.0/SCons/Tool/clang.py b/scons/scons-local-4.8.0/SCons/Tool/clang.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/clang.py rename to scons/scons-local-4.8.0/SCons/Tool/clang.py diff --git a/scons/scons-local-4.7.0/SCons/Tool/clangCommon/__init__.py b/scons/scons-local-4.8.0/SCons/Tool/clangCommon/__init__.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/clangCommon/__init__.py rename to scons/scons-local-4.8.0/SCons/Tool/clangCommon/__init__.py diff --git a/scons/scons-local-4.7.0/SCons/Tool/clangxx.py b/scons/scons-local-4.8.0/SCons/Tool/clangxx.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/clangxx.py rename to scons/scons-local-4.8.0/SCons/Tool/clangxx.py diff --git a/scons/scons-local-4.7.0/SCons/Tool/compilation_db.py b/scons/scons-local-4.8.0/SCons/Tool/compilation_db.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/compilation_db.py rename to scons/scons-local-4.8.0/SCons/Tool/compilation_db.py diff --git a/scons/scons-local-4.7.0/SCons/Tool/cvf.py b/scons/scons-local-4.8.0/SCons/Tool/cvf.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/cvf.py rename to scons/scons-local-4.8.0/SCons/Tool/cvf.py diff --git a/scons/scons-local-4.7.0/SCons/Tool/cxx.py b/scons/scons-local-4.8.0/SCons/Tool/cxx.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/cxx.py rename to scons/scons-local-4.8.0/SCons/Tool/cxx.py diff --git a/scons/scons-local-4.7.0/SCons/Tool/cyglink.py b/scons/scons-local-4.8.0/SCons/Tool/cyglink.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/cyglink.py rename to scons/scons-local-4.8.0/SCons/Tool/cyglink.py diff --git a/scons/scons-local-4.7.0/SCons/Tool/default.py b/scons/scons-local-4.8.0/SCons/Tool/default.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/default.py rename to scons/scons-local-4.8.0/SCons/Tool/default.py diff --git a/scons/scons-local-4.7.0/SCons/Tool/dmd.py b/scons/scons-local-4.8.0/SCons/Tool/dmd.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/dmd.py rename to scons/scons-local-4.8.0/SCons/Tool/dmd.py diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/__init__.py b/scons/scons-local-4.8.0/SCons/Tool/docbook/__init__.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/__init__.py rename to scons/scons-local-4.8.0/SCons/Tool/docbook/__init__.py diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/AUTHORS b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/AUTHORS similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/AUTHORS rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/AUTHORS diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/BUGS b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/BUGS similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/BUGS rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/BUGS diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/COPYING b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/COPYING similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/COPYING rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/COPYING diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/INSTALL b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/INSTALL similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/INSTALL rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/INSTALL diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/Makefile b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/Makefile similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/Makefile rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/Makefile diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/NEWS b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/NEWS similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/NEWS rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/NEWS diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/NEWS.html b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/NEWS.html similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/NEWS.html rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/NEWS.html diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/NEWS.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/NEWS.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/NEWS.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/NEWS.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/README b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/README similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/README rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/README diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/RELEASE-NOTES.html b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/RELEASE-NOTES.html similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/RELEASE-NOTES.html rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/RELEASE-NOTES.html diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/RELEASE-NOTES.txt b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/RELEASE-NOTES.txt similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/RELEASE-NOTES.txt rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/RELEASE-NOTES.txt diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/RELEASE-NOTES.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/RELEASE-NOTES.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/RELEASE-NOTES.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/RELEASE-NOTES.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/TODO b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/TODO similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/TODO rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/TODO diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/VERSION b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/VERSION similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/VERSION rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/VERSION diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/catalog.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/catalog.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/catalog.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/catalog.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/af.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/af.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/af.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/af.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/am.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/am.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/am.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/am.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/ar.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/ar.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/ar.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/ar.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/as.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/as.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/as.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/as.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/ast.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/ast.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/ast.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/ast.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/autoidx-kimber.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/autoidx-kimber.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/autoidx-kimber.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/autoidx-kimber.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/autoidx-kosek.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/autoidx-kosek.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/autoidx-kosek.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/autoidx-kosek.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/az.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/az.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/az.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/az.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/bg.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/bg.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/bg.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/bg.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/bn.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/bn.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/bn.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/bn.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/bn_in.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/bn_in.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/bn_in.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/bn_in.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/bs.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/bs.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/bs.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/bs.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/ca.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/ca.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/ca.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/ca.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/charmap.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/charmap.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/charmap.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/charmap.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/charmap.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/charmap.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/charmap.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/charmap.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/common.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/common.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/common.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/common.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/common.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/common.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/common.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/common.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/cs.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/cs.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/cs.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/cs.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/cy.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/cy.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/cy.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/cy.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/da.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/da.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/da.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/da.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/de.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/de.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/de.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/de.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/el.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/el.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/el.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/el.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/en.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/en.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/en.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/en.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/entities.ent b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/entities.ent similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/entities.ent rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/entities.ent diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/eo.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/eo.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/eo.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/eo.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/es.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/es.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/es.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/es.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/et.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/et.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/et.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/et.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/eu.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/eu.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/eu.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/eu.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/fa.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/fa.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/fa.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/fa.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/fi.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/fi.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/fi.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/fi.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/fr.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/fr.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/fr.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/fr.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/ga.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/ga.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/ga.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/ga.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/gentext.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/gentext.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/gentext.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/gentext.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/gl.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/gl.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/gl.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/gl.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/gu.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/gu.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/gu.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/gu.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/he.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/he.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/he.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/he.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/hi.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/hi.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/hi.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/hi.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/hr.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/hr.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/hr.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/hr.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/hu.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/hu.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/hu.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/hu.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/id.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/id.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/id.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/id.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/insertfile.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/insertfile.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/insertfile.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/insertfile.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/is.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/is.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/is.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/is.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/it.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/it.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/it.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/it.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/ja.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/ja.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/ja.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/ja.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/ka.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/ka.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/ka.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/ka.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/kn.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/kn.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/kn.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/kn.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/ko.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/ko.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/ko.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/ko.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/ky.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/ky.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/ky.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/ky.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/l10n.dtd b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/l10n.dtd similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/l10n.dtd rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/l10n.dtd diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/l10n.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/l10n.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/l10n.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/l10n.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/l10n.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/l10n.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/l10n.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/l10n.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/la.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/la.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/la.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/la.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/labels.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/labels.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/labels.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/labels.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/lt.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/lt.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/lt.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/lt.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/lv.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/lv.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/lv.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/lv.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/ml.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/ml.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/ml.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/ml.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/mn.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/mn.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/mn.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/mn.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/mr.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/mr.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/mr.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/mr.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/nb.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/nb.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/nb.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/nb.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/nds.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/nds.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/nds.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/nds.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/nl.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/nl.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/nl.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/nl.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/nn.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/nn.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/nn.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/nn.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/olink.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/olink.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/olink.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/olink.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/or.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/or.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/or.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/or.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/pa.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/pa.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/pa.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/pa.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/pi.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/pi.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/pi.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/pi.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/pi.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/pi.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/pi.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/pi.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/pl.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/pl.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/pl.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/pl.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/pt.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/pt.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/pt.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/pt.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/pt_br.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/pt_br.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/pt_br.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/pt_br.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/refentry.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/refentry.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/refentry.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/refentry.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/refentry.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/refentry.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/refentry.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/refentry.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/ro.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/ro.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/ro.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/ro.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/ru.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/ru.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/ru.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/ru.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/sk.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/sk.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/sk.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/sk.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/sl.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/sl.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/sl.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/sl.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/sq.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/sq.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/sq.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/sq.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/sr.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/sr.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/sr.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/sr.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/sr_Latn.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/sr_Latn.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/sr_Latn.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/sr_Latn.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/stripns.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/stripns.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/stripns.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/stripns.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/subtitles.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/subtitles.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/subtitles.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/subtitles.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/sv.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/sv.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/sv.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/sv.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/ta.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/ta.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/ta.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/ta.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/table.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/table.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/table.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/table.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/targetdatabase.dtd b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/targetdatabase.dtd similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/targetdatabase.dtd rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/targetdatabase.dtd diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/targets.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/targets.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/targets.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/targets.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/te.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/te.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/te.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/te.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/th.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/th.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/th.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/th.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/titles.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/titles.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/titles.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/titles.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/tl.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/tl.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/tl.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/tl.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/tr.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/tr.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/tr.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/tr.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/uk.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/uk.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/uk.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/uk.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/utility.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/utility.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/utility.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/utility.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/utility.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/utility.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/utility.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/utility.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/vi.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/vi.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/vi.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/vi.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/xh.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/xh.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/xh.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/xh.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/zh.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/zh.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/zh.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/zh.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/zh_cn.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/zh_cn.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/zh_cn.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/zh_cn.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/zh_tw.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/zh_tw.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/zh_tw.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/common/zh_tw.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/docsrc/authors.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/docsrc/authors.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/docsrc/authors.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/docsrc/authors.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/docsrc/copyright.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/docsrc/copyright.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/docsrc/copyright.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/docsrc/copyright.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/docsrc/license.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/docsrc/license.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/docsrc/license.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/docsrc/license.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/docsrc/reference.css b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/docsrc/reference.css similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/docsrc/reference.css rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/docsrc/reference.css diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/docsrc/reference.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/docsrc/reference.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/docsrc/reference.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/docsrc/reference.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/docsrc/reference.xml.included b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/docsrc/reference.xml.included similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/docsrc/reference.xml.included rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/docsrc/reference.xml.included diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/docsrc/warranty.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/docsrc/warranty.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/docsrc/warranty.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/docsrc/warranty.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/eclipse/eclipse.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/eclipse/eclipse.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/eclipse/eclipse.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/eclipse/eclipse.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/eclipse/eclipse3.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/eclipse/eclipse3.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/eclipse/eclipse3.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/eclipse/eclipse3.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/eclipse/profile-eclipse.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/eclipse/profile-eclipse.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/eclipse/profile-eclipse.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/eclipse/profile-eclipse.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/epub/README b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/epub/README similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/epub/README rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/epub/README diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/epub/bin/dbtoepub b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/epub/bin/dbtoepub similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/epub/bin/dbtoepub rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/epub/bin/dbtoepub diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/epub/bin/lib/docbook.rb b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/epub/bin/lib/docbook.rb similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/epub/bin/lib/docbook.rb rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/epub/bin/lib/docbook.rb diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/epub/bin/xslt/obfuscate.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/epub/bin/xslt/obfuscate.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/epub/bin/xslt/obfuscate.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/epub/bin/xslt/obfuscate.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/epub/docbook.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/epub/docbook.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/epub/docbook.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/epub/docbook.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/extensions/LICENSE.txt b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/extensions/LICENSE.txt similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/extensions/LICENSE.txt rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/extensions/LICENSE.txt diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/extensions/NOTICE.txt b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/extensions/NOTICE.txt similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/extensions/NOTICE.txt rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/extensions/NOTICE.txt diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/extensions/README.LIBXSLT b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/extensions/README.LIBXSLT similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/extensions/README.LIBXSLT rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/extensions/README.LIBXSLT diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/extensions/README.txt b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/extensions/README.txt similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/extensions/README.txt rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/extensions/README.txt diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/extensions/docbook.py b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/extensions/docbook.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/extensions/docbook.py rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/extensions/docbook.py diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/extensions/xslt.py b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/extensions/xslt.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/extensions/xslt.py rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/extensions/xslt.py diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/admon.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/admon.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/admon.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/admon.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/annotations.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/annotations.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/annotations.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/annotations.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/autoidx-kimber.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/autoidx-kimber.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/autoidx-kimber.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/autoidx-kimber.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/autoidx-kosek.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/autoidx-kosek.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/autoidx-kosek.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/autoidx-kosek.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/autoidx-ng.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/autoidx-ng.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/autoidx-ng.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/autoidx-ng.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/autoidx.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/autoidx.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/autoidx.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/autoidx.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/autotoc.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/autotoc.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/autotoc.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/autotoc.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/axf.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/axf.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/axf.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/axf.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/biblio-iso690.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/biblio-iso690.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/biblio-iso690.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/biblio-iso690.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/biblio.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/biblio.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/biblio.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/biblio.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/block.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/block.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/block.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/block.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/callout.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/callout.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/callout.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/callout.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/component.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/component.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/component.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/component.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/division.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/division.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/division.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/division.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/docbook.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/docbook.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/docbook.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/docbook.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/ebnf.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/ebnf.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/ebnf.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/ebnf.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/fo-rtf.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/fo-rtf.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/fo-rtf.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/fo-rtf.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/fo.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/fo.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/fo.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/fo.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/footnote.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/footnote.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/footnote.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/footnote.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/fop.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/fop.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/fop.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/fop.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/fop1.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/fop1.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/fop1.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/fop1.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/formal.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/formal.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/formal.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/formal.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/glossary.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/glossary.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/glossary.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/glossary.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/graphics.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/graphics.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/graphics.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/graphics.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/highlight.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/highlight.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/highlight.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/highlight.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/htmltbl.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/htmltbl.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/htmltbl.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/htmltbl.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/index.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/index.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/index.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/index.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/info.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/info.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/info.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/info.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/inline.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/inline.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/inline.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/inline.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/keywords.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/keywords.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/keywords.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/keywords.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/lists.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/lists.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/lists.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/lists.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/math.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/math.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/math.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/math.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/pagesetup.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/pagesetup.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/pagesetup.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/pagesetup.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/param.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/param.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/param.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/param.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/param.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/param.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/param.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/param.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/passivetex.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/passivetex.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/passivetex.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/passivetex.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/pdf2index b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/pdf2index similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/pdf2index rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/pdf2index diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/pi.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/pi.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/pi.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/pi.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/pi.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/pi.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/pi.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/pi.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/profile-docbook.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/profile-docbook.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/profile-docbook.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/profile-docbook.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/ptc.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/ptc.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/ptc.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/ptc.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/qandaset.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/qandaset.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/qandaset.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/qandaset.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/refentry.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/refentry.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/refentry.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/refentry.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/sections.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/sections.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/sections.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/sections.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/spaces.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/spaces.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/spaces.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/spaces.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/synop.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/synop.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/synop.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/synop.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/table.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/table.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/table.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/table.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/table.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/table.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/table.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/table.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/task.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/task.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/task.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/task.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/titlepage.templates.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/titlepage.templates.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/titlepage.templates.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/titlepage.templates.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/titlepage.templates.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/titlepage.templates.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/titlepage.templates.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/titlepage.templates.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/titlepage.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/titlepage.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/titlepage.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/titlepage.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/toc.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/toc.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/toc.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/toc.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/verbatim.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/verbatim.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/verbatim.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/verbatim.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/xep.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/xep.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/xep.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/xep.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/xref.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/xref.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/xref.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/xref.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/highlighting/README b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/highlighting/README similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/highlighting/README rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/highlighting/README diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/highlighting/c-hl.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/highlighting/c-hl.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/highlighting/c-hl.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/highlighting/c-hl.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/highlighting/common.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/highlighting/common.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/highlighting/common.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/highlighting/common.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/highlighting/cpp-hl.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/highlighting/cpp-hl.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/highlighting/cpp-hl.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/highlighting/cpp-hl.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/highlighting/csharp-hl.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/highlighting/csharp-hl.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/highlighting/csharp-hl.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/highlighting/csharp-hl.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/highlighting/delphi-hl.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/highlighting/delphi-hl.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/highlighting/delphi-hl.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/highlighting/delphi-hl.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/highlighting/ini-hl.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/highlighting/ini-hl.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/highlighting/ini-hl.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/highlighting/ini-hl.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/highlighting/java-hl.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/highlighting/java-hl.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/highlighting/java-hl.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/highlighting/java-hl.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/highlighting/javascript-hl.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/highlighting/javascript-hl.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/highlighting/javascript-hl.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/highlighting/javascript-hl.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/highlighting/m2-hl.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/highlighting/m2-hl.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/highlighting/m2-hl.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/highlighting/m2-hl.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/highlighting/myxml-hl.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/highlighting/myxml-hl.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/highlighting/myxml-hl.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/highlighting/myxml-hl.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/highlighting/perl-hl.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/highlighting/perl-hl.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/highlighting/perl-hl.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/highlighting/perl-hl.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/highlighting/php-hl.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/highlighting/php-hl.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/highlighting/php-hl.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/highlighting/php-hl.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/highlighting/python-hl.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/highlighting/python-hl.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/highlighting/python-hl.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/highlighting/python-hl.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/highlighting/ruby-hl.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/highlighting/ruby-hl.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/highlighting/ruby-hl.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/highlighting/ruby-hl.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/highlighting/tcl-hl.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/highlighting/tcl-hl.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/highlighting/tcl-hl.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/highlighting/tcl-hl.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/highlighting/xslthl-config.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/highlighting/xslthl-config.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/highlighting/xslthl-config.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/highlighting/xslthl-config.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/admon.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/admon.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/admon.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/admon.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/annotations.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/annotations.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/annotations.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/annotations.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/autoidx-kimber.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/autoidx-kimber.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/autoidx-kimber.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/autoidx-kimber.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/autoidx-kosek.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/autoidx-kosek.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/autoidx-kosek.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/autoidx-kosek.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/autoidx-ng.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/autoidx-ng.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/autoidx-ng.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/autoidx-ng.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/autoidx.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/autoidx.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/autoidx.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/autoidx.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/autotoc.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/autotoc.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/autotoc.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/autotoc.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/biblio-iso690.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/biblio-iso690.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/biblio-iso690.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/biblio-iso690.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/biblio.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/biblio.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/biblio.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/biblio.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/block.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/block.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/block.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/block.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/callout.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/callout.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/callout.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/callout.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/changebars.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/changebars.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/changebars.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/changebars.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/chunk-changebars.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/chunk-changebars.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/chunk-changebars.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/chunk-changebars.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/chunk-code.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/chunk-code.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/chunk-code.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/chunk-code.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/chunk-common.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/chunk-common.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/chunk-common.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/chunk-common.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/chunk.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/chunk.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/chunk.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/chunk.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/chunker.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/chunker.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/chunker.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/chunker.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/chunkfast.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/chunkfast.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/chunkfast.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/chunkfast.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/chunktoc.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/chunktoc.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/chunktoc.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/chunktoc.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/component.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/component.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/component.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/component.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/division.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/division.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/division.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/division.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/docbook.css.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/docbook.css.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/docbook.css.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/docbook.css.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/docbook.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/docbook.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/docbook.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/docbook.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/ebnf.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/ebnf.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/ebnf.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/ebnf.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/footnote.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/footnote.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/footnote.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/footnote.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/formal.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/formal.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/formal.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/formal.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/glossary.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/glossary.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/glossary.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/glossary.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/graphics.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/graphics.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/graphics.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/graphics.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/highlight.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/highlight.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/highlight.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/highlight.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/html-rtf.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/html-rtf.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/html-rtf.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/html-rtf.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/html.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/html.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/html.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/html.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/htmltbl.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/htmltbl.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/htmltbl.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/htmltbl.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/index.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/index.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/index.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/index.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/info.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/info.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/info.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/info.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/inline.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/inline.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/inline.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/inline.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/keywords.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/keywords.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/keywords.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/keywords.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/lists.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/lists.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/lists.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/lists.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/maketoc.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/maketoc.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/maketoc.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/maketoc.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/manifest.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/manifest.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/manifest.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/manifest.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/math.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/math.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/math.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/math.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/oldchunker.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/oldchunker.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/oldchunker.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/oldchunker.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/onechunk.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/onechunk.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/onechunk.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/onechunk.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/param.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/param.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/param.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/param.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/param.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/param.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/param.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/param.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/pi.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/pi.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/pi.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/pi.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/pi.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/pi.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/pi.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/pi.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/profile-chunk-code.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/profile-chunk-code.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/profile-chunk-code.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/profile-chunk-code.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/profile-chunk.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/profile-chunk.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/profile-chunk.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/profile-chunk.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/profile-docbook.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/profile-docbook.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/profile-docbook.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/profile-docbook.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/profile-onechunk.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/profile-onechunk.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/profile-onechunk.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/profile-onechunk.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/qandaset.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/qandaset.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/qandaset.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/qandaset.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/refentry.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/refentry.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/refentry.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/refentry.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/sections.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/sections.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/sections.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/sections.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/synop.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/synop.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/synop.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/synop.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/table.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/table.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/table.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/table.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/task.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/task.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/task.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/task.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/titlepage.templates.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/titlepage.templates.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/titlepage.templates.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/titlepage.templates.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/titlepage.templates.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/titlepage.templates.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/titlepage.templates.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/titlepage.templates.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/titlepage.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/titlepage.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/titlepage.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/titlepage.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/toc.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/toc.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/toc.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/toc.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/verbatim.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/verbatim.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/verbatim.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/verbatim.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/xref.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/xref.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/xref.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/html/xref.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/htmlhelp/htmlhelp-common.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/htmlhelp/htmlhelp-common.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/htmlhelp/htmlhelp-common.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/htmlhelp/htmlhelp-common.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/htmlhelp/htmlhelp.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/htmlhelp/htmlhelp.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/htmlhelp/htmlhelp.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/htmlhelp/htmlhelp.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/htmlhelp/profile-htmlhelp-common.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/htmlhelp/profile-htmlhelp-common.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/htmlhelp/profile-htmlhelp-common.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/htmlhelp/profile-htmlhelp-common.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/htmlhelp/profile-htmlhelp.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/htmlhelp/profile-htmlhelp.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/htmlhelp/profile-htmlhelp.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/htmlhelp/profile-htmlhelp.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/1.svg b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/1.svg similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/1.svg rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/1.svg diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/10.svg b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/10.svg similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/10.svg rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/10.svg diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/11.svg b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/11.svg similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/11.svg rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/11.svg diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/12.svg b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/12.svg similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/12.svg rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/12.svg diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/13.svg b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/13.svg similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/13.svg rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/13.svg diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/14.svg b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/14.svg similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/14.svg rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/14.svg diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/15.svg b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/15.svg similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/15.svg rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/15.svg diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/16.svg b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/16.svg similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/16.svg rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/16.svg diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/17.svg b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/17.svg similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/17.svg rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/17.svg diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/18.svg b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/18.svg similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/18.svg rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/18.svg diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/19.svg b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/19.svg similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/19.svg rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/19.svg diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/2.svg b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/2.svg similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/2.svg rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/2.svg diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/20.svg b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/20.svg similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/20.svg rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/20.svg diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/21.svg b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/21.svg similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/21.svg rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/21.svg diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/22.svg b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/22.svg similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/22.svg rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/22.svg diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/23.svg b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/23.svg similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/23.svg rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/23.svg diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/24.svg b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/24.svg similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/24.svg rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/24.svg diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/25.svg b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/25.svg similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/25.svg rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/25.svg diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/26.svg b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/26.svg similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/26.svg rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/26.svg diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/27.svg b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/27.svg similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/27.svg rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/27.svg diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/28.svg b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/28.svg similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/28.svg rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/28.svg diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/29.svg b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/29.svg similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/29.svg rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/29.svg diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/3.svg b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/3.svg similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/3.svg rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/3.svg diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/30.svg b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/30.svg similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/30.svg rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/30.svg diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/4.svg b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/4.svg similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/4.svg rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/4.svg diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/5.svg b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/5.svg similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/5.svg rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/5.svg diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/6.svg b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/6.svg similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/6.svg rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/6.svg diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/7.svg b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/7.svg similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/7.svg rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/7.svg diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/8.svg b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/8.svg similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/8.svg rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/8.svg diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/9.svg b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/9.svg similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/9.svg rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/9.svg diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/caution.svg b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/caution.svg similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/caution.svg rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/caution.svg diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/colorsvg/caution.svg b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/colorsvg/caution.svg similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/colorsvg/caution.svg rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/colorsvg/caution.svg diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/colorsvg/home.svg b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/colorsvg/home.svg similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/colorsvg/home.svg rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/colorsvg/home.svg diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/colorsvg/important.svg b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/colorsvg/important.svg similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/colorsvg/important.svg rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/colorsvg/important.svg diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/colorsvg/next.svg b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/colorsvg/next.svg similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/colorsvg/next.svg rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/colorsvg/next.svg diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/colorsvg/note.svg b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/colorsvg/note.svg similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/colorsvg/note.svg rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/colorsvg/note.svg diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/colorsvg/prev.svg b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/colorsvg/prev.svg similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/colorsvg/prev.svg rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/colorsvg/prev.svg diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/colorsvg/tip.svg b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/colorsvg/tip.svg similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/colorsvg/tip.svg rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/colorsvg/tip.svg diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/colorsvg/up.svg b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/colorsvg/up.svg similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/colorsvg/up.svg rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/colorsvg/up.svg diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/colorsvg/warning.svg b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/colorsvg/warning.svg similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/colorsvg/warning.svg rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/colorsvg/warning.svg diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/home.svg b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/home.svg similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/home.svg rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/home.svg diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/important.svg b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/important.svg similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/important.svg rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/important.svg diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/next.svg b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/next.svg similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/next.svg rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/next.svg diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/note.svg b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/note.svg similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/note.svg rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/note.svg diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/prev.svg b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/prev.svg similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/prev.svg rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/prev.svg diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/tip.svg b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/tip.svg similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/tip.svg rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/tip.svg diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/up.svg b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/up.svg similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/up.svg rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/up.svg diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/warning.svg b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/warning.svg similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/warning.svg rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/images/warning.svg diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/install.sh b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/install.sh similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/install.sh rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/install.sh diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/javahelp/javahelp.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/javahelp/javahelp.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/javahelp/javahelp.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/javahelp/javahelp.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/javahelp/profile-javahelp.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/javahelp/profile-javahelp.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/javahelp/profile-javahelp.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/javahelp/profile-javahelp.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/lib/lib.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/lib/lib.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/lib/lib.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/lib/lib.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/manpages/ChangeLog.20020917 b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/manpages/ChangeLog.20020917 similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/manpages/ChangeLog.20020917 rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/manpages/ChangeLog.20020917 diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/manpages/block.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/manpages/block.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/manpages/block.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/manpages/block.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/manpages/charmap.groff.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/manpages/charmap.groff.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/manpages/charmap.groff.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/manpages/charmap.groff.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/manpages/docbook.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/manpages/docbook.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/manpages/docbook.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/manpages/docbook.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/manpages/endnotes.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/manpages/endnotes.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/manpages/endnotes.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/manpages/endnotes.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/manpages/html-synop.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/manpages/html-synop.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/manpages/html-synop.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/manpages/html-synop.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/manpages/info.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/manpages/info.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/manpages/info.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/manpages/info.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/manpages/inline.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/manpages/inline.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/manpages/inline.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/manpages/inline.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/manpages/lists.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/manpages/lists.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/manpages/lists.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/manpages/lists.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/manpages/other.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/manpages/other.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/manpages/other.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/manpages/other.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/manpages/param.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/manpages/param.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/manpages/param.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/manpages/param.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/manpages/param.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/manpages/param.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/manpages/param.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/manpages/param.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/manpages/pi.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/manpages/pi.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/manpages/pi.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/manpages/pi.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/manpages/pi.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/manpages/pi.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/manpages/pi.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/manpages/pi.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/manpages/profile-docbook.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/manpages/profile-docbook.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/manpages/profile-docbook.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/manpages/profile-docbook.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/manpages/refentry.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/manpages/refentry.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/manpages/refentry.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/manpages/refentry.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/manpages/synop.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/manpages/synop.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/manpages/synop.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/manpages/synop.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/manpages/table.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/manpages/table.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/manpages/table.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/manpages/table.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/manpages/utility.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/manpages/utility.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/manpages/utility.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/manpages/utility.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/abstract.notitle.enabled.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/abstract.notitle.enabled.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/abstract.notitle.enabled.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/abstract.notitle.enabled.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/abstract.properties.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/abstract.properties.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/abstract.properties.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/abstract.properties.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/abstract.title.properties.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/abstract.title.properties.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/abstract.title.properties.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/abstract.title.properties.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/active.toc.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/active.toc.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/active.toc.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/active.toc.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/ade.extensions.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/ade.extensions.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/ade.extensions.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/ade.extensions.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/admon.graphics.extension.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/admon.graphics.extension.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/admon.graphics.extension.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/admon.graphics.extension.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/admon.graphics.path.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/admon.graphics.path.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/admon.graphics.path.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/admon.graphics.path.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/admon.graphics.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/admon.graphics.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/admon.graphics.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/admon.graphics.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/admon.style.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/admon.style.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/admon.style.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/admon.style.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/admon.textlabel.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/admon.textlabel.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/admon.textlabel.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/admon.textlabel.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/admonition.properties.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/admonition.properties.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/admonition.properties.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/admonition.properties.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/admonition.title.properties.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/admonition.title.properties.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/admonition.title.properties.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/admonition.title.properties.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/alignment.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/alignment.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/alignment.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/alignment.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/annotate.toc.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/annotate.toc.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/annotate.toc.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/annotate.toc.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/annotation.css.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/annotation.css.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/annotation.css.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/annotation.css.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/annotation.graphic.close.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/annotation.graphic.close.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/annotation.graphic.close.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/annotation.graphic.close.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/annotation.graphic.open.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/annotation.graphic.open.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/annotation.graphic.open.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/annotation.graphic.open.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/annotation.js.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/annotation.js.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/annotation.js.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/annotation.js.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/annotation.support.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/annotation.support.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/annotation.support.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/annotation.support.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/appendix.autolabel.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/appendix.autolabel.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/appendix.autolabel.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/appendix.autolabel.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/arbortext.extensions.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/arbortext.extensions.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/arbortext.extensions.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/arbortext.extensions.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/article.appendix.title.properties.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/article.appendix.title.properties.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/article.appendix.title.properties.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/article.appendix.title.properties.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/author.othername.in.middle.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/author.othername.in.middle.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/author.othername.in.middle.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/author.othername.in.middle.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/autolayout-file.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/autolayout-file.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/autolayout-file.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/autolayout-file.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/autotoc.label.in.hyperlink.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/autotoc.label.in.hyperlink.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/autotoc.label.in.hyperlink.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/autotoc.label.in.hyperlink.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/autotoc.label.separator.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/autotoc.label.separator.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/autotoc.label.separator.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/autotoc.label.separator.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/axf.extensions.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/axf.extensions.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/axf.extensions.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/axf.extensions.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/banner.before.navigation.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/banner.before.navigation.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/banner.before.navigation.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/banner.before.navigation.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/base.dir.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/base.dir.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/base.dir.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/base.dir.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/biblioentry.item.separator.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/biblioentry.item.separator.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/biblioentry.item.separator.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/biblioentry.item.separator.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/biblioentry.properties.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/biblioentry.properties.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/biblioentry.properties.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/biblioentry.properties.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/bibliography.collection.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/bibliography.collection.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/bibliography.collection.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/bibliography.collection.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/bibliography.numbered.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/bibliography.numbered.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/bibliography.numbered.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/bibliography.numbered.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/bibliography.style.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/bibliography.style.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/bibliography.style.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/bibliography.style.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/blockquote.properties.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/blockquote.properties.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/blockquote.properties.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/blockquote.properties.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/blurb.on.titlepage.enabled.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/blurb.on.titlepage.enabled.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/blurb.on.titlepage.enabled.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/blurb.on.titlepage.enabled.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/body.attributes.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/body.attributes.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/body.attributes.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/body.attributes.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/body.bg.color.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/body.bg.color.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/body.bg.color.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/body.bg.color.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/body.end.indent.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/body.end.indent.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/body.end.indent.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/body.end.indent.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/body.font.family.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/body.font.family.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/body.font.family.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/body.font.family.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/body.font.master.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/body.font.master.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/body.font.master.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/body.font.master.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/body.font.size.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/body.font.size.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/body.font.size.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/body.font.size.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/body.margin.bottom.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/body.margin.bottom.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/body.margin.bottom.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/body.margin.bottom.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/body.margin.top.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/body.margin.top.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/body.margin.top.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/body.margin.top.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/body.start.indent.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/body.start.indent.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/body.start.indent.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/body.start.indent.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/bookmarks.collapse.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/bookmarks.collapse.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/bookmarks.collapse.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/bookmarks.collapse.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/bridgehead.in.toc.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/bridgehead.in.toc.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/bridgehead.in.toc.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/bridgehead.in.toc.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/bullet.image.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/bullet.image.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/bullet.image.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/bullet.image.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/callout.defaultcolumn.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/callout.defaultcolumn.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/callout.defaultcolumn.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/callout.defaultcolumn.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/callout.graphics.extension.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/callout.graphics.extension.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/callout.graphics.extension.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/callout.graphics.extension.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/callout.graphics.number.limit.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/callout.graphics.number.limit.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/callout.graphics.number.limit.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/callout.graphics.number.limit.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/callout.graphics.path.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/callout.graphics.path.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/callout.graphics.path.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/callout.graphics.path.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/callout.graphics.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/callout.graphics.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/callout.graphics.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/callout.graphics.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/callout.icon.size.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/callout.icon.size.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/callout.icon.size.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/callout.icon.size.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/callout.list.table.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/callout.list.table.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/callout.list.table.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/callout.list.table.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/callout.unicode.font.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/callout.unicode.font.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/callout.unicode.font.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/callout.unicode.font.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/callout.unicode.number.limit.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/callout.unicode.number.limit.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/callout.unicode.number.limit.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/callout.unicode.number.limit.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/callout.unicode.start.character.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/callout.unicode.start.character.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/callout.unicode.start.character.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/callout.unicode.start.character.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/callout.unicode.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/callout.unicode.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/callout.unicode.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/callout.unicode.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/callouts.extension.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/callouts.extension.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/callouts.extension.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/callouts.extension.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/chapter.autolabel.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/chapter.autolabel.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/chapter.autolabel.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/chapter.autolabel.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/chunk.append.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/chunk.append.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/chunk.append.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/chunk.append.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/chunk.first.sections.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/chunk.first.sections.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/chunk.first.sections.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/chunk.first.sections.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/chunk.quietly.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/chunk.quietly.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/chunk.quietly.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/chunk.quietly.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/chunk.section.depth.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/chunk.section.depth.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/chunk.section.depth.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/chunk.section.depth.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/chunk.sections.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/chunk.sections.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/chunk.sections.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/chunk.sections.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/chunk.separate.lots.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/chunk.separate.lots.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/chunk.separate.lots.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/chunk.separate.lots.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/chunk.toc.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/chunk.toc.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/chunk.toc.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/chunk.toc.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/chunk.tocs.and.lots.has.title.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/chunk.tocs.and.lots.has.title.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/chunk.tocs.and.lots.has.title.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/chunk.tocs.and.lots.has.title.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/chunk.tocs.and.lots.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/chunk.tocs.and.lots.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/chunk.tocs.and.lots.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/chunk.tocs.and.lots.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/chunker.output.cdata-section-elements.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/chunker.output.cdata-section-elements.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/chunker.output.cdata-section-elements.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/chunker.output.cdata-section-elements.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/chunker.output.doctype-public.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/chunker.output.doctype-public.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/chunker.output.doctype-public.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/chunker.output.doctype-public.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/chunker.output.doctype-system.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/chunker.output.doctype-system.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/chunker.output.doctype-system.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/chunker.output.doctype-system.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/chunker.output.encoding.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/chunker.output.encoding.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/chunker.output.encoding.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/chunker.output.encoding.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/chunker.output.indent.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/chunker.output.indent.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/chunker.output.indent.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/chunker.output.indent.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/chunker.output.media-type.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/chunker.output.media-type.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/chunker.output.media-type.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/chunker.output.media-type.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/chunker.output.method.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/chunker.output.method.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/chunker.output.method.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/chunker.output.method.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/chunker.output.omit-xml-declaration.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/chunker.output.omit-xml-declaration.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/chunker.output.omit-xml-declaration.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/chunker.output.omit-xml-declaration.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/chunker.output.standalone.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/chunker.output.standalone.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/chunker.output.standalone.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/chunker.output.standalone.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/citerefentry.link.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/citerefentry.link.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/citerefentry.link.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/citerefentry.link.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/collect.xref.targets.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/collect.xref.targets.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/collect.xref.targets.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/collect.xref.targets.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/column.count.back.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/column.count.back.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/column.count.back.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/column.count.back.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/column.count.body.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/column.count.body.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/column.count.body.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/column.count.body.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/column.count.front.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/column.count.front.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/column.count.front.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/column.count.front.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/column.count.index.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/column.count.index.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/column.count.index.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/column.count.index.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/column.count.lot.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/column.count.lot.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/column.count.lot.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/column.count.lot.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/column.count.titlepage.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/column.count.titlepage.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/column.count.titlepage.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/column.count.titlepage.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/column.gap.back.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/column.gap.back.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/column.gap.back.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/column.gap.back.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/column.gap.body.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/column.gap.body.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/column.gap.body.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/column.gap.body.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/column.gap.front.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/column.gap.front.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/column.gap.front.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/column.gap.front.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/column.gap.index.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/column.gap.index.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/column.gap.index.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/column.gap.index.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/column.gap.lot.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/column.gap.lot.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/column.gap.lot.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/column.gap.lot.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/column.gap.titlepage.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/column.gap.titlepage.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/column.gap.titlepage.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/column.gap.titlepage.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/compact.list.item.spacing.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/compact.list.item.spacing.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/compact.list.item.spacing.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/compact.list.item.spacing.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/component.label.includes.part.label.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/component.label.includes.part.label.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/component.label.includes.part.label.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/component.label.includes.part.label.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/component.title.properties.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/component.title.properties.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/component.title.properties.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/component.title.properties.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/component.titlepage.properties.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/component.titlepage.properties.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/component.titlepage.properties.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/component.titlepage.properties.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/contrib.inline.enabled.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/contrib.inline.enabled.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/contrib.inline.enabled.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/contrib.inline.enabled.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/crop.mark.bleed.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/crop.mark.bleed.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/crop.mark.bleed.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/crop.mark.bleed.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/crop.mark.offset.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/crop.mark.offset.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/crop.mark.offset.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/crop.mark.offset.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/crop.mark.width.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/crop.mark.width.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/crop.mark.width.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/crop.mark.width.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/crop.marks.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/crop.marks.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/crop.marks.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/crop.marks.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/css.decoration.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/css.decoration.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/css.decoration.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/css.decoration.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/css.stylesheet.dir.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/css.stylesheet.dir.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/css.stylesheet.dir.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/css.stylesheet.dir.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/css.stylesheet.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/css.stylesheet.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/css.stylesheet.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/css.stylesheet.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/current.docid.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/current.docid.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/current.docid.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/current.docid.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/currentpage.marker.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/currentpage.marker.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/currentpage.marker.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/currentpage.marker.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/custom.css.source.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/custom.css.source.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/custom.css.source.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/custom.css.source.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/default.float.class.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/default.float.class.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/default.float.class.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/default.float.class.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/default.image.width.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/default.image.width.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/default.image.width.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/default.image.width.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/default.table.frame.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/default.table.frame.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/default.table.frame.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/default.table.frame.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/default.table.rules.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/default.table.rules.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/default.table.rules.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/default.table.rules.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/default.table.width.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/default.table.width.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/default.table.width.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/default.table.width.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/default.units.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/default.units.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/default.units.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/default.units.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/dingbat.font.family.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/dingbat.font.family.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/dingbat.font.family.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/dingbat.font.family.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/docbook.css.link.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/docbook.css.link.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/docbook.css.link.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/docbook.css.link.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/docbook.css.source.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/docbook.css.source.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/docbook.css.source.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/docbook.css.source.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/double.sided.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/double.sided.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/double.sided.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/double.sided.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/draft.mode.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/draft.mode.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/draft.mode.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/draft.mode.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/draft.watermark.image.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/draft.watermark.image.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/draft.watermark.image.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/draft.watermark.image.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/dry-run.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/dry-run.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/dry-run.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/dry-run.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/dynamic.toc.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/dynamic.toc.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/dynamic.toc.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/dynamic.toc.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/ebnf.assignment.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/ebnf.assignment.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/ebnf.assignment.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/ebnf.assignment.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/ebnf.statement.terminator.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/ebnf.statement.terminator.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/ebnf.statement.terminator.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/ebnf.statement.terminator.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/ebnf.table.bgcolor.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/ebnf.table.bgcolor.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/ebnf.table.bgcolor.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/ebnf.table.bgcolor.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/ebnf.table.border.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/ebnf.table.border.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/ebnf.table.border.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/ebnf.table.border.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/eclipse.autolabel.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/eclipse.autolabel.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/eclipse.autolabel.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/eclipse.autolabel.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/eclipse.plugin.id.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/eclipse.plugin.id.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/eclipse.plugin.id.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/eclipse.plugin.id.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/eclipse.plugin.name.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/eclipse.plugin.name.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/eclipse.plugin.name.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/eclipse.plugin.name.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/eclipse.plugin.provider.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/eclipse.plugin.provider.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/eclipse.plugin.provider.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/eclipse.plugin.provider.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/editedby.enabled.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/editedby.enabled.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/editedby.enabled.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/editedby.enabled.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/email.delimiters.enabled.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/email.delimiters.enabled.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/email.delimiters.enabled.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/email.delimiters.enabled.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/email.mailto.enabled.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/email.mailto.enabled.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/email.mailto.enabled.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/email.mailto.enabled.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/emphasis.propagates.style.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/emphasis.propagates.style.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/emphasis.propagates.style.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/emphasis.propagates.style.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/entry.propagates.style.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/entry.propagates.style.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/entry.propagates.style.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/entry.propagates.style.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/epub.autolabel.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/epub.autolabel.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/epub.autolabel.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/epub.autolabel.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/equation.number.properties.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/equation.number.properties.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/equation.number.properties.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/equation.number.properties.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/equation.properties.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/equation.properties.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/equation.properties.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/equation.properties.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/example.properties.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/example.properties.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/example.properties.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/example.properties.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/exsl.node.set.available.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/exsl.node.set.available.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/exsl.node.set.available.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/exsl.node.set.available.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/feedback.href.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/feedback.href.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/feedback.href.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/feedback.href.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/feedback.link.text.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/feedback.link.text.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/feedback.link.text.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/feedback.link.text.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/feedback.with.ids.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/feedback.with.ids.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/feedback.with.ids.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/feedback.with.ids.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/figure.properties.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/figure.properties.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/figure.properties.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/figure.properties.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/filename-prefix.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/filename-prefix.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/filename-prefix.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/filename-prefix.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/firstterm.only.link.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/firstterm.only.link.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/firstterm.only.link.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/firstterm.only.link.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/foil.properties.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/foil.properties.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/foil.properties.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/foil.properties.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/foil.subtitle.properties.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/foil.subtitle.properties.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/foil.subtitle.properties.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/foil.subtitle.properties.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/foil.title.master.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/foil.title.master.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/foil.title.master.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/foil.title.master.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/foil.title.size.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/foil.title.size.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/foil.title.size.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/foil.title.size.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/foilgroup.properties.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/foilgroup.properties.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/foilgroup.properties.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/foilgroup.properties.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/foilgroup.toc.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/foilgroup.toc.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/foilgroup.toc.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/foilgroup.toc.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/footer.column.widths.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/footer.column.widths.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/footer.column.widths.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/footer.column.widths.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/footer.content.properties.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/footer.content.properties.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/footer.content.properties.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/footer.content.properties.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/footer.hr.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/footer.hr.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/footer.hr.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/footer.hr.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/footer.rule.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/footer.rule.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/footer.rule.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/footer.rule.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/footer.table.height.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/footer.table.height.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/footer.table.height.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/footer.table.height.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/footer.table.properties.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/footer.table.properties.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/footer.table.properties.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/footer.table.properties.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/footers.on.blank.pages.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/footers.on.blank.pages.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/footers.on.blank.pages.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/footers.on.blank.pages.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/footnote.font.size.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/footnote.font.size.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/footnote.font.size.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/footnote.font.size.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/footnote.mark.properties.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/footnote.mark.properties.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/footnote.mark.properties.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/footnote.mark.properties.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/footnote.number.format.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/footnote.number.format.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/footnote.number.format.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/footnote.number.format.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/footnote.number.symbols.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/footnote.number.symbols.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/footnote.number.symbols.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/footnote.number.symbols.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/footnote.properties.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/footnote.properties.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/footnote.properties.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/footnote.properties.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/footnote.sep.leader.properties.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/footnote.sep.leader.properties.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/footnote.sep.leader.properties.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/footnote.sep.leader.properties.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/fop.extensions.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/fop.extensions.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/fop.extensions.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/fop.extensions.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/fop1.extensions.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/fop1.extensions.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/fop1.extensions.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/fop1.extensions.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/formal.object.properties.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/formal.object.properties.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/formal.object.properties.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/formal.object.properties.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/formal.procedures.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/formal.procedures.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/formal.procedures.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/formal.procedures.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/formal.title.placement.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/formal.title.placement.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/formal.title.placement.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/formal.title.placement.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/formal.title.properties.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/formal.title.properties.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/formal.title.properties.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/formal.title.properties.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/funcsynopsis.decoration.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/funcsynopsis.decoration.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/funcsynopsis.decoration.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/funcsynopsis.decoration.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/funcsynopsis.style.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/funcsynopsis.style.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/funcsynopsis.style.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/funcsynopsis.style.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/function.parens.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/function.parens.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/function.parens.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/function.parens.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/generate.css.header.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/generate.css.header.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/generate.css.header.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/generate.css.header.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/generate.id.attributes.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/generate.id.attributes.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/generate.id.attributes.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/generate.id.attributes.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/generate.index.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/generate.index.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/generate.index.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/generate.index.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/generate.legalnotice.link.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/generate.legalnotice.link.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/generate.legalnotice.link.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/generate.legalnotice.link.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/generate.manifest.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/generate.manifest.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/generate.manifest.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/generate.manifest.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/generate.meta.abstract.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/generate.meta.abstract.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/generate.meta.abstract.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/generate.meta.abstract.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/generate.revhistory.link.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/generate.revhistory.link.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/generate.revhistory.link.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/generate.revhistory.link.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/generate.section.toc.level.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/generate.section.toc.level.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/generate.section.toc.level.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/generate.section.toc.level.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/generate.toc.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/generate.toc.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/generate.toc.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/generate.toc.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/glossary.as.blocks.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/glossary.as.blocks.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/glossary.as.blocks.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/glossary.as.blocks.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/glossary.collection.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/glossary.collection.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/glossary.collection.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/glossary.collection.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/glossary.sort.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/glossary.sort.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/glossary.sort.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/glossary.sort.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/glossdef.block.properties.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/glossdef.block.properties.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/glossdef.block.properties.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/glossdef.block.properties.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/glossdef.list.properties.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/glossdef.list.properties.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/glossdef.list.properties.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/glossdef.list.properties.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/glossentry.list.item.properties.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/glossentry.list.item.properties.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/glossentry.list.item.properties.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/glossentry.list.item.properties.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/glossentry.show.acronym.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/glossentry.show.acronym.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/glossentry.show.acronym.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/glossentry.show.acronym.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/glosslist.as.blocks.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/glosslist.as.blocks.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/glosslist.as.blocks.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/glosslist.as.blocks.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/glossterm.auto.link.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/glossterm.auto.link.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/glossterm.auto.link.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/glossterm.auto.link.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/glossterm.block.properties.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/glossterm.block.properties.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/glossterm.block.properties.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/glossterm.block.properties.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/glossterm.list.properties.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/glossterm.list.properties.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/glossterm.list.properties.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/glossterm.list.properties.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/glossterm.separation.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/glossterm.separation.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/glossterm.separation.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/glossterm.separation.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/glossterm.width.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/glossterm.width.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/glossterm.width.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/glossterm.width.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/graphic.default.extension.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/graphic.default.extension.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/graphic.default.extension.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/graphic.default.extension.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/graphical.admonition.properties.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/graphical.admonition.properties.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/graphical.admonition.properties.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/graphical.admonition.properties.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/graphics.dir.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/graphics.dir.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/graphics.dir.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/graphics.dir.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/graphicsize.extension.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/graphicsize.extension.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/graphicsize.extension.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/graphicsize.extension.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/graphicsize.use.img.src.path.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/graphicsize.use.img.src.path.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/graphicsize.use.img.src.path.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/graphicsize.use.img.src.path.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/header.column.widths.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/header.column.widths.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/header.column.widths.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/header.column.widths.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/header.content.properties.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/header.content.properties.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/header.content.properties.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/header.content.properties.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/header.hr.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/header.hr.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/header.hr.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/header.hr.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/header.rule.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/header.rule.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/header.rule.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/header.rule.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/header.table.height.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/header.table.height.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/header.table.height.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/header.table.height.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/header.table.properties.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/header.table.properties.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/header.table.properties.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/header.table.properties.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/headers.on.blank.pages.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/headers.on.blank.pages.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/headers.on.blank.pages.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/headers.on.blank.pages.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/hidetoc.image.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/hidetoc.image.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/hidetoc.image.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/hidetoc.image.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/highlight.default.language.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/highlight.default.language.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/highlight.default.language.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/highlight.default.language.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/highlight.source.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/highlight.source.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/highlight.source.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/highlight.source.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/highlight.xslthl.config.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/highlight.xslthl.config.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/highlight.xslthl.config.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/highlight.xslthl.config.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/home.image.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/home.image.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/home.image.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/home.image.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/html.append.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/html.append.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/html.append.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/html.append.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/html.base.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/html.base.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/html.base.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/html.base.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/html.cellpadding.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/html.cellpadding.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/html.cellpadding.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/html.cellpadding.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/html.cellspacing.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/html.cellspacing.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/html.cellspacing.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/html.cellspacing.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/html.cleanup.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/html.cleanup.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/html.cleanup.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/html.cleanup.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/html.ext.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/html.ext.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/html.ext.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/html.ext.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/html.extra.head.links.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/html.extra.head.links.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/html.extra.head.links.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/html.extra.head.links.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/html.head.legalnotice.link.multiple.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/html.head.legalnotice.link.multiple.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/html.head.legalnotice.link.multiple.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/html.head.legalnotice.link.multiple.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/html.head.legalnotice.link.types.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/html.head.legalnotice.link.types.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/html.head.legalnotice.link.types.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/html.head.legalnotice.link.types.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/html.longdesc.link.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/html.longdesc.link.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/html.longdesc.link.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/html.longdesc.link.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/html.longdesc.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/html.longdesc.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/html.longdesc.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/html.longdesc.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/html.stylesheet.type.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/html.stylesheet.type.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/html.stylesheet.type.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/html.stylesheet.type.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/html.stylesheet.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/html.stylesheet.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/html.stylesheet.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/html.stylesheet.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.alias.file.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.alias.file.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.alias.file.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.alias.file.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.autolabel.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.autolabel.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.autolabel.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.autolabel.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.button.back.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.button.back.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.button.back.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.button.back.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.button.forward.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.button.forward.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.button.forward.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.button.forward.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.button.hideshow.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.button.hideshow.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.button.hideshow.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.button.hideshow.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.button.home.url.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.button.home.url.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.button.home.url.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.button.home.url.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.button.home.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.button.home.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.button.home.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.button.home.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.button.jump1.title.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.button.jump1.title.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.button.jump1.title.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.button.jump1.title.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.button.jump1.url.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.button.jump1.url.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.button.jump1.url.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.button.jump1.url.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.button.jump1.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.button.jump1.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.button.jump1.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.button.jump1.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.button.jump2.title.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.button.jump2.title.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.button.jump2.title.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.button.jump2.title.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.button.jump2.url.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.button.jump2.url.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.button.jump2.url.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.button.jump2.url.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.button.jump2.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.button.jump2.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.button.jump2.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.button.jump2.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.button.locate.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.button.locate.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.button.locate.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.button.locate.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.button.next.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.button.next.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.button.next.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.button.next.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.button.options.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.button.options.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.button.options.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.button.options.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.button.prev.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.button.prev.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.button.prev.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.button.prev.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.button.print.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.button.print.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.button.print.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.button.print.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.button.refresh.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.button.refresh.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.button.refresh.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.button.refresh.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.button.stop.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.button.stop.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.button.stop.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.button.stop.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.button.zoom.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.button.zoom.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.button.zoom.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.button.zoom.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.chm.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.chm.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.chm.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.chm.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.default.topic.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.default.topic.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.default.topic.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.default.topic.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.display.progress.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.display.progress.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.display.progress.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.display.progress.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.encoding.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.encoding.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.encoding.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.encoding.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.enhanced.decompilation.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.enhanced.decompilation.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.enhanced.decompilation.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.enhanced.decompilation.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.enumerate.images.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.enumerate.images.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.enumerate.images.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.enumerate.images.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.force.map.and.alias.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.force.map.and.alias.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.force.map.and.alias.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.force.map.and.alias.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.hhc.binary.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.hhc.binary.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.hhc.binary.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.hhc.binary.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.hhc.folders.instead.books.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.hhc.folders.instead.books.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.hhc.folders.instead.books.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.hhc.folders.instead.books.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.hhc.section.depth.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.hhc.section.depth.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.hhc.section.depth.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.hhc.section.depth.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.hhc.show.root.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.hhc.show.root.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.hhc.show.root.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.hhc.show.root.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.hhc.width.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.hhc.width.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.hhc.width.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.hhc.width.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.hhc.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.hhc.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.hhc.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.hhc.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.hhk.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.hhk.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.hhk.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.hhk.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.hhp.tail.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.hhp.tail.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.hhp.tail.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.hhp.tail.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.hhp.window.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.hhp.window.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.hhp.window.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.hhp.window.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.hhp.windows.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.hhp.windows.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.hhp.windows.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.hhp.windows.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.hhp.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.hhp.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.hhp.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.hhp.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.map.file.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.map.file.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.map.file.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.map.file.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.only.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.only.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.only.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.only.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.remember.window.position.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.remember.window.position.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.remember.window.position.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.remember.window.position.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.show.advanced.search.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.show.advanced.search.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.show.advanced.search.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.show.advanced.search.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.show.favorities.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.show.favorities.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.show.favorities.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.show.favorities.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.show.menu.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.show.menu.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.show.menu.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.show.menu.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.show.toolbar.text.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.show.toolbar.text.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.show.toolbar.text.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.show.toolbar.text.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.title.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.title.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.title.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.title.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.use.hhk.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.use.hhk.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.use.hhk.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.use.hhk.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.window.geometry.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.window.geometry.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.window.geometry.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.window.geometry.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/hyphenate.verbatim.characters.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/hyphenate.verbatim.characters.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/hyphenate.verbatim.characters.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/hyphenate.verbatim.characters.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/hyphenate.verbatim.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/hyphenate.verbatim.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/hyphenate.verbatim.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/hyphenate.verbatim.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/hyphenate.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/hyphenate.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/hyphenate.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/hyphenate.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/id.warnings.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/id.warnings.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/id.warnings.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/id.warnings.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/ignore.image.scaling.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/ignore.image.scaling.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/ignore.image.scaling.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/ignore.image.scaling.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/img.src.path.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/img.src.path.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/img.src.path.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/img.src.path.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/index.div.title.properties.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/index.div.title.properties.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/index.div.title.properties.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/index.div.title.properties.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/index.entry.properties.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/index.entry.properties.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/index.entry.properties.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/index.entry.properties.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/index.links.to.section.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/index.links.to.section.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/index.links.to.section.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/index.links.to.section.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/index.method.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/index.method.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/index.method.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/index.method.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/index.number.separator.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/index.number.separator.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/index.number.separator.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/index.number.separator.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/index.on.role.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/index.on.role.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/index.on.role.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/index.on.role.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/index.on.type.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/index.on.type.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/index.on.type.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/index.on.type.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/index.page.number.properties.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/index.page.number.properties.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/index.page.number.properties.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/index.page.number.properties.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/index.prefer.titleabbrev.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/index.prefer.titleabbrev.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/index.prefer.titleabbrev.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/index.prefer.titleabbrev.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/index.preferred.page.properties.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/index.preferred.page.properties.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/index.preferred.page.properties.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/index.preferred.page.properties.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/index.range.separator.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/index.range.separator.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/index.range.separator.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/index.range.separator.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/index.term.separator.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/index.term.separator.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/index.term.separator.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/index.term.separator.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/informal.object.properties.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/informal.object.properties.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/informal.object.properties.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/informal.object.properties.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/informalequation.properties.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/informalequation.properties.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/informalequation.properties.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/informalequation.properties.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/informalexample.properties.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/informalexample.properties.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/informalexample.properties.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/informalexample.properties.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/informalfigure.properties.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/informalfigure.properties.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/informalfigure.properties.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/informalfigure.properties.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/informaltable.properties.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/informaltable.properties.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/informaltable.properties.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/informaltable.properties.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/inherit.keywords.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/inherit.keywords.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/inherit.keywords.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/inherit.keywords.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/insert.link.page.number.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/insert.link.page.number.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/insert.link.page.number.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/insert.link.page.number.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/insert.olink.page.number.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/insert.olink.page.number.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/insert.olink.page.number.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/insert.olink.page.number.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/insert.olink.pdf.frag.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/insert.olink.pdf.frag.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/insert.olink.pdf.frag.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/insert.olink.pdf.frag.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/insert.xref.page.number.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/insert.xref.page.number.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/insert.xref.page.number.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/insert.xref.page.number.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/itemizedlist.label.properties.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/itemizedlist.label.properties.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/itemizedlist.label.properties.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/itemizedlist.label.properties.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/itemizedlist.label.width.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/itemizedlist.label.width.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/itemizedlist.label.width.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/itemizedlist.label.width.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/itemizedlist.properties.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/itemizedlist.properties.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/itemizedlist.properties.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/itemizedlist.properties.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/javahelp.encoding.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/javahelp.encoding.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/javahelp.encoding.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/javahelp.encoding.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/keep.relative.image.uris.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/keep.relative.image.uris.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/keep.relative.image.uris.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/keep.relative.image.uris.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/keyboard.nav.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/keyboard.nav.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/keyboard.nav.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/keyboard.nav.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/l10n.gentext.default.language.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/l10n.gentext.default.language.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/l10n.gentext.default.language.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/l10n.gentext.default.language.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/l10n.gentext.language.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/l10n.gentext.language.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/l10n.gentext.language.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/l10n.gentext.language.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/l10n.gentext.use.xref.language.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/l10n.gentext.use.xref.language.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/l10n.gentext.use.xref.language.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/l10n.gentext.use.xref.language.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/l10n.lang.value.rfc.compliant.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/l10n.lang.value.rfc.compliant.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/l10n.lang.value.rfc.compliant.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/l10n.lang.value.rfc.compliant.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/label.from.part.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/label.from.part.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/label.from.part.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/label.from.part.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/line-height.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/line-height.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/line-height.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/line-height.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/linenumbering.everyNth.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/linenumbering.everyNth.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/linenumbering.everyNth.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/linenumbering.everyNth.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/linenumbering.extension.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/linenumbering.extension.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/linenumbering.extension.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/linenumbering.extension.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/linenumbering.separator.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/linenumbering.separator.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/linenumbering.separator.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/linenumbering.separator.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/linenumbering.width.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/linenumbering.width.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/linenumbering.width.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/linenumbering.width.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/link.mailto.url.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/link.mailto.url.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/link.mailto.url.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/link.mailto.url.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/list.block.properties.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/list.block.properties.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/list.block.properties.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/list.block.properties.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/list.block.spacing.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/list.block.spacing.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/list.block.spacing.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/list.block.spacing.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/list.item.spacing.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/list.item.spacing.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/list.item.spacing.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/list.item.spacing.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/make.clean.html.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/make.clean.html.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/make.clean.html.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/make.clean.html.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/make.graphic.viewport.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/make.graphic.viewport.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/make.graphic.viewport.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/make.graphic.viewport.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/make.index.markup.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/make.index.markup.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/make.index.markup.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/make.index.markup.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/make.single.year.ranges.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/make.single.year.ranges.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/make.single.year.ranges.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/make.single.year.ranges.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/make.valid.html.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/make.valid.html.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/make.valid.html.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/make.valid.html.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/make.year.ranges.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/make.year.ranges.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/make.year.ranges.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/make.year.ranges.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.authors.section.enabled.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.authors.section.enabled.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.authors.section.enabled.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.authors.section.enabled.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.base.url.for.relative.links.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.base.url.for.relative.links.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.base.url.for.relative.links.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.base.url.for.relative.links.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.break.after.slash.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.break.after.slash.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.break.after.slash.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.break.after.slash.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.charmap.enabled.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.charmap.enabled.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.charmap.enabled.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.charmap.enabled.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.charmap.subset.profile.english.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.charmap.subset.profile.english.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.charmap.subset.profile.english.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.charmap.subset.profile.english.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.charmap.subset.profile.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.charmap.subset.profile.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.charmap.subset.profile.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.charmap.subset.profile.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.charmap.uri.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.charmap.uri.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.charmap.uri.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.charmap.uri.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.charmap.use.subset.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.charmap.use.subset.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.charmap.use.subset.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.charmap.use.subset.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.copyright.section.enabled.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.copyright.section.enabled.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.copyright.section.enabled.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.copyright.section.enabled.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.endnotes.are.numbered.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.endnotes.are.numbered.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.endnotes.are.numbered.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.endnotes.are.numbered.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.endnotes.list.enabled.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.endnotes.list.enabled.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.endnotes.list.enabled.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.endnotes.list.enabled.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.endnotes.list.heading.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.endnotes.list.heading.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.endnotes.list.heading.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.endnotes.list.heading.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.font.funcprototype.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.font.funcprototype.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.font.funcprototype.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.font.funcprototype.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.font.funcsynopsisinfo.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.font.funcsynopsisinfo.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.font.funcsynopsisinfo.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.font.funcsynopsisinfo.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.font.links.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.font.links.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.font.links.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.font.links.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.font.table.headings.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.font.table.headings.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.font.table.headings.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.font.table.headings.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.font.table.title.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.font.table.title.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.font.table.title.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.font.table.title.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.funcsynopsis.style.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.funcsynopsis.style.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.funcsynopsis.style.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.funcsynopsis.style.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.hyphenate.computer.inlines.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.hyphenate.computer.inlines.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.hyphenate.computer.inlines.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.hyphenate.computer.inlines.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.hyphenate.filenames.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.hyphenate.filenames.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.hyphenate.filenames.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.hyphenate.filenames.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.hyphenate.urls.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.hyphenate.urls.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.hyphenate.urls.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.hyphenate.urls.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.hyphenate.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.hyphenate.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.hyphenate.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.hyphenate.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.indent.blurbs.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.indent.blurbs.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.indent.blurbs.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.indent.blurbs.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.indent.lists.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.indent.lists.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.indent.lists.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.indent.lists.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.indent.refsect.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.indent.refsect.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.indent.refsect.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.indent.refsect.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.indent.verbatims.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.indent.verbatims.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.indent.verbatims.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.indent.verbatims.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.indent.width.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.indent.width.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.indent.width.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.indent.width.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.justify.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.justify.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.justify.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.justify.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.output.base.dir.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.output.base.dir.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.output.base.dir.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.output.base.dir.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.output.better.ps.enabled.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.output.better.ps.enabled.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.output.better.ps.enabled.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.output.better.ps.enabled.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.output.encoding.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.output.encoding.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.output.encoding.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.output.encoding.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.output.in.separate.dir.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.output.in.separate.dir.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.output.in.separate.dir.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.output.in.separate.dir.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.output.lang.in.name.enabled.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.output.lang.in.name.enabled.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.output.lang.in.name.enabled.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.output.lang.in.name.enabled.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.output.manifest.enabled.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.output.manifest.enabled.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.output.manifest.enabled.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.output.manifest.enabled.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.output.manifest.filename.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.output.manifest.filename.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.output.manifest.filename.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.output.manifest.filename.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.output.quietly.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.output.quietly.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.output.quietly.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.output.quietly.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.output.subdirs.enabled.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.output.subdirs.enabled.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.output.subdirs.enabled.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.output.subdirs.enabled.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.segtitle.suppress.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.segtitle.suppress.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.segtitle.suppress.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.segtitle.suppress.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.string.subst.map.local.post.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.string.subst.map.local.post.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.string.subst.map.local.post.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.string.subst.map.local.post.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.string.subst.map.local.pre.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.string.subst.map.local.pre.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.string.subst.map.local.pre.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.string.subst.map.local.pre.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.string.subst.map.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.string.subst.map.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.string.subst.map.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.string.subst.map.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.subheading.divider.enabled.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.subheading.divider.enabled.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.subheading.divider.enabled.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.subheading.divider.enabled.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.subheading.divider.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.subheading.divider.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.subheading.divider.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.subheading.divider.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.table.footnotes.divider.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.table.footnotes.divider.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.table.footnotes.divider.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.table.footnotes.divider.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.th.extra1.suppress.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.th.extra1.suppress.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.th.extra1.suppress.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.th.extra1.suppress.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.th.extra2.max.length.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.th.extra2.max.length.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.th.extra2.max.length.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.th.extra2.max.length.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.th.extra2.suppress.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.th.extra2.suppress.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.th.extra2.suppress.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.th.extra2.suppress.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.th.extra3.max.length.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.th.extra3.max.length.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.th.extra3.max.length.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.th.extra3.max.length.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.th.extra3.suppress.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.th.extra3.suppress.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.th.extra3.suppress.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.th.extra3.suppress.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.th.title.max.length.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.th.title.max.length.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.th.title.max.length.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.th.title.max.length.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/manifest.in.base.dir.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/manifest.in.base.dir.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/manifest.in.base.dir.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/manifest.in.base.dir.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/manifest.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/manifest.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/manifest.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/manifest.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/manual.toc.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/manual.toc.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/manual.toc.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/manual.toc.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/margin.note.float.type.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/margin.note.float.type.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/margin.note.float.type.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/margin.note.float.type.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/margin.note.properties.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/margin.note.properties.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/margin.note.properties.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/margin.note.properties.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/margin.note.title.properties.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/margin.note.title.properties.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/margin.note.title.properties.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/margin.note.title.properties.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/margin.note.width.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/margin.note.width.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/margin.note.width.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/margin.note.width.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/marker.section.level.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/marker.section.level.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/marker.section.level.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/marker.section.level.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/menuchoice.menu.separator.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/menuchoice.menu.separator.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/menuchoice.menu.separator.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/menuchoice.menu.separator.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/menuchoice.separator.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/menuchoice.separator.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/menuchoice.separator.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/menuchoice.separator.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/minus.image.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/minus.image.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/minus.image.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/minus.image.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/monospace.font.family.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/monospace.font.family.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/monospace.font.family.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/monospace.font.family.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/monospace.properties.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/monospace.properties.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/monospace.properties.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/monospace.properties.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/monospace.verbatim.font.width.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/monospace.verbatim.font.width.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/monospace.verbatim.font.width.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/monospace.verbatim.font.width.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/monospace.verbatim.properties.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/monospace.verbatim.properties.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/monospace.verbatim.properties.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/monospace.verbatim.properties.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/multiframe.bottom.bgcolor.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/multiframe.bottom.bgcolor.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/multiframe.bottom.bgcolor.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/multiframe.bottom.bgcolor.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/multiframe.navigation.height.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/multiframe.navigation.height.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/multiframe.navigation.height.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/multiframe.navigation.height.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/multiframe.top.bgcolor.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/multiframe.top.bgcolor.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/multiframe.top.bgcolor.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/multiframe.top.bgcolor.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/multiframe.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/multiframe.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/multiframe.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/multiframe.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/nav.separator.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/nav.separator.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/nav.separator.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/nav.separator.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/nav.table.summary.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/nav.table.summary.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/nav.table.summary.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/nav.table.summary.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/navbgcolor.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/navbgcolor.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/navbgcolor.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/navbgcolor.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/navbodywidth.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/navbodywidth.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/navbodywidth.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/navbodywidth.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/navig.graphics.extension.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/navig.graphics.extension.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/navig.graphics.extension.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/navig.graphics.extension.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/navig.graphics.path.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/navig.graphics.path.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/navig.graphics.path.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/navig.graphics.path.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/navig.graphics.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/navig.graphics.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/navig.graphics.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/navig.graphics.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/navig.showtitles.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/navig.showtitles.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/navig.showtitles.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/navig.showtitles.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/navtocwidth.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/navtocwidth.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/navtocwidth.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/navtocwidth.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/next.image.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/next.image.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/next.image.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/next.image.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/no.home.image.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/no.home.image.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/no.home.image.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/no.home.image.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/no.next.image.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/no.next.image.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/no.next.image.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/no.next.image.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/no.prev.image.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/no.prev.image.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/no.prev.image.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/no.prev.image.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/no.toc.image.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/no.toc.image.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/no.toc.image.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/no.toc.image.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/no.up.image.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/no.up.image.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/no.up.image.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/no.up.image.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/nominal.image.depth.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/nominal.image.depth.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/nominal.image.depth.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/nominal.image.depth.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/nominal.image.width.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/nominal.image.width.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/nominal.image.width.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/nominal.image.width.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/nominal.table.width.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/nominal.table.width.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/nominal.table.width.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/nominal.table.width.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/nongraphical.admonition.properties.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/nongraphical.admonition.properties.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/nongraphical.admonition.properties.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/nongraphical.admonition.properties.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/normal.para.spacing.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/normal.para.spacing.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/normal.para.spacing.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/normal.para.spacing.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/olink.base.uri.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/olink.base.uri.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/olink.base.uri.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/olink.base.uri.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/olink.debug.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/olink.debug.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/olink.debug.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/olink.debug.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/olink.doctitle.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/olink.doctitle.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/olink.doctitle.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/olink.doctitle.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/olink.fragid.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/olink.fragid.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/olink.fragid.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/olink.fragid.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/olink.lang.fallback.sequence.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/olink.lang.fallback.sequence.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/olink.lang.fallback.sequence.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/olink.lang.fallback.sequence.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/olink.outline.ext.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/olink.outline.ext.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/olink.outline.ext.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/olink.outline.ext.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/olink.properties.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/olink.properties.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/olink.properties.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/olink.properties.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/olink.pubid.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/olink.pubid.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/olink.pubid.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/olink.pubid.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/olink.resolver.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/olink.resolver.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/olink.resolver.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/olink.resolver.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/olink.sysid.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/olink.sysid.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/olink.sysid.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/olink.sysid.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/orderedlist.label.properties.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/orderedlist.label.properties.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/orderedlist.label.properties.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/orderedlist.label.properties.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/orderedlist.label.width.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/orderedlist.label.width.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/orderedlist.label.width.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/orderedlist.label.width.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/orderedlist.properties.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/orderedlist.properties.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/orderedlist.properties.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/orderedlist.properties.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/othercredit.like.author.enabled.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/othercredit.like.author.enabled.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/othercredit.like.author.enabled.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/othercredit.like.author.enabled.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/output-root.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/output-root.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/output-root.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/output-root.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/output.indent.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/output.indent.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/output.indent.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/output.indent.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/overlay.js.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/overlay.js.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/overlay.js.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/overlay.js.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/overlay.logo.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/overlay.logo.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/overlay.logo.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/overlay.logo.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/overlay.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/overlay.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/overlay.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/overlay.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/page.height.portrait.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/page.height.portrait.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/page.height.portrait.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/page.height.portrait.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/page.height.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/page.height.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/page.height.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/page.height.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/page.margin.bottom.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/page.margin.bottom.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/page.margin.bottom.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/page.margin.bottom.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/page.margin.inner.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/page.margin.inner.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/page.margin.inner.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/page.margin.inner.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/page.margin.outer.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/page.margin.outer.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/page.margin.outer.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/page.margin.outer.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/page.margin.top.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/page.margin.top.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/page.margin.top.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/page.margin.top.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/page.orientation.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/page.orientation.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/page.orientation.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/page.orientation.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/page.width.portrait.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/page.width.portrait.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/page.width.portrait.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/page.width.portrait.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/page.width.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/page.width.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/page.width.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/page.width.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/pages.template.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/pages.template.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/pages.template.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/pages.template.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/paper.type.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/paper.type.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/paper.type.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/paper.type.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/para.propagates.style.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/para.propagates.style.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/para.propagates.style.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/para.propagates.style.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/part.autolabel.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/part.autolabel.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/part.autolabel.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/part.autolabel.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/passivetex.extensions.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/passivetex.extensions.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/passivetex.extensions.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/passivetex.extensions.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/pgwide.properties.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/pgwide.properties.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/pgwide.properties.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/pgwide.properties.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/phrase.propagates.style.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/phrase.propagates.style.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/phrase.propagates.style.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/phrase.propagates.style.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/pixels.per.inch.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/pixels.per.inch.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/pixels.per.inch.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/pixels.per.inch.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/plus.image.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/plus.image.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/plus.image.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/plus.image.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/points.per.em.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/points.per.em.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/points.per.em.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/points.per.em.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/preface.autolabel.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/preface.autolabel.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/preface.autolabel.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/preface.autolabel.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/prefer.internal.olink.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/prefer.internal.olink.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/prefer.internal.olink.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/prefer.internal.olink.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/preferred.mediaobject.role.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/preferred.mediaobject.role.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/preferred.mediaobject.role.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/preferred.mediaobject.role.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/prev.image.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/prev.image.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/prev.image.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/prev.image.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/procedure.properties.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/procedure.properties.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/procedure.properties.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/procedure.properties.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/process.empty.source.toc.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/process.empty.source.toc.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/process.empty.source.toc.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/process.empty.source.toc.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/process.source.toc.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/process.source.toc.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/process.source.toc.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/process.source.toc.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/profile.arch.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/profile.arch.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/profile.arch.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/profile.arch.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/profile.attribute.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/profile.attribute.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/profile.attribute.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/profile.attribute.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/profile.audience.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/profile.audience.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/profile.audience.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/profile.audience.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/profile.condition.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/profile.condition.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/profile.condition.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/profile.condition.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/profile.conformance.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/profile.conformance.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/profile.conformance.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/profile.conformance.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/profile.lang.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/profile.lang.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/profile.lang.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/profile.lang.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/profile.os.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/profile.os.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/profile.os.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/profile.os.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/profile.revision.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/profile.revision.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/profile.revision.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/profile.revision.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/profile.revisionflag.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/profile.revisionflag.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/profile.revisionflag.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/profile.revisionflag.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/profile.role.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/profile.role.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/profile.role.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/profile.role.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/profile.security.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/profile.security.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/profile.security.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/profile.security.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/profile.separator.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/profile.separator.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/profile.separator.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/profile.separator.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/profile.status.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/profile.status.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/profile.status.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/profile.status.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/profile.userlevel.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/profile.userlevel.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/profile.userlevel.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/profile.userlevel.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/profile.value.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/profile.value.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/profile.value.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/profile.value.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/profile.vendor.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/profile.vendor.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/profile.vendor.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/profile.vendor.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/profile.wordsize.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/profile.wordsize.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/profile.wordsize.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/profile.wordsize.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/punct.honorific.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/punct.honorific.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/punct.honorific.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/punct.honorific.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/qanda.defaultlabel.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/qanda.defaultlabel.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/qanda.defaultlabel.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/qanda.defaultlabel.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/qanda.in.toc.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/qanda.in.toc.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/qanda.in.toc.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/qanda.in.toc.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/qanda.inherit.numeration.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/qanda.inherit.numeration.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/qanda.inherit.numeration.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/qanda.inherit.numeration.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/qanda.nested.in.toc.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/qanda.nested.in.toc.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/qanda.nested.in.toc.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/qanda.nested.in.toc.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/qanda.title.level1.properties.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/qanda.title.level1.properties.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/qanda.title.level1.properties.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/qanda.title.level1.properties.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/qanda.title.level2.properties.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/qanda.title.level2.properties.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/qanda.title.level2.properties.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/qanda.title.level2.properties.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/qanda.title.level3.properties.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/qanda.title.level3.properties.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/qanda.title.level3.properties.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/qanda.title.level3.properties.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/qanda.title.level4.properties.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/qanda.title.level4.properties.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/qanda.title.level4.properties.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/qanda.title.level4.properties.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/qanda.title.level5.properties.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/qanda.title.level5.properties.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/qanda.title.level5.properties.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/qanda.title.level5.properties.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/qanda.title.level6.properties.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/qanda.title.level6.properties.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/qanda.title.level6.properties.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/qanda.title.level6.properties.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/qanda.title.properties.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/qanda.title.properties.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/qanda.title.properties.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/qanda.title.properties.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/qandadiv.autolabel.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/qandadiv.autolabel.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/qandadiv.autolabel.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/qandadiv.autolabel.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refclass.suppress.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refclass.suppress.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refclass.suppress.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refclass.suppress.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refentry.date.profile.enabled.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refentry.date.profile.enabled.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refentry.date.profile.enabled.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refentry.date.profile.enabled.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refentry.date.profile.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refentry.date.profile.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refentry.date.profile.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refentry.date.profile.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refentry.generate.name.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refentry.generate.name.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refentry.generate.name.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refentry.generate.name.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refentry.generate.title.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refentry.generate.title.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refentry.generate.title.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refentry.generate.title.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refentry.manual.fallback.profile.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refentry.manual.fallback.profile.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refentry.manual.fallback.profile.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refentry.manual.fallback.profile.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refentry.manual.profile.enabled.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refentry.manual.profile.enabled.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refentry.manual.profile.enabled.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refentry.manual.profile.enabled.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refentry.manual.profile.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refentry.manual.profile.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refentry.manual.profile.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refentry.manual.profile.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refentry.meta.get.quietly.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refentry.meta.get.quietly.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refentry.meta.get.quietly.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refentry.meta.get.quietly.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refentry.pagebreak.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refentry.pagebreak.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refentry.pagebreak.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refentry.pagebreak.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refentry.separator.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refentry.separator.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refentry.separator.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refentry.separator.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refentry.source.fallback.profile.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refentry.source.fallback.profile.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refentry.source.fallback.profile.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refentry.source.fallback.profile.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refentry.source.name.profile.enabled.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refentry.source.name.profile.enabled.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refentry.source.name.profile.enabled.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refentry.source.name.profile.enabled.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refentry.source.name.profile.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refentry.source.name.profile.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refentry.source.name.profile.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refentry.source.name.profile.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refentry.source.name.suppress.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refentry.source.name.suppress.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refentry.source.name.suppress.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refentry.source.name.suppress.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refentry.title.properties.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refentry.title.properties.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refentry.title.properties.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refentry.title.properties.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refentry.version.profile.enabled.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refentry.version.profile.enabled.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refentry.version.profile.enabled.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refentry.version.profile.enabled.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refentry.version.profile.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refentry.version.profile.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refentry.version.profile.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refentry.version.profile.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refentry.version.suppress.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refentry.version.suppress.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refentry.version.suppress.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refentry.version.suppress.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refentry.xref.manvolnum.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refentry.xref.manvolnum.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refentry.xref.manvolnum.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refentry.xref.manvolnum.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/reference.autolabel.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/reference.autolabel.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/reference.autolabel.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/reference.autolabel.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/region.after.extent.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/region.after.extent.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/region.after.extent.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/region.after.extent.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/region.before.extent.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/region.before.extent.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/region.before.extent.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/region.before.extent.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/revhistory.table.cell.properties.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/revhistory.table.cell.properties.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/revhistory.table.cell.properties.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/revhistory.table.cell.properties.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/revhistory.table.properties.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/revhistory.table.properties.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/revhistory.table.properties.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/revhistory.table.properties.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/revhistory.title.properties.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/revhistory.title.properties.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/revhistory.title.properties.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/revhistory.title.properties.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/root.filename.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/root.filename.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/root.filename.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/root.filename.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/root.properties.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/root.properties.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/root.properties.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/root.properties.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/rootid.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/rootid.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/rootid.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/rootid.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/runinhead.default.title.end.punct.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/runinhead.default.title.end.punct.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/runinhead.default.title.end.punct.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/runinhead.default.title.end.punct.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/runinhead.title.end.punct.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/runinhead.title.end.punct.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/runinhead.title.end.punct.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/runinhead.title.end.punct.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/running.foot.properties.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/running.foot.properties.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/running.foot.properties.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/running.foot.properties.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/sans.font.family.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/sans.font.family.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/sans.font.family.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/sans.font.family.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/saxon.callouts.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/saxon.callouts.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/saxon.callouts.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/saxon.callouts.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/saxon.character.representation.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/saxon.character.representation.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/saxon.character.representation.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/saxon.character.representation.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/saxon.linenumbering.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/saxon.linenumbering.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/saxon.linenumbering.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/saxon.linenumbering.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/saxon.tablecolumns.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/saxon.tablecolumns.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/saxon.tablecolumns.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/saxon.tablecolumns.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/script.dir.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/script.dir.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/script.dir.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/script.dir.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/section.autolabel.max.depth.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/section.autolabel.max.depth.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/section.autolabel.max.depth.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/section.autolabel.max.depth.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/section.autolabel.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/section.autolabel.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/section.autolabel.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/section.autolabel.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/section.container.element.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/section.container.element.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/section.container.element.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/section.container.element.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/section.label.includes.component.label.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/section.label.includes.component.label.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/section.label.includes.component.label.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/section.label.includes.component.label.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/section.level1.properties.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/section.level1.properties.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/section.level1.properties.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/section.level1.properties.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/section.level2.properties.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/section.level2.properties.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/section.level2.properties.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/section.level2.properties.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/section.level3.properties.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/section.level3.properties.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/section.level3.properties.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/section.level3.properties.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/section.level4.properties.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/section.level4.properties.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/section.level4.properties.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/section.level4.properties.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/section.level5.properties.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/section.level5.properties.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/section.level5.properties.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/section.level5.properties.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/section.level6.properties.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/section.level6.properties.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/section.level6.properties.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/section.level6.properties.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/section.properties.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/section.properties.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/section.properties.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/section.properties.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/section.title.level1.properties.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/section.title.level1.properties.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/section.title.level1.properties.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/section.title.level1.properties.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/section.title.level2.properties.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/section.title.level2.properties.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/section.title.level2.properties.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/section.title.level2.properties.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/section.title.level3.properties.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/section.title.level3.properties.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/section.title.level3.properties.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/section.title.level3.properties.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/section.title.level4.properties.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/section.title.level4.properties.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/section.title.level4.properties.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/section.title.level4.properties.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/section.title.level5.properties.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/section.title.level5.properties.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/section.title.level5.properties.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/section.title.level5.properties.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/section.title.level6.properties.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/section.title.level6.properties.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/section.title.level6.properties.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/section.title.level6.properties.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/section.title.properties.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/section.title.properties.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/section.title.properties.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/section.title.properties.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/segmentedlist.as.table.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/segmentedlist.as.table.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/segmentedlist.as.table.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/segmentedlist.as.table.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/sequential.links.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/sequential.links.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/sequential.links.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/sequential.links.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/shade.verbatim.style.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/shade.verbatim.style.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/shade.verbatim.style.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/shade.verbatim.style.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/shade.verbatim.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/shade.verbatim.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/shade.verbatim.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/shade.verbatim.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/show.comments.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/show.comments.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/show.comments.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/show.comments.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/show.foil.number.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/show.foil.number.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/show.foil.number.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/show.foil.number.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/show.revisionflag.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/show.revisionflag.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/show.revisionflag.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/show.revisionflag.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/showtoc.image.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/showtoc.image.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/showtoc.image.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/showtoc.image.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/side.float.properties.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/side.float.properties.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/side.float.properties.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/side.float.properties.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/sidebar.float.type.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/sidebar.float.type.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/sidebar.float.type.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/sidebar.float.type.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/sidebar.float.width.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/sidebar.float.width.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/sidebar.float.width.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/sidebar.float.width.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/sidebar.properties.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/sidebar.properties.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/sidebar.properties.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/sidebar.properties.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/sidebar.title.properties.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/sidebar.title.properties.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/sidebar.title.properties.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/sidebar.title.properties.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/simplesect.in.toc.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/simplesect.in.toc.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/simplesect.in.toc.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/simplesect.in.toc.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/slide.font.family.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/slide.font.family.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/slide.font.family.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/slide.font.family.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/slide.title.font.family.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/slide.title.font.family.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/slide.title.font.family.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/slide.title.font.family.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/slides.js.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/slides.js.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/slides.js.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/slides.js.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/slides.properties.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/slides.properties.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/slides.properties.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/slides.properties.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/spacing.paras.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/spacing.paras.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/spacing.paras.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/spacing.paras.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/speakernote.properties.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/speakernote.properties.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/speakernote.properties.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/speakernote.properties.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/subscript.properties.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/subscript.properties.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/subscript.properties.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/subscript.properties.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/superscript.properties.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/superscript.properties.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/superscript.properties.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/superscript.properties.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/suppress.footer.navigation.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/suppress.footer.navigation.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/suppress.footer.navigation.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/suppress.footer.navigation.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/suppress.header.navigation.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/suppress.header.navigation.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/suppress.header.navigation.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/suppress.header.navigation.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/suppress.homepage.title.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/suppress.homepage.title.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/suppress.homepage.title.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/suppress.homepage.title.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/suppress.navigation.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/suppress.navigation.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/suppress.navigation.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/suppress.navigation.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/symbol.font.family.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/symbol.font.family.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/symbol.font.family.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/symbol.font.family.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/table.borders.with.css.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/table.borders.with.css.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/table.borders.with.css.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/table.borders.with.css.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/table.cell.border.color.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/table.cell.border.color.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/table.cell.border.color.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/table.cell.border.color.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/table.cell.border.style.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/table.cell.border.style.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/table.cell.border.style.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/table.cell.border.style.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/table.cell.border.thickness.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/table.cell.border.thickness.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/table.cell.border.thickness.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/table.cell.border.thickness.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/table.cell.padding.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/table.cell.padding.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/table.cell.padding.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/table.cell.padding.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/table.entry.padding.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/table.entry.padding.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/table.entry.padding.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/table.entry.padding.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/table.footnote.number.format.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/table.footnote.number.format.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/table.footnote.number.format.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/table.footnote.number.format.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/table.footnote.number.symbols.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/table.footnote.number.symbols.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/table.footnote.number.symbols.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/table.footnote.number.symbols.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/table.footnote.properties.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/table.footnote.properties.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/table.footnote.properties.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/table.footnote.properties.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/table.frame.border.color.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/table.frame.border.color.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/table.frame.border.color.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/table.frame.border.color.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/table.frame.border.style.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/table.frame.border.style.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/table.frame.border.style.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/table.frame.border.style.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/table.frame.border.thickness.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/table.frame.border.thickness.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/table.frame.border.thickness.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/table.frame.border.thickness.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/table.properties.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/table.properties.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/table.properties.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/table.properties.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/table.spacer.image.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/table.spacer.image.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/table.spacer.image.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/table.spacer.image.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/table.table.properties.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/table.table.properties.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/table.table.properties.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/table.table.properties.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/tablecolumns.extension.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/tablecolumns.extension.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/tablecolumns.extension.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/tablecolumns.extension.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/target.database.document.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/target.database.document.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/target.database.document.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/target.database.document.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/targets.filename.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/targets.filename.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/targets.filename.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/targets.filename.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/template.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/template.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/template.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/template.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/tex.math.delims.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/tex.math.delims.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/tex.math.delims.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/tex.math.delims.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/tex.math.file.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/tex.math.file.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/tex.math.file.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/tex.math.file.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/tex.math.in.alt.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/tex.math.in.alt.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/tex.math.in.alt.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/tex.math.in.alt.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/text.home.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/text.home.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/text.home.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/text.home.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/text.next.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/text.next.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/text.next.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/text.next.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/text.prev.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/text.prev.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/text.prev.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/text.prev.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/text.toc.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/text.toc.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/text.toc.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/text.toc.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/text.up.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/text.up.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/text.up.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/text.up.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/textbgcolor.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/textbgcolor.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/textbgcolor.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/textbgcolor.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/textdata.default.encoding.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/textdata.default.encoding.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/textdata.default.encoding.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/textdata.default.encoding.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/textinsert.extension.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/textinsert.extension.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/textinsert.extension.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/textinsert.extension.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/title.font.family.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/title.font.family.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/title.font.family.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/title.font.family.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/title.margin.left.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/title.margin.left.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/title.margin.left.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/title.margin.left.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/titlefoil.html.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/titlefoil.html.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/titlefoil.html.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/titlefoil.html.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.bg.color.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.bg.color.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.bg.color.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.bg.color.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.blank.graphic.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.blank.graphic.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.blank.graphic.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.blank.graphic.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.blank.image.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.blank.image.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.blank.image.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.blank.image.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.blank.text.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.blank.text.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.blank.text.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.blank.text.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.hide.show.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.hide.show.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.hide.show.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.hide.show.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.html.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.html.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.html.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.html.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.image.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.image.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.image.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.image.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.indent.width.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.indent.width.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.indent.width.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.indent.width.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.line.properties.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.line.properties.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.line.properties.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.line.properties.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.list.type.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.list.type.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.list.type.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.list.type.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.margin.properties.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.margin.properties.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.margin.properties.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.margin.properties.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.max.depth.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.max.depth.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.max.depth.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.max.depth.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.pointer.graphic.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.pointer.graphic.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.pointer.graphic.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.pointer.graphic.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.pointer.image.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.pointer.image.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.pointer.image.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.pointer.image.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.pointer.text.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.pointer.text.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.pointer.text.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.pointer.text.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.row.height.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.row.height.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.row.height.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.row.height.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.section.depth.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.section.depth.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.section.depth.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.section.depth.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.spacer.graphic.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.spacer.graphic.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.spacer.graphic.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.spacer.graphic.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.spacer.image.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.spacer.image.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.spacer.image.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.spacer.image.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.spacer.text.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.spacer.text.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.spacer.text.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.spacer.text.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.width.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.width.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.width.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.width.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/ua.js.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/ua.js.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/ua.js.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/ua.js.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/ulink.footnotes.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/ulink.footnotes.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/ulink.footnotes.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/ulink.footnotes.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/ulink.hyphenate.chars.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/ulink.hyphenate.chars.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/ulink.hyphenate.chars.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/ulink.hyphenate.chars.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/ulink.hyphenate.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/ulink.hyphenate.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/ulink.hyphenate.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/ulink.hyphenate.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/ulink.show.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/ulink.show.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/ulink.show.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/ulink.show.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/ulink.target.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/ulink.target.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/ulink.target.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/ulink.target.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/up.image.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/up.image.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/up.image.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/up.image.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/use.embed.for.svg.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/use.embed.for.svg.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/use.embed.for.svg.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/use.embed.for.svg.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/use.extensions.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/use.extensions.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/use.extensions.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/use.extensions.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/use.id.as.filename.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/use.id.as.filename.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/use.id.as.filename.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/use.id.as.filename.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/use.id.function.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/use.id.function.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/use.id.function.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/use.id.function.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/use.local.olink.style.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/use.local.olink.style.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/use.local.olink.style.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/use.local.olink.style.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/use.role.as.xrefstyle.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/use.role.as.xrefstyle.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/use.role.as.xrefstyle.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/use.role.as.xrefstyle.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/use.role.for.mediaobject.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/use.role.for.mediaobject.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/use.role.for.mediaobject.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/use.role.for.mediaobject.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/use.svg.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/use.svg.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/use.svg.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/use.svg.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/variablelist.as.blocks.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/variablelist.as.blocks.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/variablelist.as.blocks.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/variablelist.as.blocks.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/variablelist.as.table.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/variablelist.as.table.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/variablelist.as.table.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/variablelist.as.table.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/variablelist.max.termlength.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/variablelist.max.termlength.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/variablelist.max.termlength.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/variablelist.max.termlength.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/variablelist.term.break.after.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/variablelist.term.break.after.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/variablelist.term.break.after.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/variablelist.term.break.after.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/variablelist.term.properties.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/variablelist.term.properties.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/variablelist.term.properties.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/variablelist.term.properties.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/variablelist.term.separator.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/variablelist.term.separator.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/variablelist.term.separator.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/variablelist.term.separator.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/verbatim.properties.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/verbatim.properties.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/verbatim.properties.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/verbatim.properties.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/wordml.template.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/wordml.template.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/wordml.template.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/wordml.template.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/writing.mode.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/writing.mode.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/writing.mode.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/writing.mode.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/xbCollapsibleLists.js.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/xbCollapsibleLists.js.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/xbCollapsibleLists.js.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/xbCollapsibleLists.js.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/xbDOM.js.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/xbDOM.js.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/xbDOM.js.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/xbDOM.js.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/xbLibrary.js.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/xbLibrary.js.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/xbLibrary.js.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/xbLibrary.js.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/xbStyle.js.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/xbStyle.js.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/xbStyle.js.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/xbStyle.js.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/xep.extensions.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/xep.extensions.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/xep.extensions.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/xep.extensions.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/xep.index.item.properties.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/xep.index.item.properties.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/xep.index.item.properties.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/xep.index.item.properties.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/xref.label-page.separator.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/xref.label-page.separator.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/xref.label-page.separator.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/xref.label-page.separator.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/xref.label-title.separator.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/xref.label-title.separator.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/xref.label-title.separator.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/xref.label-title.separator.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/xref.properties.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/xref.properties.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/xref.properties.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/xref.properties.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/xref.title-page.separator.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/xref.title-page.separator.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/xref.title-page.separator.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/xref.title-page.separator.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/xref.with.number.and.title.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/xref.with.number.and.title.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/xref.with.number.and.title.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/params/xref.with.number.and.title.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/profiling/profile-mode.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/profiling/profile-mode.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/profiling/profile-mode.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/profiling/profile-mode.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/profiling/profile.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/profiling/profile.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/profiling/profile.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/profiling/profile.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/profiling/strip-attributes.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/profiling/strip-attributes.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/profiling/strip-attributes.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/profiling/strip-attributes.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/profiling/xsl2profile.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/profiling/xsl2profile.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/profiling/xsl2profile.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/profiling/xsl2profile.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/roundtrip/blocks-spec.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/roundtrip/blocks-spec.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/roundtrip/blocks-spec.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/roundtrip/blocks-spec.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/roundtrip/blocks2dbk.dtd b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/roundtrip/blocks2dbk.dtd similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/roundtrip/blocks2dbk.dtd rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/roundtrip/blocks2dbk.dtd diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/roundtrip/blocks2dbk.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/roundtrip/blocks2dbk.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/roundtrip/blocks2dbk.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/roundtrip/blocks2dbk.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/roundtrip/dbk2ooo.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/roundtrip/dbk2ooo.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/roundtrip/dbk2ooo.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/roundtrip/dbk2ooo.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/roundtrip/dbk2pages.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/roundtrip/dbk2pages.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/roundtrip/dbk2pages.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/roundtrip/dbk2pages.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/roundtrip/dbk2wordml.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/roundtrip/dbk2wordml.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/roundtrip/dbk2wordml.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/roundtrip/dbk2wordml.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/roundtrip/dbk2wp.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/roundtrip/dbk2wp.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/roundtrip/dbk2wp.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/roundtrip/dbk2wp.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/roundtrip/normalise-common.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/roundtrip/normalise-common.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/roundtrip/normalise-common.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/roundtrip/normalise-common.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/roundtrip/normalise2sections.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/roundtrip/normalise2sections.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/roundtrip/normalise2sections.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/roundtrip/normalise2sections.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/roundtrip/pages2normalise.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/roundtrip/pages2normalise.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/roundtrip/pages2normalise.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/roundtrip/pages2normalise.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/roundtrip/param.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/roundtrip/param.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/roundtrip/param.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/roundtrip/param.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/roundtrip/param.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/roundtrip/param.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/roundtrip/param.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/roundtrip/param.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/roundtrip/sections-spec.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/roundtrip/sections-spec.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/roundtrip/sections-spec.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/roundtrip/sections-spec.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/roundtrip/sections2blocks.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/roundtrip/sections2blocks.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/roundtrip/sections2blocks.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/roundtrip/sections2blocks.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/roundtrip/specifications.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/roundtrip/specifications.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/roundtrip/specifications.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/roundtrip/specifications.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/roundtrip/template-pages.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/roundtrip/template-pages.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/roundtrip/template-pages.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/roundtrip/template-pages.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/roundtrip/template.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/roundtrip/template.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/roundtrip/template.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/roundtrip/template.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/roundtrip/wordml2normalise.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/roundtrip/wordml2normalise.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/roundtrip/wordml2normalise.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/roundtrip/wordml2normalise.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/browser/CTOCWidget.js b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/browser/CTOCWidget.js similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/browser/CTOCWidget.js rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/browser/CTOCWidget.js diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/browser/overlay.js b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/browser/overlay.js similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/browser/overlay.js rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/browser/overlay.js diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/browser/slides-default.css b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/browser/slides-default.css similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/browser/slides-default.css rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/browser/slides-default.css diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/browser/slides-frames.css b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/browser/slides-frames.css similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/browser/slides-frames.css rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/browser/slides-frames.css diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/browser/slides-plain.css b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/browser/slides-plain.css similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/browser/slides-plain.css rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/browser/slides-plain.css diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/browser/slides-table.css b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/browser/slides-table.css similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/browser/slides-table.css rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/browser/slides-table.css diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/browser/slides-w3c.css b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/browser/slides-w3c.css similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/browser/slides-w3c.css rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/browser/slides-w3c.css diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/browser/slides.css b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/browser/slides.css similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/browser/slides.css rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/browser/slides.css diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/browser/slides.js b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/browser/slides.js similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/browser/slides.js rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/browser/slides.js diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/browser/ua.js b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/browser/ua.js similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/browser/ua.js rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/browser/ua.js diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/browser/xbCollapsibleLists.js b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/browser/xbCollapsibleLists.js similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/browser/xbCollapsibleLists.js rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/browser/xbCollapsibleLists.js diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/browser/xbDOM.js b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/browser/xbDOM.js similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/browser/xbDOM.js rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/browser/xbDOM.js diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/browser/xbDebug.js b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/browser/xbDebug.js similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/browser/xbDebug.js rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/browser/xbDebug.js diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/browser/xbLibrary.js b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/browser/xbLibrary.js similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/browser/xbLibrary.js rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/browser/xbLibrary.js diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/browser/xbStyle-css.js b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/browser/xbStyle-css.js similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/browser/xbStyle-css.js rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/browser/xbStyle-css.js diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/browser/xbStyle-nn4.js b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/browser/xbStyle-nn4.js similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/browser/xbStyle-nn4.js rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/browser/xbStyle-nn4.js diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/browser/xbStyle-not-supported.js b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/browser/xbStyle-not-supported.js similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/browser/xbStyle-not-supported.js rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/browser/xbStyle-not-supported.js diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/browser/xbStyle.js b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/browser/xbStyle.js similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/browser/xbStyle.js rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/browser/xbStyle.js diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/fo/param.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/fo/param.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/fo/param.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/fo/param.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/fo/param.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/fo/param.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/fo/param.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/fo/param.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/fo/plain-titlepage.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/fo/plain-titlepage.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/fo/plain-titlepage.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/fo/plain-titlepage.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/fo/plain-titlepage.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/fo/plain-titlepage.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/fo/plain-titlepage.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/fo/plain-titlepage.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/fo/plain.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/fo/plain.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/fo/plain.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/fo/plain.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/html/css.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/html/css.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/html/css.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/html/css.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/html/default.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/html/default.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/html/default.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/html/default.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/html/flat.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/html/flat.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/html/flat.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/html/flat.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/html/frames.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/html/frames.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/html/frames.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/html/frames.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/html/graphics.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/html/graphics.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/html/graphics.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/html/graphics.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/html/jscript.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/html/jscript.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/html/jscript.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/html/jscript.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/html/param.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/html/param.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/html/param.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/html/param.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/html/param.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/html/param.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/html/param.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/html/param.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/html/plain.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/html/plain.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/html/plain.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/html/plain.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/html/slides-common.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/html/slides-common.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/html/slides-common.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/html/slides-common.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/html/tables.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/html/tables.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/html/tables.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/html/tables.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/html/vslides.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/html/vslides.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/html/vslides.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/html/vslides.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/html/w3c.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/html/w3c.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/html/w3c.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/html/w3c.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/htmlhelp/htmlhelp.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/htmlhelp/htmlhelp.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/htmlhelp/htmlhelp.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/htmlhelp/htmlhelp.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/keynote/default.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/keynote/default.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/keynote/default.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/keynote/default.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/keynote/xsltsl/cmp.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/keynote/xsltsl/cmp.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/keynote/xsltsl/cmp.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/keynote/xsltsl/cmp.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/keynote/xsltsl/date-time.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/keynote/xsltsl/date-time.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/keynote/xsltsl/date-time.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/keynote/xsltsl/date-time.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/keynote/xsltsl/example.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/keynote/xsltsl/example.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/keynote/xsltsl/example.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/keynote/xsltsl/example.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/keynote/xsltsl/markup.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/keynote/xsltsl/markup.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/keynote/xsltsl/markup.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/keynote/xsltsl/markup.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/keynote/xsltsl/math.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/keynote/xsltsl/math.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/keynote/xsltsl/math.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/keynote/xsltsl/math.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/keynote/xsltsl/node.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/keynote/xsltsl/node.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/keynote/xsltsl/node.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/keynote/xsltsl/node.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/keynote/xsltsl/stdlib.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/keynote/xsltsl/stdlib.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/keynote/xsltsl/stdlib.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/keynote/xsltsl/stdlib.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/keynote/xsltsl/string.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/keynote/xsltsl/string.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/keynote/xsltsl/string.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/keynote/xsltsl/string.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/keynote/xsltsl/svg.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/keynote/xsltsl/svg.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/keynote/xsltsl/svg.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/keynote/xsltsl/svg.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/keynote/xsltsl/uri.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/keynote/xsltsl/uri.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/keynote/xsltsl/uri.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/keynote/xsltsl/uri.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/svg/default.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/svg/default.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/svg/default.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/svg/default.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/xhtml/css.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/xhtml/css.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/xhtml/css.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/xhtml/css.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/xhtml/default.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/xhtml/default.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/xhtml/default.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/xhtml/default.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/xhtml/flat.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/xhtml/flat.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/xhtml/flat.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/xhtml/flat.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/xhtml/frames.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/xhtml/frames.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/xhtml/frames.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/xhtml/frames.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/xhtml/graphics.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/xhtml/graphics.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/xhtml/graphics.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/xhtml/graphics.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/xhtml/jscript.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/xhtml/jscript.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/xhtml/jscript.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/xhtml/jscript.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/xhtml/param.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/xhtml/param.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/xhtml/param.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/xhtml/param.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/xhtml/plain.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/xhtml/plain.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/xhtml/plain.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/xhtml/plain.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/xhtml/slides-common.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/xhtml/slides-common.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/xhtml/slides-common.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/xhtml/slides-common.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/xhtml/tables.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/xhtml/tables.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/xhtml/tables.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/xhtml/tables.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/xhtml/vslides.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/xhtml/vslides.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/xhtml/vslides.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/xhtml/vslides.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/xhtml/w3c.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/xhtml/w3c.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/xhtml/w3c.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/xhtml/w3c.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/template/titlepage.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/template/titlepage.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/template/titlepage.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/template/titlepage.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/template/titlepage.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/template/titlepage.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/template/titlepage.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/template/titlepage.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/tests/refentry.007.ns.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/tests/refentry.007.ns.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/tests/refentry.007.ns.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/tests/refentry.007.ns.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/tests/refentry.007.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/tests/refentry.007.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/tests/refentry.007.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/tests/refentry.007.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/tools/bin/docbook-xsl-update b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/tools/bin/docbook-xsl-update similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/tools/bin/docbook-xsl-update rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/tools/bin/docbook-xsl-update diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/tools/make/Makefile.DocBook b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/tools/make/Makefile.DocBook similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/tools/make/Makefile.DocBook rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/tools/make/Makefile.DocBook diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/tools/make/Makefile.combine b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/tools/make/Makefile.combine similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/tools/make/Makefile.combine rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/tools/make/Makefile.combine diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/tools/make/Makefile.docParam b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/tools/make/Makefile.docParam similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/tools/make/Makefile.docParam rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/tools/make/Makefile.docParam diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/LICENSE b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/LICENSE similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/LICENSE rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/LICENSE diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/common/css/positioning.css b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/common/css/positioning.css similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/common/css/positioning.css rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/common/css/positioning.css diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/common/jquery/jquery-1.4.2.min.js b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/common/jquery/jquery-1.4.2.min.js similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/common/jquery/jquery-1.4.2.min.js rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/common/jquery/jquery-1.4.2.min.js diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/common/jquery/jquery-ui-1.8.2.custom.min.js b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/common/jquery/jquery-ui-1.8.2.custom.min.js similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/common/jquery/jquery-ui-1.8.2.custom.min.js rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/common/jquery/jquery-ui-1.8.2.custom.min.js diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/common/jquery/jquery.cookie.js b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/common/jquery/jquery.cookie.js similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/common/jquery/jquery.cookie.js rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/common/jquery/jquery.cookie.js diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/common/jquery/theme-redmond/jquery-ui-1.8.2.custom.css b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/common/jquery/theme-redmond/jquery-ui-1.8.2.custom.css similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/common/jquery/theme-redmond/jquery-ui-1.8.2.custom.css rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/common/jquery/theme-redmond/jquery-ui-1.8.2.custom.css diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/common/jquery/treeview/jquery.treeview.async.js b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/common/jquery/treeview/jquery.treeview.async.js similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/common/jquery/treeview/jquery.treeview.async.js rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/common/jquery/treeview/jquery.treeview.async.js diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/common/jquery/treeview/jquery.treeview.css b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/common/jquery/treeview/jquery.treeview.css similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/common/jquery/treeview/jquery.treeview.css rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/common/jquery/treeview/jquery.treeview.css diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/common/jquery/treeview/jquery.treeview.js b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/common/jquery/treeview/jquery.treeview.js similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/common/jquery/treeview/jquery.treeview.js rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/common/jquery/treeview/jquery.treeview.js diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/common/jquery/treeview/jquery.treeview.min.js b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/common/jquery/treeview/jquery.treeview.min.js similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/common/jquery/treeview/jquery.treeview.min.js rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/common/jquery/treeview/jquery.treeview.min.js diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/common/jquery/treeview/jquery.treeview.pack.js b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/common/jquery/treeview/jquery.treeview.pack.js similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/common/jquery/treeview/jquery.treeview.pack.js rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/common/jquery/treeview/jquery.treeview.pack.js diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/common/main.js b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/common/main.js similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/common/main.js rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/common/main.js diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/content/ch01.html b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/content/ch01.html similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/content/ch01.html rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/content/ch01.html diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/content/ch02.html b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/content/ch02.html similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/content/ch02.html rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/content/ch02.html diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/content/ch02s01.html b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/content/ch02s01.html similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/content/ch02s01.html rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/content/ch02s01.html diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/content/ch02s02.html b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/content/ch02s02.html similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/content/ch02s02.html rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/content/ch02s02.html diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/content/ch02s03.html b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/content/ch02s03.html similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/content/ch02s03.html rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/content/ch02s03.html diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/content/ch02s04.html b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/content/ch02s04.html similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/content/ch02s04.html rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/content/ch02s04.html diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/content/ch03.html b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/content/ch03.html similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/content/ch03.html rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/content/ch03.html diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/content/ch03s01.html b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/content/ch03s01.html similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/content/ch03s01.html rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/content/ch03s01.html diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/content/ch03s02.html b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/content/ch03s02.html similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/content/ch03s02.html rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/content/ch03s02.html diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/content/index.html b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/content/index.html similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/content/index.html rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/content/index.html diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/content/search/htmlFileInfoList.js b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/content/search/htmlFileInfoList.js similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/content/search/htmlFileInfoList.js rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/content/search/htmlFileInfoList.js diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/content/search/htmlFileList.js b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/content/search/htmlFileList.js similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/content/search/htmlFileList.js rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/content/search/htmlFileList.js diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/content/search/index-1.js b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/content/search/index-1.js similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/content/search/index-1.js rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/content/search/index-1.js diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/content/search/index-2.js b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/content/search/index-2.js similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/content/search/index-2.js rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/content/search/index-2.js diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/content/search/index-3.js b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/content/search/index-3.js similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/content/search/index-3.js rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/content/search/index-3.js diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/content/search/nwSearchFnt.js b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/content/search/nwSearchFnt.js similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/content/search/nwSearchFnt.js rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/content/search/nwSearchFnt.js diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/content/search/stemmers/en_stemmer.js b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/content/search/stemmers/en_stemmer.js similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/content/search/stemmers/en_stemmer.js rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/content/search/stemmers/en_stemmer.js diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/index.html b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/index.html similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/index.html rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/index.html diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docsrc/readme.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docsrc/readme.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docsrc/readme.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docsrc/readme.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/template/common/css/positioning.css b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/template/common/css/positioning.css similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/template/common/css/positioning.css rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/template/common/css/positioning.css diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/template/common/jquery/jquery-1.4.2.min.js b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/template/common/jquery/jquery-1.4.2.min.js similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/template/common/jquery/jquery-1.4.2.min.js rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/template/common/jquery/jquery-1.4.2.min.js diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/template/common/jquery/jquery-ui-1.8.2.custom.min.js b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/template/common/jquery/jquery-ui-1.8.2.custom.min.js similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/template/common/jquery/jquery-ui-1.8.2.custom.min.js rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/template/common/jquery/jquery-ui-1.8.2.custom.min.js diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/template/common/jquery/jquery.cookie.js b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/template/common/jquery/jquery.cookie.js similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/template/common/jquery/jquery.cookie.js rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/template/common/jquery/jquery.cookie.js diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/template/common/jquery/theme-redmond/jquery-ui-1.8.2.custom.css b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/template/common/jquery/theme-redmond/jquery-ui-1.8.2.custom.css similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/template/common/jquery/theme-redmond/jquery-ui-1.8.2.custom.css rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/template/common/jquery/theme-redmond/jquery-ui-1.8.2.custom.css diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/template/common/jquery/treeview/jquery.treeview.async.js b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/template/common/jquery/treeview/jquery.treeview.async.js similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/template/common/jquery/treeview/jquery.treeview.async.js rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/template/common/jquery/treeview/jquery.treeview.async.js diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/template/common/jquery/treeview/jquery.treeview.css b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/template/common/jquery/treeview/jquery.treeview.css similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/template/common/jquery/treeview/jquery.treeview.css rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/template/common/jquery/treeview/jquery.treeview.css diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/template/common/jquery/treeview/jquery.treeview.js b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/template/common/jquery/treeview/jquery.treeview.js similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/template/common/jquery/treeview/jquery.treeview.js rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/template/common/jquery/treeview/jquery.treeview.js diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/template/common/jquery/treeview/jquery.treeview.min.js b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/template/common/jquery/treeview/jquery.treeview.min.js similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/template/common/jquery/treeview/jquery.treeview.min.js rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/template/common/jquery/treeview/jquery.treeview.min.js diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/template/common/jquery/treeview/jquery.treeview.pack.js b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/template/common/jquery/treeview/jquery.treeview.pack.js similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/template/common/jquery/treeview/jquery.treeview.pack.js rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/template/common/jquery/treeview/jquery.treeview.pack.js diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/template/common/main.js b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/template/common/main.js similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/template/common/main.js rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/template/common/main.js diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/template/content/search/default.props b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/template/content/search/default.props similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/template/content/search/default.props rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/template/content/search/default.props diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/template/content/search/en-us.props b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/template/content/search/en-us.props similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/template/content/search/en-us.props rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/template/content/search/en-us.props diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/template/content/search/es-es.props b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/template/content/search/es-es.props similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/template/content/search/es-es.props rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/template/content/search/es-es.props diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/template/content/search/ja-jp.props b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/template/content/search/ja-jp.props similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/template/content/search/ja-jp.props rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/template/content/search/ja-jp.props diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/template/content/search/nwSearchFnt.js b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/template/content/search/nwSearchFnt.js similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/template/content/search/nwSearchFnt.js rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/template/content/search/nwSearchFnt.js diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/template/content/search/punctuation.props b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/template/content/search/punctuation.props similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/template/content/search/punctuation.props rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/template/content/search/punctuation.props diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/template/content/search/stemmers/de_stemmer.js b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/template/content/search/stemmers/de_stemmer.js similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/template/content/search/stemmers/de_stemmer.js rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/template/content/search/stemmers/de_stemmer.js diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/template/content/search/stemmers/en_stemmer.js b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/template/content/search/stemmers/en_stemmer.js similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/template/content/search/stemmers/en_stemmer.js rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/template/content/search/stemmers/en_stemmer.js diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/template/content/search/stemmers/fr_stemmer.js b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/template/content/search/stemmers/fr_stemmer.js similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/template/content/search/stemmers/fr_stemmer.js rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/template/content/search/stemmers/fr_stemmer.js diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/xsl/webhelp.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/xsl/webhelp.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/xsl/webhelp.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/xsl/webhelp.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/website/autolayout.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/website/autolayout.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/website/autolayout.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/website/autolayout.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/website/chunk-common.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/website/chunk-common.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/website/chunk-common.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/website/chunk-common.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/website/chunk-tabular.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/website/chunk-tabular.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/website/chunk-tabular.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/website/chunk-tabular.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/website/chunk-website.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/website/chunk-website.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/website/chunk-website.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/website/chunk-website.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/website/head.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/website/head.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/website/head.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/website/head.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/website/makefile-dep.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/website/makefile-dep.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/website/makefile-dep.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/website/makefile-dep.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/website/olink.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/website/olink.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/website/olink.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/website/olink.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/website/param.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/website/param.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/website/param.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/website/param.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/website/param.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/website/param.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/website/param.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/website/param.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/website/rss.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/website/rss.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/website/rss.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/website/rss.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/website/tabular.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/website/tabular.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/website/tabular.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/website/tabular.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/website/toc-tabular.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/website/toc-tabular.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/website/toc-tabular.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/website/toc-tabular.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/website/toc.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/website/toc.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/website/toc.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/website/toc.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/website/website-common.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/website/website-common.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/website/website-common.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/website/website-common.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/website/website-targets.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/website/website-targets.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/website/website-targets.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/website/website-targets.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/website/website.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/website/website.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/website/website.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/website/website.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/website/xbel.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/website/xbel.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/website/xbel.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/website/xbel.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/admon.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/admon.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/admon.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/admon.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/annotations.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/annotations.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/annotations.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/annotations.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/autoidx-kimber.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/autoidx-kimber.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/autoidx-kimber.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/autoidx-kimber.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/autoidx-kosek.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/autoidx-kosek.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/autoidx-kosek.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/autoidx-kosek.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/autoidx-ng.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/autoidx-ng.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/autoidx-ng.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/autoidx-ng.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/autoidx.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/autoidx.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/autoidx.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/autoidx.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/autotoc.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/autotoc.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/autotoc.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/autotoc.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/biblio-iso690.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/biblio-iso690.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/biblio-iso690.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/biblio-iso690.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/biblio.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/biblio.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/biblio.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/biblio.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/block.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/block.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/block.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/block.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/callout.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/callout.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/callout.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/callout.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/changebars.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/changebars.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/changebars.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/changebars.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/chunk-changebars.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/chunk-changebars.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/chunk-changebars.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/chunk-changebars.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/chunk-code.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/chunk-code.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/chunk-code.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/chunk-code.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/chunk-common.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/chunk-common.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/chunk-common.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/chunk-common.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/chunk.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/chunk.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/chunk.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/chunk.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/chunker.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/chunker.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/chunker.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/chunker.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/chunkfast.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/chunkfast.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/chunkfast.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/chunkfast.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/chunktoc.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/chunktoc.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/chunktoc.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/chunktoc.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/component.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/component.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/component.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/component.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/division.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/division.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/division.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/division.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/docbook.css.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/docbook.css.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/docbook.css.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/docbook.css.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/docbook.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/docbook.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/docbook.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/docbook.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/ebnf.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/ebnf.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/ebnf.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/ebnf.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/footnote.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/footnote.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/footnote.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/footnote.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/formal.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/formal.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/formal.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/formal.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/glossary.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/glossary.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/glossary.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/glossary.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/graphics.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/graphics.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/graphics.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/graphics.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/highlight.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/highlight.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/highlight.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/highlight.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/html-rtf.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/html-rtf.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/html-rtf.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/html-rtf.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/html.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/html.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/html.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/html.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/htmltbl.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/htmltbl.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/htmltbl.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/htmltbl.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/index.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/index.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/index.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/index.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/info.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/info.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/info.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/info.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/inline.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/inline.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/inline.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/inline.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/keywords.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/keywords.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/keywords.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/keywords.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/lists.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/lists.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/lists.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/lists.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/maketoc.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/maketoc.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/maketoc.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/maketoc.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/manifest.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/manifest.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/manifest.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/manifest.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/math.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/math.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/math.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/math.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/oldchunker.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/oldchunker.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/oldchunker.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/oldchunker.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/onechunk.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/onechunk.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/onechunk.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/onechunk.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/param.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/param.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/param.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/param.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/pi.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/pi.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/pi.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/pi.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/profile-chunk-code.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/profile-chunk-code.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/profile-chunk-code.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/profile-chunk-code.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/profile-chunk.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/profile-chunk.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/profile-chunk.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/profile-chunk.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/profile-docbook.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/profile-docbook.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/profile-docbook.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/profile-docbook.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/profile-onechunk.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/profile-onechunk.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/profile-onechunk.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/profile-onechunk.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/qandaset.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/qandaset.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/qandaset.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/qandaset.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/refentry.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/refentry.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/refentry.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/refentry.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/sections.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/sections.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/sections.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/sections.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/synop.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/synop.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/synop.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/synop.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/table.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/table.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/table.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/table.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/task.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/task.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/task.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/task.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/titlepage.templates.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/titlepage.templates.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/titlepage.templates.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/titlepage.templates.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/titlepage.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/titlepage.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/titlepage.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/titlepage.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/toc.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/toc.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/toc.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/toc.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/verbatim.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/verbatim.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/verbatim.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/verbatim.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/xref.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/xref.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/xref.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/xref.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/admon.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/admon.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/admon.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/admon.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/annotations.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/annotations.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/annotations.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/annotations.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/autoidx-kimber.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/autoidx-kimber.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/autoidx-kimber.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/autoidx-kimber.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/autoidx-kosek.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/autoidx-kosek.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/autoidx-kosek.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/autoidx-kosek.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/autoidx-ng.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/autoidx-ng.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/autoidx-ng.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/autoidx-ng.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/autoidx.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/autoidx.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/autoidx.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/autoidx.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/autotoc.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/autotoc.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/autotoc.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/autotoc.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/biblio-iso690.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/biblio-iso690.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/biblio-iso690.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/biblio-iso690.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/biblio.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/biblio.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/biblio.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/biblio.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/block.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/block.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/block.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/block.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/callout.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/callout.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/callout.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/callout.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/changebars.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/changebars.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/changebars.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/changebars.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/chunk-changebars.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/chunk-changebars.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/chunk-changebars.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/chunk-changebars.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/chunk-code.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/chunk-code.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/chunk-code.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/chunk-code.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/chunk-common.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/chunk-common.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/chunk-common.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/chunk-common.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/chunk.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/chunk.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/chunk.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/chunk.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/chunker.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/chunker.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/chunker.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/chunker.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/chunkfast.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/chunkfast.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/chunkfast.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/chunkfast.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/chunktoc.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/chunktoc.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/chunktoc.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/chunktoc.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/component.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/component.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/component.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/component.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/division.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/division.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/division.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/division.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/docbook.css.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/docbook.css.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/docbook.css.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/docbook.css.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/docbook.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/docbook.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/docbook.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/docbook.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/ebnf.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/ebnf.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/ebnf.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/ebnf.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/footnote.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/footnote.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/footnote.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/footnote.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/formal.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/formal.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/formal.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/formal.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/glossary.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/glossary.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/glossary.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/glossary.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/graphics.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/graphics.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/graphics.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/graphics.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/highlight.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/highlight.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/highlight.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/highlight.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/html-rtf.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/html-rtf.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/html-rtf.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/html-rtf.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/html.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/html.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/html.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/html.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/htmltbl.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/htmltbl.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/htmltbl.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/htmltbl.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/index.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/index.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/index.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/index.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/info.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/info.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/info.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/info.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/inline.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/inline.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/inline.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/inline.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/keywords.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/keywords.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/keywords.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/keywords.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/lists.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/lists.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/lists.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/lists.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/maketoc.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/maketoc.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/maketoc.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/maketoc.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/manifest.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/manifest.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/manifest.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/manifest.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/math.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/math.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/math.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/math.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/oldchunker.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/oldchunker.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/oldchunker.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/oldchunker.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/onechunk.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/onechunk.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/onechunk.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/onechunk.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/param.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/param.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/param.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/param.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/pi.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/pi.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/pi.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/pi.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/profile-chunk-code.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/profile-chunk-code.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/profile-chunk-code.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/profile-chunk-code.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/profile-chunk.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/profile-chunk.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/profile-chunk.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/profile-chunk.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/profile-docbook.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/profile-docbook.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/profile-docbook.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/profile-docbook.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/profile-onechunk.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/profile-onechunk.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/profile-onechunk.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/profile-onechunk.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/qandaset.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/qandaset.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/qandaset.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/qandaset.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/refentry.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/refentry.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/refentry.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/refentry.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/sections.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/sections.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/sections.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/sections.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/synop.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/synop.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/synop.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/synop.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/table.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/table.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/table.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/table.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/task.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/task.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/task.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/task.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/titlepage.templates.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/titlepage.templates.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/titlepage.templates.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/titlepage.templates.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/titlepage.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/titlepage.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/titlepage.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/titlepage.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/toc.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/toc.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/toc.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/toc.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/verbatim.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/verbatim.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/verbatim.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/verbatim.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/xref.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/xref.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/xref.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/xref.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook.xml similarity index 98% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docbook.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docbook.xml index c367520ae..79d2aead7 100644 --- a/scons/scons-local-4.7.0/SCons/Tool/docbook/docbook.xml +++ b/scons/scons-local-4.8.0/SCons/Tool/docbook/docbook.xml @@ -1,11 +1,10 @@ -This tool tries to make working with Docbook in SCons a little easier. +This tool tries to make working with Docbook in &SCons; a little easier. It provides several toolchains for creating different output formats, like HTML or PDF. Contained in the package is a distribution of the Docbook XSL stylesheets as of version 1.76.1. diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docs/SConstruct b/scons/scons-local-4.8.0/SCons/Tool/docbook/docs/SConstruct similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docs/SConstruct rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docs/SConstruct diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docs/html.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docs/html.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docs/html.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docs/html.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docs/manual.xml b/scons/scons-local-4.8.0/SCons/Tool/docbook/docs/manual.xml similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docs/manual.xml rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docs/manual.xml diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/docs/pdf.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/docs/pdf.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/docs/pdf.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/docs/pdf.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/docbook/utils/xmldepend.xsl b/scons/scons-local-4.8.0/SCons/Tool/docbook/utils/xmldepend.xsl similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/docbook/utils/xmldepend.xsl rename to scons/scons-local-4.8.0/SCons/Tool/docbook/utils/xmldepend.xsl diff --git a/scons/scons-local-4.7.0/SCons/Tool/dvi.py b/scons/scons-local-4.8.0/SCons/Tool/dvi.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/dvi.py rename to scons/scons-local-4.8.0/SCons/Tool/dvi.py diff --git a/scons/scons-local-4.7.0/SCons/Tool/dvipdf.py b/scons/scons-local-4.8.0/SCons/Tool/dvipdf.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/dvipdf.py rename to scons/scons-local-4.8.0/SCons/Tool/dvipdf.py diff --git a/scons/scons-local-4.7.0/SCons/Tool/dvips.py b/scons/scons-local-4.8.0/SCons/Tool/dvips.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/dvips.py rename to scons/scons-local-4.8.0/SCons/Tool/dvips.py diff --git a/scons/scons-local-4.7.0/SCons/Tool/f03.py b/scons/scons-local-4.8.0/SCons/Tool/f03.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/f03.py rename to scons/scons-local-4.8.0/SCons/Tool/f03.py diff --git a/scons/scons-local-4.7.0/SCons/Tool/f08.py b/scons/scons-local-4.8.0/SCons/Tool/f08.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/f08.py rename to scons/scons-local-4.8.0/SCons/Tool/f08.py diff --git a/scons/scons-local-4.7.0/SCons/Tool/f77.py b/scons/scons-local-4.8.0/SCons/Tool/f77.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/f77.py rename to scons/scons-local-4.8.0/SCons/Tool/f77.py diff --git a/scons/scons-local-4.7.0/SCons/Tool/f90.py b/scons/scons-local-4.8.0/SCons/Tool/f90.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/f90.py rename to scons/scons-local-4.8.0/SCons/Tool/f90.py diff --git a/scons/scons-local-4.7.0/SCons/Tool/f95.py b/scons/scons-local-4.8.0/SCons/Tool/f95.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/f95.py rename to scons/scons-local-4.8.0/SCons/Tool/f95.py diff --git a/scons/scons-local-4.7.0/SCons/Tool/filesystem.py b/scons/scons-local-4.8.0/SCons/Tool/filesystem.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/filesystem.py rename to scons/scons-local-4.8.0/SCons/Tool/filesystem.py diff --git a/scons/scons-local-4.7.0/SCons/Tool/fortran.py b/scons/scons-local-4.8.0/SCons/Tool/fortran.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/fortran.py rename to scons/scons-local-4.8.0/SCons/Tool/fortran.py diff --git a/scons/scons-local-4.7.0/SCons/Tool/g++.py b/scons/scons-local-4.8.0/SCons/Tool/g++.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/g++.py rename to scons/scons-local-4.8.0/SCons/Tool/g++.py diff --git a/scons/scons-local-4.7.0/SCons/Tool/g77.py b/scons/scons-local-4.8.0/SCons/Tool/g77.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/g77.py rename to scons/scons-local-4.8.0/SCons/Tool/g77.py diff --git a/scons/scons-local-4.7.0/SCons/Tool/gas.py b/scons/scons-local-4.8.0/SCons/Tool/gas.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/gas.py rename to scons/scons-local-4.8.0/SCons/Tool/gas.py diff --git a/scons/scons-local-4.7.0/SCons/Tool/gcc.py b/scons/scons-local-4.8.0/SCons/Tool/gcc.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/gcc.py rename to scons/scons-local-4.8.0/SCons/Tool/gcc.py diff --git a/scons/scons-local-4.7.0/SCons/Tool/gdc.py b/scons/scons-local-4.8.0/SCons/Tool/gdc.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/gdc.py rename to scons/scons-local-4.8.0/SCons/Tool/gdc.py diff --git a/scons/scons-local-4.7.0/SCons/Tool/gettext_tool.py b/scons/scons-local-4.8.0/SCons/Tool/gettext_tool.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/gettext_tool.py rename to scons/scons-local-4.8.0/SCons/Tool/gettext_tool.py diff --git a/scons/scons-local-4.7.0/SCons/Tool/gfortran.py b/scons/scons-local-4.8.0/SCons/Tool/gfortran.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/gfortran.py rename to scons/scons-local-4.8.0/SCons/Tool/gfortran.py diff --git a/scons/scons-local-4.7.0/SCons/Tool/gnulink.py b/scons/scons-local-4.8.0/SCons/Tool/gnulink.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/gnulink.py rename to scons/scons-local-4.8.0/SCons/Tool/gnulink.py diff --git a/scons/scons-local-4.7.0/SCons/Tool/gs.py b/scons/scons-local-4.8.0/SCons/Tool/gs.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/gs.py rename to scons/scons-local-4.8.0/SCons/Tool/gs.py diff --git a/scons/scons-local-4.7.0/SCons/Tool/gxx.py b/scons/scons-local-4.8.0/SCons/Tool/gxx.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/gxx.py rename to scons/scons-local-4.8.0/SCons/Tool/gxx.py diff --git a/scons/scons-local-4.7.0/SCons/Tool/hpc++.py b/scons/scons-local-4.8.0/SCons/Tool/hpc++.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/hpc++.py rename to scons/scons-local-4.8.0/SCons/Tool/hpc++.py diff --git a/scons/scons-local-4.7.0/SCons/Tool/hpcc.py b/scons/scons-local-4.8.0/SCons/Tool/hpcc.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/hpcc.py rename to scons/scons-local-4.8.0/SCons/Tool/hpcc.py diff --git a/scons/scons-local-4.7.0/SCons/Tool/hpcxx.py b/scons/scons-local-4.8.0/SCons/Tool/hpcxx.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/hpcxx.py rename to scons/scons-local-4.8.0/SCons/Tool/hpcxx.py diff --git a/scons/scons-local-4.7.0/SCons/Tool/hplink.py b/scons/scons-local-4.8.0/SCons/Tool/hplink.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/hplink.py rename to scons/scons-local-4.8.0/SCons/Tool/hplink.py diff --git a/scons/scons-local-4.7.0/SCons/Tool/icc.py b/scons/scons-local-4.8.0/SCons/Tool/icc.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/icc.py rename to scons/scons-local-4.8.0/SCons/Tool/icc.py diff --git a/scons/scons-local-4.7.0/SCons/Tool/icl.py b/scons/scons-local-4.8.0/SCons/Tool/icl.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/icl.py rename to scons/scons-local-4.8.0/SCons/Tool/icl.py diff --git a/scons/scons-local-4.7.0/SCons/Tool/ifl.py b/scons/scons-local-4.8.0/SCons/Tool/ifl.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/ifl.py rename to scons/scons-local-4.8.0/SCons/Tool/ifl.py diff --git a/scons/scons-local-4.7.0/SCons/Tool/ifort.py b/scons/scons-local-4.8.0/SCons/Tool/ifort.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/ifort.py rename to scons/scons-local-4.8.0/SCons/Tool/ifort.py diff --git a/scons/scons-local-4.7.0/SCons/Tool/ilink.py b/scons/scons-local-4.8.0/SCons/Tool/ilink.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/ilink.py rename to scons/scons-local-4.8.0/SCons/Tool/ilink.py diff --git a/scons/scons-local-4.7.0/SCons/Tool/ilink32.py b/scons/scons-local-4.8.0/SCons/Tool/ilink32.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/ilink32.py rename to scons/scons-local-4.8.0/SCons/Tool/ilink32.py diff --git a/scons/scons-local-4.7.0/SCons/Tool/install.py b/scons/scons-local-4.8.0/SCons/Tool/install.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/install.py rename to scons/scons-local-4.8.0/SCons/Tool/install.py diff --git a/scons/scons-local-4.7.0/SCons/Tool/intelc.py b/scons/scons-local-4.8.0/SCons/Tool/intelc.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/intelc.py rename to scons/scons-local-4.8.0/SCons/Tool/intelc.py diff --git a/scons/scons-local-4.7.0/SCons/Tool/ipkg.py b/scons/scons-local-4.8.0/SCons/Tool/ipkg.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/ipkg.py rename to scons/scons-local-4.8.0/SCons/Tool/ipkg.py diff --git a/scons/scons-local-4.7.0/SCons/Tool/jar.py b/scons/scons-local-4.8.0/SCons/Tool/jar.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/jar.py rename to scons/scons-local-4.8.0/SCons/Tool/jar.py diff --git a/scons/scons-local-4.7.0/SCons/Tool/javac.py b/scons/scons-local-4.8.0/SCons/Tool/javac.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/javac.py rename to scons/scons-local-4.8.0/SCons/Tool/javac.py diff --git a/scons/scons-local-4.7.0/SCons/Tool/javah.py b/scons/scons-local-4.8.0/SCons/Tool/javah.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/javah.py rename to scons/scons-local-4.8.0/SCons/Tool/javah.py diff --git a/scons/scons-local-4.7.0/SCons/Tool/latex.py b/scons/scons-local-4.8.0/SCons/Tool/latex.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/latex.py rename to scons/scons-local-4.8.0/SCons/Tool/latex.py diff --git a/scons/scons-local-4.7.0/SCons/Tool/ldc.py b/scons/scons-local-4.8.0/SCons/Tool/ldc.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/ldc.py rename to scons/scons-local-4.8.0/SCons/Tool/ldc.py diff --git a/scons/scons-local-4.7.0/SCons/Tool/lex.py b/scons/scons-local-4.8.0/SCons/Tool/lex.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/lex.py rename to scons/scons-local-4.8.0/SCons/Tool/lex.py diff --git a/scons/scons-local-4.7.0/SCons/Tool/link.py b/scons/scons-local-4.8.0/SCons/Tool/link.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/link.py rename to scons/scons-local-4.8.0/SCons/Tool/link.py diff --git a/scons/scons-local-4.7.0/SCons/Tool/linkCommon/LoadableModule.py b/scons/scons-local-4.8.0/SCons/Tool/linkCommon/LoadableModule.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/linkCommon/LoadableModule.py rename to scons/scons-local-4.8.0/SCons/Tool/linkCommon/LoadableModule.py diff --git a/scons/scons-local-4.7.0/SCons/Tool/linkCommon/README.md b/scons/scons-local-4.8.0/SCons/Tool/linkCommon/README.md similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/linkCommon/README.md rename to scons/scons-local-4.8.0/SCons/Tool/linkCommon/README.md diff --git a/scons/scons-local-4.7.0/SCons/Tool/linkCommon/SharedLibrary.py b/scons/scons-local-4.8.0/SCons/Tool/linkCommon/SharedLibrary.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/linkCommon/SharedLibrary.py rename to scons/scons-local-4.8.0/SCons/Tool/linkCommon/SharedLibrary.py diff --git a/scons/scons-local-4.7.0/SCons/Tool/linkCommon/__init__.py b/scons/scons-local-4.8.0/SCons/Tool/linkCommon/__init__.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/linkCommon/__init__.py rename to scons/scons-local-4.8.0/SCons/Tool/linkCommon/__init__.py diff --git a/scons/scons-local-4.7.0/SCons/Tool/linkloc.py b/scons/scons-local-4.8.0/SCons/Tool/linkloc.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/linkloc.py rename to scons/scons-local-4.8.0/SCons/Tool/linkloc.py diff --git a/scons/scons-local-4.7.0/SCons/Tool/m4.py b/scons/scons-local-4.8.0/SCons/Tool/m4.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/m4.py rename to scons/scons-local-4.8.0/SCons/Tool/m4.py diff --git a/scons/scons-local-4.7.0/SCons/Tool/masm.py b/scons/scons-local-4.8.0/SCons/Tool/masm.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/masm.py rename to scons/scons-local-4.8.0/SCons/Tool/masm.py diff --git a/scons/scons-local-4.7.0/SCons/Tool/midl.py b/scons/scons-local-4.8.0/SCons/Tool/midl.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/midl.py rename to scons/scons-local-4.8.0/SCons/Tool/midl.py diff --git a/scons/scons-local-4.7.0/SCons/Tool/mingw.py b/scons/scons-local-4.8.0/SCons/Tool/mingw.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/mingw.py rename to scons/scons-local-4.8.0/SCons/Tool/mingw.py diff --git a/scons/scons-local-4.7.0/SCons/Tool/msgfmt.py b/scons/scons-local-4.8.0/SCons/Tool/msgfmt.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/msgfmt.py rename to scons/scons-local-4.8.0/SCons/Tool/msgfmt.py diff --git a/scons/scons-local-4.7.0/SCons/Tool/msginit.py b/scons/scons-local-4.8.0/SCons/Tool/msginit.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/msginit.py rename to scons/scons-local-4.8.0/SCons/Tool/msginit.py diff --git a/scons/scons-local-4.7.0/SCons/Tool/msgmerge.py b/scons/scons-local-4.8.0/SCons/Tool/msgmerge.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/msgmerge.py rename to scons/scons-local-4.8.0/SCons/Tool/msgmerge.py diff --git a/scons/scons-local-4.7.0/SCons/Tool/mslib.py b/scons/scons-local-4.8.0/SCons/Tool/mslib.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/mslib.py rename to scons/scons-local-4.8.0/SCons/Tool/mslib.py diff --git a/scons/scons-local-4.7.0/SCons/Tool/mslink.py b/scons/scons-local-4.8.0/SCons/Tool/mslink.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/mslink.py rename to scons/scons-local-4.8.0/SCons/Tool/mslink.py diff --git a/scons/scons-local-4.7.0/SCons/Tool/mssdk.py b/scons/scons-local-4.8.0/SCons/Tool/mssdk.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/mssdk.py rename to scons/scons-local-4.8.0/SCons/Tool/mssdk.py diff --git a/scons/scons-local-4.7.0/SCons/Tool/msvc.py b/scons/scons-local-4.8.0/SCons/Tool/msvc.py similarity index 99% rename from scons/scons-local-4.7.0/SCons/Tool/msvc.py rename to scons/scons-local-4.8.0/SCons/Tool/msvc.py index 6afa171c9..b823752b5 100644 --- a/scons/scons-local-4.7.0/SCons/Tool/msvc.py +++ b/scons/scons-local-4.8.0/SCons/Tool/msvc.py @@ -296,9 +296,6 @@ def generate(env) -> None: # without it for lex generation env["LEXUNISTD"] = SCons.Util.CLVar("--nounistd") - # Get user specified vswhere location or locate. - env['VSWHERE'] = env.get('VSWHERE', msvc_find_vswhere()) - # Set-up ms tools paths msvc_setup_env_once(env, tool=tool_name) diff --git a/scons/scons-local-4.7.0/SCons/Tool/msvs.py b/scons/scons-local-4.8.0/SCons/Tool/msvs.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/msvs.py rename to scons/scons-local-4.8.0/SCons/Tool/msvs.py diff --git a/scons/scons-local-4.7.0/SCons/Tool/mwcc.py b/scons/scons-local-4.8.0/SCons/Tool/mwcc.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/mwcc.py rename to scons/scons-local-4.8.0/SCons/Tool/mwcc.py diff --git a/scons/scons-local-4.7.0/SCons/Tool/mwld.py b/scons/scons-local-4.8.0/SCons/Tool/mwld.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/mwld.py rename to scons/scons-local-4.8.0/SCons/Tool/mwld.py diff --git a/scons/scons-local-4.7.0/SCons/Tool/nasm.py b/scons/scons-local-4.8.0/SCons/Tool/nasm.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/nasm.py rename to scons/scons-local-4.8.0/SCons/Tool/nasm.py diff --git a/scons/scons-local-4.7.0/SCons/Tool/ninja/Globals.py b/scons/scons-local-4.8.0/SCons/Tool/ninja/Globals.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/ninja/Globals.py rename to scons/scons-local-4.8.0/SCons/Tool/ninja/Globals.py diff --git a/scons/scons-local-4.7.0/SCons/Tool/ninja/Methods.py b/scons/scons-local-4.8.0/SCons/Tool/ninja/Methods.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/ninja/Methods.py rename to scons/scons-local-4.8.0/SCons/Tool/ninja/Methods.py diff --git a/scons/scons-local-4.7.0/SCons/Tool/ninja/NinjaState.py b/scons/scons-local-4.8.0/SCons/Tool/ninja/NinjaState.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/ninja/NinjaState.py rename to scons/scons-local-4.8.0/SCons/Tool/ninja/NinjaState.py diff --git a/scons/scons-local-4.7.0/SCons/Tool/ninja/Overrides.py b/scons/scons-local-4.8.0/SCons/Tool/ninja/Overrides.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/ninja/Overrides.py rename to scons/scons-local-4.8.0/SCons/Tool/ninja/Overrides.py diff --git a/scons/scons-local-4.7.0/SCons/Tool/ninja/Rules.py b/scons/scons-local-4.8.0/SCons/Tool/ninja/Rules.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/ninja/Rules.py rename to scons/scons-local-4.8.0/SCons/Tool/ninja/Rules.py diff --git a/scons/scons-local-4.7.0/SCons/Tool/ninja/Utils.py b/scons/scons-local-4.8.0/SCons/Tool/ninja/Utils.py similarity index 99% rename from scons/scons-local-4.7.0/SCons/Tool/ninja/Utils.py rename to scons/scons-local-4.8.0/SCons/Tool/ninja/Utils.py index 126d5de0a..cdce92895 100644 --- a/scons/scons-local-4.7.0/SCons/Tool/ninja/Utils.py +++ b/scons/scons-local-4.8.0/SCons/Tool/ninja/Utils.py @@ -45,6 +45,7 @@ def ninja_add_command_line_options() -> None: metavar='BOOL', action="store_true", default=False, + settable=True, help='Disable automatically running ninja after scons') AddOption('--disable-ninja', @@ -52,6 +53,7 @@ def ninja_add_command_line_options() -> None: metavar='BOOL', action="store_true", default=False, + settable=True, help='Disable ninja generation and build with scons even if tool is loaded. '+ 'Also used by ninja to build targets which only scons can build.') @@ -60,6 +62,7 @@ def ninja_add_command_line_options() -> None: metavar='BOOL', action="store_true", default=False, + settable=True, help='Allow scons to skip regeneration of the ninja file and restarting of the daemon. ' + 'Care should be taken in cases where Glob is in use or SCons generated files are used in ' + 'command lines.') diff --git a/scons/scons-local-4.7.0/SCons/Tool/ninja/__init__.py b/scons/scons-local-4.8.0/SCons/Tool/ninja/__init__.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/ninja/__init__.py rename to scons/scons-local-4.8.0/SCons/Tool/ninja/__init__.py diff --git a/scons/scons-local-4.7.0/SCons/Tool/ninja/ninja_daemon_build.py b/scons/scons-local-4.8.0/SCons/Tool/ninja/ninja_daemon_build.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/ninja/ninja_daemon_build.py rename to scons/scons-local-4.8.0/SCons/Tool/ninja/ninja_daemon_build.py diff --git a/scons/scons-local-4.7.0/SCons/Tool/ninja/ninja_run_daemon.py b/scons/scons-local-4.8.0/SCons/Tool/ninja/ninja_run_daemon.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/ninja/ninja_run_daemon.py rename to scons/scons-local-4.8.0/SCons/Tool/ninja/ninja_run_daemon.py diff --git a/scons/scons-local-4.7.0/SCons/Tool/ninja/ninja_scons_daemon.py b/scons/scons-local-4.8.0/SCons/Tool/ninja/ninja_scons_daemon.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/ninja/ninja_scons_daemon.py rename to scons/scons-local-4.8.0/SCons/Tool/ninja/ninja_scons_daemon.py diff --git a/scons/scons-local-4.7.0/SCons/Tool/packaging/__init__.py b/scons/scons-local-4.8.0/SCons/Tool/packaging/__init__.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/packaging/__init__.py rename to scons/scons-local-4.8.0/SCons/Tool/packaging/__init__.py diff --git a/scons/scons-local-4.7.0/SCons/Tool/packaging/ipk.py b/scons/scons-local-4.8.0/SCons/Tool/packaging/ipk.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/packaging/ipk.py rename to scons/scons-local-4.8.0/SCons/Tool/packaging/ipk.py diff --git a/scons/scons-local-4.7.0/SCons/Tool/packaging/msi.py b/scons/scons-local-4.8.0/SCons/Tool/packaging/msi.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/packaging/msi.py rename to scons/scons-local-4.8.0/SCons/Tool/packaging/msi.py diff --git a/scons/scons-local-4.7.0/SCons/Tool/packaging/rpm.py b/scons/scons-local-4.8.0/SCons/Tool/packaging/rpm.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/packaging/rpm.py rename to scons/scons-local-4.8.0/SCons/Tool/packaging/rpm.py diff --git a/scons/scons-local-4.7.0/SCons/Tool/packaging/src_tarbz2.py b/scons/scons-local-4.8.0/SCons/Tool/packaging/src_tarbz2.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/packaging/src_tarbz2.py rename to scons/scons-local-4.8.0/SCons/Tool/packaging/src_tarbz2.py diff --git a/scons/scons-local-4.7.0/SCons/Tool/packaging/src_targz.py b/scons/scons-local-4.8.0/SCons/Tool/packaging/src_targz.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/packaging/src_targz.py rename to scons/scons-local-4.8.0/SCons/Tool/packaging/src_targz.py diff --git a/scons/scons-local-4.7.0/SCons/Tool/packaging/src_tarxz.py b/scons/scons-local-4.8.0/SCons/Tool/packaging/src_tarxz.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/packaging/src_tarxz.py rename to scons/scons-local-4.8.0/SCons/Tool/packaging/src_tarxz.py diff --git a/scons/scons-local-4.7.0/SCons/Tool/packaging/src_zip.py b/scons/scons-local-4.8.0/SCons/Tool/packaging/src_zip.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/packaging/src_zip.py rename to scons/scons-local-4.8.0/SCons/Tool/packaging/src_zip.py diff --git a/scons/scons-local-4.7.0/SCons/Tool/packaging/tarbz2.py b/scons/scons-local-4.8.0/SCons/Tool/packaging/tarbz2.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/packaging/tarbz2.py rename to scons/scons-local-4.8.0/SCons/Tool/packaging/tarbz2.py diff --git a/scons/scons-local-4.7.0/SCons/Tool/packaging/targz.py b/scons/scons-local-4.8.0/SCons/Tool/packaging/targz.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/packaging/targz.py rename to scons/scons-local-4.8.0/SCons/Tool/packaging/targz.py diff --git a/scons/scons-local-4.7.0/SCons/Tool/packaging/tarxz.py b/scons/scons-local-4.8.0/SCons/Tool/packaging/tarxz.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/packaging/tarxz.py rename to scons/scons-local-4.8.0/SCons/Tool/packaging/tarxz.py diff --git a/scons/scons-local-4.7.0/SCons/Tool/packaging/zip.py b/scons/scons-local-4.8.0/SCons/Tool/packaging/zip.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/packaging/zip.py rename to scons/scons-local-4.8.0/SCons/Tool/packaging/zip.py diff --git a/scons/scons-local-4.7.0/SCons/Tool/pdf.py b/scons/scons-local-4.8.0/SCons/Tool/pdf.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/pdf.py rename to scons/scons-local-4.8.0/SCons/Tool/pdf.py diff --git a/scons/scons-local-4.7.0/SCons/Tool/pdflatex.py b/scons/scons-local-4.8.0/SCons/Tool/pdflatex.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/pdflatex.py rename to scons/scons-local-4.8.0/SCons/Tool/pdflatex.py diff --git a/scons/scons-local-4.7.0/SCons/Tool/pdftex.py b/scons/scons-local-4.8.0/SCons/Tool/pdftex.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/pdftex.py rename to scons/scons-local-4.8.0/SCons/Tool/pdftex.py diff --git a/scons/scons-local-4.7.0/SCons/Tool/python.py b/scons/scons-local-4.8.0/SCons/Tool/python.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/python.py rename to scons/scons-local-4.8.0/SCons/Tool/python.py diff --git a/scons/scons-local-4.7.0/SCons/Tool/qt.py b/scons/scons-local-4.8.0/SCons/Tool/qt.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/qt.py rename to scons/scons-local-4.8.0/SCons/Tool/qt.py diff --git a/scons/scons-local-4.7.0/SCons/Tool/qt3.py b/scons/scons-local-4.8.0/SCons/Tool/qt3.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/qt3.py rename to scons/scons-local-4.8.0/SCons/Tool/qt3.py diff --git a/scons/scons-local-4.7.0/SCons/Tool/rmic.py b/scons/scons-local-4.8.0/SCons/Tool/rmic.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/rmic.py rename to scons/scons-local-4.8.0/SCons/Tool/rmic.py diff --git a/scons/scons-local-4.7.0/SCons/Tool/rpcgen.py b/scons/scons-local-4.8.0/SCons/Tool/rpcgen.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/rpcgen.py rename to scons/scons-local-4.8.0/SCons/Tool/rpcgen.py diff --git a/scons/scons-local-4.7.0/SCons/Tool/rpm.py b/scons/scons-local-4.8.0/SCons/Tool/rpm.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/rpm.py rename to scons/scons-local-4.8.0/SCons/Tool/rpm.py diff --git a/scons/scons-local-4.7.0/SCons/Tool/rpmutils.py b/scons/scons-local-4.8.0/SCons/Tool/rpmutils.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/rpmutils.py rename to scons/scons-local-4.8.0/SCons/Tool/rpmutils.py diff --git a/scons/scons-local-4.7.0/SCons/Tool/sgiar.py b/scons/scons-local-4.8.0/SCons/Tool/sgiar.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/sgiar.py rename to scons/scons-local-4.8.0/SCons/Tool/sgiar.py diff --git a/scons/scons-local-4.7.0/SCons/Tool/sgic++.py b/scons/scons-local-4.8.0/SCons/Tool/sgic++.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/sgic++.py rename to scons/scons-local-4.8.0/SCons/Tool/sgic++.py diff --git a/scons/scons-local-4.7.0/SCons/Tool/sgicc.py b/scons/scons-local-4.8.0/SCons/Tool/sgicc.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/sgicc.py rename to scons/scons-local-4.8.0/SCons/Tool/sgicc.py diff --git a/scons/scons-local-4.7.0/SCons/Tool/sgicxx.py b/scons/scons-local-4.8.0/SCons/Tool/sgicxx.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/sgicxx.py rename to scons/scons-local-4.8.0/SCons/Tool/sgicxx.py diff --git a/scons/scons-local-4.7.0/SCons/Tool/sgilink.py b/scons/scons-local-4.8.0/SCons/Tool/sgilink.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/sgilink.py rename to scons/scons-local-4.8.0/SCons/Tool/sgilink.py diff --git a/scons/scons-local-4.7.0/SCons/Tool/sunar.py b/scons/scons-local-4.8.0/SCons/Tool/sunar.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/sunar.py rename to scons/scons-local-4.8.0/SCons/Tool/sunar.py diff --git a/scons/scons-local-4.7.0/SCons/Tool/sunc++.py b/scons/scons-local-4.8.0/SCons/Tool/sunc++.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/sunc++.py rename to scons/scons-local-4.8.0/SCons/Tool/sunc++.py diff --git a/scons/scons-local-4.7.0/SCons/Tool/suncc.py b/scons/scons-local-4.8.0/SCons/Tool/suncc.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/suncc.py rename to scons/scons-local-4.8.0/SCons/Tool/suncc.py diff --git a/scons/scons-local-4.7.0/SCons/Tool/suncxx.py b/scons/scons-local-4.8.0/SCons/Tool/suncxx.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/suncxx.py rename to scons/scons-local-4.8.0/SCons/Tool/suncxx.py diff --git a/scons/scons-local-4.7.0/SCons/Tool/sunf77.py b/scons/scons-local-4.8.0/SCons/Tool/sunf77.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/sunf77.py rename to scons/scons-local-4.8.0/SCons/Tool/sunf77.py diff --git a/scons/scons-local-4.7.0/SCons/Tool/sunf90.py b/scons/scons-local-4.8.0/SCons/Tool/sunf90.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/sunf90.py rename to scons/scons-local-4.8.0/SCons/Tool/sunf90.py diff --git a/scons/scons-local-4.7.0/SCons/Tool/sunf95.py b/scons/scons-local-4.8.0/SCons/Tool/sunf95.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/sunf95.py rename to scons/scons-local-4.8.0/SCons/Tool/sunf95.py diff --git a/scons/scons-local-4.7.0/SCons/Tool/sunlink.py b/scons/scons-local-4.8.0/SCons/Tool/sunlink.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/sunlink.py rename to scons/scons-local-4.8.0/SCons/Tool/sunlink.py diff --git a/scons/scons-local-4.7.0/SCons/Tool/swig.py b/scons/scons-local-4.8.0/SCons/Tool/swig.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/swig.py rename to scons/scons-local-4.8.0/SCons/Tool/swig.py diff --git a/scons/scons-local-4.7.0/SCons/Tool/tar.py b/scons/scons-local-4.8.0/SCons/Tool/tar.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/tar.py rename to scons/scons-local-4.8.0/SCons/Tool/tar.py diff --git a/scons/scons-local-4.7.0/SCons/Tool/tex.py b/scons/scons-local-4.8.0/SCons/Tool/tex.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/tex.py rename to scons/scons-local-4.8.0/SCons/Tool/tex.py diff --git a/scons/scons-local-4.7.0/SCons/Tool/textfile.py b/scons/scons-local-4.8.0/SCons/Tool/textfile.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/textfile.py rename to scons/scons-local-4.8.0/SCons/Tool/textfile.py diff --git a/scons/scons-local-4.7.0/SCons/Tool/tlib.py b/scons/scons-local-4.8.0/SCons/Tool/tlib.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/tlib.py rename to scons/scons-local-4.8.0/SCons/Tool/tlib.py diff --git a/scons/scons-local-4.7.0/SCons/Tool/wix.py b/scons/scons-local-4.8.0/SCons/Tool/wix.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/wix.py rename to scons/scons-local-4.8.0/SCons/Tool/wix.py diff --git a/scons/scons-local-4.7.0/SCons/Tool/xgettext.py b/scons/scons-local-4.8.0/SCons/Tool/xgettext.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/xgettext.py rename to scons/scons-local-4.8.0/SCons/Tool/xgettext.py diff --git a/scons/scons-local-4.7.0/SCons/Tool/yacc.py b/scons/scons-local-4.8.0/SCons/Tool/yacc.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/yacc.py rename to scons/scons-local-4.8.0/SCons/Tool/yacc.py diff --git a/scons/scons-local-4.7.0/SCons/Tool/zip.py b/scons/scons-local-4.8.0/SCons/Tool/zip.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Tool/zip.py rename to scons/scons-local-4.8.0/SCons/Tool/zip.py diff --git a/scons/scons-local-4.7.0/SCons/Util/__init__.py b/scons/scons-local-4.8.0/SCons/Util/__init__.py similarity index 99% rename from scons/scons-local-4.7.0/SCons/Util/__init__.py rename to scons/scons-local-4.8.0/SCons/Util/__init__.py index 95c1b9978..28565da79 100644 --- a/scons/scons-local-4.7.0/SCons/Util/__init__.py +++ b/scons/scons-local-4.8.0/SCons/Util/__init__.py @@ -107,6 +107,7 @@ from .envs import ( AppendPath, AddPathIfNotExists, AddMethod, + is_valid_construction_var, ) from .filelock import FileLock, SConsLockFailure diff --git a/scons/scons-local-4.7.0/SCons/Util/envs.py b/scons/scons-local-4.8.0/SCons/Util/envs.py similarity index 95% rename from scons/scons-local-4.7.0/SCons/Util/envs.py rename to scons/scons-local-4.8.0/SCons/Util/envs.py index db4d65ab9..2640ef5c1 100644 --- a/scons/scons-local-4.7.0/SCons/Util/envs.py +++ b/scons/scons-local-4.8.0/SCons/Util/envs.py @@ -9,6 +9,7 @@ Routines for working with environments and construction variables that don't need the specifics of the Environment class. """ +import re import os from types import MethodType, FunctionType from typing import Union, Callable, Optional, Any @@ -329,6 +330,15 @@ def AddMethod(obj, function: Callable, name: Optional[str] = None) -> None: setattr(obj, name, method) +# This routine is used to validate that a construction var name can be used +# as a Python identifier, which we require. However, Python 3 introduced an +# isidentifier() string method so there's really not any need for it now. +_is_valid_var_re = re.compile(r'[_a-zA-Z]\w*$') + +def is_valid_construction_var(varstr: str) -> bool: + """Return True if *varstr* is a legitimate name of a construction variable.""" + return bool(_is_valid_var_re.match(varstr)) + # Local Variables: # tab-width:4 # indent-tabs-mode:nil diff --git a/scons/scons-local-4.7.0/SCons/Util/filelock.py b/scons/scons-local-4.8.0/SCons/Util/filelock.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Util/filelock.py rename to scons/scons-local-4.8.0/SCons/Util/filelock.py diff --git a/scons/scons-local-4.7.0/SCons/Util/hashes.py b/scons/scons-local-4.8.0/SCons/Util/hashes.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Util/hashes.py rename to scons/scons-local-4.8.0/SCons/Util/hashes.py diff --git a/scons/scons-local-4.7.0/SCons/Util/sctypes.py b/scons/scons-local-4.8.0/SCons/Util/sctypes.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Util/sctypes.py rename to scons/scons-local-4.8.0/SCons/Util/sctypes.py diff --git a/scons/scons-local-4.7.0/SCons/Util/sctyping.py b/scons/scons-local-4.8.0/SCons/Util/sctyping.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Util/sctyping.py rename to scons/scons-local-4.8.0/SCons/Util/sctyping.py diff --git a/scons/scons-local-4.7.0/SCons/Util/stats.py b/scons/scons-local-4.8.0/SCons/Util/stats.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Util/stats.py rename to scons/scons-local-4.8.0/SCons/Util/stats.py diff --git a/scons/scons-local-4.7.0/SCons/Utilities/ConfigureCache.py b/scons/scons-local-4.8.0/SCons/Utilities/ConfigureCache.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Utilities/ConfigureCache.py rename to scons/scons-local-4.8.0/SCons/Utilities/ConfigureCache.py diff --git a/scons/scons-local-4.7.0/SCons/Utilities/__init__.py b/scons/scons-local-4.8.0/SCons/Utilities/__init__.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Utilities/__init__.py rename to scons/scons-local-4.8.0/SCons/Utilities/__init__.py diff --git a/scons/scons-local-4.7.0/SCons/Utilities/sconsign.py b/scons/scons-local-4.8.0/SCons/Utilities/sconsign.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Utilities/sconsign.py rename to scons/scons-local-4.8.0/SCons/Utilities/sconsign.py diff --git a/scons/scons-local-4.7.0/SCons/Variables/BoolVariable.py b/scons/scons-local-4.8.0/SCons/Variables/BoolVariable.py similarity index 72% rename from scons/scons-local-4.7.0/SCons/Variables/BoolVariable.py rename to scons/scons-local-4.8.0/SCons/Variables/BoolVariable.py index 71e44c9cd..e1fe62b90 100644 --- a/scons/scons-local-4.7.0/SCons/Variables/BoolVariable.py +++ b/scons/scons-local-4.8.0/SCons/Variables/BoolVariable.py @@ -27,7 +27,7 @@ Usage example:: opts = Variables() opts.Add(BoolVariable('embedded', 'build for an embedded system', False)) - ... + env = Environment(variables=opts) if env['embedded']: ... """ @@ -38,7 +38,7 @@ import SCons.Errors __all__ = ['BoolVariable',] -TRUE_STRINGS = ('y', 'yes', 'true', 't', '1', 'on' , 'all') +TRUE_STRINGS = ('y', 'yes', 'true', 't', '1', 'on', 'all') FALSE_STRINGS = ('n', 'no', 'false', 'f', '0', 'off', 'none') @@ -54,42 +54,44 @@ def _text2bool(val: str) -> bool: Raises: ValueError: if *val* cannot be converted to boolean. """ - lval = val.lower() if lval in TRUE_STRINGS: return True if lval in FALSE_STRINGS: return False - raise ValueError("Invalid value for boolean option: %s" % val) + # TODO: leave this check to validator? + raise ValueError(f"Invalid value for boolean variable: {val!r}") def _validator(key, val, env) -> None: """Validate that the value of *key* in *env* is a boolean. - Parmaeter *val* is not used in the check. + Parameter *val* is not used in the check. Usable as a validator function for SCons Variables. Raises: KeyError: if *key* is not set in *env* UserError: if the value of *key* is not ``True`` or ``False``. + """ - if not env[key] in (True, False): - raise SCons.Errors.UserError( - 'Invalid value for boolean option %s: %s' % (key, env[key]) - ) + if env[key] not in (True, False): + msg = f'Invalid value for boolean variable {key!r}: {env[key]}' + raise SCons.Errors.UserError(msg) from None - -def BoolVariable(key, help, default) -> Tuple[str, str, str, Callable, Callable]: +# lint: W0622: Redefining built-in 'help' (redefined-builtin) +def BoolVariable(key, help: str, default) -> Tuple[str, str, str, Callable, Callable]: """Return a tuple describing a boolean SCons Variable. - The input parameters describe a boolean option. Returns a tuple - including the correct converter and validator. - The *help* text will have ``(yes|no)`` automatically appended to show the - valid values. The result is usable as input to :meth:`Add`. + The input parameters describe a boolean variable, using a string + value as described by :const:`TRUE_STRINGS` and :const:`FALSE_STRINGS`. + Returns a tuple including the correct converter and validator. + The *help* text will have ``(yes|no)`` automatically appended to + show the valid values. The result is usable as input to + :meth:`~SCons.Variables.Variables.Add`. """ - help = '%s (yes|no)' % help - return (key, help, default, _validator, _text2bool) + help = f'{help} (yes|no)' + return key, help, default, _validator, _text2bool # Local Variables: # tab-width:4 diff --git a/scons/scons-local-4.8.0/SCons/Variables/EnumVariable.py b/scons/scons-local-4.8.0/SCons/Variables/EnumVariable.py new file mode 100644 index 000000000..3698e470d --- /dev/null +++ b/scons/scons-local-4.8.0/SCons/Variables/EnumVariable.py @@ -0,0 +1,145 @@ +# MIT License +# +# Copyright The SCons Foundation +# +# Permission is hereby granted, free of charge, to any person obtaining +# a copy of this software and associated documentation files (the +# "Software"), to deal in the Software without restriction, including +# without limitation the rights to use, copy, modify, merge, publish, +# distribute, sublicense, and/or sell copies of the Software, and to +# permit persons to whom the Software is furnished to do so, subject to +# the following conditions: +# +# The above copyright notice and this permission notice shall be included +# in all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY +# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE +# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +"""Variable type for enumeration Variables. + +Enumeration variables allow selection of one from a specified set of values. + +Usage example:: + + opts = Variables() + opts.Add( + EnumVariable( + 'debug', + help='debug output and symbols', + default='no', + allowed_values=('yes', 'no', 'full'), + map={}, + ignorecase=2, + ) + ) + env = Environment(variables=opts) + if env['debug'] == 'full': + ... +""" + +from typing import Callable, List, Optional, Tuple + +import SCons.Errors + +__all__ = ['EnumVariable',] + + +def _validator(key, val, env, vals) -> None: + """Validate that val is in vals. + + Usable as the base for :class:`EnumVariable` validators. + """ + if val not in vals: + msg = ( + f"Invalid value for enum variable {key!r}: {val!r}. " + f"Valid values are: {vals}" + ) + raise SCons.Errors.UserError(msg) from None + + +# lint: W0622: Redefining built-in 'help' (redefined-builtin) +# lint: W0622: Redefining built-in 'map' (redefined-builtin) +def EnumVariable( + key, + help: str, + default: str, + allowed_values: List[str], + map: Optional[dict] = None, + ignorecase: int = 0, +) -> Tuple[str, str, str, Callable, Callable]: + """Return a tuple describing an enumaration SCons Variable. + + The input parameters describe a variable with only predefined values + allowed. The value of *ignorecase* defines the behavior of the + validator and converter: if ``0``, the validator/converter are + case-sensitive; if ``1``, the validator/converter are case-insensitive; + if ``2``, the validator/converter are case-insensitive and the + converted value will always be lower-case. + + Arguments: + key: variable name, passed directly through to the return tuple. + default: default values, passed directly through to the return tuple. + help: descriptive part of the help text, + will have the allowed values automatically appended. + allowed_values: list of the allowed values for this variable. + map: optional dictionary which may be used for converting the + input value into canonical values (e.g. for aliases). + ignorecase: defines the behavior of the validator and converter. + + Returns: + A tuple including an appropriate converter and validator. + The result is usable as input to :meth:`~SCons.Variables.Variables.Add`. + and :meth:`~SCons.Variables.Variables.AddVariables`. + """ + # these are all inner functions so they can access EnumVariable locals. + def validator_rcase(key, val, env): + """Case-respecting validator.""" + return _validator(key, val, env, allowed_values) + + def validator_icase(key, val, env): + """Case-ignoring validator.""" + return _validator(key, val.lower(), env, allowed_values) + + def converter_rcase(val): + """Case-respecting converter.""" + return map.get(val, val) + + def converter_icase(val): + """Case-ignoring converter.""" + return map.get(val.lower(), val) + + def converter_lcase(val): + """Case-lowering converter.""" + return map.get(val.lower(), val).lower() + + if map is None: + map = {} + help = f"{help} ({'|'.join(allowed_values)})" + + # define validator + if ignorecase: + validator = validator_icase + else: + validator = validator_rcase + + # define converter + if ignorecase == 2: + converter = converter_lcase + elif ignorecase == 1: + converter = converter_icase + else: + converter = converter_rcase + + return key, help, default, validator, converter + +# Local Variables: +# tab-width:4 +# indent-tabs-mode:nil +# End: +# vim: set expandtab tabstop=4 shiftwidth=4: diff --git a/scons/scons-local-4.8.0/SCons/Variables/ListVariable.py b/scons/scons-local-4.8.0/SCons/Variables/ListVariable.py new file mode 100644 index 000000000..f79530742 --- /dev/null +++ b/scons/scons-local-4.8.0/SCons/Variables/ListVariable.py @@ -0,0 +1,228 @@ +# MIT License +# +# Copyright The SCons Foundation +# +# Permission is hereby granted, free of charge, to any person obtaining +# a copy of this software and associated documentation files (the +# "Software"), to deal in the Software without restriction, including +# without limitation the rights to use, copy, modify, merge, publish, +# distribute, sublicense, and/or sell copies of the Software, and to +# permit persons to whom the Software is furnished to do so, subject to +# the following conditions: +# +# The above copyright notice and this permission notice shall be included +# in all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY +# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE +# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +"""Variable type for List Variables. + +A list variable allows selecting one or more from a supplied set of +allowable values, as well as from an optional mapping of alternate names +(such as aliases and abbreviations) and the special names ``'all'`` and +``'none'``. Specified values are converted during processing into values +only from the allowable values set. + +Usage example:: + + list_of_libs = Split('x11 gl qt ical') + + opts = Variables() + opts.Add( + ListVariable( + 'shared', + help='libraries to build as shared libraries', + default='all', + elems=list_of_libs, + ) + ) + env = Environment(variables=opts) + for lib in list_of_libs: + if lib in env['shared']: + env.SharedObject(...) + else: + env.Object(...) +""" + +# Known Bug: This should behave like a Set-Type, but does not really, +# since elements can occur twice. + +import collections +from typing import Callable, List, Optional, Tuple, Union + +import SCons.Util + +__all__ = ['ListVariable',] + + +class _ListVariable(collections.UserList): + """Internal class holding the data for a List Variable. + + This is normally not directly instantiated, rather the ListVariable + converter callback "converts" string input (or the default value + if none) into an instance and stores it. + + Args: + initlist: the list of actual values given. + allowedElems: the list of allowable values. + """ + + def __init__( + self, initlist: Optional[list] = None, allowedElems: Optional[list] = None + ) -> None: + if initlist is None: + initlist = [] + if allowedElems is None: + allowedElems = [] + super().__init__([_f for _f in initlist if _f]) + self.allowedElems = sorted(allowedElems) + + def __cmp__(self, other): + return NotImplemented + + def __eq__(self, other): + return NotImplemented + + def __ge__(self, other): + return NotImplemented + + def __gt__(self, other): + return NotImplemented + + def __le__(self, other): + return NotImplemented + + def __lt__(self, other): + return NotImplemented + + def __str__(self) -> str: + if not self.data: + return 'none' + self.data.sort() + if self.data == self.allowedElems: + return 'all' + return ','.join(self) + + def prepare_to_store(self): + return str(self) + +def _converter(val, allowedElems, mapdict) -> _ListVariable: + """Callback to convert list variables into a suitable form. + + The arguments *allowedElems* and *mapdict* are non-standard + for a :class:`Variables` converter: the lambda in the + :func:`ListVariable` function arranges for us to be called correctly. + """ + if val == 'none': + val = [] + elif val == 'all': + val = allowedElems + else: + val = [_f for _f in val.split(',') if _f] + val = [mapdict.get(v, v) for v in val] + return _ListVariable(val, allowedElems) + + +def _validator(key, val, env) -> None: + """Callback to validate supplied value(s) for a ListVariable. + + Validation means "is *val* in the allowed list"? *val* has + been subject to substitution before the validator is called. The + converter created a :class:`_ListVariable` container which is stored + in *env* after it runs; this includes the allowable elements list. + Substitution makes a string made out of the values (only), + so we need to fish the allowed elements list out of the environment + to complete the validation. + + Note that since 18b45e456, whether ``subst`` has been + called is conditional on the value of the *subst* argument to + :meth:`~SCons.Variables.Variables.Add`, so we have to account for + possible different types of *val*. + + Raises: + UserError: if validation failed. + + .. versionadded:: 4.8.0 + ``_validator`` split off from :func:`_converter` with an additional + check for whether *val* has been substituted before the call. + """ + allowedElems = env[key].allowedElems + if isinstance(val, _ListVariable): # not substituted, use .data + notAllowed = [v for v in val.data if v not in allowedElems] + else: # val will be a string + notAllowed = [v for v in val.split() if v not in allowedElems] + if notAllowed: + # Converter only synthesized 'all' and 'none', they are never + # in the allowed list, so we need to add those to the error message + # (as is done for the help msg). + valid = ','.join(allowedElems + ['all', 'none']) + msg = ( + f"Invalid value(s) for variable {key!r}: {','.join(notAllowed)!r}. " + f"Valid values are: {valid}" + ) + raise SCons.Errors.UserError(msg) from None + + +# lint: W0622: Redefining built-in 'help' (redefined-builtin) +# lint: W0622: Redefining built-in 'map' (redefined-builtin) +def ListVariable( + key, + help: str, + default: Union[str, List[str]], + names: List[str], + map: Optional[dict] = None, + validator: Optional[Callable] = None, +) -> Tuple[str, str, str, None, Callable]: + """Return a tuple describing a list variable. + + The input parameters describe a list variable, where the values + can be one or more from *names* plus the special values ``all`` + and ``none``. + + Arguments: + key: the name of the list variable. + help: the basic help message. Will have text appended indicating + the allowable values (not including any extra names from *map*). + default: the default value(s) for the list variable. Can be + given as string (possibly comma-separated), or as a list of strings. + ``all`` or ``none`` are allowed as *default*. You can also simulate + a must-specify ListVariable by giving a *default* that is not part + of *names*, it will fail validation if not supplied. + names: the allowable values. Must be a list of strings. + map: optional dictionary to map alternative names to the ones in + *names*, providing a form of alias. The converter will make + the replacement, names from *map* are not stored and will + not appear in the help message. + validator: optional callback to validate supplied values. + The default validator is used if not specified. + + Returns: + A tuple including the correct converter and validator. The + result is usable as input to :meth:`~SCons.Variables.Variables.Add`. + + .. versionchanged:: 4.8.0 + The validation step was split from the converter to allow for + custom validators. The *validator* keyword argument was added. + """ + if map is None: + map = {} + if validator is None: + validator = _validator + names_str = f"allowed names: {' '.join(names)}" + if SCons.Util.is_List(default): + default = ','.join(default) + help = '\n '.join( + (help, '(all|none|comma-separated list of names)', names_str)) + return key, help, default, validator, lambda val: _converter(val, names, map) + +# Local Variables: +# tab-width:4 +# indent-tabs-mode:nil +# End: +# vim: set expandtab tabstop=4 shiftwidth=4: diff --git a/scons/scons-local-4.7.0/SCons/Variables/PackageVariable.py b/scons/scons-local-4.8.0/SCons/Variables/PackageVariable.py similarity index 62% rename from scons/scons-local-4.7.0/SCons/Variables/PackageVariable.py rename to scons/scons-local-4.8.0/SCons/Variables/PackageVariable.py index 58c8441bd..fc281250c 100644 --- a/scons/scons-local-4.7.0/SCons/Variables/PackageVariable.py +++ b/scons/scons-local-4.8.0/SCons/Variables/PackageVariable.py @@ -42,15 +42,16 @@ Can be used as a replacement for autoconf's ``--with-xxx=yyy`` :: default='yes' ) ) - ... - if env['x11'] == True: + env = Environment(variables=opts) + if env['x11'] is True: dir = ... # search X11 in some standard places ... env['x11'] = dir if env['x11']: ... # build with x11 ... """ -from typing import Tuple, Callable +import os +from typing import Callable, Optional, Tuple import SCons.Errors @@ -60,7 +61,12 @@ ENABLE_STRINGS = ('1', 'yes', 'true', 'on', 'enable', 'search') DISABLE_STRINGS = ('0', 'no', 'false', 'off', 'disable') def _converter(val): - """ """ + """Convert package variables. + + Returns True or False if one of the recognized truthy or falsy + values is seen, else return the value unchanged (expected to + be a path string). + """ lval = val.lower() if lval in ENABLE_STRINGS: return True @@ -70,35 +76,45 @@ def _converter(val): def _validator(key, val, env, searchfunc) -> None: - """ """ - # NB: searchfunc is currently undocumented and unsupported - # TODO write validator, check for path - import os + """Validate package variable for valid path. + Checks that if a path is given as the value, that pathname actually exists. + """ + # NOTE: searchfunc is currently undocumented and unsupported if env[key] is True: if searchfunc: env[key] = searchfunc(key, val) + # TODO: need to check path, or be sure searchfunc raises. elif env[key] and not os.path.exists(val): - raise SCons.Errors.UserError( - 'Path does not exist for option %s: %s' % (key, val)) + msg = f'Path does not exist for variable {key!r}: {val!r}' + raise SCons.Errors.UserError(msg) from None -def PackageVariable(key, help, default, searchfunc=None) -> Tuple[str, str, str, Callable, Callable]: +# lint: W0622: Redefining built-in 'help' (redefined-builtin) +def PackageVariable( + key: str, help: str, default, searchfunc: Optional[Callable] = None +) -> Tuple[str, str, str, Callable, Callable]: """Return a tuple describing a package list SCons Variable. - The input parameters describe a 'package list' option. Returns - a tuple including the correct converter and validator appended. - The result is usable as input to :meth:`Add` . + The input parameters describe a 'package list' variable. Returns + a tuple with the correct converter and validator appended. + The result is usable as input to :meth:`~SCons.Variables.Variables.Add`. - A 'package list' option may either be 'all', 'none' or a pathname - string. This information is appended to *help*. + A 'package list' variable may either be a truthy string from + :const:`ENABLE_STRINGS`, a falsy string from + :const:`DISABLE_STRINGS`, or a pathname string. + This information is appended to *help* using only one string + each for truthy/falsy. """ # NB: searchfunc is currently undocumented and unsupported - help = '\n '.join( - (help, '( yes | no | /path/to/%s )' % key)) - return (key, help, default, - lambda k, v, e: _validator(k, v, e, searchfunc), - _converter) + help = '\n '.join((help, f'( yes | no | /path/to/{key} )')) + return ( + key, + help, + default, + lambda k, v, e: _validator(k, v, e, searchfunc), + _converter, + ) # Local Variables: # tab-width:4 diff --git a/scons/scons-local-4.7.0/SCons/Variables/PathVariable.py b/scons/scons-local-4.8.0/SCons/Variables/PathVariable.py similarity index 57% rename from scons/scons-local-4.7.0/SCons/Variables/PathVariable.py rename to scons/scons-local-4.8.0/SCons/Variables/PathVariable.py index a5bf6c59f..d5988ac47 100644 --- a/scons/scons-local-4.7.0/SCons/Variables/PathVariable.py +++ b/scons/scons-local-4.8.0/SCons/Variables/PathVariable.py @@ -26,10 +26,10 @@ To be used whenever a user-specified path override setting should be allowed. Arguments to PathVariable are: - * *key* - name of this option on the command line (e.g. "prefix") - * *help* - help string for option - * *default* - default value for this option - * *validator* - [optional] validator for option value. Predefined are: + * *key* - name of this variable on the command line (e.g. "prefix") + * *help* - help string for variable + * *default* - default value for this variable + * *validator* - [optional] validator for variable value. Predefined are: * *PathAccept* - accepts any path setting; no validation * *PathIsDir* - path must be an existing directory @@ -40,8 +40,8 @@ Arguments to PathVariable are: The *validator* is a function that is called and which should return True or False to indicate if the path is valid. The arguments to the validator function are: (*key*, *val*, *env*). *key* is the - name of the option, *val* is the path specified for the option, - and *env* is the environment to which the Options have been added. + name of the variable, *val* is the path specified for the variable, + and *env* is the environment to which the Variables have been added. Usage example:: @@ -74,68 +74,83 @@ Usage example:: import os import os.path -from typing import Tuple, Callable +from typing import Callable, Optional, Tuple import SCons.Errors +import SCons.Util __all__ = ['PathVariable',] class _PathVariableClass: + """Class implementing path variables. + + This class exists mainly to expose the validators without code having + to import the names: they will appear as methods of ``PathVariable``, + a statically created instance of this class, which is placed in + the SConscript namespace. + + Instances are callable to produce a suitable variable tuple. + """ @staticmethod def PathAccept(key, val, env) -> None: - """Accepts any path, no checking done.""" - pass + """Validate path with no checking.""" + return @staticmethod def PathIsDir(key, val, env) -> None: - """Validator to check if Path is a directory.""" - if not os.path.isdir(val): - if os.path.isfile(val): - m = 'Directory path for option %s is a file: %s' - else: - m = 'Directory path for option %s does not exist: %s' - raise SCons.Errors.UserError(m % (key, val)) + """Validate path is a directory.""" + if os.path.isdir(val): + return + if os.path.isfile(val): + msg = f'Directory path for variable {key!r} is a file: {val}' + else: + msg = f'Directory path for variable {key!r} does not exist: {val}' + raise SCons.Errors.UserError(msg) @staticmethod def PathIsDirCreate(key, val, env) -> None: - """Validator to check if Path is a directory, - creating it if it does not exist.""" + """Validate path is a directory, creating if needed.""" + if os.path.isdir(val): + return try: os.makedirs(val, exist_ok=True) - except FileExistsError: - m = 'Path for option %s is a file, not a directory: %s' - raise SCons.Errors.UserError(m % (key, val)) - except PermissionError: - m = 'Path for option %s could not be created: %s' - raise SCons.Errors.UserError(m % (key, val)) + except FileExistsError as exc: + msg = f'Path for variable {key!r} is a file, not a directory: {val}' + raise SCons.Errors.UserError(msg) from exc + except (PermissionError, OSError) as exc: + msg = f'Path for variable {key!r} could not be created: {val}' + raise SCons.Errors.UserError(msg) from exc @staticmethod def PathIsFile(key, val, env) -> None: - """Validator to check if Path is a file""" + """Validate path is a file.""" if not os.path.isfile(val): if os.path.isdir(val): - m = 'File path for option %s is a directory: %s' + msg = f'File path for variable {key!r} is a directory: {val}' else: - m = 'File path for option %s does not exist: %s' - raise SCons.Errors.UserError(m % (key, val)) + msg = f'File path for variable {key!r} does not exist: {val}' + raise SCons.Errors.UserError(msg) @staticmethod def PathExists(key, val, env) -> None: - """Validator to check if Path exists""" + """Validate path exists.""" if not os.path.exists(val): - m = 'Path for option %s does not exist: %s' - raise SCons.Errors.UserError(m % (key, val)) + msg = f'Path for variable {key!r} does not exist: {val}' + raise SCons.Errors.UserError(msg) - def __call__(self, key, help, default, validator=None) -> Tuple[str, str, str, Callable, None]: + # lint: W0622: Redefining built-in 'help' (redefined-builtin) + def __call__( + self, key: str, help: str, default, validator: Optional[Callable] = None + ) -> Tuple[str, str, str, Callable, None]: """Return a tuple describing a path list SCons Variable. - The input parameters describe a 'path list' option. Returns + The input parameters describe a 'path list' variable. Returns a tuple with the correct converter and validator appended. The result is usable for input to :meth:`Add`. - The *default* option specifies the default path to use if the - user does not specify an override with this option. + The *default* parameter specifies the default path to use if the + user does not specify an override with this variable. *validator* is a validator, see this file for examples """ @@ -143,10 +158,10 @@ class _PathVariableClass: validator = self.PathExists if SCons.Util.is_List(key) or SCons.Util.is_Tuple(key): - helpmsg = '%s ( /path/to/%s )' % (help, key[0]) + helpmsg = f'{help} ( /path/to/{key[0]} )' else: - helpmsg = '%s ( /path/to/%s )' % (help, key) - return (key, helpmsg, default, validator, None) + helpmsg = f'{help} ( /path/to/{key} )' + return key, helpmsg, default, validator, None PathVariable = _PathVariableClass() diff --git a/scons/scons-local-4.8.0/SCons/Variables/__init__.py b/scons/scons-local-4.8.0/SCons/Variables/__init__.py new file mode 100644 index 000000000..d9df2a26c --- /dev/null +++ b/scons/scons-local-4.8.0/SCons/Variables/__init__.py @@ -0,0 +1,413 @@ +# MIT License +# +# Copyright The SCons Foundation +# +# Permission is hereby granted, free of charge, to any person obtaining +# a copy of this software and associated documentation files (the +# "Software"), to deal in the Software without restriction, including +# without limitation the rights to use, copy, modify, merge, publish, +# distribute, sublicense, and/or sell copies of the Software, and to +# permit persons to whom the Software is furnished to do so, subject to +# the following conditions: +# +# The above copyright notice and this permission notice shall be included +# in all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY +# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE +# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +"""Adds user-friendly customizable variables to an SCons build.""" + +import os.path +import sys +from functools import cmp_to_key +from typing import Callable, Dict, List, Optional, Sequence, Union + +import SCons.Errors +import SCons.Util +import SCons.Warnings + +# Note: imports are for the benefit of SCons.Main (and tests); since they +# are not used here, the "as Foo" form is for checkers. +from .BoolVariable import BoolVariable +from .EnumVariable import EnumVariable +from .ListVariable import ListVariable +from .PackageVariable import PackageVariable +from .PathVariable import PathVariable + +__all__ = [ + "Variable", + "Variables", +] + +class Variable: + """A Build Variable.""" + + __slots__ = ('key', 'aliases', 'help', 'default', 'validator', 'converter', 'do_subst') + + def __lt__(self, other): + """Comparison fuction so Variable instances sort.""" + return self.key < other.key + + def __str__(self) -> str: + """Provide a way to "print" a Variable object.""" + return f"({self.key!r}, {self.aliases}, {self.help!r}, {self.default!r}, {self.validator}, {self.converter})" + + +class Variables: + """A container for multiple Build Variables. + + Includes methods to updates the environment with the variables, + and to render the help text. + + Arguments: + files: string or list of strings naming variable config scripts + (default ``None``) + args: dictionary to override values set from *files*. (default ``None``) + is_global: if true, return a global singleton :class:`Variables` object + instead of a fresh instance. Currently inoperable (default ``False``) + + .. versionchanged:: 4.8.0 + The default for *is_global* changed to ``False`` (previously + ``True`` but it had no effect due to an implementation error). + + .. deprecated:: 4.8.0 + *is_global* is deprecated. + """ + + def __init__( + self, + files: Optional[Union[str, Sequence[str]]] = None, + args: Optional[dict] = None, + is_global: bool = False, + ) -> None: + self.options: List[Variable] = [] + self.args = args if args is not None else {} + if not SCons.Util.is_Sequence(files): + files = [files] if files else [] + self.files: Sequence[str] = files + self.unknown: Dict[str, str] = {} + + def __str__(self) -> str: + """Provide a way to "print" a Variables object.""" + s = "Variables(\n options=[\n" + for option in self.options: + s += f" {str(option)},\n" + s += " ],\n" + s += f" args={self.args},\n files={self.files},\n unknown={self.unknown},\n)" + return s + + # lint: W0622: Redefining built-in 'help' + def _do_add( + self, + key: Union[str, List[str]], + help: str = "", + default=None, + validator: Optional[Callable] = None, + converter: Optional[Callable] = None, + **kwargs, + ) -> None: + """Create a Variable and add it to the list. + + This is the internal implementation for :meth:`Add` and + :meth:`AddVariables`. Not part of the public API. + + .. versionadded:: 4.8.0 + *subst* keyword argument is now recognized. + """ + option = Variable() + + # If we get a list or a tuple, we take the first element as the + # option key and store the remaining in aliases. + if SCons.Util.is_Sequence(key): + option.key = key[0] + option.aliases = list(key[1:]) + else: + option.key = key + # TODO: normalize to not include key in aliases. Currently breaks tests. + option.aliases = [key,] + if not option.key.isidentifier(): + raise SCons.Errors.UserError(f"Illegal Variables key {option.key!r}") + option.help = help + option.default = default + option.validator = validator + option.converter = converter + option.do_subst = kwargs.pop("subst", True) + # TODO should any remaining kwargs be saved in the Variable? + + self.options.append(option) + + # options might be added after the 'unknown' dict has been set up, + # so we remove the key and all its aliases from that dict + for alias in option.aliases + [option.key,]: + if alias in self.unknown: + del self.unknown[alias] + + def keys(self) -> list: + """Return the variable names.""" + for option in self.options: + yield option.key + + def Add( + self, key: Union[str, Sequence], *args, **kwargs, + ) -> None: + """Add a Build Variable. + + Arguments: + key: the name of the variable, or a 5-tuple (or other sequence). + If *key* is a tuple, and there are no additional arguments + except the *help*, *default*, *validator* and *converter* + keyword arguments, *key* is unpacked into the variable name + plus the *help*, *default*, *validator* and *converter* + arguments; if there are additional arguments, the first + elements of *key* is taken as the variable name, and the + remainder as aliases. + args: optional positional arguments, corresponding to the + *help*, *default*, *validator* and *converter* keyword args. + kwargs: arbitrary keyword arguments used by the variable itself. + + Keyword Args: + help: help text for the variable (default: empty string) + default: default value for variable (default: ``None``) + validator: function called to validate the value (default: ``None``) + converter: function to be called to convert the variable's + value before putting it in the environment. (default: ``None``) + subst: perform substitution on the value before the converter + and validator functions (if any) are called (default: ``True``) + + .. versionadded:: 4.8.0 + The *subst* keyword argument is now specially recognized. + """ + if SCons.Util.is_Sequence(key): + # If no other positional args (and no fundamental kwargs), + # unpack key, and pass the kwargs on: + known_kw = {'help', 'default', 'validator', 'converter'} + if not args and not known_kw.intersection(kwargs.keys()): + return self._do_add(*key, **kwargs) + + return self._do_add(key, *args, **kwargs) + + def AddVariables(self, *optlist) -> None: + """Add a list of Build Variables. + + Each list element is a tuple/list of arguments to be passed on + to the underlying method for adding variables. + + Example:: + + opt = Variables() + opt.AddVariables( + ('debug', '', 0), + ('CC', 'The C compiler'), + ('VALIDATE', 'An option for testing validation', 'notset', validator, None), + ) + """ + for opt in optlist: + self._do_add(*opt) + + def Update(self, env, args: Optional[dict] = None) -> None: + """Update an environment with the Build Variables. + + Args: + env: the environment to update. + args: a dictionary of keys and values to update in *env*. + If omitted, uses the saved :attr:`args` + """ + # first pull in the defaults + values = {opt.key: opt.default for opt in self.options if opt.default is not None} + + # next set the values specified in any options script(s) + for filename in self.files: + # TODO: issue #816 use Node to access saved-variables file? + if os.path.exists(filename): + # lint: W0622: Redefining built-in 'dir' + dir = os.path.split(os.path.abspath(filename))[0] + if dir: + sys.path.insert(0, dir) + try: + values['__name__'] = filename + with open(filename) as f: + contents = f.read() + exec(contents, {}, values) + finally: + if dir: + del sys.path[0] + del values['__name__'] + + # set the values specified on the command line + if args is None: + args = self.args + + for arg, value in args.items(): + added = False + for option in self.options: + if arg in option.aliases + [option.key,]: + values[option.key] = value + added = True + if not added: + self.unknown[arg] = value + + # put the variables in the environment: + # (don't copy over variables that are not declared as options) + for option in self.options: + try: + env[option.key] = values[option.key] + except KeyError: + pass + + # apply converters + for option in self.options: + if option.converter and option.key in values: + if option.do_subst: + value = env.subst('${%s}' % option.key) + else: + value = env[option.key] + try: + try: + env[option.key] = option.converter(value) + except TypeError: + env[option.key] = option.converter(value, env) + except ValueError as exc: + # We usually want the converter not to fail and leave + # that to the validator, but in case, handle it. + msg = f'Error converting option: {option.key!r}\n{exc}' + raise SCons.Errors.UserError(msg) from exc + + # apply validators + for option in self.options: + if option.validator and option.key in values: + if option.do_subst: + value = env.subst('${%s}' % option.key) + else: + value = env[option.key] + option.validator(option.key, value, env) + + def UnknownVariables(self) -> dict: + """Return dict of unknown variables. + + Identifies variables that were not recognized in this object. + """ + return self.unknown + + def Save(self, filename, env) -> None: + """Save the variables to a script. + + Saves all the variables which have non-default settings + to the given file as Python expressions. This script can + then be used to load the variables for a subsequent run. + This can be used to create a build variable "cache" or + capture different configurations for selection. + + Args: + filename: Name of the file to save into + env: the environment to get the option values from + """ + # Create the file and write out the header + try: + # TODO: issue #816 use Node to access saved-variables file? + with open(filename, 'w') as fh: + # Make an assignment in the file for each option + # within the environment that was assigned a value + # other than the default. We don't want to save the + # ones set to default: in case the SConscript settings + # change you would then pick up old defaults. + for option in self.options: + try: + value = env[option.key] + try: + prepare = value.prepare_to_store + except AttributeError: + try: + eval(repr(value)) + except KeyboardInterrupt: + raise + except Exception: + # Convert stuff that has a repr() that + # cannot be evaluated into a string + value = SCons.Util.to_String(value) + else: + value = prepare() + + defaultVal = env.subst(SCons.Util.to_String(option.default)) + if option.converter: + try: + defaultVal = option.converter(defaultVal) + except TypeError: + defaultVal = option.converter(defaultVal, env) + + if str(env.subst(f'${option.key}')) != str(defaultVal): + fh.write(f'{option.key} = {value!r}\n') + except KeyError: + pass + except OSError as exc: + msg = f'Error writing options to file: {filename}\n{exc}' + raise SCons.Errors.UserError(msg) from exc + + def GenerateHelpText(self, env, sort: Union[bool, Callable] = False) -> str: + """Generate the help text for the Variables object. + + Args: + env: an environment that is used to get the current values + of the variables. + sort: Either a comparison function used for sorting + (must take two arguments and return ``-1``, ``0`` or ``1``) + or a boolean to indicate if it should be sorted. + """ + # TODO the 'sort' argument matched the old way Python's sorted() + # worked, taking a comparison function argument. That has been + # removed so now we have to convert to a key. + if callable(sort): + options = sorted(self.options, key=cmp_to_key(lambda x, y: sort(x.key, y.key))) + elif sort is True: + options = sorted(self.options) + else: + options = self.options + + def format_opt(opt, self=self, env=env) -> str: + if opt.key in env: + actual = env.subst(f'${opt.key}') + else: + actual = None + return self.FormatVariableHelpText( + env, opt.key, opt.help, opt.default, actual, opt.aliases + ) + return ''.join(_f for _f in map(format_opt, options) if _f) + + fmt = '\n%s: %s\n default: %s\n actual: %s\n' + aliasfmt = '\n%s: %s\n default: %s\n actual: %s\n aliases: %s\n' + + # lint: W0622: Redefining built-in 'help' + def FormatVariableHelpText( + self, + env, + key: str, + help: str, + default, + actual, + aliases: Optional[List[str]] = None, + ) -> str: + """Format the help text for a single variable. + + The caller is responsible for obtaining all the values, + although now the :class:`Variable` class is more publicly exposed, + this method could easily do most of that work - however + that would change the existing published API. + """ + if aliases is None: + aliases = [] + # Don't display the key name itself as an alias. + aliases = [a for a in aliases if a != key] + if aliases: + return self.aliasfmt % (key, help, default, actual, aliases) + return self.fmt % (key, help, default, actual) + +# Local Variables: +# tab-width:4 +# indent-tabs-mode:nil +# End: +# vim: set expandtab tabstop=4 shiftwidth=4: diff --git a/scons/scons-local-4.7.0/SCons/Warnings.py b/scons/scons-local-4.8.0/SCons/Warnings.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/Warnings.py rename to scons/scons-local-4.8.0/SCons/Warnings.py diff --git a/scons/scons-local-4.7.0/SCons/__init__.py b/scons/scons-local-4.8.0/SCons/__init__.py similarity index 51% rename from scons/scons-local-4.7.0/SCons/__init__.py rename to scons/scons-local-4.8.0/SCons/__init__.py index e89057fe2..a61ba2c7c 100644 --- a/scons/scons-local-4.7.0/SCons/__init__.py +++ b/scons/scons-local-4.8.0/SCons/__init__.py @@ -1,9 +1,9 @@ -__version__="4.7.0" +__version__="4.8.0" __copyright__="Copyright (c) 2001 - 2024 The SCons Foundation" __developer__="bdbaddog" -__date__="Sun, 17 Mar 2024 17:33:54 -0700" +__date__="Sun, 07 Jul 2024 16:52:07 -0700" __buildsys__="M1Dog2021" -__revision__="265be6883fadbb5a545612265acc919595158366" -__build__="265be6883fadbb5a545612265acc919595158366" +__revision__="7c688f694c644b61342670ce92977bf4a396c0d4" +__build__="7c688f694c644b61342670ce92977bf4a396c0d4" # make sure compatibility is always in place import SCons.compat # noqa \ No newline at end of file diff --git a/scons/scons-local-4.7.0/SCons/__main__.py b/scons/scons-local-4.8.0/SCons/__main__.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/__main__.py rename to scons/scons-local-4.8.0/SCons/__main__.py diff --git a/scons/scons-local-4.7.0/SCons/compat/__init__.py b/scons/scons-local-4.8.0/SCons/compat/__init__.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/compat/__init__.py rename to scons/scons-local-4.8.0/SCons/compat/__init__.py diff --git a/scons/scons-local-4.7.0/SCons/compat/_scons_dbm.py b/scons/scons-local-4.8.0/SCons/compat/_scons_dbm.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/compat/_scons_dbm.py rename to scons/scons-local-4.8.0/SCons/compat/_scons_dbm.py diff --git a/scons/scons-local-4.7.0/SCons/compat/win32.py b/scons/scons-local-4.8.0/SCons/compat/win32.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/compat/win32.py rename to scons/scons-local-4.8.0/SCons/compat/win32.py diff --git a/scons/scons-local-4.7.0/SCons/cpp.py b/scons/scons-local-4.8.0/SCons/cpp.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/cpp.py rename to scons/scons-local-4.8.0/SCons/cpp.py diff --git a/scons/scons-local-4.7.0/SCons/dblite.py b/scons/scons-local-4.8.0/SCons/dblite.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/dblite.py rename to scons/scons-local-4.8.0/SCons/dblite.py diff --git a/scons/scons-local-4.7.0/SCons/exitfuncs.py b/scons/scons-local-4.8.0/SCons/exitfuncs.py similarity index 100% rename from scons/scons-local-4.7.0/SCons/exitfuncs.py rename to scons/scons-local-4.8.0/SCons/exitfuncs.py diff --git a/scons/scons-time.py b/scons/scons-time.py index 44f0775fa..d81d4c4e0 100644 --- a/scons/scons-time.py +++ b/scons/scons-time.py @@ -223,23 +223,25 @@ class Gnuplotter(Plotter): def untar(fname): import tarfile - tar = tarfile.open(name=fname, mode='r') - for tarinfo in tar: - tar.extract(tarinfo) - tar.close() + with tarfile.open(name=fname, mode='r') as tar: + for tarinfo in tar: + try: + tar.extract(tarinfo, filter="tar") + except TypeError: + tar.extract(tarinfo) def unzip(fname): import zipfile - zf = zipfile.ZipFile(fname, 'r') - for name in zf.namelist(): - dir = os.path.dirname(name) - try: - os.makedirs(dir) - except OSError: - pass - with open(name, 'wb') as f: - f.write(zf.read(name)) + with zipfile.ZipFile(fname, 'r') as zf: + for name in zf.namelist(): + dir = os.path.dirname(name) + try: + os.makedirs(dir) + except OSError: + pass + with open(name, 'wb') as f: + f.write(zf.read(name)) def read_tree(dir): @@ -258,6 +260,8 @@ def redirect_to_file(command, log): def tee_to_file(command, log): return '%s 2>&1 | tee %s' % (command, log) +def makedict(**kw): + return kw class SConsTimer: """ @@ -276,9 +280,6 @@ class SConsTimer: name = 'scons-time' name_spaces = ' ' * len(name) - def makedict(**kw): - return kw - default_settings = makedict( chdir=None, config_file=None, @@ -550,7 +551,7 @@ class SConsTimer: specified prefix, extracts the run numbers from each file name, and returns the next run number after the largest it finds. """ - x = re.compile(re.escape(prefix) + '-([0-9]+).*') + x = re.compile(re.escape(prefix) + r'-([0-9]+).*') matches = [x.match(e) for e in os.listdir(dir)] matches = [_f for _f in matches if _f] if not matches: diff --git a/scons/scons.py b/scons/scons.py index 92aab20a9..41d84f36e 100755 --- a/scons/scons.py +++ b/scons/scons.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python3 +#! /usr/bin/env python # # SCons - a Software Constructor # @@ -25,15 +25,15 @@ # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE -__revision__ = "scripts/scons.py 265be6883fadbb5a545612265acc919595158366 Sun, 17 Mar 2024 17:33:54 -0700 bdbaddog" +__revision__ = "scripts/scons.py 7c688f694c644b61342670ce92977bf4a396c0d4 Sun, 07 Jul 2024 16:52:07 -0700 bdbaddog" -__version__ = "4.7.0" +__version__ = "4.8.0" -__build__ = "265be6883fadbb5a545612265acc919595158366" +__build__ = "7c688f694c644b61342670ce92977bf4a396c0d4" __buildsys__ = "M1Dog2021" -__date__ = "Sun, 17 Mar 2024 17:33:54 -0700" +__date__ = "Sun, 07 Jul 2024 16:52:07 -0700" __developer__ = "bdbaddog" @@ -44,7 +44,7 @@ import sys # Python compatibility check if sys.version_info < (3, 6, 0): msg = "scons: *** SCons version %s does not run under Python version %s.\n\ -Python >= 3.5 is required.\n" +Python >= 3.6.0 is required.\n" sys.stderr.write(msg % (__version__, sys.version.split()[0])) sys.exit(1) diff --git a/scons/sconsign.py b/scons/sconsign.py index 76bd2de7a..26e4cad86 100644 --- a/scons/sconsign.py +++ b/scons/sconsign.py @@ -25,15 +25,15 @@ # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -__revision__ = "scripts/sconsign.py 265be6883fadbb5a545612265acc919595158366 Sun, 17 Mar 2024 17:33:54 -0700 bdbaddog" +__revision__ = "scripts/sconsign.py 7c688f694c644b61342670ce92977bf4a396c0d4 Sun, 07 Jul 2024 16:52:07 -0700 bdbaddog" -__version__ = "4.7.0" +__version__ = "4.8.0" -__build__ = "265be6883fadbb5a545612265acc919595158366" +__build__ = "7c688f694c644b61342670ce92977bf4a396c0d4" __buildsys__ = "M1Dog2021" -__date__ = "Sun, 17 Mar 2024 17:33:54 -0700" +__date__ = "Sun, 07 Jul 2024 16:52:07 -0700" __developer__ = "bdbaddog" @@ -43,7 +43,7 @@ import sys # python compatibility check if sys.version_info < (3, 6, 0): msg = "scons: *** SCons version %s does not run under Python version %s.\n\ -Python >= 3.5 is required.\n" +Python >= 3.6.0 is required.\n" sys.stderr.write(msg % (__version__, sys.version.split()[0])) sys.exit(1)