diff --git a/scons/scons-LICENSE b/scons/scons-LICENSE
index 3c6c58d3b..58a3e280c 100644
--- a/scons/scons-LICENSE
+++ b/scons/scons-LICENSE
@@ -5,7 +5,7 @@
MIT License
-Copyright (c) 2001 - 2024 The SCons Foundation
+Copyright (c) 2001 - 2025 The SCons Foundation
Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
diff --git a/scons/scons-configure-cache.py b/scons/scons-configure-cache.py
index c7f649719..c1d5cb95e 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 08661ed4c552323ef3a7f0ff1af38868cbabb05e Tue, 03 Sep 2024 17:46:32 -0700 bdbaddog"
+__revision__ = "scripts/scons-configure-cache.py 39a12f34d532ab2493e78a7b73aeab2250852790 Thu, 27 Mar 2025 11:44:24 -0700 bdbaddog"
-__version__ = "4.8.1"
+__version__ = "4.9.1"
-__build__ = "08661ed4c552323ef3a7f0ff1af38868cbabb05e"
+__build__ = "39a12f34d532ab2493e78a7b73aeab2250852790"
__buildsys__ = "M1Dog2021"
-__date__ = "Tue, 03 Sep 2024 17:46:32 -0700"
+__date__ = "Thu, 27 Mar 2025 11:44:24 -0700"
__developer__ = "bdbaddog"
@@ -49,9 +49,9 @@ import os
import sys
# python compatibility check
-if sys.version_info < (3, 6, 0):
+if sys.version_info < (3, 7, 0):
msg = "scons: *** SCons version %s does not run under Python version %s.\n\
-Python >= 3.6.0 is required.\n"
+Python >= 3.7.0 is required.\n"
sys.stderr.write(msg % (__version__, sys.version.split()[0]))
sys.exit(1)
diff --git a/scons/scons-local-4.8.1/SCons/Util/sctyping.py b/scons/scons-local-4.8.1/SCons/Util/sctyping.py
deleted file mode 100644
index 5da5eb9fe..000000000
--- a/scons/scons-local-4.8.1/SCons/Util/sctyping.py
+++ /dev/null
@@ -1,33 +0,0 @@
-# SPDX-License-Identifier: MIT
-#
-# Copyright The SCons Foundation
-
-"""Various SCons type aliases.
-
-For representing complex types across the entire repo without risking
-circular dependencies, we take advantage of TYPE_CHECKING to import
-modules in an tool-only environment. This allows us to introduce
-hinting that resolves as expected in IDEs without clashing at runtime.
-
-For consistency, it's recommended to ALWAYS use these aliases in a
-type-hinting context, even if the type is actually expected to be
-resolved in a given file.
-"""
-
-from typing import Union, TYPE_CHECKING
-
-if TYPE_CHECKING:
- import SCons.Executor
-
-
-# Because we don't have access to TypeAlias until 3.10, we have to utilize
-# 'Union' for all aliases. As it expects at least two entries, anything that
-# is only represented with a single type needs to list itself twice.
-ExecutorType = Union["SCons.Executor.Executor", "SCons.Executor.Executor"]
-
-
-# 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.1/SCons/__init__.py b/scons/scons-local-4.8.1/SCons/__init__.py
deleted file mode 100644
index bbf9eebe6..000000000
--- a/scons/scons-local-4.8.1/SCons/__init__.py
+++ /dev/null
@@ -1,9 +0,0 @@
-__version__="4.8.1"
-__copyright__="Copyright (c) 2001 - 2024 The SCons Foundation"
-__developer__="bdbaddog"
-__date__="Tue, 03 Sep 2024 17:46:32 -0700"
-__buildsys__="M1Dog2021"
-__revision__="08661ed4c552323ef3a7f0ff1af38868cbabb05e"
-__build__="08661ed4c552323ef3a7f0ff1af38868cbabb05e"
-# make sure compatibility is always in place
-import SCons.compat # noqa
\ No newline at end of file
diff --git a/scons/scons-local-4.8.1/SCons/Action.py b/scons/scons-local-4.9.1/SCons/Action.py
similarity index 94%
rename from scons/scons-local-4.8.1/SCons/Action.py
rename to scons/scons-local-4.9.1/SCons/Action.py
index 567f66cef..18a488a78 100644
--- a/scons/scons-local-4.8.1/SCons/Action.py
+++ b/scons/scons-local-4.9.1/SCons/Action.py
@@ -100,6 +100,8 @@ way for wrapping up the functions.
"""
+from __future__ import annotations
+
import inspect
import os
import pickle
@@ -109,7 +111,7 @@ import sys
from abc import ABC, abstractmethod
from collections import OrderedDict
from subprocess import DEVNULL, PIPE
-from typing import List, Optional, Tuple
+from typing import TYPE_CHECKING
import SCons.Debug
import SCons.Errors
@@ -120,7 +122,9 @@ import SCons.Util
from SCons.Debug import logInstanceCreation
from SCons.Subst import SUBST_CMD, SUBST_RAW, SUBST_SIG
from SCons.Util import is_String, is_List
-from SCons.Util.sctyping import ExecutorType
+
+if TYPE_CHECKING:
+ from SCons.Executor import Executor
class _null:
pass
@@ -481,9 +485,7 @@ def _do_create_action(act, kw):
return None
-# TODO: from __future__ import annotations once we get to Python 3.7 base,
-# to avoid quoting the defined-later classname
-def _do_create_list_action(act, kw) -> "ListAction":
+def _do_create_list_action(act, kw) -> ListAction:
"""A factory for list actions.
Convert the input list *act* into Actions and then wrap them in a
@@ -529,7 +531,7 @@ class ActionBase(ABC):
show=_null,
execute=_null,
chdir=_null,
- executor: Optional[ExecutorType] = None,
+ executor: Executor | None = None,
):
raise NotImplementedError
@@ -541,15 +543,15 @@ class ActionBase(ABC):
batch_key = no_batch_key
- def genstring(self, target, source, env, executor: Optional[ExecutorType] = None) -> str:
+ def genstring(self, target, source, env, executor: Executor | None = None) -> str:
return str(self)
@abstractmethod
- def get_presig(self, target, source, env, executor: Optional[ExecutorType] = None):
+ def get_presig(self, target, source, env, executor: Executor | None = None):
raise NotImplementedError
@abstractmethod
- def get_implicit_deps(self, target, source, env, executor: Optional[ExecutorType] = None):
+ def get_implicit_deps(self, target, source, env, executor: Executor | None = None):
raise NotImplementedError
def get_contents(self, target, source, env):
@@ -601,10 +603,10 @@ class ActionBase(ABC):
self.presub_env = None # don't need this any more
return lines
- def get_varlist(self, target, source, env, executor: Optional[ExecutorType] = None):
+ def get_varlist(self, target, source, env, executor: Executor | None = None):
return self.varlist
- def get_targets(self, env, executor: Optional[ExecutorType]):
+ def get_targets(self, env, executor: Executor | None):
"""
Returns the type of targets ($TARGETS, $CHANGED_TARGETS) used
by this action.
@@ -658,7 +660,7 @@ class _ActionAction(ActionBase):
show=_null,
execute=_null,
chdir=_null,
- executor: Optional[ExecutorType] = None):
+ executor: Executor | None = None):
if not is_List(target):
target = [target]
if not is_List(source):
@@ -742,10 +744,10 @@ class _ActionAction(ActionBase):
# an ABC like parent ActionBase, but things reach in and use it. It's
# not just unittests or we could fix it up with a concrete subclass there.
- def get_presig(self, target, source, env, executor: Optional[ExecutorType] = None):
+ def get_presig(self, target, source, env, executor: Executor | None = None):
raise NotImplementedError
- def get_implicit_deps(self, target, source, env, executor: Optional[ExecutorType] = None):
+ def get_implicit_deps(self, target, source, env, executor: Executor | None = None):
raise NotImplementedError
@@ -891,15 +893,6 @@ def scons_subproc_run(scons_env, *args, **kwargs) -> subprocess.CompletedProcess
del kwargs['error']
kwargs['check'] = check
- # TODO: Python version-compat stuff: remap/remove too-new args if needed
- 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, 7):
- capture_output = kwargs.pop('capture_output')
- if capture_output:
- kwargs['stdout'] = kwargs['stderr'] = PIPE
-
# Most SCons tools/tests expect not to fail on things like missing files.
# check=True (or error="raise") means we're okay to take an exception;
# else we catch the likely exception and construct a dummy
@@ -1010,7 +1003,7 @@ class CommandAction(_ActionAction):
return str(self.cmd_list)
- def process(self, target, source, env, executor=None, overrides: Optional[dict] = None) -> Tuple[List, bool, bool]:
+ def process(self, target, source, env, executor: Executor | None = None, overrides: dict | None = None) -> tuple[list, bool, bool]:
if executor:
result = env.subst_list(self.cmd_list, SUBST_CMD, executor=executor, overrides=overrides)
else:
@@ -1031,7 +1024,7 @@ class CommandAction(_ActionAction):
pass
return result, ignore, silent
- def strfunction(self, target, source, env, executor: Optional[ExecutorType] = None, overrides: Optional[dict] = None) -> str:
+ def strfunction(self, target, source, env, executor: Executor | None = None, overrides: dict | None = None) -> str:
if self.cmdstr is None:
return None
if self.cmdstr is not _null:
@@ -1046,7 +1039,7 @@ class CommandAction(_ActionAction):
return ''
return _string_from_cmd_list(cmd_list[0])
- def execute(self, target, source, env, executor: Optional[ExecutorType] = None):
+ def execute(self, target, source, env, executor: Executor | None = None):
"""Execute a command action.
This will handle lists of commands as well as individual commands,
@@ -1108,7 +1101,7 @@ class CommandAction(_ActionAction):
command=cmd_line)
return 0
- def get_presig(self, target, source, env, executor: Optional[ExecutorType] = None):
+ def get_presig(self, target, source, env, executor: Executor | None = None):
"""Return the signature contents of this action's command line.
This strips $(-$) and everything in between the string,
@@ -1123,7 +1116,7 @@ class CommandAction(_ActionAction):
return env.subst_target_source(cmd, SUBST_SIG, executor=executor)
return env.subst_target_source(cmd, SUBST_SIG, target, source)
- def get_implicit_deps(self, target, source, env, executor: Optional[ExecutorType] = None):
+ def get_implicit_deps(self, target, source, env, executor: Executor | None = None):
"""Return the implicit dependencies of this action's command line."""
icd = env.get('IMPLICIT_COMMAND_DEPENDENCIES', True)
if is_String(icd) and icd[:1] == '$':
@@ -1145,7 +1138,7 @@ class CommandAction(_ActionAction):
# lightweight dependency scanning.
return self._get_implicit_deps_lightweight(target, source, env, executor)
- def _get_implicit_deps_lightweight(self, target, source, env, executor: Optional[ExecutorType]):
+ def _get_implicit_deps_lightweight(self, target, source, env, executor: Executor | None):
"""
Lightweight dependency scanning involves only scanning the first entry
in an action string, even if it contains &&.
@@ -1166,7 +1159,7 @@ class CommandAction(_ActionAction):
res.append(env.fs.File(d))
return res
- def _get_implicit_deps_heavyweight(self, target, source, env, executor: Optional[ExecutorType],
+ def _get_implicit_deps_heavyweight(self, target, source, env, executor: Executor | None,
icd_int):
"""
Heavyweight dependency scanning involves scanning more than just the
@@ -1234,7 +1227,7 @@ class CommandGeneratorAction(ActionBase):
self.varlist = kw.get('varlist', ())
self.targets = kw.get('targets', '$TARGETS')
- def _generate(self, target, source, env, for_signature, executor: Optional[ExecutorType] = None):
+ def _generate(self, target, source, env, for_signature, executor: Executor | None = None):
# ensure that target is a list, to make it easier to write
# generator functions:
if not is_List(target):
@@ -1265,11 +1258,11 @@ class CommandGeneratorAction(ActionBase):
def batch_key(self, env, target, source):
return self._generate(target, source, env, 1).batch_key(env, target, source)
- def genstring(self, target, source, env, executor: Optional[ExecutorType] = None) -> str:
+ def genstring(self, target, source, env, executor: Executor | None = None) -> str:
return self._generate(target, source, env, 1, executor).genstring(target, source, env)
def __call__(self, target, source, env, exitstatfunc=_null, presub=_null,
- show=_null, execute=_null, chdir=_null, executor: Optional[ExecutorType] = None):
+ show=_null, execute=_null, chdir=_null, executor: Executor | None = None):
act = self._generate(target, source, env, 0, executor)
if act is None:
raise SCons.Errors.UserError(
@@ -1281,7 +1274,7 @@ class CommandGeneratorAction(ActionBase):
target, source, env, exitstatfunc, presub, show, execute, chdir, executor
)
- def get_presig(self, target, source, env, executor: Optional[ExecutorType] = None):
+ def get_presig(self, target, source, env, executor: Executor | None = None):
"""Return the signature contents of this action's command line.
This strips $(-$) and everything in between the string,
@@ -1289,13 +1282,13 @@ class CommandGeneratorAction(ActionBase):
"""
return self._generate(target, source, env, 1, executor).get_presig(target, source, env)
- def get_implicit_deps(self, target, source, env, executor: Optional[ExecutorType] = None):
+ def get_implicit_deps(self, target, source, env, executor: Executor | None = None):
return self._generate(target, source, env, 1, executor).get_implicit_deps(target, source, env)
- def get_varlist(self, target, source, env, executor: Optional[ExecutorType] = None):
+ def get_varlist(self, target, source, env, executor: Executor | None = None):
return self._generate(target, source, env, 1, executor).get_varlist(target, source, env, executor)
- def get_targets(self, env, executor: Optional[ExecutorType]):
+ def get_targets(self, env, executor: Executor | None):
return self._generate(None, None, env, 1, executor).get_targets(env, executor)
@@ -1341,22 +1334,22 @@ class LazyAction(CommandGeneratorAction, CommandAction):
raise SCons.Errors.UserError("$%s value %s cannot be used to create an Action." % (self.var, repr(c)))
return gen_cmd
- def _generate(self, target, source, env, for_signature, executor: Optional[ExecutorType] = None):
+ def _generate(self, target, source, env, for_signature, executor: Executor | None = None):
return self._generate_cache(env)
def __call__(self, target, source, env, *args, **kw):
c = self.get_parent_class(env)
return c.__call__(self, target, source, env, *args, **kw)
- def get_presig(self, target, source, env, executor: Optional[ExecutorType] = None):
+ def get_presig(self, target, source, env, executor: Executor | None = None):
c = self.get_parent_class(env)
return c.get_presig(self, target, source, env)
- def get_implicit_deps(self, target, source, env, executor: Optional[ExecutorType] = None):
+ def get_implicit_deps(self, target, source, env, executor: Executor | None = None):
c = self.get_parent_class(env)
return c.get_implicit_deps(self, target, source, env)
- def get_varlist(self, target, source, env, executor: Optional[ExecutorType] = None):
+ def get_varlist(self, target, source, env, executor: Executor | None = None):
c = self.get_parent_class(env)
return c.get_varlist(self, target, source, env, executor)
@@ -1389,7 +1382,7 @@ class FunctionAction(_ActionAction):
except AttributeError:
return "unknown_python_function"
- def strfunction(self, target, source, env, executor: Optional[ExecutorType] = None):
+ def strfunction(self, target, source, env, executor: Executor | None = None):
if self.cmdstr is None:
return None
if self.cmdstr is not _null:
@@ -1430,7 +1423,7 @@ class FunctionAction(_ActionAction):
return str(self.execfunction)
return "%s(target, source, env)" % name
- def execute(self, target, source, env, executor: Optional[ExecutorType] = None):
+ def execute(self, target, source, env, executor: Executor | None = None):
exc_info = (None,None,None)
try:
if executor:
@@ -1461,14 +1454,14 @@ class FunctionAction(_ActionAction):
# more information about this issue.
del exc_info
- def get_presig(self, target, source, env, executor: Optional[ExecutorType] = None):
+ def get_presig(self, target, source, env, executor: Executor | None = None):
"""Return the signature contents of this callable action."""
try:
return self.gc(target, source, env)
except AttributeError:
return self.funccontents
- def get_implicit_deps(self, target, source, env, executor: Optional[ExecutorType] = None):
+ def get_implicit_deps(self, target, source, env, executor: Executor | None = None):
return []
class ListAction(ActionBase):
@@ -1485,7 +1478,7 @@ class ListAction(ActionBase):
self.varlist = ()
self.targets = '$TARGETS'
- def genstring(self, target, source, env, executor: Optional[ExecutorType] = None) -> str:
+ def genstring(self, target, source, env, executor: Executor | None = None) -> str:
return '\n'.join([a.genstring(target, source, env) for a in self.list])
def __str__(self) -> str:
@@ -1495,7 +1488,7 @@ class ListAction(ActionBase):
return SCons.Util.flatten_sequence(
[a.presub_lines(env) for a in self.list])
- def get_presig(self, target, source, env, executor: Optional[ExecutorType] = None):
+ def get_presig(self, target, source, env, executor: Executor | None = None):
"""Return the signature contents of this action list.
Simple concatenation of the signatures of the elements.
@@ -1503,7 +1496,7 @@ class ListAction(ActionBase):
return b"".join([bytes(x.get_contents(target, source, env)) for x in self.list])
def __call__(self, target, source, env, exitstatfunc=_null, presub=_null,
- show=_null, execute=_null, chdir=_null, executor: Optional[ExecutorType] = None):
+ show=_null, execute=_null, chdir=_null, executor: Executor | None = None):
if executor:
target = executor.get_all_targets()
source = executor.get_all_sources()
@@ -1514,13 +1507,13 @@ class ListAction(ActionBase):
return stat
return 0
- def get_implicit_deps(self, target, source, env, executor: Optional[ExecutorType] = None):
+ def get_implicit_deps(self, target, source, env, executor: Executor | None = None):
result = []
for act in self.list:
result.extend(act.get_implicit_deps(target, source, env))
return result
- def get_varlist(self, target, source, env, executor: Optional[ExecutorType] = None):
+ def get_varlist(self, target, source, env, executor: Executor | None = None):
result = OrderedDict()
for act in self.list:
for var in act.get_varlist(target, source, env, executor):
@@ -1586,7 +1579,7 @@ class ActionCaller:
kw[key] = self.subst(self.kw[key], target, source, env)
return kw
- def __call__(self, target, source, env, executor: Optional[ExecutorType] = None):
+ def __call__(self, target, source, env, executor: Executor | None = None):
args = self.subst_args(target, source, env)
kw = self.subst_kw(target, source, env)
return self.parent.actfunc(*args, **kw)
diff --git a/scons/scons-local-4.8.1/SCons/Builder.py b/scons/scons-local-4.9.1/SCons/Builder.py
similarity index 99%
rename from scons/scons-local-4.8.1/SCons/Builder.py
rename to scons/scons-local-4.9.1/SCons/Builder.py
index 3efcc8271..c81d10414 100644
--- a/scons/scons-local-4.8.1/SCons/Builder.py
+++ b/scons/scons-local-4.9.1/SCons/Builder.py
@@ -99,10 +99,11 @@ There are the following methods for internal use within this module:
"""
+from __future__ import annotations
+
import os
from collections import UserDict, UserList
from contextlib import suppress
-from typing import Optional
import SCons.Action
import SCons.Debug
@@ -112,7 +113,7 @@ import SCons.Util
import SCons.Warnings
from SCons.Debug import logInstanceCreation
from SCons.Errors import InternalError, UserError
-from SCons.Util.sctyping import ExecutorType
+from SCons.Executor import Executor
class _Null:
pass
@@ -591,7 +592,7 @@ class BuilderBase:
# build this particular list of targets from this particular list of
# sources.
- executor: Optional[ExecutorType] = None
+ executor: Executor | None = None
key = None
if self.multi:
diff --git a/scons/scons-local-4.8.1/SCons/CacheDir.py b/scons/scons-local-4.9.1/SCons/CacheDir.py
similarity index 67%
rename from scons/scons-local-4.8.1/SCons/CacheDir.py
rename to scons/scons-local-4.9.1/SCons/CacheDir.py
index 0174793df..a5184b6e9 100644
--- a/scons/scons-local-4.8.1/SCons/CacheDir.py
+++ b/scons/scons-local-4.9.1/SCons/CacheDir.py
@@ -27,8 +27,10 @@
import atexit
import json
import os
+import shutil
import stat
import sys
+import tempfile
import uuid
import SCons.Action
@@ -36,6 +38,12 @@ import SCons.Errors
import SCons.Warnings
import SCons.Util
+CACHE_PREFIX_LEN = 2 # first two characters used as subdirectory name
+CACHE_TAG = (
+ b"Signature: 8a477f597d28d172789f06886806bc55\n"
+ b"# SCons cache directory - see https://bford.info/cachedir/\n"
+)
+
cache_enabled = True
cache_debug = False
cache_force = False
@@ -64,23 +72,22 @@ def CacheRetrieveFunc(target, source, env) -> int:
except OSError:
pass
st = fs.stat(cachefile)
- fs.chmod(t.get_internal_path(), stat.S_IMODE(st[stat.ST_MODE]) | stat.S_IWRITE)
+ fs.chmod(t.get_internal_path(), stat.S_IMODE(st.st_mode) | stat.S_IWRITE)
return 0
-def CacheRetrieveString(target, source, env) -> None:
+def CacheRetrieveString(target, source, env) -> str:
t = target[0]
- fs = t.fs
cd = env.get_CacheDir()
cachedir, cachefile = cd.cachepath(t)
if t.fs.exists(cachefile):
return "Retrieved `%s' from cache" % t.get_internal_path()
- return None
+ return ""
CacheRetrieve = SCons.Action.Action(CacheRetrieveFunc, CacheRetrieveString)
CacheRetrieveSilent = SCons.Action.Action(CacheRetrieveFunc, None)
-def CachePushFunc(target, source, env):
+def CachePushFunc(target, source, env) -> None:
if cache_readonly:
return
@@ -134,8 +141,7 @@ CachePush = SCons.Action.Action(CachePushFunc, None)
class CacheDir:
def __init__(self, path) -> None:
- """
- Initialize a CacheDir object.
+ """Initialize a CacheDir object.
The cache configuration is stored in the object. It
is read from the config file in the supplied path if
@@ -147,53 +153,120 @@ class CacheDir:
self.path = path
self.current_cache_debug = None
self.debugFP = None
- self.config = dict()
- if path is None:
- return
+ self.config = {}
+ if path is not None:
+ self._readconfig(path)
- self._readconfig(path)
+ def _add_config(self, path: str) -> None:
+ """Create the cache config file in *path*.
-
- def _readconfig(self, path):
- """
- Read the cache config.
-
- If directory or config file do not exist, create. Take advantage
- of Py3 capability in os.makedirs() and in file open(): just try
- the operation and handle failure appropriately.
-
- Omit the check for old cache format, assume that's old enough
- there will be none of those left to worry about.
-
- :param path: path to the cache directory
+ Locking isn't necessary in the normal case - when the cachedir is
+ being created - because it's written to a unique directory first,
+ before the directory is renamed. But it is legal to call CacheDir
+ with an existing directory, which may be missing the config file,
+ and in that case we do need locking. Simpler to always lock.
"""
config_file = os.path.join(path, 'config')
+ # TODO: this breaks the "unserializable config object" test which
+ # does some crazy stuff, so for now don't use setdefault. It does
+ # seem like it would be better to preserve an exisiting value.
+ # self.config.setdefault('prefix_len', CACHE_PREFIX_LEN)
+ self.config['prefix_len'] = CACHE_PREFIX_LEN
+ with SCons.Util.FileLock(config_file, timeout=5, writer=True), open(
+ config_file, "x"
+ ) as config:
+ try:
+ json.dump(self.config, config)
+ except Exception:
+ msg = "Failed to write cache configuration for " + path
+ raise SCons.Errors.SConsEnvironmentError(msg)
+
+ # Add the tag file "carelessly" - the contents are not used by SCons
+ # so we don't care about the chance of concurrent writes.
try:
- # still use a try block even with exist_ok, might have other fails
- os.makedirs(path, exist_ok=True)
- except OSError:
- msg = "Failed to create cache directory " + path
- raise SCons.Errors.SConsEnvironmentError(msg)
+ tagfile = os.path.join(path, "CACHEDIR.TAG")
+ with open(tagfile, 'xb') as cachedir_tag:
+ cachedir_tag.write(CACHE_TAG)
+ except FileExistsError:
+ pass
+
+ def _mkdir_atomic(self, path: str) -> bool:
+ """Create cache directory at *path*.
+
+ Uses directory renaming to avoid races. If we are actually
+ creating the dir, populate it with the metadata files at the
+ same time as that's the safest way. But it's not illegal to point
+ CacheDir at an existing directory that wasn't a cache previously,
+ so we may have to do that elsewhere, too.
+
+ Returns:
+ ``True`` if it we created the dir, ``False`` if already existed,
+
+ Raises:
+ SConsEnvironmentError: if we tried and failed to create the cache.
+ """
+ directory = os.path.abspath(path)
+ if os.path.exists(directory):
+ return False
try:
- with SCons.Util.FileLock(config_file, timeout=5, writer=True), open(
- config_file, "x"
- ) as config:
- self.config['prefix_len'] = 2
+ # TODO: Python 3.7. See comment below.
+ # tempdir = tempfile.TemporaryDirectory(dir=os.path.dirname(directory))
+ tempdir = tempfile.mkdtemp(dir=os.path.dirname(directory))
+ except OSError as e:
+ msg = "Failed to create cache directory " + path
+ raise SCons.Errors.SConsEnvironmentError(msg) from e
+
+ # TODO: Python 3.7: the context manager raises exception on cleanup
+ # if the temporary was moved successfully (File Not Found).
+ # Fixed in 3.8+. In the replacement below we manually clean up if
+ # the move failed as mkdtemp() does not. TemporaryDirectory's
+ # cleanup is more sophisitcated so prefer when we can use it.
+ # self._add_config(tempdir.name)
+ # with tempdir:
+ # try:
+ # os.replace(tempdir.name, directory)
+ # return True
+ # except OSError as e:
+ # # did someone else get there first?
+ # if os.path.isdir(directory):
+ # return False # context manager cleans up
+ # msg = "Failed to create cache directory " + path
+ # raise SCons.Errors.SConsEnvironmentError(msg) from e
+
+ self._add_config(tempdir)
+ try:
+ os.replace(tempdir, directory)
+ return True
+ except OSError as e:
+ # did someone else get there first? attempt cleanup.
+ if os.path.isdir(directory):
try:
- json.dump(self.config, config)
- except Exception:
- msg = "Failed to write cache configuration for " + path
- raise SCons.Errors.SConsEnvironmentError(msg)
- except FileExistsError:
- try:
- with SCons.Util.FileLock(config_file, timeout=5, writer=False), open(
- config_file
- ) as config:
- self.config = json.load(config)
- except (ValueError, json.decoder.JSONDecodeError):
- msg = "Failed to read cache configuration for " + path
- raise SCons.Errors.SConsEnvironmentError(msg)
+ shutil.rmtree(tempdir)
+ except Exception: # we tried, don't worry about it
+ pass
+ return False
+ msg = "Failed to create cache directory " + path
+ raise SCons.Errors.SConsEnvironmentError(msg) from e
+
+ def _readconfig(self, path: str) -> None:
+ """Read the cache config from *path*.
+
+ If directory or config file do not exist, create and populate.
+ """
+ config_file = os.path.join(path, 'config')
+ created = self._mkdir_atomic(path)
+ if not created and not os.path.isfile(config_file):
+ # Could have been passed an empty directory
+ self._add_config(path)
+ try:
+ with SCons.Util.FileLock(config_file, timeout=5, writer=False), open(
+ config_file
+ ) as config:
+ self.config = json.load(config)
+ except (ValueError, json.decoder.JSONDecodeError):
+ msg = "Failed to read cache configuration for " + path
+ raise SCons.Errors.SConsEnvironmentError(msg)
def CacheDebug(self, fmt, target, cachefile) -> None:
if cache_debug != self.current_cache_debug:
@@ -252,7 +325,7 @@ class CacheDir:
def is_readonly(self) -> bool:
return cache_readonly
- def get_cachedir_csig(self, node):
+ def get_cachedir_csig(self, node) -> str:
cachedir, cachefile = self.cachepath(node)
if cachefile and os.path.exists(cachefile):
return SCons.Util.hash_file_signature(cachefile, SCons.Node.FS.File.hash_chunksize)
diff --git a/scons/scons-local-4.8.1/SCons/Conftest.py b/scons/scons-local-4.9.1/SCons/Conftest.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Conftest.py
rename to scons/scons-local-4.9.1/SCons/Conftest.py
diff --git a/scons/scons-local-4.8.1/SCons/Debug.py b/scons/scons-local-4.9.1/SCons/Debug.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Debug.py
rename to scons/scons-local-4.9.1/SCons/Debug.py
diff --git a/scons/scons-local-4.8.1/SCons/Defaults.py b/scons/scons-local-4.9.1/SCons/Defaults.py
similarity index 99%
rename from scons/scons-local-4.8.1/SCons/Defaults.py
rename to scons/scons-local-4.9.1/SCons/Defaults.py
index a5d49fc76..d971d060f 100644
--- a/scons/scons-local-4.8.1/SCons/Defaults.py
+++ b/scons/scons-local-4.9.1/SCons/Defaults.py
@@ -31,12 +31,14 @@ The code that reads the registry to find MSVC components was borrowed
from distutils.msvccompiler.
"""
+from __future__ import annotations
+
import os
import shutil
import stat
import sys
import time
-from typing import List, Callable
+from typing import Callable
import SCons.Action
import SCons.Builder
@@ -467,8 +469,8 @@ def _stripixes(
prefix: str,
items,
suffix: str,
- stripprefixes: List[str],
- stripsuffixes: List[str],
+ stripprefixes: list[str],
+ stripsuffixes: list[str],
env,
literal_prefix: str = "",
c: Callable[[list], list] = None,
@@ -547,7 +549,7 @@ def _stripixes(
return c(prefix, stripped, suffix, env)
-def processDefines(defs) -> List[str]:
+def processDefines(defs) -> list[str]:
"""Return list of strings for preprocessor defines from *defs*.
Resolves the different forms ``CPPDEFINES`` can be assembled in:
diff --git a/scons/scons-local-4.8.1/SCons/Environment.py b/scons/scons-local-4.9.1/SCons/Environment.py
similarity index 90%
rename from scons/scons-local-4.8.1/SCons/Environment.py
rename to scons/scons-local-4.9.1/SCons/Environment.py
index 6c434298b..c18808db5 100644
--- a/scons/scons-local-4.8.1/SCons/Environment.py
+++ b/scons/scons-local-4.9.1/SCons/Environment.py
@@ -30,6 +30,8 @@ Keyword arguments supplied when the construction Environment is created
are construction variables used to initialize the Environment.
"""
+from __future__ import annotations
+
import copy
import os
import sys
@@ -37,7 +39,7 @@ import re
import shlex
from collections import UserDict, UserList, deque
from subprocess import PIPE, DEVNULL
-from typing import Callable, Collection, Optional, Sequence, Union
+from typing import TYPE_CHECKING, Callable, Collection, Sequence
import SCons.Action
import SCons.Builder
@@ -76,7 +78,9 @@ from SCons.Util import (
to_String_for_subst,
uniquer_hashables,
)
-from SCons.Util.sctyping import ExecutorType
+
+if TYPE_CHECKING:
+ from SCons.Executor import Executor
class _Null:
pass
@@ -534,6 +538,11 @@ class SubstitutionEnvironment:
Environment.Base to create their own flavors of construction
environment, we'll save that for a future refactoring when this
class actually becomes useful.)
+
+ Special note: methods here and in actual child classes might be called
+ via proxy from an :class:`OverrideEnvironment`, which isn't in the
+ class inheritance chain. Take care that methods called with a *self*
+ that's really an ``OverrideEnvironment`` don't make bad assumptions.
"""
def __init__(self, **kw) -> None:
@@ -567,6 +576,20 @@ class SubstitutionEnvironment:
self._special_set_keys = list(self._special_set.keys())
def __eq__(self, other):
+ """Compare two environments.
+
+ This is used by checks in Builder to determine if duplicate
+ targets have environments that would cause the same result.
+ The more reliable way (respecting the admonition to avoid poking
+ at :attr:`_dict` directly) would be to use ``Dictionary`` so this
+ is sure to work even if one or both are are instances of
+ :class:`OverrideEnvironment`. However an actual
+ ``SubstitutionEnvironment`` doesn't have a ``Dictionary`` method
+ That causes problems for unit tests written to excercise
+ ``SubsitutionEnvironment`` directly, although nobody else seems
+ to ever instantiate one. We count on :class:`OverrideEnvironment`
+ to fake the :attr:`_dict` to make things work.
+ """
return self._dict == other._dict
def __delitem__(self, key) -> None:
@@ -679,7 +702,7 @@ class SubstitutionEnvironment:
def lvars(self):
return {}
- def subst(self, string, raw: int=0, target=None, source=None, conv=None, executor: Optional[ExecutorType] = None, overrides: Optional[dict] = None):
+ def subst(self, string, raw: int=0, target=None, source=None, conv=None, executor: Executor | None = None, overrides: dict | None = None):
"""Recursively interpolates construction variables from the
Environment into the specified string, returning the expanded
result. Construction variables are specified by a $ prefix
@@ -705,7 +728,7 @@ class SubstitutionEnvironment:
nkw[k] = v
return nkw
- def subst_list(self, string, raw: int=0, target=None, source=None, conv=None, executor: Optional[ExecutorType] = None, overrides: Optional[dict] = None):
+ def subst_list(self, string, raw: int=0, target=None, source=None, conv=None, executor: Executor | None = None, overrides: dict | None = None):
"""Calls through to SCons.Subst.scons_subst_list().
See the documentation for that function.
@@ -811,16 +834,30 @@ class SubstitutionEnvironment:
self.added_methods = [dm for dm in self.added_methods if dm.method is not function]
def Override(self, overrides):
- """
- Produce a modified environment whose variables are overridden by
- the overrides dictionaries. "overrides" is a dictionary that
- will override the variables of this environment.
+ """Create an override environment from the current environment.
- This function is much more efficient than Clone() or creating
- a new Environment because it doesn't copy the construction
+ Produces a modified environment where the current variables are
+ overridden by any same-named variables from the *overrides* dict.
+
+ An override is much more efficient than doing :meth:`~Base.Clone`
+ or creating a new Environment because it doesn't copy the construction
environment dictionary, it just wraps the underlying construction
environment, and doesn't even create a wrapper object if there
are no overrides.
+
+ Using this method is preferred over directly instantiating an
+ :class:`OverrideEnvirionment` because extra checks are performed,
+ substitution takes place, and there is special handling for a
+ *parse_flags* keyword argument.
+
+ This method is not currently exposed as part of the public API,
+ but is invoked internally when things like builder calls have
+ keyword arguments, which are then passed as *overrides* here.
+ Some tools also call this explicitly.
+
+ Returns:
+ A proxy environment of type :class:`OverrideEnvironment`.
+ or the current environment if *overrides* is empty.
"""
if not overrides: return self
o = copy_non_reserved_keywords(overrides)
@@ -868,7 +905,7 @@ class SubstitutionEnvironment:
'RPATH' : [],
}
- def do_parse(arg: Union[str, Sequence]) -> None:
+ def do_parse(arg: str | Sequence) -> None:
if not arg:
return
@@ -946,7 +983,7 @@ class SubstitutionEnvironment:
else:
mapping[append_next_arg_to].append(arg)
append_next_arg_to = None
- elif not arg[0] in ['-', '+']:
+ elif arg[0] not in ['-', '+']:
mapping['LIBS'].append(self.fs.File(arg))
elif arg == '-dylib_file':
mapping['LINKFLAGS'].append(arg)
@@ -1414,7 +1451,6 @@ class Base(SubstitutionEnvironment):
The variable is created if it is not already present.
"""
-
kw = copy_non_reserved_keywords(kw)
for key, val in kw.items():
if key == 'CPPDEFINES':
@@ -1676,26 +1712,35 @@ class Base(SubstitutionEnvironment):
return None
- def Dictionary(self, *args):
- r"""Return construction variables from an environment.
+ def Dictionary(self, *args: str, as_dict: bool = False):
+ """Return construction variables from an environment.
Args:
- \*args (optional): variable names to look up
+ args (optional): construction variable names to select.
+ If omitted, all variables are selected and returned
+ as a dict.
+ as_dict: if true, and *args* is supplied, return the
+ variables and their values in a dict. If false
+ (the default), return a single value as a scalar,
+ or multiple values in a list.
Returns:
- If `args` omitted, the dictionary of all construction variables.
- If one arg, the corresponding value is returned.
- If more than one arg, a list of values is returned.
+ A dictionary of construction variables, or a single value
+ or list of values.
Raises:
- KeyError: if any of `args` is not in the construction environment.
+ KeyError: if any of *args* is not in the construction environment.
+ .. versionchanged:: 4.9.0
+ Added the *as_dict* keyword arg to specify always returning a dict.
"""
if not args:
return self._dict
- dlist = [self._dict[x] for x in args]
+ if as_dict:
+ return {key: self._dict[key] for key in args}
+ dlist = [self._dict[key] for key in args]
if len(dlist) == 1:
- dlist = dlist[0]
+ return dlist[0]
return dlist
@@ -1718,18 +1763,15 @@ class Base(SubstitutionEnvironment):
Raises:
ValueError: *format* is not a recognized serialization format.
- .. versionchanged:: NEXT_VERSION
+ .. versionchanged:: 4.9.0
*key* is no longer limited to a single construction variable name.
If *key* is supplied, a formatted dictionary is generated like the
no-arg case - previously a single *key* displayed just the value.
"""
- if not key:
- cvars = self.Dictionary()
- elif len(key) == 1:
- dkey = key[0]
- cvars = {dkey: self[dkey]}
+ if len(key):
+ cvars = self.Dictionary(*key, as_dict=True)
else:
- cvars = dict(zip(key, self.Dictionary(*key)))
+ cvars = self.Dictionary()
fmt = format.lower()
@@ -1760,7 +1802,7 @@ class Base(SubstitutionEnvironment):
raise ValueError("Unsupported serialization format: %s." % fmt)
- def FindIxes(self, paths: Sequence[str], prefix: str, suffix: str) -> Optional[str]:
+ def FindIxes(self, paths: Sequence[str], prefix: str, suffix: str) -> str | None:
"""Search *paths* for a path that has *prefix* and *suffix*.
Returns on first match.
@@ -1857,7 +1899,6 @@ class Base(SubstitutionEnvironment):
The variable is created if it is not already present.
"""
-
kw = copy_non_reserved_keywords(kw)
for key, val in kw.items():
if key == 'CPPDEFINES':
@@ -2042,7 +2083,7 @@ class Base(SubstitutionEnvironment):
return self.fs.Dir(self.subst(tp)).srcnode().get_abspath()
def Tool(
- self, tool: Union[str, Callable], toolpath: Optional[Collection[str]] = None, **kwargs
+ self, tool: str | Callable, toolpath: Collection[str] | None = None, **kwargs
) -> Callable:
"""Find and run tool module *tool*.
@@ -2207,6 +2248,16 @@ class Base(SubstitutionEnvironment):
self.get_CacheDir()
def Clean(self, targets, files) -> None:
+ """Mark additional files for cleaning.
+
+ *files* will be removed if any of *targets* are selected
+ for cleaning - that is, the combination of target selection
+ and -c clean mode.
+
+ Args:
+ targets (files or nodes): targets to associate *files* with.
+ files (files or nodes): items to remove if *targets* are selected.
+ """
global CleanTargets
tlist = self.arg2nodes(targets, self.fs.Entry)
flist = self.arg2nodes(files, self.fs.Entry)
@@ -2293,8 +2344,8 @@ class Base(SubstitutionEnvironment):
return result
return self.fs.PyPackageDir(s)
- def NoClean(self, *targets):
- """Tag target(s) so that it will not be cleaned by -c."""
+ def NoClean(self, *targets) -> list:
+ """Tag *targets* to not be removed in clean mode."""
tlist = []
for t in targets:
tlist.extend(self.arg2nodes(t, self.fs.Entry))
@@ -2537,45 +2588,75 @@ class Base(SubstitutionEnvironment):
class OverrideEnvironment(Base):
- """A proxy that overrides variables in a wrapped construction
- environment by returning values from an overrides dictionary in
- preference to values from the underlying subject environment.
+ """A proxy that implements override environments.
- This is a lightweight (I hope) proxy that passes through most use of
- attributes to the underlying Environment.Base class, but has just
- enough additional methods defined to act like a real construction
- environment with overridden values. It can wrap either a Base
- construction environment, or another OverrideEnvironment, which
- can in turn nest arbitrary OverrideEnvironments...
+ Returns attributes/methods and construction variables from the
+ base environment *subject*, except that same-named construction
+ variables from *overrides* are returned on read access; assignment
+ to a construction variable creates an override entry - *subject* is
+ not modified. This is a much lighter weight approach for limited-use
+ setups than cloning an environment, for example to handle a builder
+ call with keyword arguments that make a temporary change to the
+ current environment::
- Note that we do *not* call the underlying base class
- (SubsitutionEnvironment) initialization, because we get most of those
- from proxying the attributes of the subject construction environment.
- But because we subclass SubstitutionEnvironment, this class also
- has inherited arg2nodes() and subst*() methods; those methods can't
- be proxied because they need *this* object's methods to fetch the
- values from the overrides dictionary.
+ env.Program(target="foo", source=sources, DEBUG=True)
+
+ While the majority of methods are proxied from the underlying environment
+ class, enough plumbing is defined in this class for it to behave
+ like an ordinary Environment without the caller needing to know it is
+ "special" in some way. We don't call the initializer of the class
+ we're proxying, rather depend on it already being properly set up.
+
+ Deletion is handled specially, if a variable was explicitly deleted,
+ it should no longer appear to be in the env, but we also don't want to
+ modify the subject environment.
+
+ :class:`OverrideEnvironment` can nest arbitratily, *subject*
+ can be an existing instance. Although instances can be
+ instantiated directly, the expected use is to call the
+ :meth:`~SubstitutionEnvironment.Override` method as a factory.
+
+ Note Python does not give us a way to assure the subject environment
+ is not modified. Assigning to a variable creates a new entry in
+ the override, but moditying a variable will first fetch the one
+ from the subject, and if mutable, it will just be modified in place.
+ For example: ``over_env.Append(CPPDEFINES="-O")``, where ``CPPDEFINES``
+ is an existing list or :class:`~SCons.Util.CLVar`, will successfully
+ append to ``CPPDEFINES`` in the subject env. To avoid such leakage,
+ clients such as Scanners, Emitters and Action functions called by a
+ Builder using override syntax must take care if modifying an env
+ (which is not advised anyway) in case they were passed an
+ ``OverrideEnvironment``.
"""
- def __init__(self, subject, overrides=None) -> None:
+ def __init__(self, subject, overrides: dict | None = None) -> None:
if SCons.Debug.track_instances: logInstanceCreation(self, 'Environment.OverrideEnvironment')
+ overrides = {} if overrides is None else overrides
+ # set these directly via __dict__ to avoid trapping by __setattr__
self.__dict__['__subject'] = subject
- if overrides is None:
- self.__dict__['overrides'] = {}
- else:
- self.__dict__['overrides'] = overrides
+ self.__dict__['overrides'] = overrides
+ self.__dict__['__deleted'] = []
# Methods that make this class act like a proxy.
+
def __getattr__(self, name):
+ # Proxied environment methods don't know (nor should they have to) that
+ # they could be called with an OverrideEnvironment as 'self' and may
+ # access the _dict construction variable dict directly, so we need to
+ # pretend to have one, and not serve up the one from the subject, or it
+ # will miss the overridden values (and possibly modify the base). Use
+ # ourselves and hope the dict-like methods below are sufficient.
+ if name == '_dict':
+ return self
+
attr = getattr(self.__dict__['__subject'], name)
- # Here we check if attr is one of the Wrapper classes. For
- # example when a pseudo-builder is being called from an
- # OverrideEnvironment.
- #
- # These wrappers when they're constructed capture the
- # Environment they are being constructed with and so will not
- # have access to overrided values. So we rebuild them with the
- # OverrideEnvironment so they have access to overrided values.
+
+ # Check first if attr is one of the Wrapper classes, for example
+ # when a pseudo-builder is being called from an OverrideEnvironment.
+ # These wrappers, when they're constructed, capture the Environment
+ # they are being constructed with and so will not have access to
+ # overridden values. So we rebuild them with the OverrideEnvironment
+ # so they have access to overridden values.
if isinstance(attr, MethodWrapper):
return attr.clone(self)
else:
@@ -2585,13 +2666,21 @@ class OverrideEnvironment(Base):
setattr(self.__dict__['__subject'], name, value)
# Methods that make this class act like a dictionary.
+
def __getitem__(self, key):
+ """Return the visible value of *key*.
+
+ Backfills from the subject env if *key* doesn't have an entry in
+ the override, and is not explicity deleted.
+ """
try:
return self.__dict__['overrides'][key]
except KeyError:
+ if key in self.__dict__['__deleted']:
+ raise
return self.__dict__['__subject'].__getitem__(key)
- def __setitem__(self, key, value):
+ def __setitem__(self, key, value) -> None:
# 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
@@ -2599,58 +2688,94 @@ class OverrideEnvironment(Base):
if not key.isidentifier():
raise UserError(f"Illegal construction variable {key!r}")
self.__dict__['overrides'][key] = value
+ if key in self.__dict__['__deleted']:
+ # it's no longer "deleted" if we set it
+ self.__dict__['__deleted'].remove(key)
- def __delitem__(self, key):
+ def __delitem__(self, key) -> None:
+ """Delete *key* from override.
+
+ Makes *key* not visible in the override. Previously implemented
+ by deleting from ``overrides`` and from ``__subject``, which
+ keeps :meth:`__getitem__` from filling it back in next time.
+ However, that approach was a form of leak, as the subject
+ environment was modified. So instead we log that it's deleted
+ and use that to make decisions elsewhere.
+ """
try:
del self.__dict__['overrides'][key]
except KeyError:
- deleted = 0
+ deleted = False
else:
- deleted = 1
- try:
- result = self.__dict__['__subject'].__delitem__(key)
- except KeyError:
- if not deleted:
- raise
- result = None
- return result
+ deleted = True
+ if not deleted and key not in self.__dict__['__subject']:
+ raise KeyError(key)
+ self.__dict__['__deleted'].append(key)
def get(self, key, default=None):
- """Emulates the get() method of dictionaries."""
+ """Emulates the ``get`` method of dictionaries.
+
+ Backfills from the subject environment if *key* is not in the override
+ and not deleted.
+ """
try:
return self.__dict__['overrides'][key]
except KeyError:
+ if key in self.__dict__['__deleted']:
+ return default
return self.__dict__['__subject'].get(key, default)
def __contains__(self, key) -> bool:
+ """Emulates the ``contains`` method of dictionaries.
+
+ Backfills from the subject environment if *key* is not in the override
+ and not deleted.
+ """
if key in self.__dict__['overrides']:
return True
+ if key in self.__dict__['__deleted']:
+ return False
return key in self.__dict__['__subject']
- def Dictionary(self, *args):
- d = self.__dict__['__subject'].Dictionary().copy()
+ def Dictionary(self, *args, as_dict: bool = False):
+ """Return construction variables from an environment.
+
+ Behavior is as described for :class:`SubstitutionEnvironment.Dictionary`
+ but understanda about the override.
+
+ Raises:
+ KeyError: if any of *args* is not in the construction environment.
+
+ .. versionchanged: 4.9.0
+ Added the *as_dict* keyword arg to always return a dict.
+ """
+ d = {}
+ d.update(self.__dict__['__subject'])
d.update(self.__dict__['overrides'])
+ d = {k: v for k, v in d.items() if k not in self.__dict__['__deleted']}
if not args:
return d
- dlist = [d[x] for x in args]
+ if as_dict:
+ return {key: d[key] for key in args}
+ dlist = [d[key] for key in args]
if len(dlist) == 1:
- dlist = dlist[0]
+ return dlist[0]
return dlist
def items(self):
- """Emulates the items() method of dictionaries."""
+ """Emulates the ``items`` method of dictionaries."""
return self.Dictionary().items()
def keys(self):
- """Emulates the keys() method of dictionaries."""
+ """Emulates the ``keys`` method of dictionaries."""
return self.Dictionary().keys()
def values(self):
- """Emulates the values() method of dictionaries."""
+ """Emulates the ``values`` method of dictionaries."""
return self.Dictionary().values()
def setdefault(self, key, default=None):
- """Emulates the setdefault() method of dictionaries."""
+ """Emulates the ``setdefault`` method of dictionaries."""
try:
return self.__getitem__(key)
except KeyError:
@@ -2658,6 +2783,7 @@ class OverrideEnvironment(Base):
return default
# Overridden private construction environment methods.
+
def _update(self, other) -> None:
self.__dict__['overrides'].update(other)
@@ -2680,6 +2806,7 @@ class OverrideEnvironment(Base):
return lvars
# Overridden public construction environment methods.
+
def Replace(self, **kw) -> None:
kw = copy_non_reserved_keywords(kw)
self.__dict__['overrides'].update(semi_deepcopy(kw))
diff --git a/scons/scons-local-4.8.1/SCons/EnvironmentValues.py b/scons/scons-local-4.9.1/SCons/EnvironmentValues.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/EnvironmentValues.py
rename to scons/scons-local-4.9.1/SCons/EnvironmentValues.py
diff --git a/scons/scons-local-4.8.1/SCons/EnvironmentValuesTest.py b/scons/scons-local-4.9.1/SCons/EnvironmentValuesTest.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/EnvironmentValuesTest.py
rename to scons/scons-local-4.9.1/SCons/EnvironmentValuesTest.py
diff --git a/scons/scons-local-4.8.1/SCons/Errors.py b/scons/scons-local-4.9.1/SCons/Errors.py
similarity index 97%
rename from scons/scons-local-4.8.1/SCons/Errors.py
rename to scons/scons-local-4.9.1/SCons/Errors.py
index a2efc9708..af7797103 100644
--- a/scons/scons-local-4.8.1/SCons/Errors.py
+++ b/scons/scons-local-4.9.1/SCons/Errors.py
@@ -26,11 +26,15 @@
Used to handle internal and user errors in SCons.
"""
+from __future__ import annotations
+
import shutil
-from typing import Optional
+from typing import TYPE_CHECKING
from SCons.Util.sctypes import to_String, is_String
-from SCons.Util.sctyping import ExecutorType
+
+if TYPE_CHECKING:
+ from SCons.Executor import Executor
# Note that not all Errors are defined here, some are at the point of use
@@ -75,7 +79,7 @@ class BuildError(Exception):
def __init__(self,
node=None, errstr: str="Unknown error", status: int=2, exitstatus: int=2,
- filename=None, executor: Optional[ExecutorType] = None, action=None, command=None,
+ filename=None, executor: Executor | None = None, action=None, command=None,
exc_info=(None, None, None)) -> None:
# py3: errstr should be string and not bytes.
diff --git a/scons/scons-local-4.8.1/SCons/Executor.py b/scons/scons-local-4.9.1/SCons/Executor.py
similarity index 98%
rename from scons/scons-local-4.8.1/SCons/Executor.py
rename to scons/scons-local-4.9.1/SCons/Executor.py
index 1b054b4ba..53eb5cbb2 100644
--- a/scons/scons-local-4.8.1/SCons/Executor.py
+++ b/scons/scons-local-4.9.1/SCons/Executor.py
@@ -23,8 +23,9 @@
"""Execute actions with specific lists of target and source Nodes."""
+from __future__ import annotations
+
import collections
-from typing import Dict
import SCons.Errors
import SCons.Memoize
@@ -32,7 +33,6 @@ import SCons.Util
from SCons.compat import NoSlotsPyPy
import SCons.Debug
from SCons.Debug import logInstanceCreation
-from SCons.Util.sctyping import ExecutorType
class Batch:
"""Remembers exact association between targets
@@ -550,12 +550,12 @@ class Executor(metaclass=NoSlotsPyPy):
-_batch_executors: Dict[str, ExecutorType] = {}
+_batch_executors: dict[str, Executor] = {}
-def GetBatchExecutor(key: str) -> ExecutorType:
+def GetBatchExecutor(key: str) -> Executor:
return _batch_executors[key]
-def AddBatchExecutor(key: str, executor: ExecutorType) -> None:
+def AddBatchExecutor(key: str, executor: Executor) -> None:
assert key not in _batch_executors
_batch_executors[key] = executor
diff --git a/scons/scons-local-4.8.1/SCons/Memoize.py b/scons/scons-local-4.9.1/SCons/Memoize.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Memoize.py
rename to scons/scons-local-4.9.1/SCons/Memoize.py
diff --git a/scons/scons-local-4.8.1/SCons/Node/Alias.py b/scons/scons-local-4.9.1/SCons/Node/Alias.py
similarity index 91%
rename from scons/scons-local-4.8.1/SCons/Node/Alias.py
rename to scons/scons-local-4.9.1/SCons/Node/Alias.py
index 4de222999..604158178 100644
--- a/scons/scons-local-4.8.1/SCons/Node/Alias.py
+++ b/scons/scons-local-4.9.1/SCons/Node/Alias.py
@@ -104,9 +104,15 @@ class Alias(SCons.Node.Node):
#
#
- def build(self) -> None:
+ def build(self, **kw) -> None:
"""A "builder" for aliases."""
- pass
+ if len(self.executor.post_actions) + len(self.executor.pre_actions) > 0:
+ # Only actually call Node's build() if there are any
+ # pre or post actions.
+ # Alias nodes will get 1 action and Alias.build()
+ # This fixes GH Issue #2281
+ return self.really_build(**kw)
+
def convert(self) -> None:
try: del self.builder
diff --git a/scons/scons-local-4.8.1/SCons/Node/FS.py b/scons/scons-local-4.9.1/SCons/Node/FS.py
similarity index 99%
rename from scons/scons-local-4.8.1/SCons/Node/FS.py
rename to scons/scons-local-4.9.1/SCons/Node/FS.py
index 3cd7720c0..694ff9f87 100644
--- a/scons/scons-local-4.8.1/SCons/Node/FS.py
+++ b/scons/scons-local-4.9.1/SCons/Node/FS.py
@@ -30,6 +30,8 @@ This holds a "default_fs" variable that should be initialized with an FS
that can be used by scripts or modules looking for the canonical default.
"""
+from __future__ import annotations
+
import codecs
import fnmatch
import importlib.util
@@ -40,7 +42,6 @@ import stat
import sys
import time
from itertools import chain
-from typing import Optional
import SCons.Action
import SCons.Debug
@@ -761,6 +762,8 @@ class Base(SCons.Node.Node):
st = self.stat()
if st:
+ # TODO: switch to st.st_mtime, however this changes granularity
+ # (ST_MTIME is an int for backwards compat, st_mtime is float)
return st[stat.ST_MTIME]
else:
return None
@@ -1492,7 +1495,7 @@ class FS(LocalFS):
d = self.Dir(d)
self.Top.addRepository(d)
- def PyPackageDir(self, modulename) -> Optional[Dir]:
+ def PyPackageDir(self, modulename) -> Dir | None:
r"""Locate the directory of Python module *modulename*.
For example 'SCons' might resolve to
@@ -3190,7 +3193,7 @@ class File(Base):
# SIGNATURE SUBSYSTEM
#
- def get_max_drift_csig(self) -> Optional[str]:
+ def get_max_drift_csig(self) -> str | None:
"""
Returns the content signature currently stored for this node
if it's been unmodified longer than the max_drift value, or the
diff --git a/scons/scons-local-4.8.1/SCons/Node/Python.py b/scons/scons-local-4.9.1/SCons/Node/Python.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Node/Python.py
rename to scons/scons-local-4.9.1/SCons/Node/Python.py
diff --git a/scons/scons-local-4.8.1/SCons/Node/__init__.py b/scons/scons-local-4.9.1/SCons/Node/__init__.py
similarity index 89%
rename from scons/scons-local-4.8.1/SCons/Node/__init__.py
rename to scons/scons-local-4.9.1/SCons/Node/__init__.py
index 00bf4ac3b..055c3090c 100644
--- a/scons/scons-local-4.8.1/SCons/Node/__init__.py
+++ b/scons/scons-local-4.9.1/SCons/Node/__init__.py
@@ -40,18 +40,26 @@ be able to depend on any other type of "thing."
"""
+from __future__ import annotations
+
import collections
import copy
from itertools import chain, zip_longest
-from typing import Optional
+from typing import Any, Callable, TYPE_CHECKING
import SCons.Debug
import SCons.Executor
import SCons.Memoize
from SCons.compat import NoSlotsPyPy
from SCons.Debug import logInstanceCreation, Trace
+from SCons.Executor import Executor
from SCons.Util import hash_signature, is_List, UniqueList, render_tree
-from SCons.Util.sctyping import ExecutorType
+
+if TYPE_CHECKING:
+ from SCons.Builder import BuilderBase
+ from SCons.Environment import Base as Environment
+ from SCons.Scanner import ScannerBase
+ from SCons.SConsign import SConsignEntry
print_duplicate = 0
@@ -101,7 +109,7 @@ def do_nothing_node(node) -> None: pass
Annotate = do_nothing_node
# global set for recording all processed SContruct/SConscript nodes
-SConscriptNodes = set()
+SConscriptNodes: set[Node] = set()
# Gets set to 'True' if we're running in interactive mode. Is
# currently used to release parts of a target's info during
@@ -188,7 +196,7 @@ def get_contents_entry(node):
"""Fetch the contents of the entry. Returns the exact binary
contents of the file."""
try:
- node = node.disambiguate(must_exist=1)
+ node = node.disambiguate(must_exist=True)
except SCons.Errors.UserError:
# There was nothing on disk with which to disambiguate
# this entry. Leave it as an Entry, but return a null
@@ -355,7 +363,7 @@ class NodeInfoBase:
__slots__ = ('__weakref__',)
current_version_id = 2
- def update(self, node) -> None:
+ def update(self, node: Node) -> None:
try:
field_list = self.field_list
except AttributeError:
@@ -375,7 +383,7 @@ class NodeInfoBase:
def convert(self, node, val) -> None:
pass
- def merge(self, other) -> None:
+ def merge(self, other: NodeInfoBase) -> None:
"""
Merge the fields of another object into this object. Already existing
information is overwritten by the other instance's data.
@@ -385,7 +393,7 @@ class NodeInfoBase:
state = other.__getstate__()
self.__setstate__(state)
- def format(self, field_list=None, names: int=0):
+ def format(self, field_list: list[str] | None = None, names: bool = False):
if field_list is None:
try:
field_list = self.field_list
@@ -408,7 +416,7 @@ class NodeInfoBase:
fields.append(f)
return fields
- def __getstate__(self):
+ def __getstate__(self) -> dict[str, Any]:
"""
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
@@ -428,7 +436,7 @@ class NodeInfoBase:
pass
return state
- def __setstate__(self, state) -> None:
+ def __setstate__(self, state: dict[str, Any]) -> None:
"""
Restore the attributes from a pickled state. The version is discarded.
"""
@@ -457,12 +465,12 @@ class BuildInfoBase:
def __init__(self) -> None:
# Create an object attribute from the class attribute so it ends up
# in the pickled data in the .sconsign file.
- self.bsourcesigs = []
- self.bdependsigs = []
- self.bimplicitsigs = []
- self.bactsig = None
+ self.bsourcesigs: list[BuildInfoBase] = []
+ self.bdependsigs: list[BuildInfoBase] = []
+ self.bimplicitsigs: list[BuildInfoBase] = []
+ self.bactsig: str | None = None
- def merge(self, other) -> None:
+ def merge(self, other: BuildInfoBase) -> None:
"""
Merge the fields of another object into this object. Already existing
information is overwritten by the other instance's data.
@@ -472,7 +480,7 @@ class BuildInfoBase:
state = other.__getstate__()
self.__setstate__(state)
- def __getstate__(self):
+ def __getstate__(self) -> dict[str, Any]:
"""
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
@@ -492,7 +500,7 @@ class BuildInfoBase:
pass
return state
- def __setstate__(self, state) -> None:
+ def __setstate__(self, state: dict[str, Any]) -> None:
"""
Restore the attributes from a pickled state.
"""
@@ -570,42 +578,42 @@ class Node(metaclass=NoSlotsPyPy):
# this way, instead of wrapping up each list+dictionary pair in
# a class. (Of course, we could always still do that in the
# future if we had a good reason to...).
- self.sources = [] # source files used to build node
- self.sources_set = set()
+ self.sources: list[Node] = [] # source files used to build node
+ self.sources_set: set[Node] = set()
self._specific_sources = False
- self.depends = [] # explicit dependencies (from Depends)
- self.depends_set = set()
- self.ignore = [] # dependencies to ignore
- self.ignore_set = set()
- self.prerequisites = None
- self.implicit = None # implicit (scanned) dependencies (None means not scanned yet)
- self.waiting_parents = set()
- self.waiting_s_e = set()
+ self.depends: list[Node] = [] # explicit dependencies (from Depends)
+ self.depends_set: set[Node] = set()
+ self.ignore: list[Node] = [] # dependencies to ignore
+ self.ignore_set: set[Node] = set()
+ self.prerequisites: UniqueList | None = None
+ self.implicit: list[Node] | None = None # implicit (scanned) dependencies (None means not scanned yet)
+ self.waiting_parents: set[Node] = set()
+ self.waiting_s_e: set[Node] = set()
self.ref_count = 0
- self.wkids = None # Kids yet to walk, when it's an array
+ self.wkids: list[Node] | None = None # Kids yet to walk, when it's an array
- self.env = None
+ self.env: Environment | None = None
self.state = no_state
- self.precious = None
+ self.precious = False
self.pseudo = False
- self.noclean = 0
- self.nocache = 0
- self.cached = 0 # is this node pulled from cache?
- self.always_build = None
- self.includes = None
+ self.noclean = False
+ self.nocache = False
+ self.cached = False # is this node pulled from cache?
+ self.always_build = False
+ self.includes: list[str] | None = None
self.attributes = self.Attrs() # Generic place to stick information about the Node.
- self.side_effect = 0 # true iff this node is a side effect
- self.side_effects = [] # the side effects of building this target
- self.linked = 0 # is this node linked to the variant directory?
- self.changed_since_last_build = 0
- self.store_info = 0
- self._tags = None
- self._func_is_derived = 1
- self._func_exists = 1
- self._func_rexists = 1
- self._func_get_contents = 0
- self._func_target_from_source = 0
- self.ninfo = None
+ self.side_effect = False # true iff this node is a side effect
+ self.side_effects: list[Node] = [] # the side effects of building this target
+ self.linked = False # is this node linked to the variant directory?
+ self.changed_since_last_build = 0 # Index for "_decider_map".
+ self.store_info = 0 # Index for "store_info_map".
+ self._tags: dict[str, Any] | None = None
+ self._func_is_derived = 1 # Index for "_is_derived_map".
+ self._func_exists = 1 # Index for "_exists_map"
+ self._func_rexists = 1 # Index for "_rexists_map"
+ self._func_get_contents = 0 # Index for "_get_contents_map"
+ self._func_target_from_source = 0 # Index for "_target_from_source_map"
+ self.ninfo: NodeInfoBase | None = None
self.clear_memoized_values()
@@ -614,14 +622,14 @@ class Node(metaclass=NoSlotsPyPy):
# what line in what file created the node, for example).
Annotate(self)
- def disambiguate(self, must_exist=None):
+ def disambiguate(self, must_exist: bool = False):
return self
def get_suffix(self) -> str:
return ''
@SCons.Memoize.CountMethodCall
- def get_build_env(self):
+ def get_build_env(self) -> Environment:
"""Fetch the appropriate Environment to build this node.
"""
try:
@@ -632,15 +640,15 @@ class Node(metaclass=NoSlotsPyPy):
self._memo['get_build_env'] = result
return result
- def get_build_scanner_path(self, scanner):
+ def get_build_scanner_path(self, scanner: ScannerBase):
"""Fetch the appropriate scanner path for this node."""
return self.get_executor().get_build_scanner_path(scanner)
- def set_executor(self, executor: ExecutorType) -> None:
+ def set_executor(self, executor: Executor) -> None:
"""Set the action executor for this node."""
self.executor = executor
- def get_executor(self, create: int=1) -> ExecutorType:
+ def get_executor(self, create: bool = True) -> Executor:
"""Fetch the action executor for this node. Create one if
there isn't already one, and requested to do so."""
try:
@@ -651,7 +659,7 @@ class Node(metaclass=NoSlotsPyPy):
try:
act = self.builder.action
except AttributeError:
- executor = SCons.Executor.Null(targets=[self]) # type: ignore
+ executor = SCons.Executor.Null(targets=[self]) # type: ignore[assignment]
else:
executor = SCons.Executor.Executor(act,
self.env or self.builder.env,
@@ -664,7 +672,7 @@ class Node(metaclass=NoSlotsPyPy):
def executor_cleanup(self) -> None:
"""Let the executor clean up any cached information."""
try:
- executor = self.get_executor(create=None)
+ executor = self.get_executor(create=False)
except AttributeError:
pass
else:
@@ -681,7 +689,7 @@ class Node(metaclass=NoSlotsPyPy):
def push_to_cache(self) -> bool:
"""Try to push a node into a cache
"""
- pass
+ return False
def retrieve_from_cache(self) -> bool:
"""Try to retrieve the node's content from a cache
@@ -708,7 +716,7 @@ class Node(metaclass=NoSlotsPyPy):
"""
pass
- def prepare(self):
+ def prepare(self) -> None:
"""Prepare for this Node to be built.
This is called after the Taskmaster has decided that the Node
@@ -741,7 +749,7 @@ class Node(metaclass=NoSlotsPyPy):
raise SCons.Errors.StopError(msg % (i, self))
self.binfo = self.get_binfo()
- def build(self, **kw):
+ def build(self, **kw) -> None:
"""Actually build the node.
This is called by the Taskmaster after it's decided that the
@@ -826,10 +834,10 @@ class Node(metaclass=NoSlotsPyPy):
"""
pass
- def add_to_waiting_s_e(self, node) -> None:
+ def add_to_waiting_s_e(self, node: Node) -> None:
self.waiting_s_e.add(node)
- def add_to_waiting_parents(self, node) -> int:
+ def add_to_waiting_parents(self, node: Node) -> int:
"""
Returns the number of nodes added to our waiting parents list:
1 if we add a unique waiting parent, 0 if not. (Note that the
@@ -866,13 +874,13 @@ class Node(metaclass=NoSlotsPyPy):
delattr(self, attr)
except AttributeError:
pass
- self.cached = 0
+ self.cached = False
self.includes = None
def clear_memoized_values(self) -> None:
self._memo = {}
- def builder_set(self, builder) -> None:
+ def builder_set(self, builder: BuilderBase | None) -> None:
self.builder = builder
try:
del self.executor
@@ -898,7 +906,7 @@ class Node(metaclass=NoSlotsPyPy):
b = self.builder = None
return b is not None
- def set_explicit(self, is_explicit) -> None:
+ def set_explicit(self, is_explicit: bool) -> None:
self.is_explicit = is_explicit
def has_explicit_builder(self) -> bool:
@@ -914,7 +922,7 @@ class Node(metaclass=NoSlotsPyPy):
self.is_explicit = False
return False
- def get_builder(self, default_builder=None):
+ def get_builder(self, default_builder: BuilderBase | None = None) -> BuilderBase | None:
"""Return the set builder, or a specified default value"""
try:
return self.builder
@@ -947,7 +955,7 @@ class Node(metaclass=NoSlotsPyPy):
return False
return True
- def check_attributes(self, name):
+ def check_attributes(self, name: str) -> Any | None:
""" Simple API to check if the node.attributes for name has been set"""
return getattr(getattr(self, "attributes", None), name, None)
@@ -957,7 +965,7 @@ class Node(metaclass=NoSlotsPyPy):
"""
return [], None
- def get_found_includes(self, env, scanner, path):
+ def get_found_includes(self, env: Environment, scanner: ScannerBase | None, path) -> list[Node]:
"""Return the scanned include lines (implicit dependencies)
found in this node.
@@ -967,7 +975,7 @@ class Node(metaclass=NoSlotsPyPy):
"""
return []
- def get_implicit_deps(self, env, initial_scanner, path_func, kw = {}):
+ def get_implicit_deps(self, env: Environment, initial_scanner: ScannerBase | None, path_func, kw = {}) -> list[Node]:
"""Return a list of implicit dependencies for this node.
This method exists to handle recursive invocation of the scanner
@@ -1002,7 +1010,7 @@ class Node(metaclass=NoSlotsPyPy):
return dependencies
- def _get_scanner(self, env, initial_scanner, root_node_scanner, kw):
+ def _get_scanner(self, env: Environment, initial_scanner: ScannerBase | None, root_node_scanner: ScannerBase | None, kw: dict[str, Any] | None) -> ScannerBase | None:
if initial_scanner:
# handle explicit scanner case
scanner = initial_scanner.select(self)
@@ -1019,13 +1027,13 @@ class Node(metaclass=NoSlotsPyPy):
return scanner
- def get_env_scanner(self, env, kw={}):
+ def get_env_scanner(self, env: Environment, kw: dict[str, Any] | None = {}) -> ScannerBase | None:
return env.get_scanner(self.scanner_key())
- def get_target_scanner(self):
+ def get_target_scanner(self) -> ScannerBase | None:
return self.builder.target_scanner
- def get_source_scanner(self, node):
+ def get_source_scanner(self, node: Node) -> ScannerBase | None:
"""Fetch the source scanner for the specified node
NOTE: "self" is the target being built, "node" is
@@ -1051,10 +1059,10 @@ class Node(metaclass=NoSlotsPyPy):
scanner = scanner.select(node)
return scanner
- def add_to_implicit(self, deps) -> None:
+ def add_to_implicit(self, deps: list[Node]) -> None:
if not hasattr(self, 'implicit') or self.implicit is None:
self.implicit = []
- self.implicit_set = set()
+ self.implicit_set: set[Node] = set()
self._children_reset()
self._add_child(self.implicit, self.implicit_set, deps)
@@ -1113,10 +1121,10 @@ class Node(metaclass=NoSlotsPyPy):
if scanner:
executor.scan_targets(scanner)
- def scanner_key(self):
+ def scanner_key(self) -> str | None:
return None
- def select_scanner(self, scanner):
+ def select_scanner(self, scanner: ScannerBase) -> ScannerBase | None:
"""Selects a scanner for this Node.
This is a separate method so it can be overridden by Node
@@ -1126,7 +1134,7 @@ class Node(metaclass=NoSlotsPyPy):
"""
return scanner.select(self)
- def env_set(self, env, safe: bool=False) -> None:
+ def env_set(self, env: Environment, safe: bool = False) -> None:
if safe and self.env:
return
self.env = env
@@ -1138,21 +1146,21 @@ class Node(metaclass=NoSlotsPyPy):
NodeInfo = NodeInfoBase
BuildInfo = BuildInfoBase
- def new_ninfo(self):
+ def new_ninfo(self) -> NodeInfoBase:
ninfo = self.NodeInfo()
return ninfo
- def get_ninfo(self):
+ def get_ninfo(self) -> NodeInfoBase:
if self.ninfo is not None:
return self.ninfo
self.ninfo = self.new_ninfo()
return self.ninfo
- def new_binfo(self):
+ def new_binfo(self) -> BuildInfoBase:
binfo = self.BuildInfo()
return binfo
- def get_binfo(self):
+ def get_binfo(self) -> BuildInfoBase:
"""
Fetch a node's build information.
@@ -1211,7 +1219,7 @@ class Node(metaclass=NoSlotsPyPy):
except AttributeError:
pass
- def get_csig(self):
+ def get_csig(self) -> str:
try:
return self.ninfo.csig
except AttributeError:
@@ -1219,13 +1227,13 @@ class Node(metaclass=NoSlotsPyPy):
ninfo.csig = hash_signature(self.get_contents())
return self.ninfo.csig
- def get_cachedir_csig(self):
+ def get_cachedir_csig(self) -> str:
return self.get_csig()
- def get_stored_info(self):
+ def get_stored_info(self) -> SConsignEntry | None:
return None
- def get_stored_implicit(self):
+ def get_stored_implicit(self) -> list[Node] | None:
"""Fetch the stored implicit dependencies"""
return None
@@ -1233,7 +1241,7 @@ class Node(metaclass=NoSlotsPyPy):
#
#
- def set_precious(self, precious: int = 1) -> None:
+ def set_precious(self, precious: bool = True) -> None:
"""Set the Node's precious value."""
self.precious = precious
@@ -1241,19 +1249,15 @@ class Node(metaclass=NoSlotsPyPy):
"""Set the Node's pseudo value."""
self.pseudo = pseudo
- def set_noclean(self, noclean: int = 1) -> None:
+ def set_noclean(self, noclean: bool = True) -> None:
"""Set the Node's noclean value."""
- # Make sure noclean is an integer so the --debug=stree
- # output in Util.py can use it as an index.
- self.noclean = noclean and 1 or 0
+ self.noclean = noclean
- def set_nocache(self, nocache: int = 1) -> None:
+ def set_nocache(self, nocache: bool = True) -> None:
"""Set the Node's nocache value."""
- # Make sure nocache is an integer so the --debug=stree
- # output in Util.py can use it as an index.
- self.nocache = nocache and 1 or 0
+ self.nocache = nocache
- def set_always_build(self, always_build: int = 1) -> None:
+ def set_always_build(self, always_build: bool = True) -> None:
"""Set the Node's always_build value."""
self.always_build = always_build
@@ -1261,12 +1265,12 @@ class Node(metaclass=NoSlotsPyPy):
"""Reports whether node exists."""
return _exists_map[self._func_exists](self)
- def rexists(self):
+ def rexists(self) -> bool:
"""Does this node exist locally or in a repository?"""
# There are no repositories by default:
return _rexists_map[self._func_rexists](self)
- def get_contents(self):
+ def get_contents(self) -> bytes | str:
"""Fetch the contents of the entry."""
return _get_contents_map[self._func_get_contents](self)
@@ -1275,11 +1279,11 @@ class Node(metaclass=NoSlotsPyPy):
not self.linked and \
not self.rexists()
- def remove(self):
+ def remove(self) -> None:
"""Remove this Node: no-op by default."""
return None
- def add_dependency(self, depend):
+ def add_dependency(self, depend: list[Node]) -> None:
"""Adds dependencies."""
try:
self._add_child(self.depends, self.depends_set, depend)
@@ -1291,14 +1295,14 @@ class Node(metaclass=NoSlotsPyPy):
s = str(e)
raise SCons.Errors.UserError("attempted to add a non-Node dependency to %s:\n\t%s is a %s, not a Node" % (str(self), s, type(e)))
- def add_prerequisite(self, prerequisite) -> None:
+ def add_prerequisite(self, prerequisite: list[Node]) -> None:
"""Adds prerequisites"""
if self.prerequisites is None:
self.prerequisites = UniqueList()
self.prerequisites.extend(prerequisite)
self._children_reset()
- def add_ignore(self, depend):
+ def add_ignore(self, depend: list[Node]) -> None:
"""Adds dependencies to ignore."""
try:
self._add_child(self.ignore, self.ignore_set, depend)
@@ -1310,7 +1314,7 @@ class Node(metaclass=NoSlotsPyPy):
s = str(e)
raise SCons.Errors.UserError("attempted to ignore a non-Node dependency of %s:\n\t%s is a %s, not a Node" % (str(self), s, type(e)))
- def add_source(self, source):
+ def add_source(self, source: list[Node]) -> None:
"""Adds sources."""
if self._specific_sources:
return
@@ -1324,7 +1328,7 @@ class Node(metaclass=NoSlotsPyPy):
s = str(e)
raise SCons.Errors.UserError("attempted to add a non-Node as source of %s:\n\t%s is a %s, not a Node" % (str(self), s, type(e)))
- def _add_child(self, collection, set, child) -> None:
+ def _add_child(self, collection: list[Node], set: set[Node], child: list[Node]) -> None:
"""Adds 'child' to 'collection', first checking 'set' to see if it's
already present."""
added = None
@@ -1336,11 +1340,11 @@ class Node(metaclass=NoSlotsPyPy):
if added:
self._children_reset()
- def set_specific_source(self, source) -> None:
+ def set_specific_source(self, source: list[Node]) -> None:
self.add_source(source)
self._specific_sources = True
- def add_wkid(self, wkid) -> None:
+ def add_wkid(self, wkid: Node) -> None:
"""Add a node to the list of kids waiting to be evaluated"""
if self.wkids is not None:
self.wkids.append(wkid)
@@ -1352,7 +1356,7 @@ class Node(metaclass=NoSlotsPyPy):
self.executor_cleanup()
@SCons.Memoize.CountMethodCall
- def _children_get(self):
+ def _children_get(self) -> list[Node]:
try:
return self._memo['_children_get']
except KeyError:
@@ -1383,12 +1387,12 @@ class Node(metaclass=NoSlotsPyPy):
if i not in self.ignore_set:
children.append(i)
else:
- children = self.all_children(scan=0)
+ children = self.all_children(scan=False)
self._memo['_children_get'] = children
return children
- def all_children(self, scan: int=1):
+ def all_children(self, scan: bool = True) -> list[Node]:
"""Return a list of all the node's direct children."""
if scan:
self.scan()
@@ -1412,27 +1416,27 @@ class Node(metaclass=NoSlotsPyPy):
# internally anyway...)
return list(chain.from_iterable([_f for _f in [self.sources, self.depends, self.implicit] if _f]))
- def children(self, scan: int=1):
+ def children(self, scan: bool = True) -> list[Node]:
"""Return a list of the node's direct children, minus those
that are ignored by this node."""
if scan:
self.scan()
return self._children_get()
- def set_state(self, state) -> None:
+ def set_state(self, state: int) -> None:
self.state = state
- def get_state(self):
+ def get_state(self) -> int:
return self.state
- def get_env(self):
+ def get_env(self) -> Environment:
env = self.env
if not env:
import SCons.Defaults
env = SCons.Defaults.DefaultEnvironment()
return env
- def Decider(self, function) -> None:
+ def Decider(self, function: Callable[[Node, Node, NodeInfoBase, Node | None], bool]) -> None:
foundkey = None
for k, v in _decider_map.items():
if v == function:
@@ -1443,19 +1447,19 @@ class Node(metaclass=NoSlotsPyPy):
_decider_map[foundkey] = function
self.changed_since_last_build = foundkey
- def Tag(self, key, value) -> None:
+ def Tag(self, key: str, value: Any | None) -> None:
""" Add a user-defined tag. """
if not self._tags:
self._tags = {}
self._tags[key] = value
- def GetTag(self, key):
+ def GetTag(self, key: str) -> Any | None:
""" Return a user-defined tag. """
if not self._tags:
return None
return self._tags.get(key, None)
- def changed(self, node=None, allowcache: bool=False):
+ def changed(self, node: Node | None = None, allowcache: bool = False) -> bool:
"""
Returns if the node is up-to-date with respect to the BuildInfo
stored last time it was built. The default behavior is to compare
@@ -1534,7 +1538,7 @@ class Node(metaclass=NoSlotsPyPy):
if self.always_build:
return False
state = 0
- for kid in self.children(None):
+ for kid in self.children(False):
s = kid.get_state()
if s and (not state or s > state):
state = s
@@ -1559,13 +1563,13 @@ class Node(metaclass=NoSlotsPyPy):
path = self.get_build_scanner_path(scanner)
else:
path = None
- def f(node, env=env, scanner=scanner, path=path):
+ def f(node: Node, env: Environment = env, scanner: ScannerBase = scanner, path=path):
return node.get_found_includes(env, scanner, path)
return render_tree(s, f, 1)
else:
return None
- def get_abspath(self):
+ def get_abspath(self) -> str:
"""
Return an absolute path to the Node. This will return simply
str(Node) by default, but for Node types that have a concept of
@@ -1573,7 +1577,7 @@ class Node(metaclass=NoSlotsPyPy):
"""
return str(self)
- def for_signature(self):
+ def for_signature(self) -> str:
"""
Return a string representation of the Node that will always
be the same for this particular Node, no matter what. This
@@ -1588,7 +1592,7 @@ class Node(metaclass=NoSlotsPyPy):
"""
return str(self)
- def get_string(self, for_signature):
+ def get_string(self, for_signature: bool) -> str:
"""This is a convenience function designed primarily to be
used in command generators (i.e., CommandGeneratorActions or
Environment variables that are callable), which are called
@@ -1719,9 +1723,9 @@ class NodeList(collections.UserList):
def __str__(self) -> str:
return str(list(map(str, self.data)))
-def get_children(node, parent): return node.children()
-def ignore_cycle(node, stack) -> None: pass
-def do_nothing(node, parent) -> None: pass
+def get_children(node: Node, parent: Node | None) -> list[Node]: return node.children()
+def ignore_cycle(node: Node, stack: list[Node]) -> None: pass
+def do_nothing(node: Node, parent: Node | None) -> None: pass
class Walker:
"""An iterator for walking a Node tree.
@@ -1736,15 +1740,19 @@ class Walker:
This class does not get caught in node cycles caused, for example,
by C header file include loops.
"""
- def __init__(self, node, kids_func=get_children,
- cycle_func=ignore_cycle,
- eval_func=do_nothing) -> None:
+ def __init__(
+ self,
+ node: Node,
+ kids_func: Callable[[Node, Node | None], list[Node]] = get_children,
+ cycle_func: Callable[[Node, list[Node]], None] = ignore_cycle,
+ eval_func: Callable[[Node, Node | None], None] = do_nothing,
+ ) -> None:
self.kids_func = kids_func
self.cycle_func = cycle_func
self.eval_func = eval_func
node.wkids = copy.copy(kids_func(node, None))
self.stack = [node]
- self.history = {} # used to efficiently detect and avoid cycles
+ self.history: dict[Node, Any | None] = {} # used to efficiently detect and avoid cycles
self.history[node] = None
def get_next(self):
diff --git a/scons/scons-local-4.8.1/SCons/PathList.py b/scons/scons-local-4.9.1/SCons/PathList.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/PathList.py
rename to scons/scons-local-4.9.1/SCons/PathList.py
diff --git a/scons/scons-local-4.8.1/SCons/Platform/__init__.py b/scons/scons-local-4.9.1/SCons/Platform/__init__.py
similarity index 92%
rename from scons/scons-local-4.8.1/SCons/Platform/__init__.py
rename to scons/scons-local-4.9.1/SCons/Platform/__init__.py
index 77eea5c09..aec1a8989 100644
--- a/scons/scons-local-4.8.1/SCons/Platform/__init__.py
+++ b/scons/scons-local-4.9.1/SCons/Platform/__init__.py
@@ -42,6 +42,7 @@ their own platform definition.
import SCons.compat
+import atexit
import importlib
import os
import sys
@@ -150,7 +151,7 @@ class TempFileMunge:
the length of command lines. Example::
env["TEMPFILE"] = TempFileMunge
- env["LINKCOM"] = "${TEMPFILE('$LINK $TARGET $SOURCES','$LINKCOMSTR')}"
+ env["LINKCOM"] = "${TEMPFILE('$LINK $TARGET $SOURCES', '$LINKCOMSTR')}"
By default, the name of the temporary file used begins with a
prefix of '@'. This may be configured for other tool chains by
@@ -258,31 +259,27 @@ class TempFileMunge:
fd, tmp = tempfile.mkstemp(suffix, dir=tempfile_dir, text=True)
native_tmp = SCons.Util.get_native_path(tmp)
+ # arrange for cleanup on exit:
+
+ def tmpfile_cleanup(file) -> None:
+ os.remove(file)
+
+ atexit.register(tmpfile_cleanup, tmp)
+
if env.get('SHELL', None) == 'sh':
# The sh shell will try to escape the backslashes in the
# path, so unescape them.
native_tmp = native_tmp.replace('\\', r'\\\\')
- # In Cygwin, we want to use rm to delete the temporary
- # file, because del does not exist in the sh shell.
- rm = env.Detect('rm') or 'del'
- else:
- # Don't use 'rm' if the shell is not sh, because rm won't
- # work with the Windows shells (cmd.exe or command.com) or
- # Windows path names.
- rm = 'del'
if 'TEMPFILEPREFIX' in env:
prefix = env.subst('$TEMPFILEPREFIX')
else:
- prefix = '@'
+ prefix = "@"
tempfile_esc_func = env.get('TEMPFILEARGESCFUNC', SCons.Subst.quote_spaces)
- args = [
- tempfile_esc_func(arg)
- for arg in cmd[1:]
- ]
+ args = [tempfile_esc_func(arg) for arg in cmd[1:]]
join_char = env.get('TEMPFILEARGJOIN', ' ')
- os.write(fd, bytearray(join_char.join(args) + "\n", 'utf-8'))
+ os.write(fd, bytearray(join_char.join(args) + "\n", encoding="utf-8"))
os.close(fd)
# XXX Using the SCons.Action.print_actions value directly
@@ -301,15 +298,20 @@ class TempFileMunge:
# purity get in the way of just being helpful, so we'll
# reach into SCons.Action directly.
if SCons.Action.print_actions:
- cmdstr = env.subst(self.cmdstr, SCons.Subst.SUBST_RAW, target,
- source) if self.cmdstr is not None else ''
+ cmdstr = (
+ env.subst(self.cmdstr, SCons.Subst.SUBST_RAW, target, source)
+ if self.cmdstr is not None
+ else ''
+ )
# Print our message only if XXXCOMSTR returns an empty string
- if len(cmdstr) == 0 :
- cmdstr = ("Using tempfile "+native_tmp+" for command line:\n"+
- str(cmd[0]) + " " + " ".join(args))
+ if not cmdstr:
+ cmdstr = (
+ f"Using tempfile {native_tmp} for command line:\n"
+ f'{cmd[0]} {" ".join(args)}'
+ )
self._print_cmd_str(target, source, env, cmdstr)
- cmdlist = [cmd[0], prefix + native_tmp + '\n' + rm, native_tmp]
+ cmdlist = [cmd[0], prefix + native_tmp]
# Store the temporary file command list into the target Node.attributes
# to avoid creating two temporary files one for print and one for execute.
diff --git a/scons/scons-local-4.8.1/SCons/Platform/aix.py b/scons/scons-local-4.9.1/SCons/Platform/aix.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Platform/aix.py
rename to scons/scons-local-4.9.1/SCons/Platform/aix.py
diff --git a/scons/scons-local-4.8.1/SCons/Platform/cygwin.py b/scons/scons-local-4.9.1/SCons/Platform/cygwin.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Platform/cygwin.py
rename to scons/scons-local-4.9.1/SCons/Platform/cygwin.py
diff --git a/scons/scons-local-4.8.1/SCons/Platform/darwin.py b/scons/scons-local-4.9.1/SCons/Platform/darwin.py
similarity index 98%
rename from scons/scons-local-4.8.1/SCons/Platform/darwin.py
rename to scons/scons-local-4.9.1/SCons/Platform/darwin.py
index 381b54249..4ab7466c6 100644
--- a/scons/scons-local-4.8.1/SCons/Platform/darwin.py
+++ b/scons/scons-local-4.9.1/SCons/Platform/darwin.py
@@ -46,7 +46,7 @@ def generate(env) -> None:
# make sure this works on Macs with Tiger or earlier
try:
dirlist = os.listdir('/etc/paths.d')
- except FileNotFoundError:
+ except (FileNotFoundError, PermissionError):
dirlist = []
for file in dirlist:
diff --git a/scons/scons-local-4.8.1/SCons/Platform/hpux.py b/scons/scons-local-4.9.1/SCons/Platform/hpux.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Platform/hpux.py
rename to scons/scons-local-4.9.1/SCons/Platform/hpux.py
diff --git a/scons/scons-local-4.8.1/SCons/Platform/irix.py b/scons/scons-local-4.9.1/SCons/Platform/irix.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Platform/irix.py
rename to scons/scons-local-4.9.1/SCons/Platform/irix.py
diff --git a/scons/scons-local-4.8.1/SCons/Platform/mingw.py b/scons/scons-local-4.9.1/SCons/Platform/mingw.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Platform/mingw.py
rename to scons/scons-local-4.9.1/SCons/Platform/mingw.py
diff --git a/scons/scons-local-4.8.1/SCons/Platform/os2.py b/scons/scons-local-4.9.1/SCons/Platform/os2.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Platform/os2.py
rename to scons/scons-local-4.9.1/SCons/Platform/os2.py
diff --git a/scons/scons-local-4.8.1/SCons/Platform/posix.py b/scons/scons-local-4.9.1/SCons/Platform/posix.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Platform/posix.py
rename to scons/scons-local-4.9.1/SCons/Platform/posix.py
diff --git a/scons/scons-local-4.8.1/SCons/Platform/sunos.py b/scons/scons-local-4.9.1/SCons/Platform/sunos.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Platform/sunos.py
rename to scons/scons-local-4.9.1/SCons/Platform/sunos.py
diff --git a/scons/scons-local-4.8.1/SCons/Platform/virtualenv.py b/scons/scons-local-4.9.1/SCons/Platform/virtualenv.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Platform/virtualenv.py
rename to scons/scons-local-4.9.1/SCons/Platform/virtualenv.py
diff --git a/scons/scons-local-4.8.1/SCons/Platform/win32.py b/scons/scons-local-4.9.1/SCons/Platform/win32.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Platform/win32.py
rename to scons/scons-local-4.9.1/SCons/Platform/win32.py
diff --git a/scons/scons-local-4.8.1/SCons/SConf.py b/scons/scons-local-4.9.1/SCons/SConf.py
similarity index 97%
rename from scons/scons-local-4.8.1/SCons/SConf.py
rename to scons/scons-local-4.9.1/SCons/SConf.py
index d2e09be34..7d7874bdd 100644
--- a/scons/scons-local-4.8.1/SCons/SConf.py
+++ b/scons/scons-local-4.9.1/SCons/SConf.py
@@ -31,6 +31,8 @@ Tests on the build system can detect if compiler sees header files, if
libraries are installed, if some command line options are supported etc.
"""
+from __future__ import annotations
+
import SCons.compat
import atexit
@@ -39,7 +41,6 @@ import os
import re
import sys
import traceback
-from typing import Tuple
import SCons.Action
import SCons.Builder
@@ -265,7 +266,7 @@ class SConfBuildTask(SCons.Taskmaster.AlwaysTask):
sys.excepthook(*self.exc_info())
return SCons.Taskmaster.Task.failed(self)
- def collect_node_states(self) -> Tuple[bool, bool, bool]:
+ def collect_node_states(self) -> tuple[bool, bool, bool]:
# returns (is_up_to_date, cached_error, cachable)
# where is_up_to_date is True if the node(s) are up_to_date
# cached_error is True if the node(s) are up_to_date, but the
@@ -1100,12 +1101,17 @@ def CheckCXXHeader(context, header, include_quotes: str = '""'):
def CheckLib(context, library = None, symbol: str = "main",
- header = None, language = None, autoadd: bool=True,
- append: bool=True, unique: bool=False) -> bool:
+ header = None, language = None, extra_libs = None,
+ autoadd: bool=True, append: bool=True, unique: bool=False) -> bool:
"""
- A test for a library. See also CheckLibWithHeader.
+ A test for a library. See also :func:`CheckLibWithHeader`.
Note that library may also be None to test whether the given symbol
compiles without flags.
+
+ .. versionchanged:: 4.9.0
+ Added the *extra_libs* keyword parameter. The actual implementation
+ is in :func:`SCons.Conftest.CheckLib` which already accepted this
+ parameter, so this is only exposing existing functionality.
"""
if not library:
@@ -1115,9 +1121,9 @@ def CheckLib(context, library = None, symbol: str = "main",
library = [library]
# ToDo: accept path for the library
- res = SCons.Conftest.CheckLib(context, library, symbol, header = header,
- language = language, autoadd = autoadd,
- append=append, unique=unique)
+ res = SCons.Conftest.CheckLib(context, library, symbol, header=header,
+ language=language, extra_libs=extra_libs,
+ autoadd=autoadd, append=append, unique=unique)
context.did_show_result = True
return not res
@@ -1125,15 +1131,21 @@ def CheckLib(context, library = None, symbol: str = "main",
# Bram: Can only include one header and can't use #ifdef HAVE_HEADER_H.
def CheckLibWithHeader(context, libs, header, language,
- call = None, autoadd: bool=True, append: bool=True, unique: bool=False) -> bool:
- # ToDo: accept path for library. Support system header files.
+ extra_libs = None, call = None, autoadd: bool=True,
+ append: bool=True, unique: bool=False) -> bool:
"""
Another (more sophisticated) test for a library.
Checks, if library and header is available for language (may be 'C'
or 'CXX'). Call maybe be a valid expression _with_ a trailing ';'.
- As in CheckLib, we support library=None, to test if the call compiles
+ As in :func:`CheckLib`, we support library=None, to test if the call compiles
without extra link flags.
+
+ .. versionchanged:: 4.9.0
+ Added the *extra_libs* keyword parameter. The actual implementation
+ is in :func:`SCons.Conftest.CheckLib` which already accepted this
+ parameter, so this is only exposing existing functionality.
"""
+ # ToDo: accept path for library. Support system header files.
prog_prefix, dummy = createIncludesFromHeaders(header, 0)
if not libs:
libs = [None]
@@ -1142,8 +1154,8 @@ def CheckLibWithHeader(context, libs, header, language,
libs = [libs]
res = SCons.Conftest.CheckLib(context, libs, None, prog_prefix,
- call = call, language = language, autoadd=autoadd,
- append=append, unique=unique)
+ extra_libs = extra_libs, call = call, language = language,
+ autoadd=autoadd, append=append, unique=unique)
context.did_show_result = 1
return not res
diff --git a/scons/scons-local-4.8.1/SCons/SConsign.py b/scons/scons-local-4.9.1/SCons/SConsign.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/SConsign.py
rename to scons/scons-local-4.9.1/SCons/SConsign.py
diff --git a/scons/scons-local-4.8.1/SCons/Scanner/C.py b/scons/scons-local-4.9.1/SCons/Scanner/C.py
similarity index 70%
rename from scons/scons-local-4.8.1/SCons/Scanner/C.py
rename to scons/scons-local-4.9.1/SCons/Scanner/C.py
index aafe0d9a5..bfd897dcb 100644
--- a/scons/scons-local-4.8.1/SCons/Scanner/C.py
+++ b/scons/scons-local-4.9.1/SCons/Scanner/C.py
@@ -28,6 +28,8 @@ CConditionalScanner, which must be explicitly selected by calling
add_scanner() for each affected suffix.
"""
+from typing import Dict
+
import SCons.Node.FS
import SCons.cpp
import SCons.Util
@@ -65,32 +67,85 @@ class SConsCPPScanner(SCons.cpp.PreProcessor):
self.missing.append((file, self.current_file))
return ''
-def dictify_CPPDEFINES(env) -> dict:
- """Returns CPPDEFINES converted to a dict.
+def dictify_CPPDEFINES(env, replace: bool = False) -> dict:
+ """Return CPPDEFINES converted to a dict for preprocessor emulation.
- This should be similar to :func:`~SCons.Defaults.processDefines`.
- Unfortunately, we can't do the simple thing of calling that routine and
- passing the result to the dict() constructor, because it turns the defines
- into a list of "name=value" pairs, which the dict constructor won't
- consume correctly. Also cannot just call dict on CPPDEFINES itself - it's
- fine if it's stored in the converted form (currently deque of tuples), but
- CPPDEFINES could be in other formats too.
+ The concept is similar to :func:`~SCons.Defaults.processDefines`:
+ turn the values stored in an internal form in ``env['CPPDEFINES']``
+ into one needed for a specific context - in this case the cpp-like
+ work the C/C++ scanner will do. We can't reuse ``processDefines``
+ output as that's a list of strings for the command line. We also can't
+ pass the ``CPPDEFINES`` variable directly to the ``dict`` constructor,
+ as SCons allows it to be stored in several different ways - it's only
+ after ``Append`` and relatives has been called we know for sure it will
+ be a deque of tuples.
- So we have to do all the work here - keep concepts in sync with
- ``processDefines``.
+ If requested (*replace* is true), simulate some of the macro
+ replacement that would take place if an actual preprocessor ran,
+ to avoid some conditional inclusions comeing out wrong. A bit
+ of an edge case, but does happen (GH #4623). See 6.10.5 in the C
+ standard and 15.6 in the C++ standard).
+
+ Args:
+ replace: if true, simulate macro replacement
+
+ .. versionchanged:: 4.9.0
+ Simple macro replacement added, and *replace* arg to enable it.
"""
+ def _replace(mapping: Dict) -> Dict:
+ """Simplistic macro replacer for dictify_CPPDEFINES.
+
+ Scan *mapping* for a value that is the same as a key in the dict,
+ and replace with the value of that key; the process is repeated a few
+ times, but not forever in case someone left a case that can't be
+ fully resolved. This is a cheap approximation of the preprocessor's
+ macro replacement rules with no smarts - it doesn't "look inside"
+ the values, so only triggers on object-like macros, not on
+ function-like macros, and will not work on complex values, e.g.
+ a value like ``(1UL << PR_MTE_TCF_SHIFT)`` would not have
+ ``PR_MTE_TCF_SHIFT`` replaced if that was also a key in ``CPPDEFINES``.
+
+ Args:
+ mapping: a dictionary representing macro names and replacements.
+
+ Returns:
+ a dictionary with replacements made.
+ """
+ old_ns = mapping
+ loops = 0
+ while loops < 5: # don't recurse forever in case there's circular data
+ # this was originally written as a dict comprehension, but unrolling
+ # lets us add a finer-grained check for whether another loop is
+ # needed, rather than comparing two dicts to see if one changed.
+ again = False
+ ns = {}
+ for k, v in old_ns.items():
+ if v in old_ns:
+ ns[k] = old_ns[v]
+ if not again and ns[k] != v:
+ again = True
+ else:
+ ns[k] = v
+ if not again:
+ break
+ old_ns = ns
+ loops += 1
+ return ns
+
cppdefines = env.get('CPPDEFINES', {})
- result = {}
- if cppdefines is None:
- return result
+ if not cppdefines:
+ return {}
if SCons.Util.is_Tuple(cppdefines):
+ # single macro defined in a tuple
try:
return {cppdefines[0]: cppdefines[1]}
except IndexError:
return {cppdefines[0]: None}
if SCons.Util.is_Sequence(cppdefines):
+ # multiple (presumably) macro defines in a deque, list, etc.
+ result = {}
for c in cppdefines:
if SCons.Util.is_Sequence(c):
try:
@@ -107,9 +162,12 @@ def dictify_CPPDEFINES(env) -> dict:
else:
# don't really know what to do here
result[c] = None
- return result
+ if replace:
+ return _replace(result)
+ return(result)
if SCons.Util.is_String(cppdefines):
+ # single macro define in a string
try:
name, value = cppdefines.split('=')
return {name: value}
@@ -117,6 +175,9 @@ def dictify_CPPDEFINES(env) -> dict:
return {cppdefines: None}
if SCons.Util.is_Dict(cppdefines):
+ # already in the desired form
+ if replace:
+ return _replace(cppdefines)
return cppdefines
return {cppdefines: None}
@@ -136,7 +197,9 @@ class SConsCPPScannerWrapper:
def __call__(self, node, env, path=()):
cpp = SConsCPPScanner(
- current=node.get_dir(), cpppath=path, dict=dictify_CPPDEFINES(env)
+ current=node.get_dir(),
+ cpppath=path,
+ dict=dictify_CPPDEFINES(env, replace=True),
)
result = cpp(node)
for included, includer in cpp.missing:
@@ -149,6 +212,7 @@ class SConsCPPScannerWrapper:
def recurse_nodes(self, nodes):
return nodes
+
def select(self, node):
return self
diff --git a/scons/scons-local-4.8.1/SCons/Scanner/D.py b/scons/scons-local-4.9.1/SCons/Scanner/D.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Scanner/D.py
rename to scons/scons-local-4.9.1/SCons/Scanner/D.py
diff --git a/scons/scons-local-4.8.1/SCons/Scanner/Dir.py b/scons/scons-local-4.9.1/SCons/Scanner/Dir.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Scanner/Dir.py
rename to scons/scons-local-4.9.1/SCons/Scanner/Dir.py
diff --git a/scons/scons-local-4.8.1/SCons/Scanner/Fortran.py b/scons/scons-local-4.9.1/SCons/Scanner/Fortran.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Scanner/Fortran.py
rename to scons/scons-local-4.9.1/SCons/Scanner/Fortran.py
diff --git a/scons/scons-local-4.8.1/SCons/Scanner/IDL.py b/scons/scons-local-4.9.1/SCons/Scanner/IDL.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Scanner/IDL.py
rename to scons/scons-local-4.9.1/SCons/Scanner/IDL.py
diff --git a/scons/scons-local-4.8.1/SCons/Scanner/Java.py b/scons/scons-local-4.9.1/SCons/Scanner/Java.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Scanner/Java.py
rename to scons/scons-local-4.9.1/SCons/Scanner/Java.py
diff --git a/scons/scons-local-4.8.1/SCons/Scanner/LaTeX.py b/scons/scons-local-4.9.1/SCons/Scanner/LaTeX.py
similarity index 96%
rename from scons/scons-local-4.8.1/SCons/Scanner/LaTeX.py
rename to scons/scons-local-4.9.1/SCons/Scanner/LaTeX.py
index 4412aee64..93c2752ca 100644
--- a/scons/scons-local-4.8.1/SCons/Scanner/LaTeX.py
+++ b/scons/scons-local-4.9.1/SCons/Scanner/LaTeX.py
@@ -169,6 +169,11 @@ class LaTeX(ScannerBase):
'addsectionbib': 'BIBINPUTS',
'makeindex': 'INDEXSTYLE',
'usepackage': 'TEXINPUTS',
+ 'usetheme': 'TEXINPUTS',
+ 'usecolortheme': 'TEXINPUTS',
+ 'usefonttheme': 'TEXINPUTS',
+ 'useinnertheme': 'TEXINPUTS',
+ 'useoutertheme': 'TEXINPUTS',
'lstinputlisting': 'TEXINPUTS'}
env_variables = SCons.Util.unique(list(keyword_paths.values()))
two_arg_commands = ['import', 'subimport',
@@ -193,6 +198,7 @@ class LaTeX(ScannerBase):
| addglobalbib
| addsectionbib
| usepackage
+ | use(?:|color|font|inner|outer)theme(?:\s*\[[^\]]+\])?
)
\s*{([^}]*)} # first arg
(?: \s*{([^}]*)} )? # maybe another arg
@@ -362,6 +368,9 @@ class LaTeX(ScannerBase):
if inc_type in self.two_arg_commands:
inc_subdir = os.path.join(subdir, include[1])
inc_list = include[2].split(',')
+ elif re.match('use(|color|font|inner|outer)theme', inc_type):
+ inc_list = [re.sub('use', 'beamer', inc_type) + _ + '.sty' for _ in
+ include[1].split(',')]
else:
inc_list = include[1].split(',')
for inc in inc_list:
@@ -411,7 +420,7 @@ class LaTeX(ScannerBase):
if n is None:
# Do not bother with 'usepackage' warnings, as they most
# likely refer to system-level files
- if inc_type != 'usepackage':
+ if inc_type != 'usepackage' or re.match("use(|color|font|inner|outer)theme", inc_type):
SCons.Warnings.warn(
SCons.Warnings.DependencyWarning,
"No dependency generated for file: %s "
diff --git a/scons/scons-local-4.8.1/SCons/Scanner/Prog.py b/scons/scons-local-4.9.1/SCons/Scanner/Prog.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Scanner/Prog.py
rename to scons/scons-local-4.9.1/SCons/Scanner/Prog.py
diff --git a/scons/scons-local-4.8.1/SCons/Scanner/Python.py b/scons/scons-local-4.9.1/SCons/Scanner/Python.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Scanner/Python.py
rename to scons/scons-local-4.9.1/SCons/Scanner/Python.py
diff --git a/scons/scons-local-4.8.1/SCons/Scanner/RC.py b/scons/scons-local-4.9.1/SCons/Scanner/RC.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Scanner/RC.py
rename to scons/scons-local-4.9.1/SCons/Scanner/RC.py
diff --git a/scons/scons-local-4.8.1/SCons/Scanner/SWIG.py b/scons/scons-local-4.9.1/SCons/Scanner/SWIG.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Scanner/SWIG.py
rename to scons/scons-local-4.9.1/SCons/Scanner/SWIG.py
diff --git a/scons/scons-local-4.8.1/SCons/Scanner/__init__.py b/scons/scons-local-4.9.1/SCons/Scanner/__init__.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Scanner/__init__.py
rename to scons/scons-local-4.9.1/SCons/Scanner/__init__.py
diff --git a/scons/scons-local-4.8.1/SCons/Script/Interactive.py b/scons/scons-local-4.9.1/SCons/Script/Interactive.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Script/Interactive.py
rename to scons/scons-local-4.9.1/SCons/Script/Interactive.py
diff --git a/scons/scons-local-4.8.1/SCons/Script/Main.py b/scons/scons-local-4.9.1/SCons/Script/Main.py
similarity index 97%
rename from scons/scons-local-4.8.1/SCons/Script/Main.py
rename to scons/scons-local-4.9.1/SCons/Script/Main.py
index 77d80cb29..79cf8321b 100644
--- a/scons/scons-local-4.8.1/SCons/Script/Main.py
+++ b/scons/scons-local-4.9.1/SCons/Script/Main.py
@@ -31,9 +31,12 @@ some other module. If it's specific to the "scons" script invocation,
it goes here.
"""
+from __future__ import annotations
+
import SCons.compat
import importlib.util
+import optparse
import os
import re
import sys
@@ -41,7 +44,6 @@ import time
import traceback
import platform
import threading
-from typing import Optional, List, TYPE_CHECKING
import SCons.CacheDir
import SCons.Debug
@@ -59,14 +61,13 @@ import SCons.Taskmaster
import SCons.Util
import SCons.Warnings
import SCons.Script.Interactive
-if TYPE_CHECKING:
- from SCons.Script import SConsOption
+from .SConsOptions 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)
+minimum_python_version = (3, 7, 0)
deprecated_python_version = (3, 7, 0)
# ordered list of SConstruct names to look for if there is no -f flag
@@ -508,29 +509,41 @@ 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) -> "SConsOption":
+ def add_local_option(self, *args, **kw) -> SConsOption:
pass
OptionsParser = FakeOptionParser()
-def AddOption(*args, settable: bool = False, **kw) -> "SConsOption":
+def AddOption(*args, **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`.
+ If the SCons-specific *settable* kwarg is true (default ``False``),
+ the option will allow calling :func:``SetOption`.
.. versionchanged:: 4.8.0
The *settable* parameter added to allow including the new option
- to the table of options eligible to use :func:`SetOption`.
-
+ in the table of options eligible to use :func:`SetOption`.
"""
+ settable = kw.get('settable', False)
+ if len(args) == 1 and isinstance(args[0], SConsOption):
+ # If they passed an SConsOption object, ignore kw - the underlying
+ # add_option method relies on seeing zero kwargs to recognize this.
+ # Since we don't support an omitted default, overrwrite optparse's
+ # marker to get the same effect as setting it in kw otherwise.
+ optobj = args[0]
+ if optobj.default is optparse.NO_DEFAULT:
+ optobj.default = None
+ # make sure settable attribute exists; positive setting wins
+ attr_settable = getattr(optobj, "settable")
+ if attr_settable is None or settable > attr_settable:
+ optobj.settable = settable
+ return OptionsParser.add_local_option(*args)
+
if 'default' not in kw:
kw['default'] = None
- kw['settable'] = settable
- result = OptionsParser.add_local_option(*args, **kw)
- return result
+ kw['settable'] = settable # just to make sure it gets set
+ return OptionsParser.add_local_option(*args, **kw)
def GetOption(name: str):
"""Get the value from an option - Public API."""
@@ -540,7 +553,7 @@ def SetOption(name: str, value):
"""Set the value of an option - Public API."""
return OptionsParser.values.set_option(name, value)
-def DebugOptions(json: Optional[str] = None) -> None:
+def DebugOptions(json: str | None = None) -> None:
"""Specify options to SCons debug logic - Public API.
Currently only *json* is supported, which changes the JSON file
@@ -669,8 +682,8 @@ def _scons_internal_error() -> None:
sys.exit(2)
def _SConstruct_exists(
- dirname: str, repositories: List[str], filelist: List[str]
-) -> Optional[str]:
+ dirname: str, repositories: list[str], filelist: list[str]
+) -> str | None:
"""Check that an SConstruct file exists in a directory.
Arguments:
@@ -1344,12 +1357,6 @@ def _build_targets(fs, options, targets, target_top):
# various print_* settings, tree_printer list, etc.
BuildTask.options = options
- is_pypy = platform.python_implementation() == 'PyPy'
- # As of 3.7, python removed support for threadless platforms.
- # See https://www.python.org/dev/peps/pep-0011/
- is_37_or_later = sys.version_info >= (3, 7)
- # python_has_threads = sysconfig.get_config_var('WITH_THREAD') or is_pypy or is_37_or_later
-
# As of python 3.4 threading has a dummy_threading module for use when there is no threading
# it's get_ident() will allways return -1, while real threading modules get_ident() will
# always return a positive integer
@@ -1412,7 +1419,7 @@ def _exec_main(parser, values) -> None:
class SConsPdb(pdb.Pdb):
"""Specialization of Pdb to help find SConscript files."""
- def lookupmodule(self, filename: str) -> Optional[str]:
+ def lookupmodule(self, filename: str) -> str | None:
"""Helper function for break/clear parsing -- SCons version.
Translates (possibly incomplete) file or module name
diff --git a/scons/scons-local-4.8.1/SCons/Script/SConsOptions.py b/scons/scons-local-4.9.1/SCons/Script/SConsOptions.py
similarity index 85%
rename from scons/scons-local-4.8.1/SCons/Script/SConsOptions.py
rename to scons/scons-local-4.9.1/SCons/Script/SConsOptions.py
index d4cc99268..2690a086c 100644
--- a/scons/scons-local-4.8.1/SCons/Script/SConsOptions.py
+++ b/scons/scons-local-4.9.1/SCons/Script/SConsOptions.py
@@ -21,6 +21,8 @@
# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+from __future__ import annotations
+
import gettext
import optparse
import re
@@ -73,7 +75,7 @@ class SConsValues(optparse.Values):
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).
+ calls in the :func:`Parser` function.
The command line always overrides a value set in a SConscript file,
which in turn always overrides default settings. Because we want
@@ -144,16 +146,14 @@ class SConsValues(optparse.Values):
]
def set_option(self, name: str, value) -> None:
- """Sets an option *name* from an SConscript file.
+ """Set an option value from a :func:`~SCons.Script.Main.SetOption` call.
- 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.
+ Validation steps for settable options (those defined in SCons
+ itself) are in-line here. Duplicates the logic for the matching
+ command-line options in :func:`Parse` - these need to be kept
+ in sync. Cannot provide validation for options added via
+ :func:`~SCons.Script.Main.AddOption` since we don't know about those
+ ahead of time - it is up to the developer to figure that out.
Raises:
UserError: the option is not settable.
@@ -233,13 +233,37 @@ class SConsValues(optparse.Values):
class SConsOption(optparse.Option):
- def convert_value(self, opt, value):
+ """SCons added option.
+
+ Changes :attr:`CHECK_METHODS` and :attr:`CONST_ACTIONS` settings from
+ :class:`optparse.Option` base class to tune for our usage.
+
+ New function :meth:`_check_nargs_optional` implements the ``nargs=?``
+ syntax from :mod:`argparse`, and is added to the ``CHECK_METHODS`` list.
+ Overridden :meth:`convert_value` supports this usage.
+
+ .. versionchanged:: 4.9.0
+ The *settable* attribute is added to ``ATTRS``, allowing it to be
+ set in the option. A parameter to mark the option settable was added
+ in 4.8.0, but was not initially made part of the option object itself.
+ """
+ # can uncomment to have a place to trap SConsOption creation for debugging:
+ # def __init__(self, *args, **kwargs):
+ # super().__init__(*args, **kwargs)
+
+ def convert_value(self, opt: str, value):
+ """SCons override: recognize nargs="?"."""
if value is not None:
if self.nargs in (1, '?'):
return self.check_value(opt, value)
return tuple([self.check_value(opt, v) for v in value])
def process(self, opt, value, values, parser):
+ """Process a value.
+
+ Direct copy of optparse version including the comments -
+ we don't change anything so this could just be dropped.
+ """
# First, convert the value(s) to the right type. Howl if any
# value(s) are bogus.
value = self.convert_value(opt, value)
@@ -250,15 +274,17 @@ class SConsOption(optparse.Option):
return self.take_action(
self.action, self.dest, opt, value, values, parser)
- def _check_nargs_optional(self):
+ def _check_nargs_optional(self) -> None:
+ """SCons added: deal with optional option-arguments."""
if self.nargs == '?' and self._short_opts:
fmt = "option %s: nargs='?' is incompatible with short options"
raise SCons.Errors.UserError(fmt % self._short_opts[0])
+ ATTRS = optparse.Option.ATTRS + ['settable'] # added for SCons
CHECK_METHODS = optparse.Option.CHECK_METHODS
if CHECK_METHODS is None:
CHECK_METHODS = []
- CHECK_METHODS = CHECK_METHODS + [_check_nargs_optional]
+ CHECK_METHODS += [_check_nargs_optional] # added for SCons
CONST_ACTIONS = optparse.Option.CONST_ACTIONS + optparse.Option.TYPED_ACTIONS
@@ -270,8 +296,8 @@ class SConsOptionGroup(optparse.OptionGroup):
lined up with the normal "SCons Options".
"""
- def format_help(self, formatter):
- """ Format an option group's help text.
+ def format_help(self, formatter) -> str:
+ """SCons-specific formatting of an option group's help text.
The title is dedented so it's flush with the "SCons Options"
title we print at the top.
@@ -285,14 +311,15 @@ class SConsOptionGroup(optparse.OptionGroup):
class SConsBadOptionError(optparse.BadOptionError):
- """Exception used to indicate that invalid command line options were specified
-
- :ivar str opt_str: The offending option specified on command line which is not recognized
- :ivar OptionParser parser: The active argument parser
+ """Raised if an invalid option value is encountered on the command line.
+ Attributes:
+ opt_str: The unrecognized command-line option.
+ parser: The active argument parser.
"""
+ # TODO why is 'parser' needed? Not called in current code base.
- def __init__(self, opt_str, parser=None) -> None:
+ def __init__(self, opt_str: str, parser: SConsOptionParser | None = None) -> None:
self.opt_str = opt_str
self.parser = parser
@@ -304,8 +331,8 @@ class SConsOptionParser(optparse.OptionParser):
preserve_unknown_options = False
raise_exception_on_error = False
- def error(self, msg):
- """Overridden OptionValueError exception handler."""
+ def error(self, msg: str) -> None:
+ """SCons-specific handling of option errors."""
if self.raise_exception_on_error:
raise SConsBadOptionError(msg, self)
else:
@@ -313,15 +340,16 @@ class SConsOptionParser(optparse.OptionParser):
sys.stderr.write("SCons Error: %s\n" % msg)
sys.exit(2)
- def _process_long_opt(self, rargs, values):
- """ SCons-specific processing of long options.
+ def _process_long_opt(self, rargs, values) -> None:
+ """SCons-specific processing of long options.
- This is copied directly from the normal
- ``optparse._process_long_opt()`` method, except that, if configured
- to do so, we catch the exception thrown when an unknown option
- is encountered and just stick it back on the "leftover" arguments
- for later (re-)processing. This is because we may see the option
- definition later, while processing SConscript files.
+ This is copied directly from the normal Optparse
+ :meth:`~optparse.OptionParser._process_long_opt` method, except
+ that, if configured to do so, we catch the exception thrown
+ when an unknown option is encountered and just stick it back
+ on the "leftover" arguments for later (re-)processing. This is
+ because we may see the option definition later, while processing
+ SConscript files.
"""
arg = rargs.pop(0)
@@ -341,9 +369,9 @@ class SConsOptionParser(optparse.OptionParser):
% (opt, self._match_long_opt(opt))
)
except optparse.BadOptionError:
+ # SCons addition: if requested, add unknown options to
+ # the "leftover arguments" list for later processing.
if self.preserve_unknown_options:
- # SCons-specific: if requested, add unknown options to
- # the "leftover arguments" list for later processing.
self.largs.append(arg)
if had_explicit_value:
# The unknown option will be re-processed later,
@@ -355,6 +383,7 @@ class SConsOptionParser(optparse.OptionParser):
option = self._long_opt[opt]
if option.takes_value():
nargs = option.nargs
+ # SCons addition: recognize '?' for nargs
if nargs == '?':
if had_explicit_value:
value = rargs.pop(0)
@@ -362,6 +391,7 @@ class SConsOptionParser(optparse.OptionParser):
value = option.const
elif len(rargs) < nargs:
if nargs == 1:
+ # SCons addition: nicer msg if option had choices
if not option.choices:
self.error(_("%s option requires an argument") % opt)
else:
@@ -386,6 +416,66 @@ class SConsOptionParser(optparse.OptionParser):
option.process(opt, value, values, self)
+
+ def _process_short_opts(self, rargs, values) -> None:
+ """SCons-specific processing of short options.
+
+ This is copied directly from the normal Optparse
+ :meth:`~optparse.OptionParser._process_short_opts` method, except
+ that, if configured to do so, we catch the exception thrown
+ when an unknown option is encountered and just stick it back
+ on the "leftover" arguments for later (re-)processing. This is
+ because we may see the option definition later, while processing
+ SConscript files.
+ """
+ arg = rargs.pop(0)
+ stop = False
+ i = 1
+ for ch in arg[1:]:
+ opt = "-" + ch
+ option = self._short_opt.get(opt)
+ i += 1 # we have consumed a character
+
+ try:
+ if not option:
+ raise optparse.BadOptionError(opt)
+ except optparse.BadOptionError:
+ # SCons addition: if requested, add unknown options to
+ # the "leftover arguments" list for later processing.
+ if self.preserve_unknown_options:
+ self.largs.append(arg)
+ return
+ raise
+
+ if option.takes_value():
+ # Any characters left in arg? Pretend they're the
+ # next arg, and stop consuming characters of arg.
+ if i < len(arg):
+ rargs.insert(0, arg[i:])
+ stop = True
+
+ nargs = option.nargs
+ if len(rargs) < nargs:
+ if nargs == 1:
+ self.error(_("%s option requires an argument") % opt)
+ else:
+ self.error(_("%s option requires %d arguments")
+ % (opt, nargs))
+ elif nargs == 1:
+ value = rargs.pop(0)
+ else:
+ value = tuple(rargs[0:nargs])
+ del rargs[0:nargs]
+
+ else: # option doesn't take a value
+ value = None
+
+ option.process(opt, value, values, self)
+
+ if stop:
+ break
+
+
def reparse_local_options(self) -> None:
"""Re-parse the leftover command-line options.
@@ -399,10 +489,8 @@ class SConsOptionParser(optparse.OptionParser):
allow exact matches for long-opts only (no partial argument names!).
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.
+ command-line arguments that haven't been processed so far
+ (``self.largs``), but are possibly not added to the options list yet.
So, when we only have a value for ``--myargument`` so far,
a command-line argument of ``--myarg=test`` would set it,
@@ -450,29 +538,31 @@ class SConsOptionParser(optparse.OptionParser):
self.largs = self.largs + largs_restore
def add_local_option(self, *args, **kw) -> SConsOption:
- """ Adds a local option to the parser.
+ """Add a local option to the parser.
- 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.
+ This is the implementation of :func:`~SCons.Script.Main.AddOption`,
+ to add a project-defined command-line option. Local options
+ are added to a separate option group, which is created 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*.
+ :func:`~SCons.Script.Main.SetOption` calls.
+ .. versionchanged:: NEXT_VERSION
+ If the option's *settable* attribute is true, it is added to
+ the :attr:`SConsValues.settable` list. *settable* handling was
+ added in 4.8.0, but was not made an option attribute at the time.
"""
+ group: SConsOptionGroup
try:
group = self.local_option_group
except AttributeError:
group = SConsOptionGroup(self, 'Local Options')
- group = self.add_option_group(group)
+ self.add_option_group(group)
self.local_option_group = group
- settable = kw.pop('settable')
+ # this gives us an SConsOption due to the setting of self.option_class
result = group.add_option(*args, **kw)
if result:
# The option was added successfully. We now have to add the
@@ -483,15 +573,16 @@ class SConsOptionParser(optparse.OptionParser):
# any value overridden on the command line is immediately
# available if the user turns around and does a GetOption()
# right away.
+ # TODO: what if dest is None?
setattr(self.values.__defaults__, result.dest, result.default)
self.reparse_local_options()
- if settable:
+ if result.settable:
SConsValues.settable.append(result.dest)
return result
def format_local_option_help(self, formatter=None, file=None):
- """Return the help for the project-level ("local") options.
+ """Return the help for the project-level ("local") SCons options.
.. versionadded:: 4.6.0
"""
@@ -514,7 +605,7 @@ class SConsOptionParser(optparse.OptionParser):
return local_help
def print_local_option_help(self, file=None):
- """Print help for just project-defined options.
+ """Print help for just local SCons options.
Writes to *file* (default stdout).
@@ -527,11 +618,11 @@ class SConsOptionParser(optparse.OptionParser):
class SConsIndentedHelpFormatter(optparse.IndentedHelpFormatter):
def format_usage(self, usage) -> str:
- """ Formats the usage message. """
+ """Format the usage message for SCons."""
return "usage: %s\n" % usage
def format_heading(self, heading):
- """ Translates heading to "SCons Options"
+ """Translate heading to "SCons Options"
Heading of "Options" changed to "SCons Options."
Unfortunately, we have to do this here, because those titles
@@ -542,11 +633,10 @@ class SConsIndentedHelpFormatter(optparse.IndentedHelpFormatter):
return super().format_heading(heading)
def format_option(self, option):
- """ Customized option formatter.
+ """SCons-specific option formatter.
- A copy of the normal ``optparse.IndentedHelpFormatter.format_option()``
- method. This has been snarfed so we can modify text wrapping to
- our liking:
+ A copy of the :meth:`optparse.IndentedHelpFormatter.format_option`
+ method. Overridden so we can modify text wrapping to our liking:
* add our own regular expression that doesn't break on hyphens
(so things like ``--no-print-directory`` don't get broken).
@@ -556,21 +646,25 @@ class SConsIndentedHelpFormatter(optparse.IndentedHelpFormatter):
The help for each option consists of two parts:
- * the opt strings and metavars e.g. ("-x", or
- "-fFILENAME, --file=FILENAME")
+ * the opt strings and metavars e.g. (``-x``, or
+ ``-fFILENAME, --file=FILENAME``)
* the user-supplied help string e.g.
- ("turn on expert mode", "read data from FILENAME")
+ (``turn on expert mode``, ``read data from FILENAME``)
If possible, we write both of these on the same line::
-x turn on expert mode
- But if the opt string list is too long, we put the help
+ If the opt string list is too long, we put the help
string on a second line, indented to the same column it would
start in if it fit on the first line::
-fFILENAME, --file=FILENAME
read data from FILENAME
+
+ Help strings are wrapped for terminal width and do not preserve
+ any hand-made formatting that may have been used in the ``AddOption``
+ call, so don't attempt prettying up a list of choices (for example).
"""
result = []
opts = self.option_strings[option]
diff --git a/scons/scons-local-4.8.1/SCons/Script/SConscript.py b/scons/scons-local-4.9.1/SCons/Script/SConscript.py
similarity index 98%
rename from scons/scons-local-4.8.1/SCons/Script/SConscript.py
rename to scons/scons-local-4.9.1/SCons/Script/SConscript.py
index a2ef3b9d5..f98cf3b21 100644
--- a/scons/scons-local-4.8.1/SCons/Script/SConscript.py
+++ b/scons/scons-local-4.9.1/SCons/Script/SConscript.py
@@ -23,6 +23,8 @@
"""This module defines the Python API provided to SConscript files."""
+from __future__ import annotations
+
import SCons
import SCons.Action
import SCons.Builder
@@ -45,7 +47,6 @@ import re
import sys
import traceback
import time
-from typing import Tuple
class SConscriptReturn(Exception):
pass
@@ -386,7 +387,7 @@ class SConsEnvironment(SCons.Environment.Base):
# Private methods of an SConsEnvironment.
#
@staticmethod
- def _get_major_minor_revision(version_string: str) -> Tuple[int, int, int]:
+ def _get_major_minor_revision(version_string: str) -> tuple[int, int, int]:
"""Split a version string into major, minor and (optionally)
revision parts.
@@ -485,7 +486,7 @@ class SConsEnvironment(SCons.Environment.Base):
SCons.Script._Set_Default_Targets(self, targets)
@staticmethod
- def GetSConsVersion() -> Tuple[int, int, int]:
+ def GetSConsVersion() -> tuple[int, int, int]:
"""Return the current SCons version.
.. versionadded:: 4.8.0
@@ -535,25 +536,27 @@ class SConsEnvironment(SCons.Environment.Base):
name = self.subst(name)
return SCons.Script.Main.GetOption(name)
- def Help(self, text, append: bool = False, keep_local: bool = False) -> None:
+ def Help(self, text, append: bool = False, local_only: bool = False) -> None:
"""Update the help text.
The previous help text has *text* appended to it, except on the
- first call. On first call, the values of *append* and *keep_local*
+ first call. On first call, the values of *append* and *local_only*
are considered to determine what is appended to.
Arguments:
text: string to add to the help text.
append: on first call, if true, keep the existing help text
(default False).
- keep_local: on first call, if true and *append* is also true,
+ local_only: on first call, if true and *append* is also true,
keep only the help text from AddOption calls.
.. versionchanged:: 4.6.0
The *keep_local* parameter was added.
+ .. versionchanged:: 4.9.0
+ The *keep_local* parameter was renamed *local_only* to match manpage
"""
text = self.subst(text, raw=1)
- SCons.Script.HelpFunction(text, append=append, keep_local=keep_local)
+ SCons.Script.HelpFunction(text, append=append, local_only=local_only)
def Import(self, *vars):
try:
diff --git a/scons/scons-local-4.8.1/SCons/Script/__init__.py b/scons/scons-local-4.9.1/SCons/Script/__init__.py
similarity index 95%
rename from scons/scons-local-4.8.1/SCons/Script/__init__.py
rename to scons/scons-local-4.9.1/SCons/Script/__init__.py
index ce0105573..cf6c9de31 100644
--- a/scons/scons-local-4.8.1/SCons/Script/__init__.py
+++ b/scons/scons-local-4.9.1/SCons/Script/__init__.py
@@ -35,6 +35,7 @@ import time
start_time = time.time()
import collections
+import itertools
import os
from io import StringIO
@@ -53,9 +54,17 @@ import sys
# to not add the shims. So we use a special-case, up-front check for
# the "--debug=memoizer" flag and enable Memoizer before we import any
# of the other modules that use it.
+# Update: this breaks if the option isn't exactly "--debug=memoizer",
+# like if there is more than one debug option as a csv. Do a bit more work.
-_args = sys.argv + os.environ.get('SCONSFLAGS', '').split()
-if "--debug=memoizer" in _args:
+_args = sys.argv + os.environ.get("SCONSFLAGS", "").split()
+_args = (
+ arg[len("--debug=") :].split(",")
+ for arg in _args
+ if arg.startswith("--debug=")
+)
+_args = list(itertools.chain.from_iterable(_args))
+if "memoizer" in _args:
import SCons.Memoize
import SCons.Warnings
try:
@@ -251,19 +260,21 @@ def _Set_Default_Targets(env, tlist) -> None:
help_text = None
-def HelpFunction(text, append: bool = False, keep_local: bool = False) -> None:
+def HelpFunction(text, append: bool = False, local_only: bool = False) -> None:
"""The implementaion of the the ``Help`` method.
See :meth:`~SCons.Script.SConscript.Help`.
.. versionchanged:: 4.6.0
The *keep_local* parameter was added.
+ .. versionchanged:: 4.9.0
+ The *keep_local* parameter was renamed *local_only* to match manpage
"""
global help_text
if help_text is None:
if append:
with StringIO() as s:
- PrintHelp(s, local_only=keep_local)
+ PrintHelp(s, local_only=local_only)
help_text = s.getvalue()
else:
help_text = ""
diff --git a/scons/scons-local-4.8.1/SCons/Subst.py b/scons/scons-local-4.9.1/SCons/Subst.py
similarity index 99%
rename from scons/scons-local-4.8.1/SCons/Subst.py
rename to scons/scons-local-4.9.1/SCons/Subst.py
index b04ebe50c..4d6b249c6 100644
--- a/scons/scons-local-4.8.1/SCons/Subst.py
+++ b/scons/scons-local-4.9.1/SCons/Subst.py
@@ -23,10 +23,11 @@
"""SCons string substitution."""
+from __future__ import annotations
+
import collections
import re
from inspect import signature, Parameter
-from typing import Optional
import SCons.Errors
from SCons.Util import is_String, is_Sequence
@@ -807,7 +808,7 @@ _separate_args = re.compile(r'(%s|\s+|[^\s$]+|\$)' % _dollar_exps_str)
_space_sep = re.compile(r'[\t ]+(?![^{]*})')
-def scons_subst(strSubst, env, mode=SUBST_RAW, target=None, source=None, gvars={}, lvars={}, conv=None, overrides: Optional[dict] = None):
+def scons_subst(strSubst, env, mode=SUBST_RAW, target=None, source=None, gvars={}, lvars={}, conv=None, overrides: dict | None = None):
"""Expand a string or list containing construction variable
substitutions.
@@ -889,7 +890,7 @@ def scons_subst(strSubst, env, mode=SUBST_RAW, target=None, source=None, gvars={
return result
-def scons_subst_list(strSubst, env, mode=SUBST_RAW, target=None, source=None, gvars={}, lvars={}, conv=None, overrides: Optional[dict] = None):
+def scons_subst_list(strSubst, env, mode=SUBST_RAW, target=None, source=None, gvars={}, lvars={}, conv=None, overrides: dict | None = None):
"""Substitute construction variables in a string (or list or other
object) and separate the arguments into a command list.
diff --git a/scons/scons-local-4.8.1/SCons/Taskmaster/Job.py b/scons/scons-local-4.9.1/SCons/Taskmaster/Job.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Taskmaster/Job.py
rename to scons/scons-local-4.9.1/SCons/Taskmaster/Job.py
diff --git a/scons/scons-local-4.8.1/SCons/Taskmaster/__init__.py b/scons/scons-local-4.9.1/SCons/Taskmaster/__init__.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Taskmaster/__init__.py
rename to scons/scons-local-4.9.1/SCons/Taskmaster/__init__.py
diff --git a/scons/scons-local-4.8.1/SCons/Tool/386asm.py b/scons/scons-local-4.9.1/SCons/Tool/386asm.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/386asm.py
rename to scons/scons-local-4.9.1/SCons/Tool/386asm.py
diff --git a/scons/scons-local-4.8.1/SCons/Tool/DCommon.py b/scons/scons-local-4.9.1/SCons/Tool/DCommon.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/DCommon.py
rename to scons/scons-local-4.9.1/SCons/Tool/DCommon.py
diff --git a/scons/scons-local-4.8.1/SCons/Tool/FortranCommon.py b/scons/scons-local-4.9.1/SCons/Tool/FortranCommon.py
similarity index 97%
rename from scons/scons-local-4.8.1/SCons/Tool/FortranCommon.py
rename to scons/scons-local-4.9.1/SCons/Tool/FortranCommon.py
index f221d15ec..dc9dcddf6 100644
--- a/scons/scons-local-4.8.1/SCons/Tool/FortranCommon.py
+++ b/scons/scons-local-4.9.1/SCons/Tool/FortranCommon.py
@@ -23,9 +23,10 @@
"""Routines for setting up Fortran, common to all dialects."""
+from __future__ import annotations
+
import re
import os.path
-from typing import Tuple, List
import SCons.Scanner.Fortran
import SCons.Tool
@@ -96,7 +97,7 @@ def ShFortranEmitter(target, source, env) -> Tuple:
return SharedObjectEmitter(target, source, env)
-def ComputeFortranSuffixes(suffixes: List[str], ppsuffixes: List[str]) -> None:
+def ComputeFortranSuffixes(suffixes: list[str], ppsuffixes: list[str]) -> None:
"""Update the suffix lists to reflect the platform requirements.
If upper-cased suffixes can be distinguished from lower, those are
@@ -119,7 +120,7 @@ def ComputeFortranSuffixes(suffixes: List[str], ppsuffixes: List[str]) -> None:
def CreateDialectActions(
dialect: str,
-) -> Tuple[CommandAction, CommandAction, CommandAction, CommandAction]:
+) -> tuple[CommandAction, CommandAction, CommandAction, CommandAction]:
"""Create dialect specific actions."""
CompAction = Action(f'${dialect}COM ', cmdstr=f'${dialect}COMSTR')
CompPPAction = Action(f'${dialect}PPCOM ', cmdstr=f'${dialect}PPCOMSTR')
@@ -131,8 +132,8 @@ def CreateDialectActions(
def DialectAddToEnv(
env,
dialect: str,
- suffixes: List[str],
- ppsuffixes: List[str],
+ suffixes: list[str],
+ ppsuffixes: list[str],
support_mods: bool = False,
) -> None:
"""Add dialect specific construction variables.
diff --git a/scons/scons-local-4.8.1/SCons/Tool/GettextCommon.py b/scons/scons-local-4.9.1/SCons/Tool/GettextCommon.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/GettextCommon.py
rename to scons/scons-local-4.9.1/SCons/Tool/GettextCommon.py
diff --git a/scons/scons-local-4.8.1/SCons/Tool/JavaCommon.py b/scons/scons-local-4.9.1/SCons/Tool/JavaCommon.py
similarity index 99%
rename from scons/scons-local-4.8.1/SCons/Tool/JavaCommon.py
rename to scons/scons-local-4.9.1/SCons/Tool/JavaCommon.py
index c7e62b88c..0bcb0eaa5 100644
--- a/scons/scons-local-4.8.1/SCons/Tool/JavaCommon.py
+++ b/scons/scons-local-4.9.1/SCons/Tool/JavaCommon.py
@@ -23,11 +23,12 @@
"""Common routines for processing Java. """
+from __future__ import annotations
+
import os
import re
import glob
from pathlib import Path
-from typing import List
import SCons.Util
@@ -491,7 +492,7 @@ else:
return os.path.split(fn)
-def get_java_install_dirs(platform, version=None) -> List[str]:
+def get_java_install_dirs(platform, version=None) -> list[str]:
""" Find possible java jdk installation directories.
Returns a list for use as `default_paths` when looking up actual
@@ -540,7 +541,7 @@ def get_java_install_dirs(platform, version=None) -> List[str]:
return []
-def get_java_include_paths(env, javac, version) -> List[str]:
+def get_java_include_paths(env, javac, version) -> list[str]:
"""Find java include paths for JNI building.
Cannot be called in isolation - `javac` refers to an already detected
diff --git a/scons/scons-local-4.8.1/SCons/Tool/MSCommon/MSVC/Dispatcher.py b/scons/scons-local-4.9.1/SCons/Tool/MSCommon/MSVC/Dispatcher.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/MSCommon/MSVC/Dispatcher.py
rename to scons/scons-local-4.9.1/SCons/Tool/MSCommon/MSVC/Dispatcher.py
diff --git a/scons/scons-local-4.8.1/SCons/Tool/MSCommon/MSVC/Exceptions.py b/scons/scons-local-4.9.1/SCons/Tool/MSCommon/MSVC/Exceptions.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/MSCommon/MSVC/Exceptions.py
rename to scons/scons-local-4.9.1/SCons/Tool/MSCommon/MSVC/Exceptions.py
diff --git a/scons/scons-local-4.8.1/SCons/Tool/MSCommon/MSVC/Kind.py b/scons/scons-local-4.9.1/SCons/Tool/MSCommon/MSVC/Kind.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/MSCommon/MSVC/Kind.py
rename to scons/scons-local-4.9.1/SCons/Tool/MSCommon/MSVC/Kind.py
diff --git a/scons/scons-local-4.8.1/SCons/Tool/MSCommon/MSVC/Policy.py b/scons/scons-local-4.9.1/SCons/Tool/MSCommon/MSVC/Policy.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/MSCommon/MSVC/Policy.py
rename to scons/scons-local-4.9.1/SCons/Tool/MSCommon/MSVC/Policy.py
diff --git a/scons/scons-local-4.8.1/SCons/Tool/MSCommon/MSVC/Registry.py b/scons/scons-local-4.9.1/SCons/Tool/MSCommon/MSVC/Registry.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/MSCommon/MSVC/Registry.py
rename to scons/scons-local-4.9.1/SCons/Tool/MSCommon/MSVC/Registry.py
diff --git a/scons/scons-local-4.8.1/SCons/Tool/MSCommon/MSVC/ScriptArguments.py b/scons/scons-local-4.9.1/SCons/Tool/MSCommon/MSVC/ScriptArguments.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/MSCommon/MSVC/ScriptArguments.py
rename to scons/scons-local-4.9.1/SCons/Tool/MSCommon/MSVC/ScriptArguments.py
diff --git a/scons/scons-local-4.8.1/SCons/Tool/MSCommon/MSVC/SetupEnvDefault.py b/scons/scons-local-4.9.1/SCons/Tool/MSCommon/MSVC/SetupEnvDefault.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/MSCommon/MSVC/SetupEnvDefault.py
rename to scons/scons-local-4.9.1/SCons/Tool/MSCommon/MSVC/SetupEnvDefault.py
diff --git a/scons/scons-local-4.8.1/SCons/Tool/MSCommon/MSVC/Util.py b/scons/scons-local-4.9.1/SCons/Tool/MSCommon/MSVC/Util.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/MSCommon/MSVC/Util.py
rename to scons/scons-local-4.9.1/SCons/Tool/MSCommon/MSVC/Util.py
diff --git a/scons/scons-local-4.8.1/SCons/Tool/MSCommon/MSVC/Warnings.py b/scons/scons-local-4.9.1/SCons/Tool/MSCommon/MSVC/Warnings.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/MSCommon/MSVC/Warnings.py
rename to scons/scons-local-4.9.1/SCons/Tool/MSCommon/MSVC/Warnings.py
diff --git a/scons/scons-local-4.8.1/SCons/Tool/MSCommon/MSVC/WinSDK.py b/scons/scons-local-4.9.1/SCons/Tool/MSCommon/MSVC/WinSDK.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/MSCommon/MSVC/WinSDK.py
rename to scons/scons-local-4.9.1/SCons/Tool/MSCommon/MSVC/WinSDK.py
diff --git a/scons/scons-local-4.8.1/SCons/Tool/MSCommon/MSVC/__init__.py b/scons/scons-local-4.9.1/SCons/Tool/MSCommon/MSVC/__init__.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/MSCommon/MSVC/__init__.py
rename to scons/scons-local-4.9.1/SCons/Tool/MSCommon/MSVC/__init__.py
diff --git a/scons/scons-local-4.8.1/SCons/Tool/MSCommon/README.rst b/scons/scons-local-4.9.1/SCons/Tool/MSCommon/README.rst
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/MSCommon/README.rst
rename to scons/scons-local-4.9.1/SCons/Tool/MSCommon/README.rst
diff --git a/scons/scons-local-4.8.1/SCons/Tool/MSCommon/__init__.py b/scons/scons-local-4.9.1/SCons/Tool/MSCommon/__init__.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/MSCommon/__init__.py
rename to scons/scons-local-4.9.1/SCons/Tool/MSCommon/__init__.py
diff --git a/scons/scons-local-4.8.1/SCons/Tool/MSCommon/arch.py b/scons/scons-local-4.9.1/SCons/Tool/MSCommon/arch.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/MSCommon/arch.py
rename to scons/scons-local-4.9.1/SCons/Tool/MSCommon/arch.py
diff --git a/scons/scons-local-4.8.1/SCons/Tool/MSCommon/common.py b/scons/scons-local-4.9.1/SCons/Tool/MSCommon/common.py
similarity index 95%
rename from scons/scons-local-4.8.1/SCons/Tool/MSCommon/common.py
rename to scons/scons-local-4.9.1/SCons/Tool/MSCommon/common.py
index af3afb515..5f011052b 100644
--- a/scons/scons-local-4.8.1/SCons/Tool/MSCommon/common.py
+++ b/scons/scons-local-4.9.1/SCons/Tool/MSCommon/common.py
@@ -34,15 +34,25 @@ from contextlib import suppress
from subprocess import DEVNULL, PIPE
from pathlib import Path
+import SCons.Errors
import SCons.Util
import SCons.Warnings
class MSVCCacheInvalidWarning(SCons.Warnings.WarningOnByDefault):
pass
+def _check_logfile(logfile):
+ if logfile and '"' in logfile:
+ err_msg = (
+ "SCONS_MSCOMMON_DEBUG value contains double quote character(s)\n"
+ f" SCONS_MSCOMMON_DEBUG={logfile}"
+ )
+ raise SCons.Errors.UserError(err_msg)
+ return logfile
+
# SCONS_MSCOMMON_DEBUG is internal-use so undocumented:
# set to '-' to print to console, else set to filename to log to
-LOGFILE = os.environ.get('SCONS_MSCOMMON_DEBUG')
+LOGFILE = _check_logfile(os.environ.get('SCONS_MSCOMMON_DEBUG'))
if LOGFILE:
import logging
@@ -129,7 +139,15 @@ if LOGFILE:
log_handler = logging.StreamHandler(sys.stdout)
else:
log_prefix = ''
- log_handler = logging.FileHandler(filename=LOGFILE)
+ try:
+ log_handler = logging.FileHandler(filename=LOGFILE)
+ except (OSError, FileNotFoundError) as e:
+ err_msg = (
+ "Could not create logfile, check SCONS_MSCOMMON_DEBUG\n"
+ f" SCONS_MSCOMMON_DEBUG={LOGFILE}\n"
+ f" {e.__class__.__name__}: {str(e)}"
+ )
+ raise SCons.Errors.UserError(err_msg)
log_formatter = _CustomFormatter(log_prefix)
log_handler.setFormatter(log_formatter)
logger = logging.getLogger(name=__name__)
diff --git a/scons/scons-local-4.8.1/SCons/Tool/MSCommon/netframework.py b/scons/scons-local-4.9.1/SCons/Tool/MSCommon/netframework.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/MSCommon/netframework.py
rename to scons/scons-local-4.9.1/SCons/Tool/MSCommon/netframework.py
diff --git a/scons/scons-local-4.8.1/SCons/Tool/MSCommon/sdk.py b/scons/scons-local-4.9.1/SCons/Tool/MSCommon/sdk.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/MSCommon/sdk.py
rename to scons/scons-local-4.9.1/SCons/Tool/MSCommon/sdk.py
diff --git a/scons/scons-local-4.8.1/SCons/Tool/MSCommon/vc.py b/scons/scons-local-4.9.1/SCons/Tool/MSCommon/vc.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/MSCommon/vc.py
rename to scons/scons-local-4.9.1/SCons/Tool/MSCommon/vc.py
diff --git a/scons/scons-local-4.8.1/SCons/Tool/MSCommon/vs.py b/scons/scons-local-4.9.1/SCons/Tool/MSCommon/vs.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/MSCommon/vs.py
rename to scons/scons-local-4.9.1/SCons/Tool/MSCommon/vs.py
diff --git a/scons/scons-local-4.8.1/SCons/Tool/PharLapCommon.py b/scons/scons-local-4.9.1/SCons/Tool/PharLapCommon.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/PharLapCommon.py
rename to scons/scons-local-4.9.1/SCons/Tool/PharLapCommon.py
diff --git a/scons/scons-local-4.8.1/SCons/Tool/__init__.py b/scons/scons-local-4.9.1/SCons/Tool/__init__.py
similarity index 98%
rename from scons/scons-local-4.8.1/SCons/Tool/__init__.py
rename to scons/scons-local-4.9.1/SCons/Tool/__init__.py
index 474414e3d..23b7eeba2 100644
--- a/scons/scons-local-4.8.1/SCons/Tool/__init__.py
+++ b/scons/scons-local-4.9.1/SCons/Tool/__init__.py
@@ -33,10 +33,11 @@ one needs to use or tie in to this subsystem in order to roll their own
tool specifications.
"""
+from __future__ import annotations
+
import sys
import os
import importlib.util
-from typing import Optional
import SCons.Builder
import SCons.Errors
@@ -101,6 +102,7 @@ TOOL_ALIASES = {
'gettext': 'gettext_tool',
'clang++': 'clangxx',
'as': 'asm',
+ 'ninja' : 'ninja_tool'
}
@@ -691,8 +693,8 @@ def tool_list(platform, env):
if str(platform) == 'win32':
"prefer Microsoft tools on Windows"
linkers = ['mslink', 'gnulink', 'ilink', 'linkloc', 'ilink32']
- c_compilers = ['msvc', 'mingw', 'gcc', 'intelc', 'icl', 'icc', 'cc', 'bcc32']
- cxx_compilers = ['msvc', 'intelc', 'icc', 'g++', 'cxx', 'bcc32']
+ c_compilers = ['msvc', 'mingw', 'gcc', 'clang', 'intelc', 'icl', 'icc', 'cc', 'bcc32']
+ cxx_compilers = ['msvc', 'intelc', 'icc', 'g++', 'clang++', 'cxx', 'bcc32']
assemblers = ['masm', 'nasm', 'gas', '386asm']
fortran_compilers = ['gfortran', 'g77', 'ifl', 'cvf', 'f95', 'f90', 'fortran']
ars = ['mslib', 'ar', 'tlib']
@@ -757,8 +759,8 @@ def tool_list(platform, env):
else:
"prefer GNU tools on all other platforms"
linkers = ['gnulink', 'ilink']
- c_compilers = ['gcc', 'intelc', 'icc', 'cc']
- cxx_compilers = ['g++', 'intelc', 'icc', 'cxx']
+ c_compilers = ['gcc', 'clang', 'intelc', 'icc', 'cc']
+ cxx_compilers = ['g++', 'clang++', 'intelc', 'icc', 'cxx']
assemblers = ['gas', 'nasm', 'masm']
fortran_compilers = ['gfortran', 'g77', 'ifort', 'ifl', 'f95', 'f90', 'f77']
ars = ['ar', ]
@@ -824,7 +826,7 @@ def tool_list(platform, env):
return [x for x in tools if x]
-def find_program_path(env, key_program, default_paths=None, add_path: bool=False) -> Optional[str]:
+def find_program_path(env, key_program, default_paths=None, add_path: bool=False) -> str | None:
"""
Find the location of a tool using various means.
diff --git a/scons/scons-local-4.8.1/SCons/Tool/aixc++.py b/scons/scons-local-4.9.1/SCons/Tool/aixc++.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/aixc++.py
rename to scons/scons-local-4.9.1/SCons/Tool/aixc++.py
diff --git a/scons/scons-local-4.8.1/SCons/Tool/aixcc.py b/scons/scons-local-4.9.1/SCons/Tool/aixcc.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/aixcc.py
rename to scons/scons-local-4.9.1/SCons/Tool/aixcc.py
diff --git a/scons/scons-local-4.8.1/SCons/Tool/aixcxx.py b/scons/scons-local-4.9.1/SCons/Tool/aixcxx.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/aixcxx.py
rename to scons/scons-local-4.9.1/SCons/Tool/aixcxx.py
diff --git a/scons/scons-local-4.8.1/SCons/Tool/aixf77.py b/scons/scons-local-4.9.1/SCons/Tool/aixf77.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/aixf77.py
rename to scons/scons-local-4.9.1/SCons/Tool/aixf77.py
diff --git a/scons/scons-local-4.8.1/SCons/Tool/aixlink.py b/scons/scons-local-4.9.1/SCons/Tool/aixlink.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/aixlink.py
rename to scons/scons-local-4.9.1/SCons/Tool/aixlink.py
diff --git a/scons/scons-local-4.8.1/SCons/Tool/applelink.py b/scons/scons-local-4.9.1/SCons/Tool/applelink.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/applelink.py
rename to scons/scons-local-4.9.1/SCons/Tool/applelink.py
diff --git a/scons/scons-local-4.8.1/SCons/Tool/ar.py b/scons/scons-local-4.9.1/SCons/Tool/ar.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/ar.py
rename to scons/scons-local-4.9.1/SCons/Tool/ar.py
diff --git a/scons/scons-local-4.8.1/SCons/Tool/as.py b/scons/scons-local-4.9.1/SCons/Tool/as.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/as.py
rename to scons/scons-local-4.9.1/SCons/Tool/as.py
diff --git a/scons/scons-local-4.8.1/SCons/Tool/asm.py b/scons/scons-local-4.9.1/SCons/Tool/asm.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/asm.py
rename to scons/scons-local-4.9.1/SCons/Tool/asm.py
diff --git a/scons/scons-local-4.8.1/SCons/Tool/bcc32.py b/scons/scons-local-4.9.1/SCons/Tool/bcc32.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/bcc32.py
rename to scons/scons-local-4.9.1/SCons/Tool/bcc32.py
diff --git a/scons/scons-local-4.8.1/SCons/Tool/c++.py b/scons/scons-local-4.9.1/SCons/Tool/c++.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/c++.py
rename to scons/scons-local-4.9.1/SCons/Tool/c++.py
diff --git a/scons/scons-local-4.8.1/SCons/Tool/cc.py b/scons/scons-local-4.9.1/SCons/Tool/cc.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/cc.py
rename to scons/scons-local-4.9.1/SCons/Tool/cc.py
diff --git a/scons/scons-local-4.8.1/SCons/Tool/clang.py b/scons/scons-local-4.9.1/SCons/Tool/clang.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/clang.py
rename to scons/scons-local-4.9.1/SCons/Tool/clang.py
diff --git a/scons/scons-local-4.8.1/SCons/Tool/clangCommon/__init__.py b/scons/scons-local-4.9.1/SCons/Tool/clangCommon/__init__.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/clangCommon/__init__.py
rename to scons/scons-local-4.9.1/SCons/Tool/clangCommon/__init__.py
diff --git a/scons/scons-local-4.8.1/SCons/Tool/clangxx.py b/scons/scons-local-4.9.1/SCons/Tool/clangxx.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/clangxx.py
rename to scons/scons-local-4.9.1/SCons/Tool/clangxx.py
diff --git a/scons/scons-local-4.8.1/SCons/Tool/compilation_db.py b/scons/scons-local-4.9.1/SCons/Tool/compilation_db.py
similarity index 95%
rename from scons/scons-local-4.8.1/SCons/Tool/compilation_db.py
rename to scons/scons-local-4.9.1/SCons/Tool/compilation_db.py
index e17b5dc66..2b1bfb56d 100644
--- a/scons/scons-local-4.8.1/SCons/Tool/compilation_db.py
+++ b/scons/scons-local-4.9.1/SCons/Tool/compilation_db.py
@@ -43,6 +43,8 @@ from .cxx import CXXSuffixes
from .cc import CSuffixes
from .asm import ASSuffixes, ASPPSuffixes
+DEFAULT_DB_NAME = 'compile_commands.json'
+
# TODO: Is there a better way to do this than this global? Right now this exists so that the
# emitter we add can record all of the things it emits, so that the scanner for the top level
# compilation database can access the complete list, and also so that the writer has easy
@@ -189,9 +191,8 @@ def compilation_db_emitter(target, source, env):
if not target and len(source) == 1:
target = source
- # Default target name is compilation_db.json
if not target:
- target = ['compile_commands.json', ]
+ target = [DEFAULT_DB_NAME]
# No source should have been passed. Drop it.
if source:
@@ -224,13 +225,17 @@ def generate(env, **kwargs) -> None:
),
itertools.product(
ASSuffixes,
- [(static_obj, SCons.Defaults.StaticObjectEmitter, "$ASCOM")],
- [(shared_obj, SCons.Defaults.SharedObjectEmitter, "$ASCOM")],
+ [
+ (static_obj, SCons.Defaults.StaticObjectEmitter, "$ASCOM"),
+ (shared_obj, SCons.Defaults.SharedObjectEmitter, "$ASCOM")
+ ],
),
itertools.product(
ASPPSuffixes,
- [(static_obj, SCons.Defaults.StaticObjectEmitter, "$ASPPCOM")],
- [(shared_obj, SCons.Defaults.SharedObjectEmitter, "$ASPPCOM")],
+ [
+ (static_obj, SCons.Defaults.StaticObjectEmitter, "$ASPPCOM"),
+ (shared_obj, SCons.Defaults.SharedObjectEmitter, "$ASPPCOM")
+ ],
),
)
diff --git a/scons/scons-local-4.8.1/SCons/Tool/cvf.py b/scons/scons-local-4.9.1/SCons/Tool/cvf.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/cvf.py
rename to scons/scons-local-4.9.1/SCons/Tool/cvf.py
diff --git a/scons/scons-local-4.8.1/SCons/Tool/cxx.py b/scons/scons-local-4.9.1/SCons/Tool/cxx.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/cxx.py
rename to scons/scons-local-4.9.1/SCons/Tool/cxx.py
diff --git a/scons/scons-local-4.8.1/SCons/Tool/cyglink.py b/scons/scons-local-4.9.1/SCons/Tool/cyglink.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/cyglink.py
rename to scons/scons-local-4.9.1/SCons/Tool/cyglink.py
diff --git a/scons/scons-local-4.8.1/SCons/Tool/default.py b/scons/scons-local-4.9.1/SCons/Tool/default.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/default.py
rename to scons/scons-local-4.9.1/SCons/Tool/default.py
diff --git a/scons/scons-local-4.8.1/SCons/Tool/dmd.py b/scons/scons-local-4.9.1/SCons/Tool/dmd.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/dmd.py
rename to scons/scons-local-4.9.1/SCons/Tool/dmd.py
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/__init__.py b/scons/scons-local-4.9.1/SCons/Tool/docbook/__init__.py
similarity index 95%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/__init__.py
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/__init__.py
index 3adb3148b..f0e9ef507 100644
--- a/scons/scons-local-4.8.1/SCons/Tool/docbook/__init__.py
+++ b/scons/scons-local-4.9.1/SCons/Tool/docbook/__init__.py
@@ -157,16 +157,22 @@ xsltproc_com_priority = ['xsltproc', 'saxon', 'saxon-xslt', 'xalan']
# TODO: Set minimum version of saxon-xslt to be 8.x (lower than this only supports xslt 1.0.
# see: https://saxon.sourceforge.net/saxon6.5.5/
# see: https://saxon.sourceforge.net/
-xsltproc_com = {'xsltproc' : '$DOCBOOK_XSLTPROC $DOCBOOK_XSLTPROCFLAGS -o $TARGET $DOCBOOK_XSL $SOURCE',
- 'saxon' : '$DOCBOOK_XSLTPROC $DOCBOOK_XSLTPROCFLAGS -o $TARGET $DOCBOOK_XSL $SOURCE $DOCBOOK_XSLTPROCPARAMS',
- # Note if saxon-xslt is version 5.5 the proper arguments are: (swap order of docbook_xsl and source)
- # 'saxon-xslt' : '$DOCBOOK_XSLTPROC $DOCBOOK_XSLTPROCFLAGS -o $TARGET $SOURCE $DOCBOOK_XSL $DOCBOOK_XSLTPROCPARAMS',
- 'saxon-xslt' : '$DOCBOOK_XSLTPROC $DOCBOOK_XSLTPROCFLAGS -o $TARGET $DOCBOOK_XSL $SOURCE $DOCBOOK_XSLTPROCPARAMS',
- 'xalan' : '$DOCBOOK_XSLTPROC $DOCBOOK_XSLTPROCFLAGS -q -out $TARGET -xsl $DOCBOOK_XSL -in $SOURCE'}
-xmllint_com = {'xmllint' : '$DOCBOOK_XMLLINT $DOCBOOK_XMLLINTFLAGS --xinclude $SOURCE > $TARGET'}
-fop_com = {'fop' : '$DOCBOOK_FOP $DOCBOOK_FOPFLAGS -fo $SOURCE -pdf $TARGET',
- 'xep' : '$DOCBOOK_FOP $DOCBOOK_FOPFLAGS -valid -fo $SOURCE -pdf $TARGET',
- 'jw' : '$DOCBOOK_FOP $DOCBOOK_FOPFLAGS -f docbook -b pdf $SOURCE -o $TARGET'}
+xsltproc_com = {
+ 'xsltproc': '$DOCBOOK_XSLTPROC $DOCBOOK_XSLTPROCFLAGS -o $TARGET $DOCBOOK_XSL $SOURCE',
+ 'saxon': '$DOCBOOK_XSLTPROC $DOCBOOK_XSLTPROCFLAGS -o $TARGET $DOCBOOK_XSL $SOURCE $DOCBOOK_XSLTPROCPARAMS',
+ # Note if saxon-xslt is version 5.5 the proper arguments are: (swap order of docbook_xsl and source)
+ # 'saxon-xslt' : '$DOCBOOK_XSLTPROC $DOCBOOK_XSLTPROCFLAGS -o $TARGET $SOURCE $DOCBOOK_XSL $DOCBOOK_XSLTPROCPARAMS',
+ 'saxon-xslt': '$DOCBOOK_XSLTPROC $DOCBOOK_XSLTPROCFLAGS -o $TARGET $DOCBOOK_XSL $SOURCE $DOCBOOK_XSLTPROCPARAMS',
+ 'xalan': '$DOCBOOK_XSLTPROC $DOCBOOK_XSLTPROCFLAGS -q -out $TARGET -xsl $DOCBOOK_XSL -in $SOURCE',
+}
+xmllint_com = {
+ 'xmllint': '$DOCBOOK_XMLLINT $DOCBOOK_XMLLINTFLAGS --xinclude $SOURCE > $TARGET'
+}
+fop_com = {
+ 'fop': '$DOCBOOK_FOP $DOCBOOK_FOPFLAGS -fo $SOURCE -pdf $TARGET',
+ 'xep': '$DOCBOOK_FOP $DOCBOOK_FOPFLAGS -valid -fo $SOURCE -pdf $TARGET',
+ 'jw': '$DOCBOOK_FOP $DOCBOOK_FOPFLAGS -f docbook -b pdf $SOURCE -o $TARGET',
+}
def __detect_cl_tool(env, chainkey, cdict, cpriority=None) -> None:
"""
@@ -180,11 +186,11 @@ def __detect_cl_tool(env, chainkey, cdict, cpriority=None) -> None:
cpriority = cdict.keys()
for cltool in cpriority:
if __debug_tool_location:
- print("DocBook: Looking for %s"%cltool)
+ print(f"DocBook: Looking for {cltool}")
clpath = env.WhereIs(cltool)
if clpath:
if __debug_tool_location:
- print("DocBook: Found:%s"%cltool)
+ print(f"DocBook: Found:{cltool}")
env[chainkey] = clpath
if not env[chainkey + 'COM']:
env[chainkey + 'COM'] = cdict[cltool]
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/AUTHORS b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/AUTHORS
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/AUTHORS
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/AUTHORS
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/BUGS b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/BUGS
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/BUGS
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/BUGS
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/COPYING b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/COPYING
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/COPYING
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/COPYING
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/INSTALL b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/INSTALL
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/INSTALL
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/INSTALL
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/Makefile b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/Makefile
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/Makefile
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/Makefile
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/NEWS b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/NEWS
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/NEWS
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/NEWS
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/NEWS.html b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/NEWS.html
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/NEWS.html
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/NEWS.html
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/NEWS.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/NEWS.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/NEWS.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/NEWS.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/README b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/README
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/README
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/README
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/RELEASE-NOTES.html b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/RELEASE-NOTES.html
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/RELEASE-NOTES.html
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/RELEASE-NOTES.html
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/RELEASE-NOTES.txt b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/RELEASE-NOTES.txt
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/RELEASE-NOTES.txt
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/RELEASE-NOTES.txt
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/RELEASE-NOTES.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/RELEASE-NOTES.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/RELEASE-NOTES.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/RELEASE-NOTES.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/TODO b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/TODO
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/TODO
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/TODO
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/VERSION b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/VERSION
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/VERSION
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/VERSION
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/catalog.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/catalog.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/catalog.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/catalog.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/af.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/af.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/af.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/af.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/am.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/am.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/am.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/am.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/ar.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/ar.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/ar.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/ar.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/as.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/as.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/as.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/as.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/ast.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/ast.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/ast.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/ast.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/autoidx-kimber.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/autoidx-kimber.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/autoidx-kimber.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/autoidx-kimber.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/autoidx-kosek.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/autoidx-kosek.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/autoidx-kosek.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/autoidx-kosek.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/az.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/az.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/az.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/az.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/bg.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/bg.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/bg.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/bg.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/bn.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/bn.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/bn.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/bn.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/bn_in.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/bn_in.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/bn_in.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/bn_in.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/bs.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/bs.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/bs.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/bs.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/ca.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/ca.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/ca.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/ca.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/charmap.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/charmap.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/charmap.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/charmap.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/charmap.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/charmap.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/charmap.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/charmap.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/common.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/common.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/common.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/common.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/common.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/common.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/common.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/common.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/cs.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/cs.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/cs.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/cs.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/cy.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/cy.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/cy.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/cy.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/da.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/da.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/da.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/da.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/de.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/de.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/de.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/de.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/el.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/el.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/el.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/el.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/en.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/en.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/en.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/en.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/entities.ent b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/entities.ent
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/entities.ent
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/entities.ent
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/eo.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/eo.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/eo.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/eo.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/es.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/es.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/es.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/es.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/et.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/et.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/et.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/et.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/eu.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/eu.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/eu.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/eu.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/fa.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/fa.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/fa.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/fa.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/fi.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/fi.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/fi.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/fi.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/fr.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/fr.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/fr.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/fr.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/ga.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/ga.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/ga.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/ga.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/gentext.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/gentext.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/gentext.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/gentext.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/gl.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/gl.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/gl.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/gl.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/gu.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/gu.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/gu.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/gu.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/he.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/he.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/he.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/he.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/hi.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/hi.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/hi.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/hi.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/hr.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/hr.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/hr.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/hr.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/hu.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/hu.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/hu.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/hu.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/id.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/id.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/id.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/id.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/insertfile.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/insertfile.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/insertfile.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/insertfile.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/is.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/is.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/is.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/is.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/it.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/it.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/it.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/it.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/ja.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/ja.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/ja.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/ja.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/ka.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/ka.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/ka.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/ka.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/kn.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/kn.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/kn.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/kn.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/ko.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/ko.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/ko.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/ko.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/ky.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/ky.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/ky.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/ky.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/l10n.dtd b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/l10n.dtd
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/l10n.dtd
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/l10n.dtd
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/l10n.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/l10n.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/l10n.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/l10n.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/l10n.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/l10n.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/l10n.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/l10n.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/la.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/la.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/la.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/la.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/labels.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/labels.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/labels.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/labels.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/lt.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/lt.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/lt.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/lt.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/lv.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/lv.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/lv.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/lv.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/ml.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/ml.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/ml.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/ml.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/mn.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/mn.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/mn.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/mn.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/mr.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/mr.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/mr.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/mr.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/nb.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/nb.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/nb.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/nb.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/nds.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/nds.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/nds.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/nds.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/nl.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/nl.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/nl.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/nl.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/nn.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/nn.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/nn.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/nn.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/olink.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/olink.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/olink.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/olink.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/or.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/or.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/or.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/or.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/pa.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/pa.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/pa.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/pa.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/pi.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/pi.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/pi.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/pi.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/pi.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/pi.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/pi.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/pi.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/pl.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/pl.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/pl.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/pl.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/pt.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/pt.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/pt.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/pt.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/pt_br.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/pt_br.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/pt_br.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/pt_br.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/refentry.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/refentry.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/refentry.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/refentry.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/refentry.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/refentry.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/refentry.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/refentry.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/ro.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/ro.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/ro.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/ro.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/ru.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/ru.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/ru.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/ru.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/sk.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/sk.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/sk.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/sk.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/sl.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/sl.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/sl.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/sl.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/sq.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/sq.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/sq.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/sq.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/sr.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/sr.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/sr.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/sr.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/sr_Latn.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/sr_Latn.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/sr_Latn.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/sr_Latn.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/stripns.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/stripns.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/stripns.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/stripns.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/subtitles.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/subtitles.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/subtitles.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/subtitles.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/sv.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/sv.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/sv.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/sv.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/ta.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/ta.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/ta.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/ta.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/table.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/table.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/table.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/table.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/targetdatabase.dtd b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/targetdatabase.dtd
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/targetdatabase.dtd
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/targetdatabase.dtd
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/targets.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/targets.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/targets.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/targets.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/te.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/te.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/te.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/te.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/th.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/th.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/th.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/th.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/titles.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/titles.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/titles.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/titles.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/tl.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/tl.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/tl.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/tl.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/tr.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/tr.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/tr.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/tr.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/uk.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/uk.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/uk.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/uk.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/utility.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/utility.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/utility.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/utility.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/utility.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/utility.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/utility.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/utility.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/vi.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/vi.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/vi.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/vi.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/xh.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/xh.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/xh.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/xh.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/zh.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/zh.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/zh.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/zh.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/zh_cn.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/zh_cn.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/zh_cn.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/zh_cn.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/zh_tw.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/zh_tw.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/zh_tw.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/common/zh_tw.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/docsrc/authors.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/docsrc/authors.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/docsrc/authors.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/docsrc/authors.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/docsrc/copyright.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/docsrc/copyright.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/docsrc/copyright.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/docsrc/copyright.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/docsrc/license.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/docsrc/license.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/docsrc/license.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/docsrc/license.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/docsrc/reference.css b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/docsrc/reference.css
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/docsrc/reference.css
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/docsrc/reference.css
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/docsrc/reference.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/docsrc/reference.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/docsrc/reference.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/docsrc/reference.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/docsrc/reference.xml.included b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/docsrc/reference.xml.included
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/docsrc/reference.xml.included
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/docsrc/reference.xml.included
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/docsrc/warranty.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/docsrc/warranty.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/docsrc/warranty.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/docsrc/warranty.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/eclipse/eclipse.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/eclipse/eclipse.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/eclipse/eclipse.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/eclipse/eclipse.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/eclipse/eclipse3.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/eclipse/eclipse3.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/eclipse/eclipse3.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/eclipse/eclipse3.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/eclipse/profile-eclipse.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/eclipse/profile-eclipse.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/eclipse/profile-eclipse.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/eclipse/profile-eclipse.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/epub/README b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/epub/README
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/epub/README
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/epub/README
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/epub/bin/dbtoepub b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/epub/bin/dbtoepub
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/epub/bin/dbtoepub
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/epub/bin/dbtoepub
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/epub/bin/lib/docbook.rb b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/epub/bin/lib/docbook.rb
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/epub/bin/lib/docbook.rb
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/epub/bin/lib/docbook.rb
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/epub/bin/xslt/obfuscate.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/epub/bin/xslt/obfuscate.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/epub/bin/xslt/obfuscate.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/epub/bin/xslt/obfuscate.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/epub/docbook.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/epub/docbook.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/epub/docbook.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/epub/docbook.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/extensions/LICENSE.txt b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/extensions/LICENSE.txt
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/extensions/LICENSE.txt
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/extensions/LICENSE.txt
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/extensions/NOTICE.txt b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/extensions/NOTICE.txt
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/extensions/NOTICE.txt
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/extensions/NOTICE.txt
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/extensions/README.LIBXSLT b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/extensions/README.LIBXSLT
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/extensions/README.LIBXSLT
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/extensions/README.LIBXSLT
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/extensions/README.txt b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/extensions/README.txt
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/extensions/README.txt
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/extensions/README.txt
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/extensions/docbook.py b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/extensions/docbook.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/extensions/docbook.py
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/extensions/docbook.py
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/extensions/xslt.py b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/extensions/xslt.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/extensions/xslt.py
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/extensions/xslt.py
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/admon.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/admon.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/admon.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/admon.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/annotations.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/annotations.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/annotations.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/annotations.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/autoidx-kimber.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/autoidx-kimber.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/autoidx-kimber.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/autoidx-kimber.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/autoidx-kosek.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/autoidx-kosek.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/autoidx-kosek.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/autoidx-kosek.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/autoidx-ng.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/autoidx-ng.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/autoidx-ng.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/autoidx-ng.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/autoidx.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/autoidx.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/autoidx.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/autoidx.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/autotoc.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/autotoc.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/autotoc.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/autotoc.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/axf.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/axf.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/axf.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/axf.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/biblio-iso690.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/biblio-iso690.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/biblio-iso690.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/biblio-iso690.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/biblio.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/biblio.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/biblio.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/biblio.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/block.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/block.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/block.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/block.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/callout.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/callout.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/callout.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/callout.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/component.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/component.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/component.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/component.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/division.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/division.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/division.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/division.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/docbook.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/docbook.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/docbook.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/docbook.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/ebnf.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/ebnf.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/ebnf.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/ebnf.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/fo-rtf.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/fo-rtf.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/fo-rtf.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/fo-rtf.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/fo.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/fo.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/fo.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/fo.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/footnote.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/footnote.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/footnote.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/footnote.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/fop.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/fop.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/fop.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/fop.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/fop1.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/fop1.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/fop1.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/fop1.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/formal.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/formal.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/formal.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/formal.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/glossary.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/glossary.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/glossary.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/glossary.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/graphics.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/graphics.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/graphics.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/graphics.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/highlight.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/highlight.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/highlight.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/highlight.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/htmltbl.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/htmltbl.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/htmltbl.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/htmltbl.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/index.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/index.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/index.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/index.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/info.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/info.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/info.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/info.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/inline.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/inline.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/inline.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/inline.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/keywords.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/keywords.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/keywords.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/keywords.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/lists.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/lists.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/lists.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/lists.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/math.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/math.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/math.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/math.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/pagesetup.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/pagesetup.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/pagesetup.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/pagesetup.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/param.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/param.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/param.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/param.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/param.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/param.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/param.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/param.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/passivetex.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/passivetex.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/passivetex.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/passivetex.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/pdf2index b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/pdf2index
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/pdf2index
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/pdf2index
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/pi.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/pi.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/pi.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/pi.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/pi.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/pi.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/pi.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/pi.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/profile-docbook.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/profile-docbook.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/profile-docbook.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/profile-docbook.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/ptc.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/ptc.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/ptc.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/ptc.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/qandaset.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/qandaset.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/qandaset.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/qandaset.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/refentry.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/refentry.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/refentry.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/refentry.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/sections.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/sections.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/sections.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/sections.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/spaces.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/spaces.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/spaces.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/spaces.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/synop.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/synop.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/synop.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/synop.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/table.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/table.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/table.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/table.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/table.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/table.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/table.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/table.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/task.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/task.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/task.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/task.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/titlepage.templates.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/titlepage.templates.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/titlepage.templates.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/titlepage.templates.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/titlepage.templates.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/titlepage.templates.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/titlepage.templates.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/titlepage.templates.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/titlepage.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/titlepage.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/titlepage.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/titlepage.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/toc.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/toc.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/toc.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/toc.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/verbatim.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/verbatim.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/verbatim.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/verbatim.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/xep.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/xep.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/xep.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/xep.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/xref.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/xref.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/xref.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/fo/xref.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/highlighting/README b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/highlighting/README
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/highlighting/README
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/highlighting/README
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/highlighting/c-hl.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/highlighting/c-hl.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/highlighting/c-hl.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/highlighting/c-hl.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/highlighting/common.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/highlighting/common.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/highlighting/common.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/highlighting/common.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/highlighting/cpp-hl.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/highlighting/cpp-hl.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/highlighting/cpp-hl.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/highlighting/cpp-hl.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/highlighting/csharp-hl.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/highlighting/csharp-hl.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/highlighting/csharp-hl.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/highlighting/csharp-hl.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/highlighting/delphi-hl.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/highlighting/delphi-hl.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/highlighting/delphi-hl.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/highlighting/delphi-hl.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/highlighting/ini-hl.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/highlighting/ini-hl.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/highlighting/ini-hl.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/highlighting/ini-hl.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/highlighting/java-hl.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/highlighting/java-hl.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/highlighting/java-hl.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/highlighting/java-hl.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/highlighting/javascript-hl.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/highlighting/javascript-hl.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/highlighting/javascript-hl.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/highlighting/javascript-hl.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/highlighting/m2-hl.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/highlighting/m2-hl.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/highlighting/m2-hl.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/highlighting/m2-hl.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/highlighting/myxml-hl.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/highlighting/myxml-hl.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/highlighting/myxml-hl.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/highlighting/myxml-hl.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/highlighting/perl-hl.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/highlighting/perl-hl.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/highlighting/perl-hl.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/highlighting/perl-hl.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/highlighting/php-hl.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/highlighting/php-hl.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/highlighting/php-hl.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/highlighting/php-hl.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/highlighting/python-hl.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/highlighting/python-hl.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/highlighting/python-hl.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/highlighting/python-hl.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/highlighting/ruby-hl.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/highlighting/ruby-hl.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/highlighting/ruby-hl.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/highlighting/ruby-hl.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/highlighting/tcl-hl.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/highlighting/tcl-hl.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/highlighting/tcl-hl.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/highlighting/tcl-hl.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/highlighting/xslthl-config.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/highlighting/xslthl-config.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/highlighting/xslthl-config.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/highlighting/xslthl-config.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/admon.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/admon.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/admon.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/admon.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/annotations.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/annotations.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/annotations.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/annotations.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/autoidx-kimber.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/autoidx-kimber.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/autoidx-kimber.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/autoidx-kimber.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/autoidx-kosek.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/autoidx-kosek.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/autoidx-kosek.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/autoidx-kosek.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/autoidx-ng.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/autoidx-ng.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/autoidx-ng.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/autoidx-ng.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/autoidx.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/autoidx.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/autoidx.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/autoidx.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/autotoc.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/autotoc.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/autotoc.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/autotoc.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/biblio-iso690.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/biblio-iso690.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/biblio-iso690.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/biblio-iso690.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/biblio.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/biblio.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/biblio.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/biblio.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/block.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/block.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/block.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/block.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/callout.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/callout.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/callout.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/callout.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/changebars.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/changebars.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/changebars.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/changebars.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/chunk-changebars.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/chunk-changebars.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/chunk-changebars.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/chunk-changebars.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/chunk-code.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/chunk-code.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/chunk-code.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/chunk-code.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/chunk-common.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/chunk-common.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/chunk-common.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/chunk-common.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/chunk.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/chunk.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/chunk.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/chunk.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/chunker.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/chunker.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/chunker.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/chunker.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/chunkfast.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/chunkfast.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/chunkfast.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/chunkfast.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/chunktoc.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/chunktoc.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/chunktoc.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/chunktoc.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/component.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/component.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/component.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/component.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/division.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/division.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/division.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/division.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/docbook.css.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/docbook.css.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/docbook.css.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/docbook.css.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/docbook.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/docbook.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/docbook.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/docbook.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/ebnf.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/ebnf.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/ebnf.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/ebnf.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/footnote.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/footnote.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/footnote.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/footnote.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/formal.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/formal.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/formal.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/formal.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/glossary.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/glossary.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/glossary.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/glossary.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/graphics.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/graphics.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/graphics.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/graphics.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/highlight.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/highlight.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/highlight.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/highlight.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/html-rtf.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/html-rtf.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/html-rtf.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/html-rtf.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/html.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/html.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/html.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/html.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/htmltbl.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/htmltbl.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/htmltbl.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/htmltbl.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/index.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/index.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/index.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/index.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/info.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/info.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/info.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/info.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/inline.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/inline.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/inline.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/inline.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/keywords.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/keywords.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/keywords.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/keywords.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/lists.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/lists.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/lists.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/lists.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/maketoc.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/maketoc.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/maketoc.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/maketoc.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/manifest.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/manifest.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/manifest.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/manifest.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/math.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/math.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/math.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/math.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/oldchunker.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/oldchunker.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/oldchunker.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/oldchunker.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/onechunk.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/onechunk.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/onechunk.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/onechunk.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/param.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/param.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/param.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/param.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/param.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/param.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/param.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/param.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/pi.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/pi.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/pi.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/pi.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/pi.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/pi.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/pi.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/pi.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/profile-chunk-code.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/profile-chunk-code.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/profile-chunk-code.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/profile-chunk-code.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/profile-chunk.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/profile-chunk.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/profile-chunk.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/profile-chunk.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/profile-docbook.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/profile-docbook.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/profile-docbook.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/profile-docbook.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/profile-onechunk.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/profile-onechunk.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/profile-onechunk.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/profile-onechunk.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/qandaset.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/qandaset.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/qandaset.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/qandaset.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/refentry.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/refentry.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/refentry.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/refentry.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/sections.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/sections.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/sections.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/sections.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/synop.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/synop.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/synop.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/synop.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/table.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/table.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/table.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/table.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/task.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/task.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/task.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/task.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/titlepage.templates.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/titlepage.templates.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/titlepage.templates.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/titlepage.templates.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/titlepage.templates.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/titlepage.templates.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/titlepage.templates.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/titlepage.templates.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/titlepage.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/titlepage.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/titlepage.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/titlepage.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/toc.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/toc.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/toc.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/toc.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/verbatim.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/verbatim.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/verbatim.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/verbatim.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/xref.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/xref.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/xref.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/html/xref.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/htmlhelp/htmlhelp-common.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/htmlhelp/htmlhelp-common.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/htmlhelp/htmlhelp-common.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/htmlhelp/htmlhelp-common.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/htmlhelp/htmlhelp.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/htmlhelp/htmlhelp.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/htmlhelp/htmlhelp.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/htmlhelp/htmlhelp.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/htmlhelp/profile-htmlhelp-common.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/htmlhelp/profile-htmlhelp-common.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/htmlhelp/profile-htmlhelp-common.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/htmlhelp/profile-htmlhelp-common.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/htmlhelp/profile-htmlhelp.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/htmlhelp/profile-htmlhelp.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/htmlhelp/profile-htmlhelp.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/htmlhelp/profile-htmlhelp.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/1.svg b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/1.svg
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/1.svg
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/1.svg
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/10.svg b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/10.svg
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/10.svg
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/10.svg
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/11.svg b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/11.svg
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/11.svg
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/11.svg
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/12.svg b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/12.svg
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/12.svg
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/12.svg
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/13.svg b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/13.svg
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/13.svg
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/13.svg
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/14.svg b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/14.svg
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/14.svg
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/14.svg
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/15.svg b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/15.svg
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/15.svg
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/15.svg
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/16.svg b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/16.svg
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/16.svg
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/16.svg
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/17.svg b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/17.svg
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/17.svg
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/17.svg
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/18.svg b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/18.svg
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/18.svg
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/18.svg
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/19.svg b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/19.svg
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/19.svg
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/19.svg
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/2.svg b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/2.svg
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/2.svg
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/2.svg
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/20.svg b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/20.svg
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/20.svg
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/20.svg
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/21.svg b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/21.svg
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/21.svg
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/21.svg
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/22.svg b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/22.svg
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/22.svg
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/22.svg
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/23.svg b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/23.svg
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/23.svg
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/23.svg
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/24.svg b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/24.svg
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/24.svg
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/24.svg
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/25.svg b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/25.svg
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/25.svg
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/25.svg
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/26.svg b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/26.svg
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/26.svg
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/26.svg
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/27.svg b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/27.svg
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/27.svg
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/27.svg
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/28.svg b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/28.svg
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/28.svg
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/28.svg
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/29.svg b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/29.svg
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/29.svg
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/29.svg
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/3.svg b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/3.svg
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/3.svg
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/3.svg
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/30.svg b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/30.svg
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/30.svg
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/30.svg
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/4.svg b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/4.svg
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/4.svg
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/4.svg
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/5.svg b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/5.svg
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/5.svg
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/5.svg
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/6.svg b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/6.svg
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/6.svg
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/6.svg
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/7.svg b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/7.svg
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/7.svg
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/7.svg
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/8.svg b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/8.svg
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/8.svg
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/8.svg
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/9.svg b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/9.svg
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/9.svg
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/callouts/9.svg
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/caution.svg b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/caution.svg
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/caution.svg
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/caution.svg
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/colorsvg/caution.svg b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/colorsvg/caution.svg
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/colorsvg/caution.svg
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/colorsvg/caution.svg
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/colorsvg/home.svg b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/colorsvg/home.svg
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/colorsvg/home.svg
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/colorsvg/home.svg
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/colorsvg/important.svg b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/colorsvg/important.svg
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/colorsvg/important.svg
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/colorsvg/important.svg
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/colorsvg/next.svg b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/colorsvg/next.svg
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/colorsvg/next.svg
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/colorsvg/next.svg
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/colorsvg/note.svg b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/colorsvg/note.svg
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/colorsvg/note.svg
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/colorsvg/note.svg
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/colorsvg/prev.svg b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/colorsvg/prev.svg
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/colorsvg/prev.svg
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/colorsvg/prev.svg
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/colorsvg/tip.svg b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/colorsvg/tip.svg
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/colorsvg/tip.svg
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/colorsvg/tip.svg
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/colorsvg/up.svg b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/colorsvg/up.svg
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/colorsvg/up.svg
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/colorsvg/up.svg
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/colorsvg/warning.svg b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/colorsvg/warning.svg
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/colorsvg/warning.svg
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/colorsvg/warning.svg
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/home.svg b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/home.svg
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/home.svg
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/home.svg
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/important.svg b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/important.svg
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/important.svg
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/important.svg
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/next.svg b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/next.svg
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/next.svg
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/next.svg
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/note.svg b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/note.svg
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/note.svg
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/note.svg
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/prev.svg b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/prev.svg
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/prev.svg
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/prev.svg
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/tip.svg b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/tip.svg
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/tip.svg
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/tip.svg
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/up.svg b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/up.svg
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/up.svg
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/up.svg
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/warning.svg b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/warning.svg
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/warning.svg
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/images/warning.svg
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/install.sh b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/install.sh
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/install.sh
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/install.sh
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/javahelp/javahelp.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/javahelp/javahelp.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/javahelp/javahelp.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/javahelp/javahelp.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/javahelp/profile-javahelp.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/javahelp/profile-javahelp.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/javahelp/profile-javahelp.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/javahelp/profile-javahelp.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/lib/lib.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/lib/lib.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/lib/lib.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/lib/lib.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/manpages/ChangeLog.20020917 b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/manpages/ChangeLog.20020917
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/manpages/ChangeLog.20020917
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/manpages/ChangeLog.20020917
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/manpages/block.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/manpages/block.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/manpages/block.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/manpages/block.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/manpages/charmap.groff.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/manpages/charmap.groff.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/manpages/charmap.groff.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/manpages/charmap.groff.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/manpages/docbook.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/manpages/docbook.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/manpages/docbook.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/manpages/docbook.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/manpages/endnotes.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/manpages/endnotes.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/manpages/endnotes.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/manpages/endnotes.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/manpages/html-synop.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/manpages/html-synop.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/manpages/html-synop.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/manpages/html-synop.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/manpages/info.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/manpages/info.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/manpages/info.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/manpages/info.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/manpages/inline.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/manpages/inline.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/manpages/inline.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/manpages/inline.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/manpages/lists.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/manpages/lists.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/manpages/lists.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/manpages/lists.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/manpages/other.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/manpages/other.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/manpages/other.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/manpages/other.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/manpages/param.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/manpages/param.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/manpages/param.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/manpages/param.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/manpages/param.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/manpages/param.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/manpages/param.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/manpages/param.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/manpages/pi.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/manpages/pi.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/manpages/pi.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/manpages/pi.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/manpages/pi.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/manpages/pi.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/manpages/pi.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/manpages/pi.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/manpages/profile-docbook.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/manpages/profile-docbook.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/manpages/profile-docbook.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/manpages/profile-docbook.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/manpages/refentry.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/manpages/refentry.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/manpages/refentry.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/manpages/refentry.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/manpages/synop.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/manpages/synop.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/manpages/synop.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/manpages/synop.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/manpages/table.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/manpages/table.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/manpages/table.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/manpages/table.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/manpages/utility.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/manpages/utility.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/manpages/utility.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/manpages/utility.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/abstract.notitle.enabled.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/abstract.notitle.enabled.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/abstract.notitle.enabled.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/abstract.notitle.enabled.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/abstract.properties.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/abstract.properties.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/abstract.properties.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/abstract.properties.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/abstract.title.properties.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/abstract.title.properties.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/abstract.title.properties.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/abstract.title.properties.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/active.toc.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/active.toc.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/active.toc.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/active.toc.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/ade.extensions.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/ade.extensions.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/ade.extensions.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/ade.extensions.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/admon.graphics.extension.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/admon.graphics.extension.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/admon.graphics.extension.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/admon.graphics.extension.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/admon.graphics.path.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/admon.graphics.path.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/admon.graphics.path.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/admon.graphics.path.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/admon.graphics.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/admon.graphics.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/admon.graphics.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/admon.graphics.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/admon.style.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/admon.style.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/admon.style.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/admon.style.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/admon.textlabel.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/admon.textlabel.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/admon.textlabel.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/admon.textlabel.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/admonition.properties.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/admonition.properties.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/admonition.properties.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/admonition.properties.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/admonition.title.properties.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/admonition.title.properties.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/admonition.title.properties.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/admonition.title.properties.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/alignment.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/alignment.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/alignment.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/alignment.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/annotate.toc.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/annotate.toc.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/annotate.toc.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/annotate.toc.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/annotation.css.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/annotation.css.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/annotation.css.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/annotation.css.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/annotation.graphic.close.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/annotation.graphic.close.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/annotation.graphic.close.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/annotation.graphic.close.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/annotation.graphic.open.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/annotation.graphic.open.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/annotation.graphic.open.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/annotation.graphic.open.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/annotation.js.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/annotation.js.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/annotation.js.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/annotation.js.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/annotation.support.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/annotation.support.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/annotation.support.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/annotation.support.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/appendix.autolabel.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/appendix.autolabel.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/appendix.autolabel.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/appendix.autolabel.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/arbortext.extensions.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/arbortext.extensions.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/arbortext.extensions.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/arbortext.extensions.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/article.appendix.title.properties.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/article.appendix.title.properties.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/article.appendix.title.properties.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/article.appendix.title.properties.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/author.othername.in.middle.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/author.othername.in.middle.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/author.othername.in.middle.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/author.othername.in.middle.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/autolayout-file.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/autolayout-file.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/autolayout-file.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/autolayout-file.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/autotoc.label.in.hyperlink.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/autotoc.label.in.hyperlink.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/autotoc.label.in.hyperlink.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/autotoc.label.in.hyperlink.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/autotoc.label.separator.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/autotoc.label.separator.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/autotoc.label.separator.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/autotoc.label.separator.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/axf.extensions.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/axf.extensions.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/axf.extensions.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/axf.extensions.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/banner.before.navigation.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/banner.before.navigation.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/banner.before.navigation.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/banner.before.navigation.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/base.dir.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/base.dir.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/base.dir.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/base.dir.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/biblioentry.item.separator.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/biblioentry.item.separator.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/biblioentry.item.separator.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/biblioentry.item.separator.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/biblioentry.properties.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/biblioentry.properties.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/biblioentry.properties.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/biblioentry.properties.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/bibliography.collection.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/bibliography.collection.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/bibliography.collection.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/bibliography.collection.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/bibliography.numbered.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/bibliography.numbered.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/bibliography.numbered.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/bibliography.numbered.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/bibliography.style.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/bibliography.style.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/bibliography.style.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/bibliography.style.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/blockquote.properties.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/blockquote.properties.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/blockquote.properties.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/blockquote.properties.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/blurb.on.titlepage.enabled.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/blurb.on.titlepage.enabled.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/blurb.on.titlepage.enabled.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/blurb.on.titlepage.enabled.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/body.attributes.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/body.attributes.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/body.attributes.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/body.attributes.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/body.bg.color.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/body.bg.color.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/body.bg.color.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/body.bg.color.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/body.end.indent.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/body.end.indent.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/body.end.indent.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/body.end.indent.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/body.font.family.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/body.font.family.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/body.font.family.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/body.font.family.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/body.font.master.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/body.font.master.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/body.font.master.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/body.font.master.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/body.font.size.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/body.font.size.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/body.font.size.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/body.font.size.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/body.margin.bottom.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/body.margin.bottom.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/body.margin.bottom.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/body.margin.bottom.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/body.margin.top.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/body.margin.top.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/body.margin.top.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/body.margin.top.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/body.start.indent.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/body.start.indent.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/body.start.indent.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/body.start.indent.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/bookmarks.collapse.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/bookmarks.collapse.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/bookmarks.collapse.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/bookmarks.collapse.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/bridgehead.in.toc.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/bridgehead.in.toc.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/bridgehead.in.toc.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/bridgehead.in.toc.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/bullet.image.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/bullet.image.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/bullet.image.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/bullet.image.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/callout.defaultcolumn.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/callout.defaultcolumn.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/callout.defaultcolumn.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/callout.defaultcolumn.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/callout.graphics.extension.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/callout.graphics.extension.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/callout.graphics.extension.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/callout.graphics.extension.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/callout.graphics.number.limit.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/callout.graphics.number.limit.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/callout.graphics.number.limit.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/callout.graphics.number.limit.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/callout.graphics.path.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/callout.graphics.path.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/callout.graphics.path.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/callout.graphics.path.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/callout.graphics.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/callout.graphics.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/callout.graphics.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/callout.graphics.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/callout.icon.size.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/callout.icon.size.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/callout.icon.size.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/callout.icon.size.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/callout.list.table.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/callout.list.table.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/callout.list.table.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/callout.list.table.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/callout.unicode.font.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/callout.unicode.font.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/callout.unicode.font.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/callout.unicode.font.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/callout.unicode.number.limit.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/callout.unicode.number.limit.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/callout.unicode.number.limit.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/callout.unicode.number.limit.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/callout.unicode.start.character.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/callout.unicode.start.character.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/callout.unicode.start.character.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/callout.unicode.start.character.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/callout.unicode.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/callout.unicode.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/callout.unicode.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/callout.unicode.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/callouts.extension.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/callouts.extension.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/callouts.extension.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/callouts.extension.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/chapter.autolabel.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/chapter.autolabel.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/chapter.autolabel.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/chapter.autolabel.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/chunk.append.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/chunk.append.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/chunk.append.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/chunk.append.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/chunk.first.sections.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/chunk.first.sections.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/chunk.first.sections.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/chunk.first.sections.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/chunk.quietly.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/chunk.quietly.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/chunk.quietly.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/chunk.quietly.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/chunk.section.depth.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/chunk.section.depth.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/chunk.section.depth.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/chunk.section.depth.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/chunk.sections.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/chunk.sections.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/chunk.sections.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/chunk.sections.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/chunk.separate.lots.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/chunk.separate.lots.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/chunk.separate.lots.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/chunk.separate.lots.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/chunk.toc.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/chunk.toc.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/chunk.toc.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/chunk.toc.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/chunk.tocs.and.lots.has.title.xml b/scons/scons-local-4.9.1/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.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/chunk.tocs.and.lots.has.title.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/chunk.tocs.and.lots.has.title.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/chunk.tocs.and.lots.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/chunk.tocs.and.lots.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/chunk.tocs.and.lots.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/chunk.tocs.and.lots.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/chunker.output.cdata-section-elements.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/chunker.output.cdata-section-elements.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/chunker.output.cdata-section-elements.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/chunker.output.cdata-section-elements.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/chunker.output.doctype-public.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/chunker.output.doctype-public.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/chunker.output.doctype-public.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/chunker.output.doctype-public.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/chunker.output.doctype-system.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/chunker.output.doctype-system.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/chunker.output.doctype-system.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/chunker.output.doctype-system.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/chunker.output.encoding.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/chunker.output.encoding.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/chunker.output.encoding.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/chunker.output.encoding.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/chunker.output.indent.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/chunker.output.indent.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/chunker.output.indent.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/chunker.output.indent.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/chunker.output.media-type.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/chunker.output.media-type.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/chunker.output.media-type.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/chunker.output.media-type.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/chunker.output.method.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/chunker.output.method.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/chunker.output.method.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/chunker.output.method.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/chunker.output.omit-xml-declaration.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/chunker.output.omit-xml-declaration.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/chunker.output.omit-xml-declaration.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/chunker.output.omit-xml-declaration.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/chunker.output.standalone.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/chunker.output.standalone.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/chunker.output.standalone.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/chunker.output.standalone.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/citerefentry.link.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/citerefentry.link.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/citerefentry.link.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/citerefentry.link.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/collect.xref.targets.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/collect.xref.targets.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/collect.xref.targets.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/collect.xref.targets.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/column.count.back.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/column.count.back.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/column.count.back.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/column.count.back.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/column.count.body.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/column.count.body.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/column.count.body.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/column.count.body.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/column.count.front.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/column.count.front.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/column.count.front.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/column.count.front.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/column.count.index.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/column.count.index.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/column.count.index.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/column.count.index.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/column.count.lot.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/column.count.lot.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/column.count.lot.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/column.count.lot.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/column.count.titlepage.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/column.count.titlepage.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/column.count.titlepage.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/column.count.titlepage.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/column.gap.back.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/column.gap.back.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/column.gap.back.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/column.gap.back.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/column.gap.body.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/column.gap.body.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/column.gap.body.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/column.gap.body.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/column.gap.front.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/column.gap.front.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/column.gap.front.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/column.gap.front.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/column.gap.index.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/column.gap.index.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/column.gap.index.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/column.gap.index.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/column.gap.lot.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/column.gap.lot.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/column.gap.lot.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/column.gap.lot.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/column.gap.titlepage.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/column.gap.titlepage.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/column.gap.titlepage.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/column.gap.titlepage.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/compact.list.item.spacing.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/compact.list.item.spacing.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/compact.list.item.spacing.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/compact.list.item.spacing.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/component.label.includes.part.label.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/component.label.includes.part.label.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/component.label.includes.part.label.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/component.label.includes.part.label.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/component.title.properties.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/component.title.properties.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/component.title.properties.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/component.title.properties.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/component.titlepage.properties.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/component.titlepage.properties.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/component.titlepage.properties.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/component.titlepage.properties.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/contrib.inline.enabled.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/contrib.inline.enabled.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/contrib.inline.enabled.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/contrib.inline.enabled.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/crop.mark.bleed.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/crop.mark.bleed.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/crop.mark.bleed.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/crop.mark.bleed.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/crop.mark.offset.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/crop.mark.offset.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/crop.mark.offset.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/crop.mark.offset.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/crop.mark.width.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/crop.mark.width.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/crop.mark.width.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/crop.mark.width.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/crop.marks.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/crop.marks.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/crop.marks.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/crop.marks.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/css.decoration.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/css.decoration.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/css.decoration.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/css.decoration.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/css.stylesheet.dir.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/css.stylesheet.dir.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/css.stylesheet.dir.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/css.stylesheet.dir.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/css.stylesheet.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/css.stylesheet.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/css.stylesheet.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/css.stylesheet.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/current.docid.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/current.docid.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/current.docid.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/current.docid.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/currentpage.marker.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/currentpage.marker.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/currentpage.marker.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/currentpage.marker.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/custom.css.source.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/custom.css.source.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/custom.css.source.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/custom.css.source.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/default.float.class.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/default.float.class.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/default.float.class.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/default.float.class.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/default.image.width.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/default.image.width.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/default.image.width.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/default.image.width.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/default.table.frame.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/default.table.frame.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/default.table.frame.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/default.table.frame.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/default.table.rules.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/default.table.rules.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/default.table.rules.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/default.table.rules.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/default.table.width.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/default.table.width.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/default.table.width.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/default.table.width.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/default.units.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/default.units.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/default.units.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/default.units.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/dingbat.font.family.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/dingbat.font.family.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/dingbat.font.family.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/dingbat.font.family.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/docbook.css.link.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/docbook.css.link.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/docbook.css.link.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/docbook.css.link.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/docbook.css.source.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/docbook.css.source.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/docbook.css.source.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/docbook.css.source.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/double.sided.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/double.sided.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/double.sided.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/double.sided.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/draft.mode.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/draft.mode.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/draft.mode.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/draft.mode.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/draft.watermark.image.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/draft.watermark.image.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/draft.watermark.image.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/draft.watermark.image.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/dry-run.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/dry-run.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/dry-run.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/dry-run.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/dynamic.toc.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/dynamic.toc.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/dynamic.toc.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/dynamic.toc.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/ebnf.assignment.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/ebnf.assignment.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/ebnf.assignment.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/ebnf.assignment.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/ebnf.statement.terminator.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/ebnf.statement.terminator.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/ebnf.statement.terminator.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/ebnf.statement.terminator.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/ebnf.table.bgcolor.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/ebnf.table.bgcolor.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/ebnf.table.bgcolor.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/ebnf.table.bgcolor.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/ebnf.table.border.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/ebnf.table.border.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/ebnf.table.border.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/ebnf.table.border.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/eclipse.autolabel.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/eclipse.autolabel.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/eclipse.autolabel.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/eclipse.autolabel.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/eclipse.plugin.id.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/eclipse.plugin.id.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/eclipse.plugin.id.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/eclipse.plugin.id.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/eclipse.plugin.name.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/eclipse.plugin.name.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/eclipse.plugin.name.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/eclipse.plugin.name.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/eclipse.plugin.provider.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/eclipse.plugin.provider.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/eclipse.plugin.provider.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/eclipse.plugin.provider.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/editedby.enabled.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/editedby.enabled.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/editedby.enabled.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/editedby.enabled.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/email.delimiters.enabled.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/email.delimiters.enabled.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/email.delimiters.enabled.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/email.delimiters.enabled.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/email.mailto.enabled.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/email.mailto.enabled.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/email.mailto.enabled.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/email.mailto.enabled.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/emphasis.propagates.style.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/emphasis.propagates.style.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/emphasis.propagates.style.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/emphasis.propagates.style.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/entry.propagates.style.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/entry.propagates.style.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/entry.propagates.style.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/entry.propagates.style.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/epub.autolabel.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/epub.autolabel.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/epub.autolabel.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/epub.autolabel.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/equation.number.properties.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/equation.number.properties.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/equation.number.properties.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/equation.number.properties.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/equation.properties.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/equation.properties.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/equation.properties.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/equation.properties.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/example.properties.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/example.properties.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/example.properties.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/example.properties.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/exsl.node.set.available.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/exsl.node.set.available.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/exsl.node.set.available.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/exsl.node.set.available.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/feedback.href.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/feedback.href.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/feedback.href.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/feedback.href.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/feedback.link.text.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/feedback.link.text.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/feedback.link.text.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/feedback.link.text.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/feedback.with.ids.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/feedback.with.ids.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/feedback.with.ids.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/feedback.with.ids.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/figure.properties.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/figure.properties.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/figure.properties.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/figure.properties.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/filename-prefix.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/filename-prefix.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/filename-prefix.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/filename-prefix.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/firstterm.only.link.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/firstterm.only.link.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/firstterm.only.link.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/firstterm.only.link.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/foil.properties.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/foil.properties.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/foil.properties.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/foil.properties.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/foil.subtitle.properties.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/foil.subtitle.properties.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/foil.subtitle.properties.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/foil.subtitle.properties.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/foil.title.master.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/foil.title.master.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/foil.title.master.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/foil.title.master.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/foil.title.size.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/foil.title.size.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/foil.title.size.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/foil.title.size.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/foilgroup.properties.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/foilgroup.properties.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/foilgroup.properties.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/foilgroup.properties.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/foilgroup.toc.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/foilgroup.toc.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/foilgroup.toc.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/foilgroup.toc.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/footer.column.widths.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/footer.column.widths.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/footer.column.widths.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/footer.column.widths.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/footer.content.properties.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/footer.content.properties.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/footer.content.properties.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/footer.content.properties.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/footer.hr.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/footer.hr.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/footer.hr.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/footer.hr.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/footer.rule.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/footer.rule.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/footer.rule.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/footer.rule.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/footer.table.height.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/footer.table.height.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/footer.table.height.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/footer.table.height.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/footer.table.properties.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/footer.table.properties.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/footer.table.properties.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/footer.table.properties.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/footers.on.blank.pages.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/footers.on.blank.pages.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/footers.on.blank.pages.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/footers.on.blank.pages.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/footnote.font.size.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/footnote.font.size.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/footnote.font.size.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/footnote.font.size.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/footnote.mark.properties.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/footnote.mark.properties.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/footnote.mark.properties.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/footnote.mark.properties.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/footnote.number.format.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/footnote.number.format.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/footnote.number.format.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/footnote.number.format.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/footnote.number.symbols.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/footnote.number.symbols.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/footnote.number.symbols.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/footnote.number.symbols.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/footnote.properties.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/footnote.properties.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/footnote.properties.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/footnote.properties.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/footnote.sep.leader.properties.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/footnote.sep.leader.properties.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/footnote.sep.leader.properties.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/footnote.sep.leader.properties.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/fop.extensions.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/fop.extensions.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/fop.extensions.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/fop.extensions.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/fop1.extensions.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/fop1.extensions.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/fop1.extensions.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/fop1.extensions.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/formal.object.properties.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/formal.object.properties.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/formal.object.properties.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/formal.object.properties.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/formal.procedures.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/formal.procedures.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/formal.procedures.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/formal.procedures.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/formal.title.placement.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/formal.title.placement.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/formal.title.placement.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/formal.title.placement.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/formal.title.properties.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/formal.title.properties.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/formal.title.properties.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/formal.title.properties.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/funcsynopsis.decoration.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/funcsynopsis.decoration.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/funcsynopsis.decoration.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/funcsynopsis.decoration.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/funcsynopsis.style.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/funcsynopsis.style.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/funcsynopsis.style.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/funcsynopsis.style.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/function.parens.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/function.parens.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/function.parens.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/function.parens.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/generate.css.header.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/generate.css.header.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/generate.css.header.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/generate.css.header.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/generate.id.attributes.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/generate.id.attributes.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/generate.id.attributes.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/generate.id.attributes.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/generate.index.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/generate.index.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/generate.index.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/generate.index.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/generate.legalnotice.link.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/generate.legalnotice.link.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/generate.legalnotice.link.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/generate.legalnotice.link.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/generate.manifest.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/generate.manifest.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/generate.manifest.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/generate.manifest.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/generate.meta.abstract.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/generate.meta.abstract.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/generate.meta.abstract.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/generate.meta.abstract.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/generate.revhistory.link.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/generate.revhistory.link.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/generate.revhistory.link.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/generate.revhistory.link.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/generate.section.toc.level.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/generate.section.toc.level.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/generate.section.toc.level.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/generate.section.toc.level.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/generate.toc.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/generate.toc.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/generate.toc.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/generate.toc.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/glossary.as.blocks.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/glossary.as.blocks.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/glossary.as.blocks.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/glossary.as.blocks.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/glossary.collection.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/glossary.collection.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/glossary.collection.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/glossary.collection.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/glossary.sort.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/glossary.sort.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/glossary.sort.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/glossary.sort.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/glossdef.block.properties.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/glossdef.block.properties.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/glossdef.block.properties.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/glossdef.block.properties.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/glossdef.list.properties.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/glossdef.list.properties.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/glossdef.list.properties.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/glossdef.list.properties.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/glossentry.list.item.properties.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/glossentry.list.item.properties.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/glossentry.list.item.properties.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/glossentry.list.item.properties.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/glossentry.show.acronym.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/glossentry.show.acronym.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/glossentry.show.acronym.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/glossentry.show.acronym.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/glosslist.as.blocks.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/glosslist.as.blocks.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/glosslist.as.blocks.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/glosslist.as.blocks.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/glossterm.auto.link.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/glossterm.auto.link.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/glossterm.auto.link.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/glossterm.auto.link.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/glossterm.block.properties.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/glossterm.block.properties.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/glossterm.block.properties.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/glossterm.block.properties.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/glossterm.list.properties.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/glossterm.list.properties.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/glossterm.list.properties.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/glossterm.list.properties.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/glossterm.separation.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/glossterm.separation.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/glossterm.separation.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/glossterm.separation.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/glossterm.width.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/glossterm.width.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/glossterm.width.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/glossterm.width.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/graphic.default.extension.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/graphic.default.extension.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/graphic.default.extension.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/graphic.default.extension.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/graphical.admonition.properties.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/graphical.admonition.properties.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/graphical.admonition.properties.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/graphical.admonition.properties.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/graphics.dir.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/graphics.dir.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/graphics.dir.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/graphics.dir.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/graphicsize.extension.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/graphicsize.extension.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/graphicsize.extension.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/graphicsize.extension.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/graphicsize.use.img.src.path.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/graphicsize.use.img.src.path.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/graphicsize.use.img.src.path.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/graphicsize.use.img.src.path.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/header.column.widths.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/header.column.widths.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/header.column.widths.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/header.column.widths.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/header.content.properties.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/header.content.properties.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/header.content.properties.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/header.content.properties.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/header.hr.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/header.hr.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/header.hr.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/header.hr.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/header.rule.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/header.rule.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/header.rule.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/header.rule.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/header.table.height.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/header.table.height.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/header.table.height.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/header.table.height.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/header.table.properties.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/header.table.properties.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/header.table.properties.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/header.table.properties.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/headers.on.blank.pages.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/headers.on.blank.pages.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/headers.on.blank.pages.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/headers.on.blank.pages.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/hidetoc.image.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/hidetoc.image.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/hidetoc.image.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/hidetoc.image.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/highlight.default.language.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/highlight.default.language.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/highlight.default.language.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/highlight.default.language.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/highlight.source.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/highlight.source.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/highlight.source.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/highlight.source.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/highlight.xslthl.config.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/highlight.xslthl.config.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/highlight.xslthl.config.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/highlight.xslthl.config.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/home.image.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/home.image.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/home.image.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/home.image.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/html.append.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/html.append.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/html.append.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/html.append.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/html.base.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/html.base.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/html.base.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/html.base.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/html.cellpadding.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/html.cellpadding.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/html.cellpadding.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/html.cellpadding.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/html.cellspacing.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/html.cellspacing.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/html.cellspacing.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/html.cellspacing.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/html.cleanup.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/html.cleanup.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/html.cleanup.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/html.cleanup.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/html.ext.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/html.ext.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/html.ext.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/html.ext.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/html.extra.head.links.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/html.extra.head.links.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/html.extra.head.links.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/html.extra.head.links.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/html.head.legalnotice.link.multiple.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/html.head.legalnotice.link.multiple.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/html.head.legalnotice.link.multiple.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/html.head.legalnotice.link.multiple.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/html.head.legalnotice.link.types.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/html.head.legalnotice.link.types.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/html.head.legalnotice.link.types.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/html.head.legalnotice.link.types.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/html.longdesc.link.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/html.longdesc.link.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/html.longdesc.link.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/html.longdesc.link.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/html.longdesc.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/html.longdesc.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/html.longdesc.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/html.longdesc.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/html.stylesheet.type.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/html.stylesheet.type.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/html.stylesheet.type.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/html.stylesheet.type.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/html.stylesheet.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/html.stylesheet.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/html.stylesheet.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/html.stylesheet.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.alias.file.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.alias.file.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.alias.file.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.alias.file.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.autolabel.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.autolabel.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.autolabel.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.autolabel.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.button.back.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.button.back.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.button.back.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.button.back.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.button.forward.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.button.forward.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.button.forward.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.button.forward.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.button.hideshow.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.button.hideshow.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.button.hideshow.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.button.hideshow.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.button.home.url.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.button.home.url.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.button.home.url.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.button.home.url.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.button.home.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.button.home.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.button.home.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.button.home.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.button.jump1.title.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.button.jump1.title.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.button.jump1.title.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.button.jump1.title.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.button.jump1.url.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.button.jump1.url.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.button.jump1.url.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.button.jump1.url.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.button.jump1.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.button.jump1.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.button.jump1.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.button.jump1.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.button.jump2.title.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.button.jump2.title.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.button.jump2.title.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.button.jump2.title.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.button.jump2.url.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.button.jump2.url.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.button.jump2.url.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.button.jump2.url.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.button.jump2.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.button.jump2.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.button.jump2.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.button.jump2.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.button.locate.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.button.locate.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.button.locate.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.button.locate.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.button.next.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.button.next.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.button.next.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.button.next.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.button.options.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.button.options.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.button.options.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.button.options.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.button.prev.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.button.prev.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.button.prev.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.button.prev.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.button.print.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.button.print.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.button.print.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.button.print.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.button.refresh.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.button.refresh.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.button.refresh.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.button.refresh.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.button.stop.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.button.stop.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.button.stop.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.button.stop.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.button.zoom.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.button.zoom.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.button.zoom.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.button.zoom.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.chm.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.chm.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.chm.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.chm.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.default.topic.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.default.topic.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.default.topic.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.default.topic.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.display.progress.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.display.progress.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.display.progress.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.display.progress.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.encoding.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.encoding.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.encoding.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.encoding.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.enhanced.decompilation.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.enhanced.decompilation.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.enhanced.decompilation.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.enhanced.decompilation.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.enumerate.images.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.enumerate.images.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.enumerate.images.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.enumerate.images.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.force.map.and.alias.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.force.map.and.alias.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.force.map.and.alias.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.force.map.and.alias.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.hhc.binary.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.hhc.binary.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.hhc.binary.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.hhc.binary.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.hhc.folders.instead.books.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.hhc.folders.instead.books.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.hhc.folders.instead.books.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.hhc.folders.instead.books.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.hhc.section.depth.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.hhc.section.depth.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.hhc.section.depth.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.hhc.section.depth.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.hhc.show.root.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.hhc.show.root.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.hhc.show.root.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.hhc.show.root.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.hhc.width.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.hhc.width.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.hhc.width.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.hhc.width.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.hhc.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.hhc.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.hhc.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.hhc.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.hhk.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.hhk.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.hhk.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.hhk.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.hhp.tail.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.hhp.tail.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.hhp.tail.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.hhp.tail.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.hhp.window.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.hhp.window.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.hhp.window.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.hhp.window.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.hhp.windows.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.hhp.windows.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.hhp.windows.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.hhp.windows.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.hhp.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.hhp.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.hhp.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.hhp.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.map.file.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.map.file.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.map.file.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.map.file.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.only.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.only.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.only.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.only.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.remember.window.position.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.remember.window.position.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.remember.window.position.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.remember.window.position.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.show.advanced.search.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.show.advanced.search.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.show.advanced.search.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.show.advanced.search.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.show.favorities.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.show.favorities.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.show.favorities.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.show.favorities.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.show.menu.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.show.menu.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.show.menu.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.show.menu.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.show.toolbar.text.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.show.toolbar.text.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.show.toolbar.text.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.show.toolbar.text.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.title.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.title.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.title.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.title.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.use.hhk.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.use.hhk.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.use.hhk.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.use.hhk.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.window.geometry.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.window.geometry.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.window.geometry.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/htmlhelp.window.geometry.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/hyphenate.verbatim.characters.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/hyphenate.verbatim.characters.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/hyphenate.verbatim.characters.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/hyphenate.verbatim.characters.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/hyphenate.verbatim.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/hyphenate.verbatim.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/hyphenate.verbatim.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/hyphenate.verbatim.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/hyphenate.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/hyphenate.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/hyphenate.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/hyphenate.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/id.warnings.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/id.warnings.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/id.warnings.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/id.warnings.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/ignore.image.scaling.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/ignore.image.scaling.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/ignore.image.scaling.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/ignore.image.scaling.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/img.src.path.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/img.src.path.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/img.src.path.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/img.src.path.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/index.div.title.properties.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/index.div.title.properties.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/index.div.title.properties.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/index.div.title.properties.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/index.entry.properties.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/index.entry.properties.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/index.entry.properties.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/index.entry.properties.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/index.links.to.section.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/index.links.to.section.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/index.links.to.section.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/index.links.to.section.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/index.method.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/index.method.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/index.method.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/index.method.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/index.number.separator.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/index.number.separator.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/index.number.separator.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/index.number.separator.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/index.on.role.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/index.on.role.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/index.on.role.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/index.on.role.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/index.on.type.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/index.on.type.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/index.on.type.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/index.on.type.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/index.page.number.properties.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/index.page.number.properties.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/index.page.number.properties.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/index.page.number.properties.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/index.prefer.titleabbrev.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/index.prefer.titleabbrev.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/index.prefer.titleabbrev.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/index.prefer.titleabbrev.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/index.preferred.page.properties.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/index.preferred.page.properties.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/index.preferred.page.properties.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/index.preferred.page.properties.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/index.range.separator.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/index.range.separator.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/index.range.separator.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/index.range.separator.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/index.term.separator.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/index.term.separator.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/index.term.separator.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/index.term.separator.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/informal.object.properties.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/informal.object.properties.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/informal.object.properties.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/informal.object.properties.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/informalequation.properties.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/informalequation.properties.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/informalequation.properties.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/informalequation.properties.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/informalexample.properties.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/informalexample.properties.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/informalexample.properties.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/informalexample.properties.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/informalfigure.properties.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/informalfigure.properties.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/informalfigure.properties.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/informalfigure.properties.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/informaltable.properties.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/informaltable.properties.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/informaltable.properties.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/informaltable.properties.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/inherit.keywords.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/inherit.keywords.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/inherit.keywords.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/inherit.keywords.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/insert.link.page.number.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/insert.link.page.number.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/insert.link.page.number.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/insert.link.page.number.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/insert.olink.page.number.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/insert.olink.page.number.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/insert.olink.page.number.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/insert.olink.page.number.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/insert.olink.pdf.frag.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/insert.olink.pdf.frag.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/insert.olink.pdf.frag.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/insert.olink.pdf.frag.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/insert.xref.page.number.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/insert.xref.page.number.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/insert.xref.page.number.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/insert.xref.page.number.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/itemizedlist.label.properties.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/itemizedlist.label.properties.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/itemizedlist.label.properties.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/itemizedlist.label.properties.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/itemizedlist.label.width.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/itemizedlist.label.width.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/itemizedlist.label.width.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/itemizedlist.label.width.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/itemizedlist.properties.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/itemizedlist.properties.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/itemizedlist.properties.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/itemizedlist.properties.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/javahelp.encoding.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/javahelp.encoding.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/javahelp.encoding.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/javahelp.encoding.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/keep.relative.image.uris.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/keep.relative.image.uris.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/keep.relative.image.uris.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/keep.relative.image.uris.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/keyboard.nav.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/keyboard.nav.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/keyboard.nav.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/keyboard.nav.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/l10n.gentext.default.language.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/l10n.gentext.default.language.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/l10n.gentext.default.language.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/l10n.gentext.default.language.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/l10n.gentext.language.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/l10n.gentext.language.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/l10n.gentext.language.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/l10n.gentext.language.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/l10n.gentext.use.xref.language.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/l10n.gentext.use.xref.language.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/l10n.gentext.use.xref.language.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/l10n.gentext.use.xref.language.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/l10n.lang.value.rfc.compliant.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/l10n.lang.value.rfc.compliant.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/l10n.lang.value.rfc.compliant.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/l10n.lang.value.rfc.compliant.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/label.from.part.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/label.from.part.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/label.from.part.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/label.from.part.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/line-height.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/line-height.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/line-height.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/line-height.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/linenumbering.everyNth.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/linenumbering.everyNth.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/linenumbering.everyNth.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/linenumbering.everyNth.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/linenumbering.extension.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/linenumbering.extension.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/linenumbering.extension.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/linenumbering.extension.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/linenumbering.separator.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/linenumbering.separator.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/linenumbering.separator.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/linenumbering.separator.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/linenumbering.width.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/linenumbering.width.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/linenumbering.width.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/linenumbering.width.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/link.mailto.url.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/link.mailto.url.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/link.mailto.url.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/link.mailto.url.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/list.block.properties.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/list.block.properties.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/list.block.properties.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/list.block.properties.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/list.block.spacing.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/list.block.spacing.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/list.block.spacing.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/list.block.spacing.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/list.item.spacing.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/list.item.spacing.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/list.item.spacing.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/list.item.spacing.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/make.clean.html.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/make.clean.html.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/make.clean.html.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/make.clean.html.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/make.graphic.viewport.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/make.graphic.viewport.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/make.graphic.viewport.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/make.graphic.viewport.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/make.index.markup.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/make.index.markup.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/make.index.markup.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/make.index.markup.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/make.single.year.ranges.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/make.single.year.ranges.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/make.single.year.ranges.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/make.single.year.ranges.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/make.valid.html.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/make.valid.html.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/make.valid.html.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/make.valid.html.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/make.year.ranges.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/make.year.ranges.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/make.year.ranges.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/make.year.ranges.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.authors.section.enabled.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.authors.section.enabled.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.authors.section.enabled.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.authors.section.enabled.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.base.url.for.relative.links.xml b/scons/scons-local-4.9.1/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.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.base.url.for.relative.links.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.base.url.for.relative.links.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.break.after.slash.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.break.after.slash.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.break.after.slash.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.break.after.slash.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.charmap.enabled.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.charmap.enabled.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.charmap.enabled.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.charmap.enabled.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.charmap.subset.profile.english.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.charmap.subset.profile.english.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.charmap.subset.profile.english.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.charmap.subset.profile.english.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.charmap.subset.profile.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.charmap.subset.profile.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.charmap.subset.profile.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.charmap.subset.profile.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.charmap.uri.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.charmap.uri.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.charmap.uri.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.charmap.uri.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.charmap.use.subset.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.charmap.use.subset.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.charmap.use.subset.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.charmap.use.subset.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.copyright.section.enabled.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.copyright.section.enabled.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.copyright.section.enabled.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.copyright.section.enabled.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.endnotes.are.numbered.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.endnotes.are.numbered.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.endnotes.are.numbered.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.endnotes.are.numbered.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.endnotes.list.enabled.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.endnotes.list.enabled.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.endnotes.list.enabled.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.endnotes.list.enabled.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.endnotes.list.heading.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.endnotes.list.heading.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.endnotes.list.heading.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.endnotes.list.heading.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.font.funcprototype.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.font.funcprototype.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.font.funcprototype.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.font.funcprototype.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.font.funcsynopsisinfo.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.font.funcsynopsisinfo.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.font.funcsynopsisinfo.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.font.funcsynopsisinfo.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.font.links.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.font.links.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.font.links.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.font.links.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.font.table.headings.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.font.table.headings.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.font.table.headings.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.font.table.headings.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.font.table.title.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.font.table.title.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.font.table.title.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.font.table.title.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.funcsynopsis.style.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.funcsynopsis.style.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.funcsynopsis.style.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.funcsynopsis.style.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.hyphenate.computer.inlines.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.hyphenate.computer.inlines.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.hyphenate.computer.inlines.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.hyphenate.computer.inlines.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.hyphenate.filenames.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.hyphenate.filenames.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.hyphenate.filenames.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.hyphenate.filenames.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.hyphenate.urls.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.hyphenate.urls.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.hyphenate.urls.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.hyphenate.urls.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.hyphenate.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.hyphenate.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.hyphenate.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.hyphenate.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.indent.blurbs.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.indent.blurbs.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.indent.blurbs.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.indent.blurbs.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.indent.lists.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.indent.lists.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.indent.lists.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.indent.lists.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.indent.refsect.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.indent.refsect.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.indent.refsect.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.indent.refsect.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.indent.verbatims.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.indent.verbatims.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.indent.verbatims.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.indent.verbatims.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.indent.width.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.indent.width.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.indent.width.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.indent.width.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.justify.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.justify.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.justify.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.justify.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.output.base.dir.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.output.base.dir.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.output.base.dir.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.output.base.dir.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.output.better.ps.enabled.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.output.better.ps.enabled.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.output.better.ps.enabled.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.output.better.ps.enabled.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.output.encoding.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.output.encoding.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.output.encoding.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.output.encoding.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.output.in.separate.dir.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.output.in.separate.dir.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.output.in.separate.dir.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.output.in.separate.dir.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.output.lang.in.name.enabled.xml b/scons/scons-local-4.9.1/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.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.output.lang.in.name.enabled.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.output.lang.in.name.enabled.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.output.manifest.enabled.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.output.manifest.enabled.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.output.manifest.enabled.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.output.manifest.enabled.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.output.manifest.filename.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.output.manifest.filename.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.output.manifest.filename.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.output.manifest.filename.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.output.quietly.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.output.quietly.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.output.quietly.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.output.quietly.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.output.subdirs.enabled.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.output.subdirs.enabled.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.output.subdirs.enabled.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.output.subdirs.enabled.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.segtitle.suppress.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.segtitle.suppress.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.segtitle.suppress.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.segtitle.suppress.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.string.subst.map.local.post.xml b/scons/scons-local-4.9.1/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.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.string.subst.map.local.post.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.string.subst.map.local.post.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.string.subst.map.local.pre.xml b/scons/scons-local-4.9.1/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.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.string.subst.map.local.pre.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.string.subst.map.local.pre.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.string.subst.map.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.string.subst.map.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.string.subst.map.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.string.subst.map.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.subheading.divider.enabled.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.subheading.divider.enabled.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.subheading.divider.enabled.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.subheading.divider.enabled.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.subheading.divider.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.subheading.divider.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.subheading.divider.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.subheading.divider.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.table.footnotes.divider.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.table.footnotes.divider.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.table.footnotes.divider.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.table.footnotes.divider.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.th.extra1.suppress.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.th.extra1.suppress.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.th.extra1.suppress.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.th.extra1.suppress.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.th.extra2.max.length.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.th.extra2.max.length.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.th.extra2.max.length.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.th.extra2.max.length.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.th.extra2.suppress.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.th.extra2.suppress.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.th.extra2.suppress.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.th.extra2.suppress.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.th.extra3.max.length.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.th.extra3.max.length.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.th.extra3.max.length.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.th.extra3.max.length.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.th.extra3.suppress.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.th.extra3.suppress.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.th.extra3.suppress.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.th.extra3.suppress.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.th.title.max.length.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.th.title.max.length.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.th.title.max.length.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/man.th.title.max.length.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/manifest.in.base.dir.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/manifest.in.base.dir.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/manifest.in.base.dir.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/manifest.in.base.dir.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/manifest.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/manifest.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/manifest.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/manifest.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/manual.toc.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/manual.toc.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/manual.toc.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/manual.toc.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/margin.note.float.type.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/margin.note.float.type.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/margin.note.float.type.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/margin.note.float.type.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/margin.note.properties.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/margin.note.properties.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/margin.note.properties.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/margin.note.properties.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/margin.note.title.properties.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/margin.note.title.properties.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/margin.note.title.properties.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/margin.note.title.properties.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/margin.note.width.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/margin.note.width.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/margin.note.width.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/margin.note.width.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/marker.section.level.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/marker.section.level.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/marker.section.level.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/marker.section.level.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/menuchoice.menu.separator.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/menuchoice.menu.separator.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/menuchoice.menu.separator.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/menuchoice.menu.separator.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/menuchoice.separator.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/menuchoice.separator.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/menuchoice.separator.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/menuchoice.separator.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/minus.image.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/minus.image.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/minus.image.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/minus.image.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/monospace.font.family.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/monospace.font.family.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/monospace.font.family.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/monospace.font.family.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/monospace.properties.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/monospace.properties.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/monospace.properties.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/monospace.properties.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/monospace.verbatim.font.width.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/monospace.verbatim.font.width.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/monospace.verbatim.font.width.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/monospace.verbatim.font.width.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/monospace.verbatim.properties.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/monospace.verbatim.properties.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/monospace.verbatim.properties.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/monospace.verbatim.properties.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/multiframe.bottom.bgcolor.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/multiframe.bottom.bgcolor.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/multiframe.bottom.bgcolor.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/multiframe.bottom.bgcolor.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/multiframe.navigation.height.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/multiframe.navigation.height.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/multiframe.navigation.height.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/multiframe.navigation.height.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/multiframe.top.bgcolor.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/multiframe.top.bgcolor.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/multiframe.top.bgcolor.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/multiframe.top.bgcolor.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/multiframe.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/multiframe.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/multiframe.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/multiframe.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/nav.separator.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/nav.separator.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/nav.separator.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/nav.separator.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/nav.table.summary.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/nav.table.summary.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/nav.table.summary.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/nav.table.summary.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/navbgcolor.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/navbgcolor.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/navbgcolor.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/navbgcolor.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/navbodywidth.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/navbodywidth.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/navbodywidth.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/navbodywidth.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/navig.graphics.extension.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/navig.graphics.extension.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/navig.graphics.extension.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/navig.graphics.extension.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/navig.graphics.path.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/navig.graphics.path.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/navig.graphics.path.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/navig.graphics.path.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/navig.graphics.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/navig.graphics.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/navig.graphics.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/navig.graphics.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/navig.showtitles.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/navig.showtitles.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/navig.showtitles.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/navig.showtitles.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/navtocwidth.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/navtocwidth.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/navtocwidth.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/navtocwidth.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/next.image.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/next.image.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/next.image.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/next.image.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/no.home.image.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/no.home.image.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/no.home.image.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/no.home.image.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/no.next.image.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/no.next.image.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/no.next.image.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/no.next.image.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/no.prev.image.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/no.prev.image.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/no.prev.image.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/no.prev.image.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/no.toc.image.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/no.toc.image.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/no.toc.image.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/no.toc.image.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/no.up.image.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/no.up.image.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/no.up.image.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/no.up.image.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/nominal.image.depth.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/nominal.image.depth.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/nominal.image.depth.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/nominal.image.depth.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/nominal.image.width.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/nominal.image.width.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/nominal.image.width.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/nominal.image.width.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/nominal.table.width.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/nominal.table.width.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/nominal.table.width.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/nominal.table.width.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/nongraphical.admonition.properties.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/nongraphical.admonition.properties.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/nongraphical.admonition.properties.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/nongraphical.admonition.properties.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/normal.para.spacing.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/normal.para.spacing.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/normal.para.spacing.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/normal.para.spacing.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/olink.base.uri.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/olink.base.uri.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/olink.base.uri.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/olink.base.uri.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/olink.debug.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/olink.debug.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/olink.debug.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/olink.debug.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/olink.doctitle.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/olink.doctitle.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/olink.doctitle.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/olink.doctitle.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/olink.fragid.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/olink.fragid.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/olink.fragid.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/olink.fragid.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/olink.lang.fallback.sequence.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/olink.lang.fallback.sequence.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/olink.lang.fallback.sequence.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/olink.lang.fallback.sequence.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/olink.outline.ext.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/olink.outline.ext.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/olink.outline.ext.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/olink.outline.ext.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/olink.properties.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/olink.properties.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/olink.properties.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/olink.properties.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/olink.pubid.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/olink.pubid.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/olink.pubid.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/olink.pubid.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/olink.resolver.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/olink.resolver.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/olink.resolver.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/olink.resolver.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/olink.sysid.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/olink.sysid.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/olink.sysid.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/olink.sysid.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/orderedlist.label.properties.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/orderedlist.label.properties.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/orderedlist.label.properties.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/orderedlist.label.properties.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/orderedlist.label.width.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/orderedlist.label.width.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/orderedlist.label.width.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/orderedlist.label.width.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/orderedlist.properties.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/orderedlist.properties.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/orderedlist.properties.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/orderedlist.properties.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/othercredit.like.author.enabled.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/othercredit.like.author.enabled.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/othercredit.like.author.enabled.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/othercredit.like.author.enabled.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/output-root.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/output-root.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/output-root.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/output-root.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/output.indent.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/output.indent.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/output.indent.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/output.indent.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/overlay.js.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/overlay.js.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/overlay.js.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/overlay.js.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/overlay.logo.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/overlay.logo.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/overlay.logo.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/overlay.logo.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/overlay.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/overlay.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/overlay.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/overlay.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/page.height.portrait.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/page.height.portrait.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/page.height.portrait.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/page.height.portrait.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/page.height.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/page.height.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/page.height.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/page.height.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/page.margin.bottom.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/page.margin.bottom.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/page.margin.bottom.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/page.margin.bottom.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/page.margin.inner.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/page.margin.inner.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/page.margin.inner.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/page.margin.inner.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/page.margin.outer.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/page.margin.outer.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/page.margin.outer.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/page.margin.outer.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/page.margin.top.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/page.margin.top.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/page.margin.top.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/page.margin.top.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/page.orientation.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/page.orientation.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/page.orientation.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/page.orientation.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/page.width.portrait.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/page.width.portrait.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/page.width.portrait.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/page.width.portrait.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/page.width.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/page.width.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/page.width.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/page.width.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/pages.template.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/pages.template.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/pages.template.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/pages.template.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/paper.type.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/paper.type.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/paper.type.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/paper.type.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/para.propagates.style.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/para.propagates.style.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/para.propagates.style.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/para.propagates.style.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/part.autolabel.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/part.autolabel.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/part.autolabel.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/part.autolabel.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/passivetex.extensions.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/passivetex.extensions.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/passivetex.extensions.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/passivetex.extensions.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/pgwide.properties.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/pgwide.properties.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/pgwide.properties.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/pgwide.properties.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/phrase.propagates.style.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/phrase.propagates.style.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/phrase.propagates.style.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/phrase.propagates.style.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/pixels.per.inch.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/pixels.per.inch.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/pixels.per.inch.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/pixels.per.inch.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/plus.image.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/plus.image.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/plus.image.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/plus.image.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/points.per.em.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/points.per.em.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/points.per.em.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/points.per.em.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/preface.autolabel.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/preface.autolabel.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/preface.autolabel.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/preface.autolabel.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/prefer.internal.olink.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/prefer.internal.olink.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/prefer.internal.olink.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/prefer.internal.olink.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/preferred.mediaobject.role.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/preferred.mediaobject.role.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/preferred.mediaobject.role.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/preferred.mediaobject.role.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/prev.image.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/prev.image.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/prev.image.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/prev.image.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/procedure.properties.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/procedure.properties.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/procedure.properties.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/procedure.properties.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/process.empty.source.toc.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/process.empty.source.toc.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/process.empty.source.toc.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/process.empty.source.toc.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/process.source.toc.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/process.source.toc.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/process.source.toc.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/process.source.toc.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/profile.arch.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/profile.arch.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/profile.arch.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/profile.arch.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/profile.attribute.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/profile.attribute.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/profile.attribute.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/profile.attribute.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/profile.audience.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/profile.audience.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/profile.audience.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/profile.audience.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/profile.condition.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/profile.condition.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/profile.condition.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/profile.condition.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/profile.conformance.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/profile.conformance.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/profile.conformance.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/profile.conformance.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/profile.lang.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/profile.lang.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/profile.lang.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/profile.lang.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/profile.os.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/profile.os.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/profile.os.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/profile.os.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/profile.revision.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/profile.revision.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/profile.revision.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/profile.revision.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/profile.revisionflag.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/profile.revisionflag.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/profile.revisionflag.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/profile.revisionflag.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/profile.role.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/profile.role.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/profile.role.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/profile.role.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/profile.security.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/profile.security.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/profile.security.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/profile.security.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/profile.separator.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/profile.separator.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/profile.separator.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/profile.separator.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/profile.status.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/profile.status.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/profile.status.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/profile.status.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/profile.userlevel.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/profile.userlevel.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/profile.userlevel.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/profile.userlevel.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/profile.value.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/profile.value.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/profile.value.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/profile.value.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/profile.vendor.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/profile.vendor.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/profile.vendor.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/profile.vendor.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/profile.wordsize.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/profile.wordsize.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/profile.wordsize.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/profile.wordsize.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/punct.honorific.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/punct.honorific.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/punct.honorific.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/punct.honorific.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/qanda.defaultlabel.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/qanda.defaultlabel.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/qanda.defaultlabel.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/qanda.defaultlabel.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/qanda.in.toc.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/qanda.in.toc.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/qanda.in.toc.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/qanda.in.toc.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/qanda.inherit.numeration.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/qanda.inherit.numeration.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/qanda.inherit.numeration.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/qanda.inherit.numeration.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/qanda.nested.in.toc.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/qanda.nested.in.toc.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/qanda.nested.in.toc.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/qanda.nested.in.toc.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/qanda.title.level1.properties.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/qanda.title.level1.properties.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/qanda.title.level1.properties.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/qanda.title.level1.properties.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/qanda.title.level2.properties.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/qanda.title.level2.properties.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/qanda.title.level2.properties.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/qanda.title.level2.properties.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/qanda.title.level3.properties.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/qanda.title.level3.properties.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/qanda.title.level3.properties.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/qanda.title.level3.properties.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/qanda.title.level4.properties.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/qanda.title.level4.properties.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/qanda.title.level4.properties.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/qanda.title.level4.properties.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/qanda.title.level5.properties.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/qanda.title.level5.properties.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/qanda.title.level5.properties.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/qanda.title.level5.properties.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/qanda.title.level6.properties.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/qanda.title.level6.properties.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/qanda.title.level6.properties.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/qanda.title.level6.properties.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/qanda.title.properties.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/qanda.title.properties.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/qanda.title.properties.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/qanda.title.properties.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/qandadiv.autolabel.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/qandadiv.autolabel.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/qandadiv.autolabel.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/qandadiv.autolabel.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refclass.suppress.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refclass.suppress.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refclass.suppress.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refclass.suppress.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refentry.date.profile.enabled.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refentry.date.profile.enabled.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refentry.date.profile.enabled.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refentry.date.profile.enabled.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refentry.date.profile.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refentry.date.profile.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refentry.date.profile.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refentry.date.profile.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refentry.generate.name.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refentry.generate.name.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refentry.generate.name.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refentry.generate.name.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refentry.generate.title.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refentry.generate.title.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refentry.generate.title.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refentry.generate.title.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refentry.manual.fallback.profile.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refentry.manual.fallback.profile.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refentry.manual.fallback.profile.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refentry.manual.fallback.profile.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refentry.manual.profile.enabled.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refentry.manual.profile.enabled.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refentry.manual.profile.enabled.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refentry.manual.profile.enabled.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refentry.manual.profile.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refentry.manual.profile.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refentry.manual.profile.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refentry.manual.profile.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refentry.meta.get.quietly.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refentry.meta.get.quietly.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refentry.meta.get.quietly.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refentry.meta.get.quietly.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refentry.pagebreak.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refentry.pagebreak.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refentry.pagebreak.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refentry.pagebreak.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refentry.separator.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refentry.separator.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refentry.separator.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refentry.separator.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refentry.source.fallback.profile.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refentry.source.fallback.profile.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refentry.source.fallback.profile.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refentry.source.fallback.profile.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refentry.source.name.profile.enabled.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refentry.source.name.profile.enabled.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refentry.source.name.profile.enabled.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refentry.source.name.profile.enabled.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refentry.source.name.profile.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refentry.source.name.profile.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refentry.source.name.profile.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refentry.source.name.profile.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refentry.source.name.suppress.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refentry.source.name.suppress.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refentry.source.name.suppress.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refentry.source.name.suppress.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refentry.title.properties.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refentry.title.properties.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refentry.title.properties.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refentry.title.properties.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refentry.version.profile.enabled.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refentry.version.profile.enabled.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refentry.version.profile.enabled.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refentry.version.profile.enabled.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refentry.version.profile.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refentry.version.profile.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refentry.version.profile.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refentry.version.profile.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refentry.version.suppress.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refentry.version.suppress.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refentry.version.suppress.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refentry.version.suppress.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refentry.xref.manvolnum.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refentry.xref.manvolnum.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refentry.xref.manvolnum.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/refentry.xref.manvolnum.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/reference.autolabel.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/reference.autolabel.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/reference.autolabel.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/reference.autolabel.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/region.after.extent.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/region.after.extent.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/region.after.extent.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/region.after.extent.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/region.before.extent.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/region.before.extent.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/region.before.extent.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/region.before.extent.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/revhistory.table.cell.properties.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/revhistory.table.cell.properties.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/revhistory.table.cell.properties.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/revhistory.table.cell.properties.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/revhistory.table.properties.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/revhistory.table.properties.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/revhistory.table.properties.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/revhistory.table.properties.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/revhistory.title.properties.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/revhistory.title.properties.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/revhistory.title.properties.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/revhistory.title.properties.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/root.filename.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/root.filename.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/root.filename.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/root.filename.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/root.properties.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/root.properties.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/root.properties.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/root.properties.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/rootid.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/rootid.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/rootid.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/rootid.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/runinhead.default.title.end.punct.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/runinhead.default.title.end.punct.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/runinhead.default.title.end.punct.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/runinhead.default.title.end.punct.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/runinhead.title.end.punct.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/runinhead.title.end.punct.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/runinhead.title.end.punct.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/runinhead.title.end.punct.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/running.foot.properties.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/running.foot.properties.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/running.foot.properties.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/running.foot.properties.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/sans.font.family.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/sans.font.family.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/sans.font.family.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/sans.font.family.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/saxon.callouts.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/saxon.callouts.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/saxon.callouts.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/saxon.callouts.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/saxon.character.representation.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/saxon.character.representation.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/saxon.character.representation.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/saxon.character.representation.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/saxon.linenumbering.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/saxon.linenumbering.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/saxon.linenumbering.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/saxon.linenumbering.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/saxon.tablecolumns.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/saxon.tablecolumns.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/saxon.tablecolumns.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/saxon.tablecolumns.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/script.dir.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/script.dir.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/script.dir.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/script.dir.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/section.autolabel.max.depth.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/section.autolabel.max.depth.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/section.autolabel.max.depth.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/section.autolabel.max.depth.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/section.autolabel.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/section.autolabel.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/section.autolabel.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/section.autolabel.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/section.container.element.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/section.container.element.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/section.container.element.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/section.container.element.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/section.label.includes.component.label.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/section.label.includes.component.label.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/section.label.includes.component.label.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/section.label.includes.component.label.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/section.level1.properties.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/section.level1.properties.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/section.level1.properties.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/section.level1.properties.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/section.level2.properties.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/section.level2.properties.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/section.level2.properties.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/section.level2.properties.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/section.level3.properties.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/section.level3.properties.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/section.level3.properties.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/section.level3.properties.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/section.level4.properties.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/section.level4.properties.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/section.level4.properties.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/section.level4.properties.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/section.level5.properties.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/section.level5.properties.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/section.level5.properties.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/section.level5.properties.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/section.level6.properties.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/section.level6.properties.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/section.level6.properties.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/section.level6.properties.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/section.properties.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/section.properties.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/section.properties.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/section.properties.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/section.title.level1.properties.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/section.title.level1.properties.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/section.title.level1.properties.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/section.title.level1.properties.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/section.title.level2.properties.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/section.title.level2.properties.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/section.title.level2.properties.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/section.title.level2.properties.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/section.title.level3.properties.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/section.title.level3.properties.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/section.title.level3.properties.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/section.title.level3.properties.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/section.title.level4.properties.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/section.title.level4.properties.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/section.title.level4.properties.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/section.title.level4.properties.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/section.title.level5.properties.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/section.title.level5.properties.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/section.title.level5.properties.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/section.title.level5.properties.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/section.title.level6.properties.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/section.title.level6.properties.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/section.title.level6.properties.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/section.title.level6.properties.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/section.title.properties.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/section.title.properties.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/section.title.properties.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/section.title.properties.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/segmentedlist.as.table.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/segmentedlist.as.table.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/segmentedlist.as.table.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/segmentedlist.as.table.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/sequential.links.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/sequential.links.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/sequential.links.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/sequential.links.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/shade.verbatim.style.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/shade.verbatim.style.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/shade.verbatim.style.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/shade.verbatim.style.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/shade.verbatim.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/shade.verbatim.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/shade.verbatim.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/shade.verbatim.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/show.comments.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/show.comments.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/show.comments.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/show.comments.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/show.foil.number.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/show.foil.number.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/show.foil.number.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/show.foil.number.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/show.revisionflag.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/show.revisionflag.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/show.revisionflag.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/show.revisionflag.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/showtoc.image.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/showtoc.image.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/showtoc.image.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/showtoc.image.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/side.float.properties.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/side.float.properties.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/side.float.properties.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/side.float.properties.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/sidebar.float.type.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/sidebar.float.type.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/sidebar.float.type.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/sidebar.float.type.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/sidebar.float.width.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/sidebar.float.width.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/sidebar.float.width.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/sidebar.float.width.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/sidebar.properties.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/sidebar.properties.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/sidebar.properties.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/sidebar.properties.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/sidebar.title.properties.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/sidebar.title.properties.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/sidebar.title.properties.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/sidebar.title.properties.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/simplesect.in.toc.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/simplesect.in.toc.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/simplesect.in.toc.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/simplesect.in.toc.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/slide.font.family.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/slide.font.family.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/slide.font.family.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/slide.font.family.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/slide.title.font.family.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/slide.title.font.family.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/slide.title.font.family.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/slide.title.font.family.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/slides.js.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/slides.js.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/slides.js.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/slides.js.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/slides.properties.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/slides.properties.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/slides.properties.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/slides.properties.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/spacing.paras.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/spacing.paras.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/spacing.paras.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/spacing.paras.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/speakernote.properties.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/speakernote.properties.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/speakernote.properties.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/speakernote.properties.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/subscript.properties.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/subscript.properties.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/subscript.properties.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/subscript.properties.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/superscript.properties.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/superscript.properties.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/superscript.properties.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/superscript.properties.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/suppress.footer.navigation.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/suppress.footer.navigation.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/suppress.footer.navigation.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/suppress.footer.navigation.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/suppress.header.navigation.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/suppress.header.navigation.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/suppress.header.navigation.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/suppress.header.navigation.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/suppress.homepage.title.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/suppress.homepage.title.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/suppress.homepage.title.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/suppress.homepage.title.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/suppress.navigation.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/suppress.navigation.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/suppress.navigation.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/suppress.navigation.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/symbol.font.family.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/symbol.font.family.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/symbol.font.family.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/symbol.font.family.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/table.borders.with.css.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/table.borders.with.css.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/table.borders.with.css.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/table.borders.with.css.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/table.cell.border.color.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/table.cell.border.color.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/table.cell.border.color.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/table.cell.border.color.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/table.cell.border.style.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/table.cell.border.style.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/table.cell.border.style.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/table.cell.border.style.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/table.cell.border.thickness.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/table.cell.border.thickness.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/table.cell.border.thickness.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/table.cell.border.thickness.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/table.cell.padding.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/table.cell.padding.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/table.cell.padding.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/table.cell.padding.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/table.entry.padding.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/table.entry.padding.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/table.entry.padding.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/table.entry.padding.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/table.footnote.number.format.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/table.footnote.number.format.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/table.footnote.number.format.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/table.footnote.number.format.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/table.footnote.number.symbols.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/table.footnote.number.symbols.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/table.footnote.number.symbols.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/table.footnote.number.symbols.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/table.footnote.properties.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/table.footnote.properties.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/table.footnote.properties.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/table.footnote.properties.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/table.frame.border.color.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/table.frame.border.color.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/table.frame.border.color.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/table.frame.border.color.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/table.frame.border.style.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/table.frame.border.style.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/table.frame.border.style.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/table.frame.border.style.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/table.frame.border.thickness.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/table.frame.border.thickness.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/table.frame.border.thickness.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/table.frame.border.thickness.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/table.properties.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/table.properties.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/table.properties.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/table.properties.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/table.spacer.image.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/table.spacer.image.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/table.spacer.image.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/table.spacer.image.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/table.table.properties.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/table.table.properties.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/table.table.properties.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/table.table.properties.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/tablecolumns.extension.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/tablecolumns.extension.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/tablecolumns.extension.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/tablecolumns.extension.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/target.database.document.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/target.database.document.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/target.database.document.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/target.database.document.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/targets.filename.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/targets.filename.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/targets.filename.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/targets.filename.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/template.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/template.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/template.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/template.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/tex.math.delims.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/tex.math.delims.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/tex.math.delims.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/tex.math.delims.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/tex.math.file.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/tex.math.file.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/tex.math.file.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/tex.math.file.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/tex.math.in.alt.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/tex.math.in.alt.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/tex.math.in.alt.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/tex.math.in.alt.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/text.home.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/text.home.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/text.home.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/text.home.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/text.next.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/text.next.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/text.next.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/text.next.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/text.prev.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/text.prev.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/text.prev.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/text.prev.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/text.toc.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/text.toc.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/text.toc.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/text.toc.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/text.up.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/text.up.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/text.up.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/text.up.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/textbgcolor.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/textbgcolor.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/textbgcolor.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/textbgcolor.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/textdata.default.encoding.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/textdata.default.encoding.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/textdata.default.encoding.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/textdata.default.encoding.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/textinsert.extension.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/textinsert.extension.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/textinsert.extension.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/textinsert.extension.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/title.font.family.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/title.font.family.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/title.font.family.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/title.font.family.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/title.margin.left.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/title.margin.left.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/title.margin.left.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/title.margin.left.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/titlefoil.html.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/titlefoil.html.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/titlefoil.html.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/titlefoil.html.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.bg.color.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.bg.color.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.bg.color.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.bg.color.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.blank.graphic.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.blank.graphic.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.blank.graphic.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.blank.graphic.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.blank.image.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.blank.image.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.blank.image.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.blank.image.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.blank.text.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.blank.text.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.blank.text.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.blank.text.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.hide.show.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.hide.show.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.hide.show.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.hide.show.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.html.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.html.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.html.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.html.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.image.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.image.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.image.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.image.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.indent.width.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.indent.width.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.indent.width.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.indent.width.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.line.properties.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.line.properties.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.line.properties.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.line.properties.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.list.type.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.list.type.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.list.type.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.list.type.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.margin.properties.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.margin.properties.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.margin.properties.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.margin.properties.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.max.depth.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.max.depth.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.max.depth.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.max.depth.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.pointer.graphic.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.pointer.graphic.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.pointer.graphic.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.pointer.graphic.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.pointer.image.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.pointer.image.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.pointer.image.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.pointer.image.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.pointer.text.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.pointer.text.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.pointer.text.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.pointer.text.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.row.height.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.row.height.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.row.height.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.row.height.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.section.depth.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.section.depth.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.section.depth.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.section.depth.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.spacer.graphic.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.spacer.graphic.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.spacer.graphic.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.spacer.graphic.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.spacer.image.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.spacer.image.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.spacer.image.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.spacer.image.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.spacer.text.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.spacer.text.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.spacer.text.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.spacer.text.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.width.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.width.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.width.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/toc.width.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/ua.js.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/ua.js.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/ua.js.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/ua.js.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/ulink.footnotes.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/ulink.footnotes.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/ulink.footnotes.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/ulink.footnotes.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/ulink.hyphenate.chars.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/ulink.hyphenate.chars.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/ulink.hyphenate.chars.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/ulink.hyphenate.chars.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/ulink.hyphenate.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/ulink.hyphenate.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/ulink.hyphenate.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/ulink.hyphenate.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/ulink.show.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/ulink.show.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/ulink.show.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/ulink.show.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/ulink.target.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/ulink.target.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/ulink.target.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/ulink.target.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/up.image.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/up.image.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/up.image.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/up.image.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/use.embed.for.svg.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/use.embed.for.svg.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/use.embed.for.svg.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/use.embed.for.svg.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/use.extensions.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/use.extensions.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/use.extensions.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/use.extensions.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/use.id.as.filename.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/use.id.as.filename.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/use.id.as.filename.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/use.id.as.filename.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/use.id.function.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/use.id.function.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/use.id.function.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/use.id.function.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/use.local.olink.style.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/use.local.olink.style.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/use.local.olink.style.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/use.local.olink.style.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/use.role.as.xrefstyle.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/use.role.as.xrefstyle.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/use.role.as.xrefstyle.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/use.role.as.xrefstyle.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/use.role.for.mediaobject.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/use.role.for.mediaobject.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/use.role.for.mediaobject.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/use.role.for.mediaobject.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/use.svg.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/use.svg.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/use.svg.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/use.svg.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/variablelist.as.blocks.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/variablelist.as.blocks.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/variablelist.as.blocks.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/variablelist.as.blocks.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/variablelist.as.table.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/variablelist.as.table.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/variablelist.as.table.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/variablelist.as.table.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/variablelist.max.termlength.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/variablelist.max.termlength.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/variablelist.max.termlength.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/variablelist.max.termlength.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/variablelist.term.break.after.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/variablelist.term.break.after.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/variablelist.term.break.after.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/variablelist.term.break.after.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/variablelist.term.properties.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/variablelist.term.properties.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/variablelist.term.properties.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/variablelist.term.properties.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/variablelist.term.separator.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/variablelist.term.separator.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/variablelist.term.separator.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/variablelist.term.separator.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/verbatim.properties.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/verbatim.properties.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/verbatim.properties.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/verbatim.properties.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/wordml.template.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/wordml.template.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/wordml.template.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/wordml.template.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/writing.mode.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/writing.mode.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/writing.mode.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/writing.mode.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/xbCollapsibleLists.js.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/xbCollapsibleLists.js.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/xbCollapsibleLists.js.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/xbCollapsibleLists.js.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/xbDOM.js.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/xbDOM.js.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/xbDOM.js.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/xbDOM.js.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/xbLibrary.js.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/xbLibrary.js.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/xbLibrary.js.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/xbLibrary.js.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/xbStyle.js.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/xbStyle.js.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/xbStyle.js.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/xbStyle.js.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/xep.extensions.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/xep.extensions.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/xep.extensions.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/xep.extensions.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/xep.index.item.properties.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/xep.index.item.properties.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/xep.index.item.properties.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/xep.index.item.properties.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/xref.label-page.separator.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/xref.label-page.separator.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/xref.label-page.separator.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/xref.label-page.separator.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/xref.label-title.separator.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/xref.label-title.separator.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/xref.label-title.separator.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/xref.label-title.separator.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/xref.properties.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/xref.properties.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/xref.properties.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/xref.properties.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/xref.title-page.separator.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/xref.title-page.separator.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/xref.title-page.separator.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/xref.title-page.separator.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/xref.with.number.and.title.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/xref.with.number.and.title.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/xref.with.number.and.title.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/params/xref.with.number.and.title.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/profiling/profile-mode.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/profiling/profile-mode.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/profiling/profile-mode.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/profiling/profile-mode.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/profiling/profile.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/profiling/profile.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/profiling/profile.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/profiling/profile.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/profiling/strip-attributes.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/profiling/strip-attributes.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/profiling/strip-attributes.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/profiling/strip-attributes.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/profiling/xsl2profile.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/profiling/xsl2profile.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/profiling/xsl2profile.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/profiling/xsl2profile.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/roundtrip/blocks-spec.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/roundtrip/blocks-spec.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/roundtrip/blocks-spec.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/roundtrip/blocks-spec.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/roundtrip/blocks2dbk.dtd b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/roundtrip/blocks2dbk.dtd
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/roundtrip/blocks2dbk.dtd
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/roundtrip/blocks2dbk.dtd
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/roundtrip/blocks2dbk.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/roundtrip/blocks2dbk.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/roundtrip/blocks2dbk.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/roundtrip/blocks2dbk.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/roundtrip/dbk2ooo.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/roundtrip/dbk2ooo.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/roundtrip/dbk2ooo.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/roundtrip/dbk2ooo.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/roundtrip/dbk2pages.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/roundtrip/dbk2pages.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/roundtrip/dbk2pages.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/roundtrip/dbk2pages.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/roundtrip/dbk2wordml.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/roundtrip/dbk2wordml.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/roundtrip/dbk2wordml.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/roundtrip/dbk2wordml.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/roundtrip/dbk2wp.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/roundtrip/dbk2wp.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/roundtrip/dbk2wp.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/roundtrip/dbk2wp.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/roundtrip/normalise-common.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/roundtrip/normalise-common.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/roundtrip/normalise-common.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/roundtrip/normalise-common.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/roundtrip/normalise2sections.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/roundtrip/normalise2sections.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/roundtrip/normalise2sections.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/roundtrip/normalise2sections.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/roundtrip/pages2normalise.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/roundtrip/pages2normalise.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/roundtrip/pages2normalise.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/roundtrip/pages2normalise.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/roundtrip/param.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/roundtrip/param.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/roundtrip/param.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/roundtrip/param.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/roundtrip/param.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/roundtrip/param.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/roundtrip/param.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/roundtrip/param.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/roundtrip/sections-spec.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/roundtrip/sections-spec.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/roundtrip/sections-spec.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/roundtrip/sections-spec.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/roundtrip/sections2blocks.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/roundtrip/sections2blocks.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/roundtrip/sections2blocks.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/roundtrip/sections2blocks.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/roundtrip/specifications.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/roundtrip/specifications.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/roundtrip/specifications.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/roundtrip/specifications.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/roundtrip/template-pages.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/roundtrip/template-pages.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/roundtrip/template-pages.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/roundtrip/template-pages.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/roundtrip/template.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/roundtrip/template.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/roundtrip/template.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/roundtrip/template.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/roundtrip/wordml2normalise.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/roundtrip/wordml2normalise.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/roundtrip/wordml2normalise.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/roundtrip/wordml2normalise.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/browser/CTOCWidget.js b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/browser/CTOCWidget.js
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/browser/CTOCWidget.js
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/browser/CTOCWidget.js
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/browser/overlay.js b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/browser/overlay.js
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/browser/overlay.js
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/browser/overlay.js
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/browser/slides-default.css b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/browser/slides-default.css
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/browser/slides-default.css
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/browser/slides-default.css
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/browser/slides-frames.css b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/browser/slides-frames.css
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/browser/slides-frames.css
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/browser/slides-frames.css
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/browser/slides-plain.css b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/browser/slides-plain.css
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/browser/slides-plain.css
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/browser/slides-plain.css
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/browser/slides-table.css b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/browser/slides-table.css
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/browser/slides-table.css
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/browser/slides-table.css
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/browser/slides-w3c.css b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/browser/slides-w3c.css
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/browser/slides-w3c.css
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/browser/slides-w3c.css
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/browser/slides.css b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/browser/slides.css
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/browser/slides.css
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/browser/slides.css
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/browser/slides.js b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/browser/slides.js
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/browser/slides.js
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/browser/slides.js
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/browser/ua.js b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/browser/ua.js
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/browser/ua.js
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/browser/ua.js
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/browser/xbCollapsibleLists.js b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/browser/xbCollapsibleLists.js
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/browser/xbCollapsibleLists.js
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/browser/xbCollapsibleLists.js
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/browser/xbDOM.js b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/browser/xbDOM.js
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/browser/xbDOM.js
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/browser/xbDOM.js
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/browser/xbDebug.js b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/browser/xbDebug.js
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/browser/xbDebug.js
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/browser/xbDebug.js
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/browser/xbLibrary.js b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/browser/xbLibrary.js
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/browser/xbLibrary.js
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/browser/xbLibrary.js
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/browser/xbStyle-css.js b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/browser/xbStyle-css.js
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/browser/xbStyle-css.js
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/browser/xbStyle-css.js
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/browser/xbStyle-nn4.js b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/browser/xbStyle-nn4.js
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/browser/xbStyle-nn4.js
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/browser/xbStyle-nn4.js
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/browser/xbStyle-not-supported.js b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/browser/xbStyle-not-supported.js
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/browser/xbStyle-not-supported.js
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/browser/xbStyle-not-supported.js
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/browser/xbStyle.js b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/browser/xbStyle.js
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/browser/xbStyle.js
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/browser/xbStyle.js
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/fo/param.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/fo/param.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/fo/param.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/fo/param.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/fo/param.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/fo/param.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/fo/param.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/fo/param.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/fo/plain-titlepage.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/fo/plain-titlepage.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/fo/plain-titlepage.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/fo/plain-titlepage.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/fo/plain-titlepage.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/fo/plain-titlepage.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/fo/plain-titlepage.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/fo/plain-titlepage.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/fo/plain.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/fo/plain.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/fo/plain.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/fo/plain.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/html/css.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/html/css.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/html/css.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/html/css.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/html/default.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/html/default.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/html/default.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/html/default.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/html/flat.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/html/flat.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/html/flat.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/html/flat.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/html/frames.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/html/frames.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/html/frames.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/html/frames.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/html/graphics.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/html/graphics.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/html/graphics.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/html/graphics.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/html/jscript.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/html/jscript.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/html/jscript.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/html/jscript.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/html/param.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/html/param.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/html/param.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/html/param.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/html/param.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/html/param.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/html/param.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/html/param.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/html/plain.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/html/plain.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/html/plain.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/html/plain.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/html/slides-common.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/html/slides-common.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/html/slides-common.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/html/slides-common.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/html/tables.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/html/tables.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/html/tables.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/html/tables.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/html/vslides.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/html/vslides.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/html/vslides.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/html/vslides.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/html/w3c.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/html/w3c.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/html/w3c.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/html/w3c.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/htmlhelp/htmlhelp.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/htmlhelp/htmlhelp.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/htmlhelp/htmlhelp.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/htmlhelp/htmlhelp.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/keynote/default.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/keynote/default.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/keynote/default.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/keynote/default.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/keynote/xsltsl/cmp.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/keynote/xsltsl/cmp.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/keynote/xsltsl/cmp.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/keynote/xsltsl/cmp.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/keynote/xsltsl/date-time.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/keynote/xsltsl/date-time.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/keynote/xsltsl/date-time.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/keynote/xsltsl/date-time.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/keynote/xsltsl/example.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/keynote/xsltsl/example.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/keynote/xsltsl/example.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/keynote/xsltsl/example.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/keynote/xsltsl/markup.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/keynote/xsltsl/markup.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/keynote/xsltsl/markup.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/keynote/xsltsl/markup.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/keynote/xsltsl/math.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/keynote/xsltsl/math.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/keynote/xsltsl/math.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/keynote/xsltsl/math.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/keynote/xsltsl/node.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/keynote/xsltsl/node.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/keynote/xsltsl/node.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/keynote/xsltsl/node.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/keynote/xsltsl/stdlib.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/keynote/xsltsl/stdlib.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/keynote/xsltsl/stdlib.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/keynote/xsltsl/stdlib.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/keynote/xsltsl/string.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/keynote/xsltsl/string.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/keynote/xsltsl/string.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/keynote/xsltsl/string.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/keynote/xsltsl/svg.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/keynote/xsltsl/svg.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/keynote/xsltsl/svg.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/keynote/xsltsl/svg.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/keynote/xsltsl/uri.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/keynote/xsltsl/uri.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/keynote/xsltsl/uri.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/keynote/xsltsl/uri.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/svg/default.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/svg/default.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/svg/default.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/svg/default.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/xhtml/css.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/xhtml/css.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/xhtml/css.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/xhtml/css.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/xhtml/default.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/xhtml/default.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/xhtml/default.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/xhtml/default.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/xhtml/flat.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/xhtml/flat.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/xhtml/flat.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/xhtml/flat.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/xhtml/frames.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/xhtml/frames.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/xhtml/frames.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/xhtml/frames.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/xhtml/graphics.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/xhtml/graphics.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/xhtml/graphics.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/xhtml/graphics.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/xhtml/jscript.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/xhtml/jscript.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/xhtml/jscript.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/xhtml/jscript.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/xhtml/param.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/xhtml/param.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/xhtml/param.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/xhtml/param.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/xhtml/plain.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/xhtml/plain.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/xhtml/plain.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/xhtml/plain.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/xhtml/slides-common.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/xhtml/slides-common.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/xhtml/slides-common.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/xhtml/slides-common.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/xhtml/tables.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/xhtml/tables.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/xhtml/tables.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/xhtml/tables.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/xhtml/vslides.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/xhtml/vslides.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/xhtml/vslides.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/xhtml/vslides.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/xhtml/w3c.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/xhtml/w3c.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/xhtml/w3c.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/slides/xhtml/w3c.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/template/titlepage.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/template/titlepage.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/template/titlepage.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/template/titlepage.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/template/titlepage.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/template/titlepage.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/template/titlepage.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/template/titlepage.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/tests/refentry.007.ns.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/tests/refentry.007.ns.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/tests/refentry.007.ns.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/tests/refentry.007.ns.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/tests/refentry.007.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/tests/refentry.007.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/tests/refentry.007.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/tests/refentry.007.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/tools/bin/docbook-xsl-update b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/tools/bin/docbook-xsl-update
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/tools/bin/docbook-xsl-update
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/tools/bin/docbook-xsl-update
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/tools/make/Makefile.DocBook b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/tools/make/Makefile.DocBook
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/tools/make/Makefile.DocBook
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/tools/make/Makefile.DocBook
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/tools/make/Makefile.combine b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/tools/make/Makefile.combine
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/tools/make/Makefile.combine
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/tools/make/Makefile.combine
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/tools/make/Makefile.docParam b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/tools/make/Makefile.docParam
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/tools/make/Makefile.docParam
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/tools/make/Makefile.docParam
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/LICENSE b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/LICENSE
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/LICENSE
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/LICENSE
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/common/css/positioning.css b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/common/css/positioning.css
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/common/css/positioning.css
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/common/css/positioning.css
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/common/jquery/jquery-1.4.2.min.js b/scons/scons-local-4.9.1/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.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/common/jquery/jquery-1.4.2.min.js
rename to scons/scons-local-4.9.1/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.8.1/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.9.1/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.8.1/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.9.1/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.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/common/jquery/jquery.cookie.js b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/common/jquery/jquery.cookie.js
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/common/jquery/jquery.cookie.js
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/common/jquery/jquery.cookie.js
diff --git a/scons/scons-local-4.8.1/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.9.1/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.8.1/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.9.1/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.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/common/jquery/treeview/jquery.treeview.async.js b/scons/scons-local-4.9.1/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.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/common/jquery/treeview/jquery.treeview.async.js
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/common/jquery/treeview/jquery.treeview.async.js
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/common/jquery/treeview/jquery.treeview.css b/scons/scons-local-4.9.1/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.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/common/jquery/treeview/jquery.treeview.css
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/common/jquery/treeview/jquery.treeview.css
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/common/jquery/treeview/jquery.treeview.js b/scons/scons-local-4.9.1/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.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/common/jquery/treeview/jquery.treeview.js
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/common/jquery/treeview/jquery.treeview.js
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/common/jquery/treeview/jquery.treeview.min.js b/scons/scons-local-4.9.1/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.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/common/jquery/treeview/jquery.treeview.min.js
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/common/jquery/treeview/jquery.treeview.min.js
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/common/jquery/treeview/jquery.treeview.pack.js b/scons/scons-local-4.9.1/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.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/common/jquery/treeview/jquery.treeview.pack.js
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/common/jquery/treeview/jquery.treeview.pack.js
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/common/main.js b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/common/main.js
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/common/main.js
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/common/main.js
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/content/ch01.html b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/content/ch01.html
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/content/ch01.html
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/content/ch01.html
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/content/ch02.html b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/content/ch02.html
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/content/ch02.html
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/content/ch02.html
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/content/ch02s01.html b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/content/ch02s01.html
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/content/ch02s01.html
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/content/ch02s01.html
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/content/ch02s02.html b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/content/ch02s02.html
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/content/ch02s02.html
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/content/ch02s02.html
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/content/ch02s03.html b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/content/ch02s03.html
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/content/ch02s03.html
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/content/ch02s03.html
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/content/ch02s04.html b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/content/ch02s04.html
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/content/ch02s04.html
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/content/ch02s04.html
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/content/ch03.html b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/content/ch03.html
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/content/ch03.html
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/content/ch03.html
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/content/ch03s01.html b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/content/ch03s01.html
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/content/ch03s01.html
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/content/ch03s01.html
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/content/ch03s02.html b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/content/ch03s02.html
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/content/ch03s02.html
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/content/ch03s02.html
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/content/index.html b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/content/index.html
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/content/index.html
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/content/index.html
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/content/search/htmlFileInfoList.js b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/content/search/htmlFileInfoList.js
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/content/search/htmlFileInfoList.js
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/content/search/htmlFileInfoList.js
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/content/search/htmlFileList.js b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/content/search/htmlFileList.js
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/content/search/htmlFileList.js
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/content/search/htmlFileList.js
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/content/search/index-1.js b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/content/search/index-1.js
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/content/search/index-1.js
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/content/search/index-1.js
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/content/search/index-2.js b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/content/search/index-2.js
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/content/search/index-2.js
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/content/search/index-2.js
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/content/search/index-3.js b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/content/search/index-3.js
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/content/search/index-3.js
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/content/search/index-3.js
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/content/search/nwSearchFnt.js b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/content/search/nwSearchFnt.js
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/content/search/nwSearchFnt.js
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/content/search/nwSearchFnt.js
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/content/search/stemmers/en_stemmer.js b/scons/scons-local-4.9.1/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.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/content/search/stemmers/en_stemmer.js
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/content/search/stemmers/en_stemmer.js
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/index.html b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/index.html
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/index.html
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docs/index.html
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docsrc/readme.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docsrc/readme.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docsrc/readme.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/docsrc/readme.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/template/common/css/positioning.css b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/template/common/css/positioning.css
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/template/common/css/positioning.css
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/template/common/css/positioning.css
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/template/common/jquery/jquery-1.4.2.min.js b/scons/scons-local-4.9.1/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.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/template/common/jquery/jquery-1.4.2.min.js
rename to scons/scons-local-4.9.1/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.8.1/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.9.1/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.8.1/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.9.1/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.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/template/common/jquery/jquery.cookie.js b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/template/common/jquery/jquery.cookie.js
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/template/common/jquery/jquery.cookie.js
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/template/common/jquery/jquery.cookie.js
diff --git a/scons/scons-local-4.8.1/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.9.1/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.8.1/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.9.1/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.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/template/common/jquery/treeview/jquery.treeview.async.js b/scons/scons-local-4.9.1/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.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/template/common/jquery/treeview/jquery.treeview.async.js
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/template/common/jquery/treeview/jquery.treeview.async.js
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/template/common/jquery/treeview/jquery.treeview.css b/scons/scons-local-4.9.1/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.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/template/common/jquery/treeview/jquery.treeview.css
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/template/common/jquery/treeview/jquery.treeview.css
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/template/common/jquery/treeview/jquery.treeview.js b/scons/scons-local-4.9.1/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.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/template/common/jquery/treeview/jquery.treeview.js
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/template/common/jquery/treeview/jquery.treeview.js
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/template/common/jquery/treeview/jquery.treeview.min.js b/scons/scons-local-4.9.1/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.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/template/common/jquery/treeview/jquery.treeview.min.js
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/template/common/jquery/treeview/jquery.treeview.min.js
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/template/common/jquery/treeview/jquery.treeview.pack.js b/scons/scons-local-4.9.1/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.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/template/common/jquery/treeview/jquery.treeview.pack.js
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/template/common/jquery/treeview/jquery.treeview.pack.js
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/template/common/main.js b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/template/common/main.js
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/template/common/main.js
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/template/common/main.js
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/template/content/search/default.props b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/template/content/search/default.props
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/template/content/search/default.props
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/template/content/search/default.props
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/template/content/search/en-us.props b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/template/content/search/en-us.props
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/template/content/search/en-us.props
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/template/content/search/en-us.props
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/template/content/search/es-es.props b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/template/content/search/es-es.props
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/template/content/search/es-es.props
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/template/content/search/es-es.props
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/template/content/search/ja-jp.props b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/template/content/search/ja-jp.props
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/template/content/search/ja-jp.props
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/template/content/search/ja-jp.props
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/template/content/search/nwSearchFnt.js b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/template/content/search/nwSearchFnt.js
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/template/content/search/nwSearchFnt.js
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/template/content/search/nwSearchFnt.js
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/template/content/search/punctuation.props b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/template/content/search/punctuation.props
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/template/content/search/punctuation.props
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/template/content/search/punctuation.props
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/template/content/search/stemmers/de_stemmer.js b/scons/scons-local-4.9.1/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.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/template/content/search/stemmers/de_stemmer.js
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/template/content/search/stemmers/de_stemmer.js
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/template/content/search/stemmers/en_stemmer.js b/scons/scons-local-4.9.1/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.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/template/content/search/stemmers/en_stemmer.js
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/template/content/search/stemmers/en_stemmer.js
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/template/content/search/stemmers/fr_stemmer.js b/scons/scons-local-4.9.1/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.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/template/content/search/stemmers/fr_stemmer.js
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/template/content/search/stemmers/fr_stemmer.js
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/xsl/webhelp.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/xsl/webhelp.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/xsl/webhelp.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/webhelp/xsl/webhelp.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/website/autolayout.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/website/autolayout.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/website/autolayout.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/website/autolayout.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/website/chunk-common.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/website/chunk-common.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/website/chunk-common.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/website/chunk-common.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/website/chunk-tabular.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/website/chunk-tabular.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/website/chunk-tabular.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/website/chunk-tabular.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/website/chunk-website.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/website/chunk-website.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/website/chunk-website.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/website/chunk-website.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/website/head.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/website/head.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/website/head.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/website/head.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/website/makefile-dep.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/website/makefile-dep.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/website/makefile-dep.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/website/makefile-dep.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/website/olink.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/website/olink.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/website/olink.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/website/olink.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/website/param.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/website/param.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/website/param.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/website/param.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/website/param.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/website/param.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/website/param.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/website/param.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/website/rss.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/website/rss.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/website/rss.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/website/rss.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/website/tabular.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/website/tabular.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/website/tabular.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/website/tabular.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/website/toc-tabular.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/website/toc-tabular.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/website/toc-tabular.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/website/toc-tabular.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/website/toc.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/website/toc.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/website/toc.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/website/toc.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/website/website-common.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/website/website-common.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/website/website-common.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/website/website-common.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/website/website-targets.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/website/website-targets.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/website/website-targets.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/website/website-targets.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/website/website.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/website/website.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/website/website.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/website/website.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/website/xbel.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/website/xbel.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/website/xbel.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/website/xbel.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/admon.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/admon.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/admon.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/admon.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/annotations.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/annotations.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/annotations.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/annotations.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/autoidx-kimber.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/autoidx-kimber.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/autoidx-kimber.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/autoidx-kimber.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/autoidx-kosek.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/autoidx-kosek.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/autoidx-kosek.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/autoidx-kosek.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/autoidx-ng.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/autoidx-ng.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/autoidx-ng.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/autoidx-ng.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/autoidx.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/autoidx.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/autoidx.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/autoidx.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/autotoc.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/autotoc.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/autotoc.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/autotoc.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/biblio-iso690.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/biblio-iso690.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/biblio-iso690.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/biblio-iso690.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/biblio.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/biblio.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/biblio.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/biblio.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/block.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/block.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/block.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/block.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/callout.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/callout.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/callout.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/callout.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/changebars.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/changebars.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/changebars.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/changebars.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/chunk-changebars.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/chunk-changebars.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/chunk-changebars.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/chunk-changebars.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/chunk-code.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/chunk-code.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/chunk-code.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/chunk-code.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/chunk-common.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/chunk-common.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/chunk-common.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/chunk-common.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/chunk.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/chunk.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/chunk.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/chunk.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/chunker.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/chunker.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/chunker.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/chunker.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/chunkfast.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/chunkfast.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/chunkfast.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/chunkfast.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/chunktoc.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/chunktoc.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/chunktoc.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/chunktoc.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/component.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/component.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/component.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/component.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/division.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/division.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/division.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/division.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/docbook.css.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/docbook.css.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/docbook.css.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/docbook.css.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/docbook.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/docbook.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/docbook.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/docbook.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/ebnf.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/ebnf.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/ebnf.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/ebnf.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/footnote.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/footnote.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/footnote.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/footnote.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/formal.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/formal.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/formal.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/formal.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/glossary.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/glossary.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/glossary.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/glossary.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/graphics.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/graphics.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/graphics.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/graphics.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/highlight.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/highlight.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/highlight.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/highlight.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/html-rtf.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/html-rtf.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/html-rtf.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/html-rtf.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/html.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/html.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/html.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/html.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/htmltbl.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/htmltbl.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/htmltbl.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/htmltbl.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/index.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/index.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/index.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/index.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/info.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/info.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/info.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/info.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/inline.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/inline.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/inline.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/inline.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/keywords.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/keywords.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/keywords.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/keywords.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/lists.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/lists.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/lists.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/lists.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/maketoc.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/maketoc.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/maketoc.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/maketoc.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/manifest.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/manifest.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/manifest.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/manifest.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/math.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/math.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/math.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/math.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/oldchunker.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/oldchunker.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/oldchunker.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/oldchunker.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/onechunk.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/onechunk.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/onechunk.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/onechunk.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/param.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/param.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/param.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/param.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/pi.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/pi.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/pi.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/pi.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/profile-chunk-code.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/profile-chunk-code.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/profile-chunk-code.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/profile-chunk-code.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/profile-chunk.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/profile-chunk.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/profile-chunk.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/profile-chunk.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/profile-docbook.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/profile-docbook.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/profile-docbook.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/profile-docbook.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/profile-onechunk.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/profile-onechunk.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/profile-onechunk.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/profile-onechunk.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/qandaset.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/qandaset.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/qandaset.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/qandaset.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/refentry.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/refentry.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/refentry.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/refentry.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/sections.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/sections.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/sections.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/sections.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/synop.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/synop.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/synop.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/synop.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/table.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/table.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/table.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/table.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/task.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/task.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/task.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/task.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/titlepage.templates.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/titlepage.templates.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/titlepage.templates.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/titlepage.templates.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/titlepage.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/titlepage.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/titlepage.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/titlepage.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/toc.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/toc.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/toc.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/toc.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/verbatim.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/verbatim.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/verbatim.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/verbatim.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/xref.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/xref.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/xref.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml-1_1/xref.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/admon.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/admon.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/admon.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/admon.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/annotations.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/annotations.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/annotations.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/annotations.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/autoidx-kimber.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/autoidx-kimber.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/autoidx-kimber.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/autoidx-kimber.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/autoidx-kosek.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/autoidx-kosek.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/autoidx-kosek.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/autoidx-kosek.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/autoidx-ng.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/autoidx-ng.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/autoidx-ng.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/autoidx-ng.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/autoidx.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/autoidx.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/autoidx.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/autoidx.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/autotoc.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/autotoc.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/autotoc.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/autotoc.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/biblio-iso690.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/biblio-iso690.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/biblio-iso690.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/biblio-iso690.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/biblio.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/biblio.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/biblio.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/biblio.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/block.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/block.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/block.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/block.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/callout.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/callout.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/callout.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/callout.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/changebars.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/changebars.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/changebars.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/changebars.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/chunk-changebars.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/chunk-changebars.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/chunk-changebars.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/chunk-changebars.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/chunk-code.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/chunk-code.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/chunk-code.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/chunk-code.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/chunk-common.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/chunk-common.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/chunk-common.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/chunk-common.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/chunk.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/chunk.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/chunk.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/chunk.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/chunker.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/chunker.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/chunker.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/chunker.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/chunkfast.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/chunkfast.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/chunkfast.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/chunkfast.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/chunktoc.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/chunktoc.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/chunktoc.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/chunktoc.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/component.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/component.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/component.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/component.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/division.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/division.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/division.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/division.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/docbook.css.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/docbook.css.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/docbook.css.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/docbook.css.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/docbook.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/docbook.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/docbook.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/docbook.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/ebnf.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/ebnf.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/ebnf.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/ebnf.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/footnote.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/footnote.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/footnote.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/footnote.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/formal.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/formal.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/formal.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/formal.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/glossary.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/glossary.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/glossary.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/glossary.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/graphics.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/graphics.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/graphics.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/graphics.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/highlight.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/highlight.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/highlight.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/highlight.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/html-rtf.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/html-rtf.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/html-rtf.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/html-rtf.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/html.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/html.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/html.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/html.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/htmltbl.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/htmltbl.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/htmltbl.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/htmltbl.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/index.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/index.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/index.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/index.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/info.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/info.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/info.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/info.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/inline.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/inline.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/inline.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/inline.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/keywords.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/keywords.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/keywords.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/keywords.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/lists.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/lists.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/lists.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/lists.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/maketoc.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/maketoc.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/maketoc.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/maketoc.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/manifest.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/manifest.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/manifest.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/manifest.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/math.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/math.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/math.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/math.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/oldchunker.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/oldchunker.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/oldchunker.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/oldchunker.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/onechunk.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/onechunk.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/onechunk.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/onechunk.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/param.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/param.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/param.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/param.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/pi.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/pi.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/pi.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/pi.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/profile-chunk-code.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/profile-chunk-code.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/profile-chunk-code.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/profile-chunk-code.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/profile-chunk.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/profile-chunk.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/profile-chunk.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/profile-chunk.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/profile-docbook.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/profile-docbook.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/profile-docbook.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/profile-docbook.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/profile-onechunk.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/profile-onechunk.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/profile-onechunk.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/profile-onechunk.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/qandaset.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/qandaset.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/qandaset.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/qandaset.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/refentry.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/refentry.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/refentry.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/refentry.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/sections.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/sections.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/sections.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/sections.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/synop.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/synop.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/synop.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/synop.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/table.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/table.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/table.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/table.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/task.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/task.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/task.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/task.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/titlepage.templates.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/titlepage.templates.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/titlepage.templates.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/titlepage.templates.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/titlepage.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/titlepage.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/titlepage.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/titlepage.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/toc.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/toc.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/toc.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/toc.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/verbatim.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/verbatim.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/verbatim.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/verbatim.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/xref.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/xref.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/xref.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook-xsl-1.76.1/xhtml/xref.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook.xml
similarity index 98%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docbook.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docbook.xml
index 79d2aead7..464c1b255 100644
--- a/scons/scons-local-4.8.1/SCons/Tool/docbook/docbook.xml
+++ b/scons/scons-local-4.9.1/SCons/Tool/docbook/docbook.xml
@@ -286,7 +286,7 @@ if one of them is installed (fop gets checked first).
-Additonal command-line flags for the external executable
+Additional command-line flags for the external executable
xsltproc (or saxon,
xalan).
@@ -296,7 +296,7 @@ Additonal command-line flags for the external executable
-Additonal command-line flags for the external executable
+Additional command-line flags for the external executable
xmllint.
@@ -305,7 +305,7 @@ Additonal command-line flags for the external executable
-Additonal command-line flags for the
+Additional command-line flags for the
PDF renderer fop or xep.
@@ -314,7 +314,7 @@ PDF renderer fop or xep.
-Additonal parameters that are not intended for the XSLT processor executable, but
+Additional parameters that are not intended for the XSLT processor executable, but
the XSL processing itself. By default, they get appended at the end of the command line
for saxon and saxon-xslt, respectively.
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docs/SConstruct b/scons/scons-local-4.9.1/SCons/Tool/docbook/docs/SConstruct
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docs/SConstruct
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docs/SConstruct
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docs/html.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docs/html.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docs/html.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docs/html.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docs/manual.xml b/scons/scons-local-4.9.1/SCons/Tool/docbook/docs/manual.xml
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docs/manual.xml
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docs/manual.xml
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/docs/pdf.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/docs/pdf.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/docs/pdf.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/docs/pdf.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/docbook/utils/xmldepend.xsl b/scons/scons-local-4.9.1/SCons/Tool/docbook/utils/xmldepend.xsl
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/docbook/utils/xmldepend.xsl
rename to scons/scons-local-4.9.1/SCons/Tool/docbook/utils/xmldepend.xsl
diff --git a/scons/scons-local-4.8.1/SCons/Tool/dvi.py b/scons/scons-local-4.9.1/SCons/Tool/dvi.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/dvi.py
rename to scons/scons-local-4.9.1/SCons/Tool/dvi.py
diff --git a/scons/scons-local-4.8.1/SCons/Tool/dvipdf.py b/scons/scons-local-4.9.1/SCons/Tool/dvipdf.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/dvipdf.py
rename to scons/scons-local-4.9.1/SCons/Tool/dvipdf.py
diff --git a/scons/scons-local-4.8.1/SCons/Tool/dvips.py b/scons/scons-local-4.9.1/SCons/Tool/dvips.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/dvips.py
rename to scons/scons-local-4.9.1/SCons/Tool/dvips.py
diff --git a/scons/scons-local-4.8.1/SCons/Tool/f03.py b/scons/scons-local-4.9.1/SCons/Tool/f03.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/f03.py
rename to scons/scons-local-4.9.1/SCons/Tool/f03.py
diff --git a/scons/scons-local-4.8.1/SCons/Tool/f08.py b/scons/scons-local-4.9.1/SCons/Tool/f08.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/f08.py
rename to scons/scons-local-4.9.1/SCons/Tool/f08.py
diff --git a/scons/scons-local-4.8.1/SCons/Tool/f77.py b/scons/scons-local-4.9.1/SCons/Tool/f77.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/f77.py
rename to scons/scons-local-4.9.1/SCons/Tool/f77.py
diff --git a/scons/scons-local-4.8.1/SCons/Tool/f90.py b/scons/scons-local-4.9.1/SCons/Tool/f90.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/f90.py
rename to scons/scons-local-4.9.1/SCons/Tool/f90.py
diff --git a/scons/scons-local-4.8.1/SCons/Tool/f95.py b/scons/scons-local-4.9.1/SCons/Tool/f95.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/f95.py
rename to scons/scons-local-4.9.1/SCons/Tool/f95.py
diff --git a/scons/scons-local-4.8.1/SCons/Tool/filesystem.py b/scons/scons-local-4.9.1/SCons/Tool/filesystem.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/filesystem.py
rename to scons/scons-local-4.9.1/SCons/Tool/filesystem.py
diff --git a/scons/scons-local-4.8.1/SCons/Tool/fortran.py b/scons/scons-local-4.9.1/SCons/Tool/fortran.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/fortran.py
rename to scons/scons-local-4.9.1/SCons/Tool/fortran.py
diff --git a/scons/scons-local-4.8.1/SCons/Tool/g++.py b/scons/scons-local-4.9.1/SCons/Tool/g++.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/g++.py
rename to scons/scons-local-4.9.1/SCons/Tool/g++.py
diff --git a/scons/scons-local-4.8.1/SCons/Tool/g77.py b/scons/scons-local-4.9.1/SCons/Tool/g77.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/g77.py
rename to scons/scons-local-4.9.1/SCons/Tool/g77.py
diff --git a/scons/scons-local-4.8.1/SCons/Tool/gas.py b/scons/scons-local-4.9.1/SCons/Tool/gas.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/gas.py
rename to scons/scons-local-4.9.1/SCons/Tool/gas.py
diff --git a/scons/scons-local-4.8.1/SCons/Tool/gcc.py b/scons/scons-local-4.9.1/SCons/Tool/gcc.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/gcc.py
rename to scons/scons-local-4.9.1/SCons/Tool/gcc.py
diff --git a/scons/scons-local-4.8.1/SCons/Tool/gdc.py b/scons/scons-local-4.9.1/SCons/Tool/gdc.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/gdc.py
rename to scons/scons-local-4.9.1/SCons/Tool/gdc.py
diff --git a/scons/scons-local-4.8.1/SCons/Tool/gettext_tool.py b/scons/scons-local-4.9.1/SCons/Tool/gettext_tool.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/gettext_tool.py
rename to scons/scons-local-4.9.1/SCons/Tool/gettext_tool.py
diff --git a/scons/scons-local-4.8.1/SCons/Tool/gfortran.py b/scons/scons-local-4.9.1/SCons/Tool/gfortran.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/gfortran.py
rename to scons/scons-local-4.9.1/SCons/Tool/gfortran.py
diff --git a/scons/scons-local-4.8.1/SCons/Tool/gnulink.py b/scons/scons-local-4.9.1/SCons/Tool/gnulink.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/gnulink.py
rename to scons/scons-local-4.9.1/SCons/Tool/gnulink.py
diff --git a/scons/scons-local-4.8.1/SCons/Tool/gs.py b/scons/scons-local-4.9.1/SCons/Tool/gs.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/gs.py
rename to scons/scons-local-4.9.1/SCons/Tool/gs.py
diff --git a/scons/scons-local-4.8.1/SCons/Tool/gxx.py b/scons/scons-local-4.9.1/SCons/Tool/gxx.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/gxx.py
rename to scons/scons-local-4.9.1/SCons/Tool/gxx.py
diff --git a/scons/scons-local-4.8.1/SCons/Tool/hpc++.py b/scons/scons-local-4.9.1/SCons/Tool/hpc++.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/hpc++.py
rename to scons/scons-local-4.9.1/SCons/Tool/hpc++.py
diff --git a/scons/scons-local-4.8.1/SCons/Tool/hpcc.py b/scons/scons-local-4.9.1/SCons/Tool/hpcc.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/hpcc.py
rename to scons/scons-local-4.9.1/SCons/Tool/hpcc.py
diff --git a/scons/scons-local-4.8.1/SCons/Tool/hpcxx.py b/scons/scons-local-4.9.1/SCons/Tool/hpcxx.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/hpcxx.py
rename to scons/scons-local-4.9.1/SCons/Tool/hpcxx.py
diff --git a/scons/scons-local-4.8.1/SCons/Tool/hplink.py b/scons/scons-local-4.9.1/SCons/Tool/hplink.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/hplink.py
rename to scons/scons-local-4.9.1/SCons/Tool/hplink.py
diff --git a/scons/scons-local-4.8.1/SCons/Tool/icc.py b/scons/scons-local-4.9.1/SCons/Tool/icc.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/icc.py
rename to scons/scons-local-4.9.1/SCons/Tool/icc.py
diff --git a/scons/scons-local-4.8.1/SCons/Tool/icl.py b/scons/scons-local-4.9.1/SCons/Tool/icl.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/icl.py
rename to scons/scons-local-4.9.1/SCons/Tool/icl.py
diff --git a/scons/scons-local-4.8.1/SCons/Tool/ifl.py b/scons/scons-local-4.9.1/SCons/Tool/ifl.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/ifl.py
rename to scons/scons-local-4.9.1/SCons/Tool/ifl.py
diff --git a/scons/scons-local-4.8.1/SCons/Tool/ifort.py b/scons/scons-local-4.9.1/SCons/Tool/ifort.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/ifort.py
rename to scons/scons-local-4.9.1/SCons/Tool/ifort.py
diff --git a/scons/scons-local-4.8.1/SCons/Tool/ilink.py b/scons/scons-local-4.9.1/SCons/Tool/ilink.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/ilink.py
rename to scons/scons-local-4.9.1/SCons/Tool/ilink.py
diff --git a/scons/scons-local-4.8.1/SCons/Tool/ilink32.py b/scons/scons-local-4.9.1/SCons/Tool/ilink32.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/ilink32.py
rename to scons/scons-local-4.9.1/SCons/Tool/ilink32.py
diff --git a/scons/scons-local-4.8.1/SCons/Tool/install.py b/scons/scons-local-4.9.1/SCons/Tool/install.py
similarity index 99%
rename from scons/scons-local-4.8.1/SCons/Tool/install.py
rename to scons/scons-local-4.9.1/SCons/Tool/install.py
index d553e31af..fc20586ff 100644
--- a/scons/scons-local-4.8.1/SCons/Tool/install.py
+++ b/scons/scons-local-4.9.1/SCons/Tool/install.py
@@ -176,7 +176,7 @@ def copyFunc(dest, source, env) -> int:
else:
copy2(source, dest)
st = os.stat(source)
- os.chmod(dest, stat.S_IMODE(st[stat.ST_MODE]) | stat.S_IWRITE)
+ os.chmod(dest, stat.S_IMODE(st.st_mode) | stat.S_IWRITE)
return 0
@@ -204,7 +204,7 @@ def copyFuncVersionedLib(dest, source, env) -> int:
pass
copy2(source, dest)
st = os.stat(source)
- os.chmod(dest, stat.S_IMODE(st[stat.ST_MODE]) | stat.S_IWRITE)
+ os.chmod(dest, stat.S_IMODE(st.st_mode) | stat.S_IWRITE)
installShlibLinks(dest, source, env)
return 0
diff --git a/scons/scons-local-4.8.1/SCons/Tool/intelc.py b/scons/scons-local-4.9.1/SCons/Tool/intelc.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/intelc.py
rename to scons/scons-local-4.9.1/SCons/Tool/intelc.py
diff --git a/scons/scons-local-4.8.1/SCons/Tool/ipkg.py b/scons/scons-local-4.9.1/SCons/Tool/ipkg.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/ipkg.py
rename to scons/scons-local-4.9.1/SCons/Tool/ipkg.py
diff --git a/scons/scons-local-4.8.1/SCons/Tool/jar.py b/scons/scons-local-4.9.1/SCons/Tool/jar.py
similarity index 98%
rename from scons/scons-local-4.8.1/SCons/Tool/jar.py
rename to scons/scons-local-4.9.1/SCons/Tool/jar.py
index 1967294f0..13bdca051 100644
--- a/scons/scons-local-4.8.1/SCons/Tool/jar.py
+++ b/scons/scons-local-4.9.1/SCons/Tool/jar.py
@@ -28,8 +28,9 @@ It will usually be imported through the generic SCons.Tool.Tool()
selection method.
"""
+from __future__ import annotations
+
import os
-from typing import List
import SCons.Node
import SCons.Node.FS
@@ -41,7 +42,7 @@ from SCons.Node.FS import _my_normcase
from SCons.Tool.JavaCommon import get_java_install_dirs
-def jarSources(target, source, env, for_signature) -> List[str]:
+def jarSources(target, source, env, for_signature) -> list[str]:
"""Only include sources that are not a manifest file."""
try:
env['JARCHDIR']
diff --git a/scons/scons-local-4.8.1/SCons/Tool/javac.py b/scons/scons-local-4.9.1/SCons/Tool/javac.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/javac.py
rename to scons/scons-local-4.9.1/SCons/Tool/javac.py
diff --git a/scons/scons-local-4.8.1/SCons/Tool/javah.py b/scons/scons-local-4.9.1/SCons/Tool/javah.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/javah.py
rename to scons/scons-local-4.9.1/SCons/Tool/javah.py
diff --git a/scons/scons-local-4.8.1/SCons/Tool/latex.py b/scons/scons-local-4.9.1/SCons/Tool/latex.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/latex.py
rename to scons/scons-local-4.9.1/SCons/Tool/latex.py
diff --git a/scons/scons-local-4.8.1/SCons/Tool/ldc.py b/scons/scons-local-4.9.1/SCons/Tool/ldc.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/ldc.py
rename to scons/scons-local-4.9.1/SCons/Tool/ldc.py
diff --git a/scons/scons-local-4.8.1/SCons/Tool/lex.py b/scons/scons-local-4.9.1/SCons/Tool/lex.py
similarity index 97%
rename from scons/scons-local-4.8.1/SCons/Tool/lex.py
rename to scons/scons-local-4.9.1/SCons/Tool/lex.py
index 527f91c29..5e77ea692 100644
--- a/scons/scons-local-4.8.1/SCons/Tool/lex.py
+++ b/scons/scons-local-4.9.1/SCons/Tool/lex.py
@@ -31,9 +31,10 @@ It will usually be imported through the generic SCons.Tool.Tool()
selection method.
"""
+from __future__ import annotations
+
import os.path
import sys
-from typing import Optional
import SCons.Action
import SCons.Tool
@@ -95,7 +96,7 @@ def lexEmitter(target, source, env) -> tuple:
return target, source
-def get_lex_path(env, append_paths: bool=False) -> Optional[str]:
+def get_lex_path(env, append_paths: bool=False) -> str | None:
"""
Returns the path to the lex tool, searching several possible names.
@@ -162,7 +163,7 @@ def generate(env) -> None:
env['_LEX_TABLES'] = '${LEX_TABLES_FILE and "--tables-file=" + str(LEX_TABLES_FILE)}'
-def exists(env) -> Optional[str]:
+def exists(env) -> str | None:
if sys.platform == 'win32':
return get_lex_path(env)
else:
diff --git a/scons/scons-local-4.8.1/SCons/Tool/link.py b/scons/scons-local-4.9.1/SCons/Tool/link.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/link.py
rename to scons/scons-local-4.9.1/SCons/Tool/link.py
diff --git a/scons/scons-local-4.8.1/SCons/Tool/linkCommon/LoadableModule.py b/scons/scons-local-4.9.1/SCons/Tool/linkCommon/LoadableModule.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/linkCommon/LoadableModule.py
rename to scons/scons-local-4.9.1/SCons/Tool/linkCommon/LoadableModule.py
diff --git a/scons/scons-local-4.8.1/SCons/Tool/linkCommon/README.md b/scons/scons-local-4.9.1/SCons/Tool/linkCommon/README.md
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/linkCommon/README.md
rename to scons/scons-local-4.9.1/SCons/Tool/linkCommon/README.md
diff --git a/scons/scons-local-4.8.1/SCons/Tool/linkCommon/SharedLibrary.py b/scons/scons-local-4.9.1/SCons/Tool/linkCommon/SharedLibrary.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/linkCommon/SharedLibrary.py
rename to scons/scons-local-4.9.1/SCons/Tool/linkCommon/SharedLibrary.py
diff --git a/scons/scons-local-4.8.1/SCons/Tool/linkCommon/__init__.py b/scons/scons-local-4.9.1/SCons/Tool/linkCommon/__init__.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/linkCommon/__init__.py
rename to scons/scons-local-4.9.1/SCons/Tool/linkCommon/__init__.py
diff --git a/scons/scons-local-4.8.1/SCons/Tool/linkloc.py b/scons/scons-local-4.9.1/SCons/Tool/linkloc.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/linkloc.py
rename to scons/scons-local-4.9.1/SCons/Tool/linkloc.py
diff --git a/scons/scons-local-4.8.1/SCons/Tool/m4.py b/scons/scons-local-4.9.1/SCons/Tool/m4.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/m4.py
rename to scons/scons-local-4.9.1/SCons/Tool/m4.py
diff --git a/scons/scons-local-4.8.1/SCons/Tool/masm.py b/scons/scons-local-4.9.1/SCons/Tool/masm.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/masm.py
rename to scons/scons-local-4.9.1/SCons/Tool/masm.py
diff --git a/scons/scons-local-4.8.1/SCons/Tool/midl.py b/scons/scons-local-4.9.1/SCons/Tool/midl.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/midl.py
rename to scons/scons-local-4.9.1/SCons/Tool/midl.py
diff --git a/scons/scons-local-4.8.1/SCons/Tool/mingw.py b/scons/scons-local-4.9.1/SCons/Tool/mingw.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/mingw.py
rename to scons/scons-local-4.9.1/SCons/Tool/mingw.py
diff --git a/scons/scons-local-4.8.1/SCons/Tool/msgfmt.py b/scons/scons-local-4.9.1/SCons/Tool/msgfmt.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/msgfmt.py
rename to scons/scons-local-4.9.1/SCons/Tool/msgfmt.py
diff --git a/scons/scons-local-4.8.1/SCons/Tool/msginit.py b/scons/scons-local-4.9.1/SCons/Tool/msginit.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/msginit.py
rename to scons/scons-local-4.9.1/SCons/Tool/msginit.py
diff --git a/scons/scons-local-4.8.1/SCons/Tool/msgmerge.py b/scons/scons-local-4.9.1/SCons/Tool/msgmerge.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/msgmerge.py
rename to scons/scons-local-4.9.1/SCons/Tool/msgmerge.py
diff --git a/scons/scons-local-4.8.1/SCons/Tool/mslib.py b/scons/scons-local-4.9.1/SCons/Tool/mslib.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/mslib.py
rename to scons/scons-local-4.9.1/SCons/Tool/mslib.py
diff --git a/scons/scons-local-4.8.1/SCons/Tool/mslink.py b/scons/scons-local-4.9.1/SCons/Tool/mslink.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/mslink.py
rename to scons/scons-local-4.9.1/SCons/Tool/mslink.py
diff --git a/scons/scons-local-4.8.1/SCons/Tool/mssdk.py b/scons/scons-local-4.9.1/SCons/Tool/mssdk.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/mssdk.py
rename to scons/scons-local-4.9.1/SCons/Tool/mssdk.py
diff --git a/scons/scons-local-4.8.1/SCons/Tool/msvc.py b/scons/scons-local-4.9.1/SCons/Tool/msvc.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/msvc.py
rename to scons/scons-local-4.9.1/SCons/Tool/msvc.py
diff --git a/scons/scons-local-4.8.1/SCons/Tool/msvs.py b/scons/scons-local-4.9.1/SCons/Tool/msvs.py
similarity index 95%
rename from scons/scons-local-4.8.1/SCons/Tool/msvs.py
rename to scons/scons-local-4.9.1/SCons/Tool/msvs.py
index 12974489a..b32765316 100644
--- a/scons/scons-local-4.8.1/SCons/Tool/msvs.py
+++ b/scons/scons-local-4.9.1/SCons/Tool/msvs.py
@@ -124,6 +124,21 @@ def _generateGUID(slnfile, name, namespace=external_makefile_guid):
return '{' + str(solution).upper() + '}'
+def _projectGUID(env, dspfile):
+ """Generates a GUID for the project file to use.
+
+ In order of preference:
+ * MSVS_PROJECT_GUID in environment
+ * Generated from the project file name (dspfile)
+
+ Returns (str)
+ """
+ project_guid = env.get('MSVS_PROJECT_GUID')
+ if not project_guid:
+ project_guid = _generateGUID(dspfile, '')
+ return project_guid
+
+
version_re = re.compile(r'(\d+\.\d+)(.*)')
@@ -436,6 +451,10 @@ class _DSPGenerator:
else:
self.dspabs = get_abspath()
+ self.project_guid = _projectGUID(env, self.dspfile)
+ dspnode = env.File(self.dspfile)
+ dspnode.Tag('project_guid', self.project_guid)
+
if 'variant' not in env:
raise SCons.Errors.InternalError("You must specify a 'variant' argument (i.e. 'Debug' or " +\
"'Release') to create an MSVSProject.")
@@ -571,7 +590,7 @@ class _DSPGenerator:
self.configs = {}
self.nokeep = 0
- if 'nokeep' in env and env['variant'] != 0:
+ if 'nokeep' in env and env['nokeep'] != 0:
self.nokeep = 1
if self.nokeep == 0 and os.path.exists(self.dspabs):
@@ -912,8 +931,9 @@ class _GenerateV7DSP(_DSPGenerator, _GenerateV7User):
def PrintHeader(self) -> None:
env = self.env
- versionstr = self.versionstr
name = self.name
+ versionstr = self.versionstr
+ project_guid = self.project_guid
encoding = self.env.subst('$MSVSENCODING')
scc_provider = env.get('MSVS_SCC_PROVIDER', '')
scc_project_name = env.get('MSVS_SCC_PROJECT_NAME', '')
@@ -923,9 +943,6 @@ class _GenerateV7DSP(_DSPGenerator, _GenerateV7User):
scc_local_path_legacy = env.get('MSVS_SCC_LOCAL_PATH', '')
scc_connection_root = env.get('MSVS_SCC_CONNECTION_ROOT', os.curdir)
scc_local_path = os.path.relpath(scc_connection_root, os.path.dirname(self.dspabs))
- project_guid = env.get('MSVS_PROJECT_GUID', '')
- if not project_guid:
- project_guid = _generateGUID(self.dspfile, '')
if scc_provider != '':
scc_attrs = '\tSccProjectName="%s"\n' % scc_project_name
if scc_aux_path != '':
@@ -1209,8 +1226,8 @@ class _GenerateV10DSP(_DSPGenerator, _GenerateV10User):
env = self.env
name = self.name
versionstr = self.versionstr
+ project_guid = self.project_guid
encoding = env.subst('$MSVSENCODING')
- project_guid = env.get('MSVS_PROJECT_GUID', '')
scc_provider = env.get('MSVS_SCC_PROVIDER', '')
scc_project_name = env.get('MSVS_SCC_PROJECT_NAME', '')
scc_aux_path = env.get('MSVS_SCC_AUX_PATH', '')
@@ -1219,8 +1236,6 @@ class _GenerateV10DSP(_DSPGenerator, _GenerateV10User):
scc_local_path_legacy = env.get('MSVS_SCC_LOCAL_PATH', '')
scc_connection_root = env.get('MSVS_SCC_CONNECTION_ROOT', os.curdir)
scc_local_path = os.path.relpath(scc_connection_root, os.path.dirname(self.dspabs))
- if not project_guid:
- project_guid = _generateGUID(self.dspfile, '')
if scc_provider != '':
scc_attrs = '\t\t%s\n' % scc_project_name
if scc_aux_path != '':
@@ -1465,6 +1480,42 @@ class _GenerateV10DSP(_DSPGenerator, _GenerateV10User):
_GenerateV10User.Build(self)
+def _projectDSPNodes(env):
+ auto_filter_projects = env.get('auto_filter_projects', None)
+ if 'projects' not in env:
+ raise SCons.Errors.UserError("You must specify a 'projects' argument to create an MSVSSolution.")
+ projects = env['projects']
+ if not SCons.Util.is_List(projects):
+ raise SCons.Errors.InternalError("The 'projects' argument must be a list of nodes.")
+ projects = SCons.Util.flatten(projects)
+ if len(projects) < 1:
+ raise SCons.Errors.UserError("You must specify at least one project to create an MSVSSolution.")
+ sln_suffix = os.path.normcase(env.subst('$MSVSSOLUTIONSUFFIX'))
+ dspnodes = []
+ for p in projects:
+ node = env.File(p)
+ if os.path.normcase(str(node)).endswith(sln_suffix):
+ # solution node detected (possible issues when opening generated solution file with VS IDE)
+ if auto_filter_projects is None:
+ nodestr = str(node)
+ errmsg = (
+ f"An msvs solution file was detected in the MSVSSolution 'projects' argument: {nodestr!r}.\n"
+ " Add MSVSSolution argument 'auto_filter_projects=True' to suppress project solution nodes.\n"
+ " Add MSVSSolution argument 'auto_filter_projects=False' to keep project solution nodes.\n"
+ " Refer to the MSVSSolution documentation for more information."
+ )
+ raise SCons.Errors.UserError(errmsg)
+ elif auto_filter_projects:
+ # skip solution node
+ continue
+ else:
+ # keep solution node
+ pass
+ dspnodes.append(node)
+ if len(dspnodes) < 1:
+ raise SCons.Errors.UserError("You must specify at least one project node to create an MSVSSolution.")
+ return dspnodes
+
class _DSWGenerator:
""" Base class for DSW generators """
def __init__(self, dswfile, source, env) -> None:
@@ -1472,15 +1523,8 @@ class _DSWGenerator:
self.dsw_folder_path = os.path.dirname(os.path.abspath(self.dswfile))
self.env = env
- if 'projects' not in env:
- raise SCons.Errors.UserError("You must specify a 'projects' argument to create an MSVSSolution.")
- projects = env['projects']
- if not SCons.Util.is_List(projects):
- raise SCons.Errors.InternalError("The 'projects' argument must be a list of nodes.")
- projects = SCons.Util.flatten(projects)
- if len(projects) < 1:
- raise SCons.Errors.UserError("You must specify at least one project to create an MSVSSolution.")
- self.dspfiles = list(map(str, projects))
+ dspnodes = _projectDSPNodes(env)
+ self.dsp_srcnodes = [dspnode.srcnode() for dspnode in dspnodes]
if 'name' in self.env:
self.name = self.env['name']
@@ -1519,7 +1563,7 @@ class _GenerateV7DSW(_DSWGenerator):
self.configs = {}
self.nokeep = 0
- if 'nokeep' in env and env['variant'] != 0:
+ if 'nokeep' in env and env['nokeep'] != 0:
self.nokeep = 1
if self.nokeep == 0 and os.path.exists(self.dswfile):
@@ -1554,7 +1598,9 @@ class _GenerateV7DSW(_DSWGenerator):
if not (p.platform in seen or seen.add(p.platform))]
def GenerateProjectFilesInfo(self) -> None:
- for dspfile in self.dspfiles:
+ for dspnode in self.dsp_srcnodes:
+ project_guid = dspnode.GetTag('project_guid')
+ dspfile = str(dspnode)
dsp_folder_path, name = os.path.split(dspfile)
dsp_folder_path = os.path.abspath(dsp_folder_path)
if SCons.Util.splitext(name)[1] == '.filters':
@@ -1565,8 +1611,10 @@ class _GenerateV7DSW(_DSWGenerator):
dsp_relative_file_path = name
else:
dsp_relative_file_path = os.path.join(dsp_relative_folder_path, name)
+ if not project_guid:
+ project_guid = _generateGUID(dspfile, '')
dspfile_info = {'NAME': name,
- 'GUID': _generateGUID(dspfile, ''),
+ 'GUID': project_guid,
'FOLDER_PATH': dsp_folder_path,
'FILE_PATH': dspfile,
'SLN_RELATIVE_FOLDER_PATH': dsp_relative_folder_path,
@@ -1615,7 +1663,7 @@ class _GenerateV7DSW(_DSWGenerator):
elif self.version_num >= 14.2:
# Visual Studio 2019 is considered to be version 16.
self.file.write('# Visual Studio 16\n')
- elif self.version_num > 14.0:
+ elif self.version_num >= 14.0:
# Visual Studio 2015 and 2017 are both considered to be version 15.
self.file.write('# Visual Studio 15\n')
elif self.version_num >= 12.0:
@@ -1632,7 +1680,7 @@ class _GenerateV7DSW(_DSWGenerator):
for dspinfo in self.dspfiles_info:
name = dspinfo['NAME']
base, suffix = SCons.Util.splitext(name)
- if suffix == '.vcproj':
+ if suffix in ('.vcxproj', '.vcproj'):
name = base
self.file.write('Project("%s") = "%s", "%s", "%s"\n'
% (external_makefile_guid, name, dspinfo['SLN_RELATIVE_FILE_PATH'], dspinfo['GUID']))
@@ -1645,7 +1693,7 @@ class _GenerateV7DSW(_DSWGenerator):
env = self.env
if 'MSVS_SCC_PROVIDER' in env:
- scc_number_of_projects = len(self.dspfiles) + 1
+ scc_number_of_projects = len(self.dsp_srcnodes) + 1
slnguid = self.slnguid
scc_provider = env.get('MSVS_SCC_PROVIDER', '').replace(' ', r'\u0020')
scc_project_name = env.get('MSVS_SCC_PROJECT_NAME', '').replace(' ', r'\u0020')
@@ -1777,7 +1825,7 @@ class _GenerateV6DSW(_DSWGenerator):
def PrintWorkspace(self) -> None:
""" writes a DSW file """
name = self.name
- dspfile = os.path.relpath(self.dspfiles[0], self.dsw_folder_path)
+ dspfile = os.path.relpath(str(self.dsp_srcnodes[0]), self.dsw_folder_path)
self.file.write(V6DSWHeader % locals())
def Build(self):
@@ -1867,7 +1915,22 @@ def GenerateProject(target, source, env):
GenerateDSW(dswfile, source, env)
def GenerateSolution(target, source, env) -> None:
- GenerateDSW(target[0], source, env)
+
+ builddswfile = target[0]
+ dswfile = builddswfile.srcnode()
+
+ if dswfile is not builddswfile:
+
+ try:
+ bdsw = open(str(builddswfile), "w+")
+ except OSError as detail:
+ print('Unable to open "' + str(dspfile) + '" for writing:',detail,'\n')
+ raise
+
+ bdsw.write("This is just a placeholder file.\nThe real workspace file is here:\n%s\n" % dswfile.get_abspath())
+ bdsw.close()
+
+ GenerateDSW(dswfile, source, env)
def projectEmitter(target, source, env):
"""Sets up the DSP dependencies."""
@@ -1961,7 +2024,7 @@ def projectEmitter(target, source, env):
sourcelist = source
if env.get('auto_build_solution', 1):
- env['projects'] = [env.File(t).srcnode() for t in targetlist]
+ env['projects'] = [env.File(t) for t in targetlist]
t, s = solutionEmitter(target, target, env)
targetlist = targetlist + t
@@ -2028,6 +2091,9 @@ def solutionEmitter(target, source, env):
source = source + ' "%s"' % str(target[0])
source = [SCons.Node.Python.Value(source)]
+ dsp_nodes = _projectDSPNodes(env)
+ source.extend(dsp_nodes)
+
return ([target[0]], source)
projectAction = SCons.Action.Action(GenerateProject, None)
diff --git a/scons/scons-local-4.8.1/SCons/Tool/mwcc.py b/scons/scons-local-4.9.1/SCons/Tool/mwcc.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/mwcc.py
rename to scons/scons-local-4.9.1/SCons/Tool/mwcc.py
diff --git a/scons/scons-local-4.8.1/SCons/Tool/mwld.py b/scons/scons-local-4.9.1/SCons/Tool/mwld.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/mwld.py
rename to scons/scons-local-4.9.1/SCons/Tool/mwld.py
diff --git a/scons/scons-local-4.8.1/SCons/Tool/nasm.py b/scons/scons-local-4.9.1/SCons/Tool/nasm.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/nasm.py
rename to scons/scons-local-4.9.1/SCons/Tool/nasm.py
diff --git a/scons/scons-local-4.8.1/SCons/Tool/ninja/Globals.py b/scons/scons-local-4.9.1/SCons/Tool/ninja_tool/Globals.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/ninja/Globals.py
rename to scons/scons-local-4.9.1/SCons/Tool/ninja_tool/Globals.py
diff --git a/scons/scons-local-4.8.1/SCons/Tool/ninja/Methods.py b/scons/scons-local-4.9.1/SCons/Tool/ninja_tool/Methods.py
similarity index 95%
rename from scons/scons-local-4.8.1/SCons/Tool/ninja/Methods.py
rename to scons/scons-local-4.9.1/SCons/Tool/ninja_tool/Methods.py
index 5c56e4908..01866e5f3 100644
--- a/scons/scons-local-4.8.1/SCons/Tool/ninja/Methods.py
+++ b/scons/scons-local-4.9.1/SCons/Tool/ninja_tool/Methods.py
@@ -21,18 +21,22 @@
# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+from __future__ import annotations
+
import os
import shlex
import textwrap
-from typing import Optional
+from typing import TYPE_CHECKING
import SCons
from SCons.Subst import SUBST_CMD
-from SCons.Tool.ninja import NINJA_CUSTOM_HANDLERS, NINJA_RULES, NINJA_POOLS
-from SCons.Tool.ninja.Globals import __NINJA_RULE_MAPPING
-from SCons.Tool.ninja.Utils import get_targets_sources, get_dependencies, get_order_only, get_outputs, get_inputs, \
+from SCons.Tool.ninja_tool import NINJA_CUSTOM_HANDLERS, NINJA_RULES, NINJA_POOLS
+from SCons.Tool.ninja_tool.Globals import __NINJA_RULE_MAPPING
+from SCons.Tool.ninja_tool.Utils import get_targets_sources, get_dependencies, get_order_only, get_outputs, get_inputs, \
get_rule, get_path, generate_command, get_command_env, get_comstr
-from SCons.Util.sctyping import ExecutorType
+
+if TYPE_CHECKING:
+ from SCons.Executor import Executor
def register_custom_handler(env, name, handler) -> None:
@@ -42,7 +46,7 @@ def register_custom_handler(env, name, handler) -> None:
def register_custom_rule_mapping(env, pre_subst_string, rule) -> None:
"""Register a function to call for a given rule."""
- SCons.Tool.ninja.Globals.__NINJA_RULE_MAPPING[pre_subst_string] = rule
+ __NINJA_RULE_MAPPING[pre_subst_string] = rule
def register_custom_rule(env, rule, command, description: str="", deps=None, pool=None, use_depfile: bool=False, use_response_file: bool=False, response_file_content: str="$rspc") -> None:
@@ -78,7 +82,7 @@ def set_build_node_callback(env, node, callback) -> None:
node.attributes.ninja_build_callback = callback
-def get_generic_shell_command(env, node, action, targets, sources, executor: Optional[ExecutorType] = None):
+def get_generic_shell_command(env, node, action, targets, sources, executor: Executor | None = None):
return (
"GENERATED_CMD",
{
@@ -231,7 +235,7 @@ def gen_get_response_file_command(env, rule, tool, tool_is_dynamic: bool=False,
if "$" in tool:
tool_is_dynamic = True
- def get_response_file_command(env, node, action, targets, sources, executor: Optional[ExecutorType] = None):
+ def get_response_file_command(env, node, action, targets, sources, executor: Executor | None = None):
if hasattr(action, "process"):
cmd_list, _, _ = action.process(targets, sources, env, executor=executor)
cmd_list = [str(c).replace("$", "$$") for c in cmd_list[0]]
diff --git a/scons/scons-local-4.8.1/SCons/Tool/ninja/NinjaState.py b/scons/scons-local-4.9.1/SCons/Tool/ninja_tool/NinjaState.py
similarity index 99%
rename from scons/scons-local-4.8.1/SCons/Tool/ninja/NinjaState.py
rename to scons/scons-local-4.9.1/SCons/Tool/ninja_tool/NinjaState.py
index 549af7855..ef11b5038 100644
--- a/scons/scons-local-4.8.1/SCons/Tool/ninja/NinjaState.py
+++ b/scons/scons-local-4.9.1/SCons/Tool/ninja_tool/NinjaState.py
@@ -60,12 +60,11 @@ class NinjaState:
if not self.ninja_bin_path:
# default to using ninja installed with python module
ninja_bin = 'ninja.exe' if env["PLATFORM"] == "win32" else 'ninja'
+
self.ninja_bin_path = os.path.abspath(os.path.join(
- ninja.__file__,
- os.pardir,
- 'data',
- 'bin',
- ninja_bin))
+ ninja.BIN_DIR, ninja_bin
+ ))
+
if not os.path.exists(self.ninja_bin_path):
# couldn't find it, just give the bin name and hope
# its in the path later
@@ -232,7 +231,7 @@ class NinjaState:
"TEMPLATE": {
"command": "$PYTHON_BIN $NINJA_TOOL_DIR/ninja_daemon_build.py $PORT $NINJA_DIR_PATH $out",
"description": "Defer to SCons to build $out",
- "pool": "local_pool",
+ "pool": "install_pool",
"restat": 1
},
"EXIT_SCONS_DAEMON": {
@@ -398,7 +397,7 @@ class NinjaState:
self.rules.update({key: non_rsp_rule})
else:
self.rules.update({key: rule})
-
+
self.pools.update(self.env.get(NINJA_POOLS, {}))
content = io.StringIO()
@@ -435,7 +434,7 @@ class NinjaState:
generated_source_files = sorted(
[] if not generated_sources_build else generated_sources_build['implicit']
)
-
+
def check_generated_source_deps(build):
return (
build != generated_sources_build
@@ -464,7 +463,7 @@ class NinjaState:
rule="phony",
implicit=generated_source_files
)
-
+
def check_generated_source_deps(build):
return (
not build["rule"] == "INSTALL"
@@ -661,7 +660,7 @@ class NinjaState:
all_targets = [str(node) for node in NINJA_DEFAULT_TARGETS]
else:
all_targets = list(all_targets)
-
+
if len(all_targets) == 0:
all_targets = ["phony_default"]
ninja_sorted_build(
@@ -669,7 +668,7 @@ class NinjaState:
outputs=all_targets,
rule="phony",
)
-
+
ninja.default([self.ninja_syntax.escape_path(path) for path in sorted(all_targets)])
with NamedTemporaryFile(delete=False, mode='w') as temp_ninja_file:
@@ -754,7 +753,7 @@ class SConsToNinjaTranslator:
# Ninja builders out of being sources of ninja builders but I
# can't fix every DAG problem so we just skip ninja_builders
# if we find one
- if SCons.Tool.ninja.NINJA_STATE.ninja_file == str(node):
+ if SCons.Tool.ninja_tool.NINJA_STATE.ninja_file == str(node):
build = None
elif isinstance(action, SCons.Action.FunctionAction):
build = self.handle_func_action(node, action)
diff --git a/scons/scons-local-4.8.1/SCons/Tool/ninja/Overrides.py b/scons/scons-local-4.9.1/SCons/Tool/ninja_tool/Overrides.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/ninja/Overrides.py
rename to scons/scons-local-4.9.1/SCons/Tool/ninja_tool/Overrides.py
diff --git a/scons/scons-local-4.8.1/SCons/Tool/ninja/Rules.py b/scons/scons-local-4.9.1/SCons/Tool/ninja_tool/Rules.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/ninja/Rules.py
rename to scons/scons-local-4.9.1/SCons/Tool/ninja_tool/Rules.py
diff --git a/scons/scons-local-4.8.1/SCons/Tool/ninja/Utils.py b/scons/scons-local-4.9.1/SCons/Tool/ninja_tool/Utils.py
similarity index 97%
rename from scons/scons-local-4.8.1/SCons/Tool/ninja/Utils.py
rename to scons/scons-local-4.9.1/SCons/Tool/ninja_tool/Utils.py
index cdce92895..778268779 100644
--- a/scons/scons-local-4.8.1/SCons/Tool/ninja/Utils.py
+++ b/scons/scons-local-4.9.1/SCons/Tool/ninja_tool/Utils.py
@@ -20,17 +20,22 @@
# 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.
+
+from __future__ import annotations
+
import os
import shutil
from os.path import join as joinpath
from collections import OrderedDict
-from typing import Optional
+from typing import TYPE_CHECKING
import SCons
from SCons.Action import get_default_ENV, _string_from_cmd_list
from SCons.Script import AddOption
from SCons.Util import is_List, flatten_sequence
-from SCons.Util.sctyping import ExecutorType
+
+if TYPE_CHECKING:
+ from SCons.Executor import Executor
class NinjaExperimentalWarning(SCons.Warnings.WarningOnByDefault):
pass
@@ -349,7 +354,7 @@ def get_comstr(env, action, targets, sources):
return action.genstring(targets, sources, env)
-def generate_command(env, node, action, targets, sources, executor: Optional[ExecutorType] = None):
+def generate_command(env, node, action, targets, sources, executor: Executor | None = None):
# Actions like CommandAction have a method called process that is
# used by SCons to generate the cmd_line they need to run. So
# check if it's a thing like CommandAction and call it if we can.
@@ -408,14 +413,14 @@ def ninja_stat(_self, path):
"""
try:
- return SCons.Tool.ninja.Globals.NINJA_STAT_MEMO[path]
+ return SCons.Tool.ninja_tool.Globals.NINJA_STAT_MEMO[path]
except KeyError:
try:
result = os.stat(path)
except os.error:
result = None
- SCons.Tool.ninja.Globals.NINJA_STAT_MEMO[path] = result
+ SCons.Tool.ninja_tool.Globals.NINJA_STAT_MEMO[path] = result
return result
@@ -425,7 +430,7 @@ def ninja_whereis(thing, *_args, **_kwargs):
# Optimize for success, this gets called significantly more often
# when the value is already memoized than when it's not.
try:
- return SCons.Tool.ninja.Globals.NINJA_WHEREIS_MEMO[thing]
+ return SCons.Tool.ninja_tool.Globals.NINJA_WHEREIS_MEMO[thing]
except KeyError:
# TODO: Fix this to respect env['ENV']['PATH']... WPD
# We do not honor any env['ENV'] or env[*] variables in the
@@ -438,7 +443,7 @@ def ninja_whereis(thing, *_args, **_kwargs):
# with shell quoting is nigh impossible. So I've decided to
# cross that bridge when it's absolutely required.
path = shutil.which(thing)
- SCons.Tool.ninja.Globals.NINJA_WHEREIS_MEMO[thing] = path
+ SCons.Tool.ninja_tool.Globals.NINJA_WHEREIS_MEMO[thing] = path
return path
diff --git a/scons/scons-local-4.8.1/SCons/Tool/ninja/__init__.py b/scons/scons-local-4.9.1/SCons/Tool/ninja_tool/__init__.py
similarity index 99%
rename from scons/scons-local-4.8.1/SCons/Tool/ninja/__init__.py
rename to scons/scons-local-4.9.1/SCons/Tool/ninja_tool/__init__.py
index 7320d0385..d86c2c9d4 100644
--- a/scons/scons-local-4.8.1/SCons/Tool/ninja/__init__.py
+++ b/scons/scons-local-4.9.1/SCons/Tool/ninja_tool/__init__.py
@@ -32,7 +32,7 @@ import sys
import SCons
import SCons.Script
-import SCons.Tool.ninja.Globals
+from SCons.Tool.ninja_tool.Globals import ninja_builder_initialized
from SCons.Script import GetOption
from SCons.Util import sanitize_shell_env
@@ -187,13 +187,13 @@ def ninja_emitter(target, source, env):
def generate(env):
"""Generate the NINJA builders."""
- global NINJA_STATE, NINJA_CMDLINE_TARGETS
+ global NINJA_STATE, NINJA_CMDLINE_TARGETS, ninja_builder_initialized
if 'ninja' not in GetOption('experimental'):
return
- if not SCons.Tool.ninja.Globals.ninja_builder_initialized:
- SCons.Tool.ninja.Globals.ninja_builder_initialized = True
+ if not ninja_builder_initialized:
+ ninja_builder_initialized = True
ninja_add_command_line_options()
@@ -255,7 +255,7 @@ def generate(env):
pass
else:
env.Append(CCFLAGS='$CCDEPFLAGS')
-
+
env.AddMethod(CheckNinjaCompdbExpand, "CheckNinjaCompdbExpand")
# Provide a way for custom rule authors to easily access command
diff --git a/scons/scons-local-4.8.1/SCons/Tool/ninja/ninja_daemon_build.py b/scons/scons-local-4.9.1/SCons/Tool/ninja_tool/ninja_daemon_build.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/ninja/ninja_daemon_build.py
rename to scons/scons-local-4.9.1/SCons/Tool/ninja_tool/ninja_daemon_build.py
diff --git a/scons/scons-local-4.8.1/SCons/Tool/ninja/ninja_run_daemon.py b/scons/scons-local-4.9.1/SCons/Tool/ninja_tool/ninja_run_daemon.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/ninja/ninja_run_daemon.py
rename to scons/scons-local-4.9.1/SCons/Tool/ninja_tool/ninja_run_daemon.py
diff --git a/scons/scons-local-4.8.1/SCons/Tool/ninja/ninja_scons_daemon.py b/scons/scons-local-4.9.1/SCons/Tool/ninja_tool/ninja_scons_daemon.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/ninja/ninja_scons_daemon.py
rename to scons/scons-local-4.9.1/SCons/Tool/ninja_tool/ninja_scons_daemon.py
diff --git a/scons/scons-local-4.8.1/SCons/Tool/packaging/__init__.py b/scons/scons-local-4.9.1/SCons/Tool/packaging/__init__.py
similarity index 96%
rename from scons/scons-local-4.8.1/SCons/Tool/packaging/__init__.py
rename to scons/scons-local-4.9.1/SCons/Tool/packaging/__init__.py
index ea2f429a1..0bf08fa6a 100644
--- a/scons/scons-local-4.8.1/SCons/Tool/packaging/__init__.py
+++ b/scons/scons-local-4.9.1/SCons/Tool/packaging/__init__.py
@@ -86,8 +86,7 @@ def Tag(env, target, source, *more_tags, **kw_tags):
t.Tag(k, v)
def Package(env, target=None, source=None, **kw):
- """ Entry point for the package tool.
- """
+ """Entry point for the package tool."""
# check if we need to find the source files ourselves
if not source:
source = env.FindInstalledFiles()
@@ -96,17 +95,11 @@ def Package(env, target=None, source=None, **kw):
raise UserError("No source for Package() given")
# decide which types of packages shall be built. Can be defined through
- # four mechanisms: command line argument, keyword argument,
- # environment argument and default selection (zip or tar.gz) in that
- # order.
- try:
- kw['PACKAGETYPE'] = env['PACKAGETYPE']
- except KeyError:
- pass
-
- if not kw.get('PACKAGETYPE'):
+ # four mechanisms: command line argument, keyword argument, environment
+ # argument and default selection (zip or tar.gz) in that order.
+ kw.setdefault('PACKAGETYPE', env.get('PACKAGETYPE'))
+ if kw['PACKAGETYPE'] is None:
kw['PACKAGETYPE'] = GetOption('package_type')
-
if kw['PACKAGETYPE'] is None:
if 'Tar' in env['BUILDERS']:
kw['PACKAGETYPE'] = 'targz'
diff --git a/scons/scons-local-4.8.1/SCons/Tool/packaging/ipk.py b/scons/scons-local-4.9.1/SCons/Tool/packaging/ipk.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/packaging/ipk.py
rename to scons/scons-local-4.9.1/SCons/Tool/packaging/ipk.py
diff --git a/scons/scons-local-4.8.1/SCons/Tool/packaging/msi.py b/scons/scons-local-4.9.1/SCons/Tool/packaging/msi.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/packaging/msi.py
rename to scons/scons-local-4.9.1/SCons/Tool/packaging/msi.py
diff --git a/scons/scons-local-4.8.1/SCons/Tool/packaging/rpm.py b/scons/scons-local-4.9.1/SCons/Tool/packaging/rpm.py
similarity index 99%
rename from scons/scons-local-4.8.1/SCons/Tool/packaging/rpm.py
rename to scons/scons-local-4.9.1/SCons/Tool/packaging/rpm.py
index 03633db26..a51e8679e 100644
--- a/scons/scons-local-4.8.1/SCons/Tool/packaging/rpm.py
+++ b/scons/scons-local-4.9.1/SCons/Tool/packaging/rpm.py
@@ -25,7 +25,6 @@
import SCons.Builder
import SCons.Tool.rpmutils
-from SCons.Environment import OverrideEnvironment
from SCons.Tool.packaging import stripinstallbuilder, src_targz
from SCons.Errors import UserError
@@ -67,7 +66,7 @@ def package(env, target, source, PACKAGEROOT, NAME, VERSION,
kw['SOURCE_URL']=(str(target[0])+".tar.gz").replace('.rpm', '')
# mangle the source and target list for the rpmbuild
- env = OverrideEnvironment(env, kw)
+ env = env.Override(kw)
target, source = stripinstallbuilder(target, source, env)
target, source = addspecfile(target, source, env)
target, source = collectintargz(target, source, env)
diff --git a/scons/scons-local-4.8.1/SCons/Tool/packaging/src_tarbz2.py b/scons/scons-local-4.9.1/SCons/Tool/packaging/src_tarbz2.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/packaging/src_tarbz2.py
rename to scons/scons-local-4.9.1/SCons/Tool/packaging/src_tarbz2.py
diff --git a/scons/scons-local-4.8.1/SCons/Tool/packaging/src_targz.py b/scons/scons-local-4.9.1/SCons/Tool/packaging/src_targz.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/packaging/src_targz.py
rename to scons/scons-local-4.9.1/SCons/Tool/packaging/src_targz.py
diff --git a/scons/scons-local-4.8.1/SCons/Tool/packaging/src_tarxz.py b/scons/scons-local-4.9.1/SCons/Tool/packaging/src_tarxz.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/packaging/src_tarxz.py
rename to scons/scons-local-4.9.1/SCons/Tool/packaging/src_tarxz.py
diff --git a/scons/scons-local-4.8.1/SCons/Tool/packaging/src_zip.py b/scons/scons-local-4.9.1/SCons/Tool/packaging/src_zip.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/packaging/src_zip.py
rename to scons/scons-local-4.9.1/SCons/Tool/packaging/src_zip.py
diff --git a/scons/scons-local-4.8.1/SCons/Tool/packaging/tarbz2.py b/scons/scons-local-4.9.1/SCons/Tool/packaging/tarbz2.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/packaging/tarbz2.py
rename to scons/scons-local-4.9.1/SCons/Tool/packaging/tarbz2.py
diff --git a/scons/scons-local-4.8.1/SCons/Tool/packaging/targz.py b/scons/scons-local-4.9.1/SCons/Tool/packaging/targz.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/packaging/targz.py
rename to scons/scons-local-4.9.1/SCons/Tool/packaging/targz.py
diff --git a/scons/scons-local-4.8.1/SCons/Tool/packaging/tarxz.py b/scons/scons-local-4.9.1/SCons/Tool/packaging/tarxz.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/packaging/tarxz.py
rename to scons/scons-local-4.9.1/SCons/Tool/packaging/tarxz.py
diff --git a/scons/scons-local-4.8.1/SCons/Tool/packaging/zip.py b/scons/scons-local-4.9.1/SCons/Tool/packaging/zip.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/packaging/zip.py
rename to scons/scons-local-4.9.1/SCons/Tool/packaging/zip.py
diff --git a/scons/scons-local-4.8.1/SCons/Tool/pdf.py b/scons/scons-local-4.9.1/SCons/Tool/pdf.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/pdf.py
rename to scons/scons-local-4.9.1/SCons/Tool/pdf.py
diff --git a/scons/scons-local-4.8.1/SCons/Tool/pdflatex.py b/scons/scons-local-4.9.1/SCons/Tool/pdflatex.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/pdflatex.py
rename to scons/scons-local-4.9.1/SCons/Tool/pdflatex.py
diff --git a/scons/scons-local-4.8.1/SCons/Tool/pdftex.py b/scons/scons-local-4.9.1/SCons/Tool/pdftex.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/pdftex.py
rename to scons/scons-local-4.9.1/SCons/Tool/pdftex.py
diff --git a/scons/scons-local-4.8.1/SCons/Tool/python.py b/scons/scons-local-4.9.1/SCons/Tool/python.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/python.py
rename to scons/scons-local-4.9.1/SCons/Tool/python.py
diff --git a/scons/scons-local-4.8.1/SCons/Tool/qt.py b/scons/scons-local-4.9.1/SCons/Tool/qt.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/qt.py
rename to scons/scons-local-4.9.1/SCons/Tool/qt.py
diff --git a/scons/scons-local-4.8.1/SCons/Tool/qt3.py b/scons/scons-local-4.9.1/SCons/Tool/qt3.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/qt3.py
rename to scons/scons-local-4.9.1/SCons/Tool/qt3.py
diff --git a/scons/scons-local-4.8.1/SCons/Tool/rmic.py b/scons/scons-local-4.9.1/SCons/Tool/rmic.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/rmic.py
rename to scons/scons-local-4.9.1/SCons/Tool/rmic.py
diff --git a/scons/scons-local-4.8.1/SCons/Tool/rpcgen.py b/scons/scons-local-4.9.1/SCons/Tool/rpcgen.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/rpcgen.py
rename to scons/scons-local-4.9.1/SCons/Tool/rpcgen.py
diff --git a/scons/scons-local-4.8.1/SCons/Tool/rpm.py b/scons/scons-local-4.9.1/SCons/Tool/rpm.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/rpm.py
rename to scons/scons-local-4.9.1/SCons/Tool/rpm.py
diff --git a/scons/scons-local-4.8.1/SCons/Tool/rpmutils.py b/scons/scons-local-4.9.1/SCons/Tool/rpmutils.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/rpmutils.py
rename to scons/scons-local-4.9.1/SCons/Tool/rpmutils.py
diff --git a/scons/scons-local-4.8.1/SCons/Tool/sgiar.py b/scons/scons-local-4.9.1/SCons/Tool/sgiar.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/sgiar.py
rename to scons/scons-local-4.9.1/SCons/Tool/sgiar.py
diff --git a/scons/scons-local-4.8.1/SCons/Tool/sgic++.py b/scons/scons-local-4.9.1/SCons/Tool/sgic++.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/sgic++.py
rename to scons/scons-local-4.9.1/SCons/Tool/sgic++.py
diff --git a/scons/scons-local-4.8.1/SCons/Tool/sgicc.py b/scons/scons-local-4.9.1/SCons/Tool/sgicc.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/sgicc.py
rename to scons/scons-local-4.9.1/SCons/Tool/sgicc.py
diff --git a/scons/scons-local-4.8.1/SCons/Tool/sgicxx.py b/scons/scons-local-4.9.1/SCons/Tool/sgicxx.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/sgicxx.py
rename to scons/scons-local-4.9.1/SCons/Tool/sgicxx.py
diff --git a/scons/scons-local-4.8.1/SCons/Tool/sgilink.py b/scons/scons-local-4.9.1/SCons/Tool/sgilink.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/sgilink.py
rename to scons/scons-local-4.9.1/SCons/Tool/sgilink.py
diff --git a/scons/scons-local-4.8.1/SCons/Tool/sunar.py b/scons/scons-local-4.9.1/SCons/Tool/sunar.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/sunar.py
rename to scons/scons-local-4.9.1/SCons/Tool/sunar.py
diff --git a/scons/scons-local-4.8.1/SCons/Tool/sunc++.py b/scons/scons-local-4.9.1/SCons/Tool/sunc++.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/sunc++.py
rename to scons/scons-local-4.9.1/SCons/Tool/sunc++.py
diff --git a/scons/scons-local-4.8.1/SCons/Tool/suncc.py b/scons/scons-local-4.9.1/SCons/Tool/suncc.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/suncc.py
rename to scons/scons-local-4.9.1/SCons/Tool/suncc.py
diff --git a/scons/scons-local-4.8.1/SCons/Tool/suncxx.py b/scons/scons-local-4.9.1/SCons/Tool/suncxx.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/suncxx.py
rename to scons/scons-local-4.9.1/SCons/Tool/suncxx.py
diff --git a/scons/scons-local-4.8.1/SCons/Tool/sunf77.py b/scons/scons-local-4.9.1/SCons/Tool/sunf77.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/sunf77.py
rename to scons/scons-local-4.9.1/SCons/Tool/sunf77.py
diff --git a/scons/scons-local-4.8.1/SCons/Tool/sunf90.py b/scons/scons-local-4.9.1/SCons/Tool/sunf90.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/sunf90.py
rename to scons/scons-local-4.9.1/SCons/Tool/sunf90.py
diff --git a/scons/scons-local-4.8.1/SCons/Tool/sunf95.py b/scons/scons-local-4.9.1/SCons/Tool/sunf95.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/sunf95.py
rename to scons/scons-local-4.9.1/SCons/Tool/sunf95.py
diff --git a/scons/scons-local-4.8.1/SCons/Tool/sunlink.py b/scons/scons-local-4.9.1/SCons/Tool/sunlink.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/sunlink.py
rename to scons/scons-local-4.9.1/SCons/Tool/sunlink.py
diff --git a/scons/scons-local-4.8.1/SCons/Tool/swig.py b/scons/scons-local-4.9.1/SCons/Tool/swig.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/swig.py
rename to scons/scons-local-4.9.1/SCons/Tool/swig.py
diff --git a/scons/scons-local-4.8.1/SCons/Tool/tar.py b/scons/scons-local-4.9.1/SCons/Tool/tar.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/tar.py
rename to scons/scons-local-4.9.1/SCons/Tool/tar.py
diff --git a/scons/scons-local-4.8.1/SCons/Tool/tex.py b/scons/scons-local-4.9.1/SCons/Tool/tex.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/tex.py
rename to scons/scons-local-4.9.1/SCons/Tool/tex.py
diff --git a/scons/scons-local-4.8.1/SCons/Tool/textfile.py b/scons/scons-local-4.9.1/SCons/Tool/textfile.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/textfile.py
rename to scons/scons-local-4.9.1/SCons/Tool/textfile.py
diff --git a/scons/scons-local-4.8.1/SCons/Tool/tlib.py b/scons/scons-local-4.9.1/SCons/Tool/tlib.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/tlib.py
rename to scons/scons-local-4.9.1/SCons/Tool/tlib.py
diff --git a/scons/scons-local-4.8.1/SCons/Tool/wix.py b/scons/scons-local-4.9.1/SCons/Tool/wix.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/wix.py
rename to scons/scons-local-4.9.1/SCons/Tool/wix.py
diff --git a/scons/scons-local-4.8.1/SCons/Tool/xgettext.py b/scons/scons-local-4.9.1/SCons/Tool/xgettext.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/xgettext.py
rename to scons/scons-local-4.9.1/SCons/Tool/xgettext.py
diff --git a/scons/scons-local-4.8.1/SCons/Tool/yacc.py b/scons/scons-local-4.9.1/SCons/Tool/yacc.py
similarity index 97%
rename from scons/scons-local-4.8.1/SCons/Tool/yacc.py
rename to scons/scons-local-4.9.1/SCons/Tool/yacc.py
index 7a4ddfc54..bfd82f605 100644
--- a/scons/scons-local-4.8.1/SCons/Tool/yacc.py
+++ b/scons/scons-local-4.9.1/SCons/Tool/yacc.py
@@ -34,9 +34,10 @@ It will usually be imported through the generic SCons.Tool.Tool()
selection method.
"""
+from __future__ import annotations
+
import os.path
import sys
-from typing import Optional
import SCons.Defaults
import SCons.Tool
@@ -68,7 +69,7 @@ def _yaccEmitter(target, source, env, ysuf, hsuf) -> tuple:
# If -d is specified on the command line, yacc will emit a .h
# or .hpp file with the same base name as the .c or .cpp output file.
- # if '-d' in flags:
+ # if '-d' in flags:
# or bison options -H, --header, --defines (obsolete)
if "-d" in flags or "-H" in flags or "--header" in flags or "--defines" in flags:
target.append(targetBase + env.subst(hsuf, target=target, source=source))
@@ -76,7 +77,7 @@ def _yaccEmitter(target, source, env, ysuf, hsuf) -> tuple:
# If -g is specified on the command line, yacc will emit a graph
# file with the same base name as the .c or .cpp output file.
# TODO: should this be handled like -v? i.e. a side effect, not target
- # if "-g" in flags:
+ # if "-g" in flags:
# or bison option --graph
if "-g" in flags or "--graph" in flags:
target.append(targetBase + env.subst("$YACC_GRAPH_FILE_SUFFIX"))
@@ -134,7 +135,7 @@ def yyEmitter(target, source, env) -> tuple:
return _yaccEmitter(target, source, env, ['.yy'], '$YACCHXXFILESUFFIX')
-def get_yacc_path(env, append_paths: bool=False) -> Optional[str]:
+def get_yacc_path(env, append_paths: bool=False) -> str | None:
"""
Returns the path to the yacc tool, searching several possible names.
@@ -200,7 +201,7 @@ def generate(env) -> None:
env['_YACC_GRAPH'] = '${YACC_GRAPH_FILE and "--graph=" + str(YACC_GRAPH_FILE)}'
-def exists(env) -> Optional[str]:
+def exists(env) -> str | None:
if 'YACC' in env:
return env.Detect(env['YACC'])
diff --git a/scons/scons-local-4.8.1/SCons/Tool/zip.py b/scons/scons-local-4.9.1/SCons/Tool/zip.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Tool/zip.py
rename to scons/scons-local-4.9.1/SCons/Tool/zip.py
diff --git a/scons/scons-local-4.8.1/SCons/Util/__init__.py b/scons/scons-local-4.9.1/SCons/Util/__init__.py
similarity index 94%
rename from scons/scons-local-4.8.1/SCons/Util/__init__.py
rename to scons/scons-local-4.9.1/SCons/Util/__init__.py
index 28565da79..ff693c8d7 100644
--- a/scons/scons-local-4.8.1/SCons/Util/__init__.py
+++ b/scons/scons-local-4.9.1/SCons/Util/__init__.py
@@ -49,6 +49,8 @@ in multiple places, rather then being topical only to one module/package.
# )
# (issue filed on this upstream, for now just be aware)
+from __future__ import annotations
+
import copy
import hashlib
import logging
@@ -59,7 +61,7 @@ import time
from collections import UserDict, UserList, deque
from contextlib import suppress
from types import MethodType, FunctionType
-from typing import Optional, Union, Any, List
+from typing import Any
from logging import Formatter
# Util split into a package. Make sure things that used to work
@@ -203,11 +205,11 @@ class NodeList(UserList):
def __iter__(self):
return iter(self.data)
- def __call__(self, *args, **kwargs) -> 'NodeList':
+ def __call__(self, *args, **kwargs) -> NodeList:
result = [x(*args, **kwargs) for x in self.data]
return self.__class__(result)
- def __getattr__(self, name) -> 'NodeList':
+ def __getattr__(self, name) -> NodeList:
"""Returns a NodeList of `name` from each member."""
result = [getattr(x, name) for x in self.data]
return self.__class__(result)
@@ -254,8 +256,8 @@ def render_tree(
root,
child_func,
prune: bool = False,
- margin: List[bool] = [False],
- visited: Optional[dict] = None,
+ margin: list[bool] = [False],
+ visited: dict | None = None,
) -> str:
"""Render a tree of nodes into an ASCII tree view.
@@ -323,8 +325,8 @@ def print_tree(
child_func,
prune: bool = False,
showtags: int = 0,
- margin: List[bool] = [False],
- visited: Optional[dict] = None,
+ margin: list[bool] = [False],
+ visited: dict | None = None,
lastChild: bool = False,
singleLineDraw: bool = False,
) -> None:
@@ -694,7 +696,7 @@ else:
if sys.platform == 'win32':
- def WhereIs(file, path=None, pathext=None, reject=None) -> Optional[str]:
+ def WhereIs(file, path=None, pathext=None, reject=None) -> str | None:
if path is None:
try:
path = os.environ['PATH']
@@ -731,7 +733,7 @@ if sys.platform == 'win32':
elif os.name == 'os2':
- def WhereIs(file, path=None, pathext=None, reject=None) -> Optional[str]:
+ def WhereIs(file, path=None, pathext=None, reject=None) -> str | None:
if path is None:
try:
path = os.environ['PATH']
@@ -763,7 +765,7 @@ elif os.name == 'os2':
else:
- def WhereIs(file, path=None, pathext=None, reject=None) -> Optional[str]:
+ def WhereIs(file, path=None, pathext=None, reject=None) -> str | None:
import stat # pylint: disable=import-outside-toplevel
if path is None:
@@ -1295,36 +1297,70 @@ def print_time():
return print_time
-def wait_for_process_to_die(pid) -> None:
+def wait_for_process_to_die(pid: int) -> None:
"""
- Wait for specified process to die, or alternatively kill it
- NOTE: This function operates best with psutil pypi package
+ Wait for the specified process to die.
+
TODO: Add timeout which raises exception
"""
# wait for the process to fully killed
try:
import psutil # pylint: disable=import-outside-toplevel
while True:
+ # TODO: this should use psutil.process_exists() or psutil.Process.wait()
+ # The psutil docs explicitly recommend against using process_iter()/pids()
+ # for checking the existence of a process.
if pid not in [proc.pid for proc in psutil.process_iter()]:
break
time.sleep(0.1)
except ImportError:
# if psutil is not installed we can do this the hard way
- while True:
- if sys.platform == 'win32':
- import ctypes # pylint: disable=import-outside-toplevel
- PROCESS_QUERY_INFORMATION = 0x1000
- processHandle = ctypes.windll.kernel32.OpenProcess(PROCESS_QUERY_INFORMATION, 0, pid)
- if processHandle == 0:
- break
- ctypes.windll.kernel32.CloseHandle(processHandle)
- time.sleep(0.1)
- else:
- try:
- os.kill(pid, 0)
- except OSError:
- break
- time.sleep(0.1)
+ _wait_for_process_to_die_non_psutil(pid, timeout=-1.0)
+
+
+def _wait_for_process_to_die_non_psutil(pid: int, timeout: float = 60.0) -> None:
+ start_time = time.time()
+ while True:
+ if not _is_process_alive(pid):
+ break
+ if timeout >= 0.0 and time.time() - start_time > timeout:
+ raise TimeoutError(f"timed out waiting for process {pid}")
+ time.sleep(0.1)
+
+
+if sys.platform == 'win32':
+ def _is_process_alive(pid: int) -> bool:
+ import ctypes # pylint: disable=import-outside-toplevel
+ PROCESS_QUERY_INFORMATION = 0x1000
+ STILL_ACTIVE = 259
+
+ processHandle = ctypes.windll.kernel32.OpenProcess(PROCESS_QUERY_INFORMATION, 0, pid)
+ if processHandle == 0:
+ return False
+
+ # OpenProcess() may successfully return a handle even for terminated
+ # processes when something else in the system is still holding a
+ # reference to their handle. Call GetExitCodeProcess() to check if the
+ # process has already exited.
+ try:
+ exit_code = ctypes.c_ulong()
+ success = ctypes.windll.kernel32.GetExitCodeProcess(
+ processHandle, ctypes.byref(exit_code))
+ if success:
+ return exit_code.value == STILL_ACTIVE
+ finally:
+ ctypes.windll.kernel32.CloseHandle(processHandle)
+
+ return True
+
+else:
+ def _is_process_alive(pid: int) -> bool:
+ try:
+ os.kill(pid, 0)
+ return True
+ except OSError:
+ return False
+
# From: https://stackoverflow.com/questions/1741972/how-to-use-different-formatters-with-the-same-logging-handler-in-python
class DispatchingFormatter(Formatter):
diff --git a/scons/scons-local-4.8.1/SCons/Util/envs.py b/scons/scons-local-4.9.1/SCons/Util/envs.py
similarity index 96%
rename from scons/scons-local-4.8.1/SCons/Util/envs.py
rename to scons/scons-local-4.9.1/SCons/Util/envs.py
index 2640ef5c1..9c97da6e9 100644
--- a/scons/scons-local-4.8.1/SCons/Util/envs.py
+++ b/scons/scons-local-4.9.1/SCons/Util/envs.py
@@ -9,10 +9,12 @@ Routines for working with environments and construction variables
that don't need the specifics of the Environment class.
"""
+from __future__ import annotations
+
import re
import os
from types import MethodType, FunctionType
-from typing import Union, Callable, Optional, Any
+from typing import Callable, Any
from .sctypes import is_List, is_Tuple, is_String
@@ -22,8 +24,8 @@ def PrependPath(
newpath,
sep=os.pathsep,
delete_existing: bool = True,
- canonicalize: Optional[Callable] = None,
-) -> Union[list, str]:
+ canonicalize: Callable | None = None,
+) -> list | str:
"""Prepend *newpath* path elements to *oldpath*.
Will only add any particular path once (leaving the first one it
@@ -112,8 +114,8 @@ def AppendPath(
newpath,
sep=os.pathsep,
delete_existing: bool = True,
- canonicalize: Optional[Callable] = None,
-) -> Union[list, str]:
+ canonicalize: Callable | None = None,
+) -> list | str:
"""Append *newpath* path elements to *oldpath*.
Will only add any particular path once (leaving the last one it
@@ -239,7 +241,7 @@ class MethodWrapper:
a new underlying object being copied (without which we wouldn't need
to save that info).
"""
- def __init__(self, obj: Any, method: Callable, name: Optional[str] = None) -> None:
+ def __init__(self, obj: Any, method: Callable, name: str | None = None) -> None:
if name is None:
name = method.__name__
self.object = obj
@@ -275,7 +277,7 @@ class MethodWrapper:
# is not needed, the remaining bit is now used inline in AddMethod.
-def AddMethod(obj, function: Callable, name: Optional[str] = None) -> None:
+def AddMethod(obj, function: Callable, name: str | None = None) -> None:
"""Add a method to an object.
Adds *function* to *obj* if *obj* is a class object.
@@ -314,7 +316,7 @@ def AddMethod(obj, function: Callable, name: Optional[str] = None) -> None:
function.__code__, function.__globals__, name, function.__defaults__
)
- method: Union[MethodType, MethodWrapper, Callable]
+ method: MethodType | MethodWrapper | Callable
if hasattr(obj, '__class__') and obj.__class__ is not type:
# obj is an instance, so it gets a bound method.
diff --git a/scons/scons-local-4.8.1/SCons/Util/filelock.py b/scons/scons-local-4.9.1/SCons/Util/filelock.py
similarity index 96%
rename from scons/scons-local-4.8.1/SCons/Util/filelock.py
rename to scons/scons-local-4.9.1/SCons/Util/filelock.py
index 8ebf3889f..730f48607 100644
--- a/scons/scons-local-4.8.1/SCons/Util/filelock.py
+++ b/scons/scons-local-4.9.1/SCons/Util/filelock.py
@@ -30,9 +30,10 @@ Usage::
# The lock attributes could probably be made opaque. Showed one visible
# in the example above, but not sure the benefit of that.
+from __future__ import annotations
+
import os
import time
-from typing import Optional
class SConsLockFailure(Exception):
@@ -75,8 +76,8 @@ class FileLock:
def __init__(
self,
file: str,
- timeout: Optional[int] = None,
- delay: Optional[float] = 0.05,
+ timeout: int | None = None,
+ delay: float | None = 0.05,
writer: bool = False,
) -> None:
if timeout is not None and delay is None:
@@ -90,7 +91,7 @@ class FileLock:
# Our simple first guess is just put it where the file is.
self.file = file
self.lockfile = f"{file}.lock"
- self.lock: Optional[int] = None
+ self.lock: int | None = None
self.timeout = 999999 if timeout == 0 else timeout
self.delay = 0.0 if delay is None else delay
self.writer = writer
@@ -128,7 +129,7 @@ class FileLock:
os.unlink(self.lockfile)
self.lock = None
- def __enter__(self) -> "FileLock":
+ def __enter__(self) -> FileLock:
"""Context manager entry: acquire lock if not holding."""
if not self.lock:
self.acquire_lock()
diff --git a/scons/scons-local-4.8.1/SCons/Util/hashes.py b/scons/scons-local-4.9.1/SCons/Util/hashes.py
similarity index 99%
rename from scons/scons-local-4.8.1/SCons/Util/hashes.py
rename to scons/scons-local-4.9.1/SCons/Util/hashes.py
index 566897abb..016354c6e 100644
--- a/scons/scons-local-4.8.1/SCons/Util/hashes.py
+++ b/scons/scons-local-4.9.1/SCons/Util/hashes.py
@@ -8,10 +8,11 @@ SCons hash utility routines.
Routines for working with content and signature hashes.
"""
+from __future__ import annotations
+
import functools
import hashlib
import sys
-from typing import Optional, Union
from .sctypes import to_bytes
diff --git a/scons/scons-local-4.8.1/SCons/Util/sctypes.py b/scons/scons-local-4.9.1/SCons/Util/sctypes.py
similarity index 93%
rename from scons/scons-local-4.8.1/SCons/Util/sctypes.py
rename to scons/scons-local-4.9.1/SCons/Util/sctypes.py
index 765458e13..b95e395c8 100644
--- a/scons/scons-local-4.8.1/SCons/Util/sctypes.py
+++ b/scons/scons-local-4.9.1/SCons/Util/sctypes.py
@@ -6,13 +6,13 @@
Routines which check types and do type conversions.
"""
+from __future__ import annotations
import codecs
import os
import pprint
import re
import sys
-from typing import Optional, Union
from collections import UserDict, UserList, UserString, deque
from collections.abc import MappingView, Iterable
@@ -56,20 +56,24 @@ BaseStringTypes = str
if sys.version_info >= (3, 13):
from typing import TypeAlias, TypeIs
- DictTypeRet: TypeAlias = TypeIs[Union[dict, UserDict]]
- ListTypeRet: TypeAlias = TypeIs[Union[list, UserList, deque]]
- SequenceTypeRet: TypeAlias = TypeIs[Union[list, tuple, deque, UserList, MappingView]]
+ DictTypeRet: TypeAlias = TypeIs[dict | UserDict]
+ ListTypeRet: TypeAlias = TypeIs[list | UserList | deque]
+ SequenceTypeRet: TypeAlias = TypeIs[list | tuple | deque | UserList | MappingView]
TupleTypeRet: TypeAlias = TypeIs[tuple]
- StringTypeRet: TypeAlias = TypeIs[Union[str, UserString]]
+ StringTypeRet: TypeAlias = TypeIs[str | UserString]
elif sys.version_info >= (3, 10):
from typing import TypeAlias, TypeGuard
- DictTypeRet: TypeAlias = TypeGuard[Union[dict, UserDict]]
- ListTypeRet: TypeAlias = TypeGuard[Union[list, UserList, deque]]
- SequenceTypeRet: TypeAlias = TypeGuard[Union[list, tuple, deque, UserList, MappingView]]
+ DictTypeRet: TypeAlias = TypeGuard[dict | UserDict]
+ ListTypeRet: TypeAlias = TypeGuard[list | UserList | deque]
+ SequenceTypeRet: TypeAlias = TypeGuard[list | tuple | deque | UserList | MappingView]
TupleTypeRet: TypeAlias = TypeGuard[tuple]
- StringTypeRet: TypeAlias = TypeGuard[Union[str, UserString]]
+ StringTypeRet: TypeAlias = TypeGuard[str | UserString]
else:
+ # Because we have neither `TypeAlias` class nor `type` keyword pre-3.10,
+ # the boolean fallback type has to be wrapped in the legacy `Union` class.
+ from typing import Union
+
DictTypeRet = Union[bool, bool]
ListTypeRet = Union[bool, bool]
SequenceTypeRet = Union[bool, bool]
@@ -354,7 +358,7 @@ def get_os_env_bool(name: str, default: bool=False) -> bool:
_get_env_var = re.compile(r'^\$([_a-zA-Z]\w*|{[_a-zA-Z]\w*})$')
-def get_environment_var(varstr) -> Optional[str]:
+def get_environment_var(varstr) -> str | None:
"""Return undecorated construction variable string.
Determine if *varstr* looks like a reference
diff --git a/scons/scons-local-4.8.1/SCons/Util/stats.py b/scons/scons-local-4.9.1/SCons/Util/stats.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Util/stats.py
rename to scons/scons-local-4.9.1/SCons/Util/stats.py
diff --git a/scons/scons-local-4.8.1/SCons/Utilities/ConfigureCache.py b/scons/scons-local-4.9.1/SCons/Utilities/ConfigureCache.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Utilities/ConfigureCache.py
rename to scons/scons-local-4.9.1/SCons/Utilities/ConfigureCache.py
diff --git a/scons/scons-local-4.8.1/SCons/Utilities/__init__.py b/scons/scons-local-4.9.1/SCons/Utilities/__init__.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Utilities/__init__.py
rename to scons/scons-local-4.9.1/SCons/Utilities/__init__.py
diff --git a/scons/scons-local-4.8.1/SCons/Utilities/sconsign.py b/scons/scons-local-4.9.1/SCons/Utilities/sconsign.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/Utilities/sconsign.py
rename to scons/scons-local-4.9.1/SCons/Utilities/sconsign.py
diff --git a/scons/scons-local-4.8.1/SCons/Variables/BoolVariable.py b/scons/scons-local-4.9.1/SCons/Variables/BoolVariable.py
similarity index 95%
rename from scons/scons-local-4.8.1/SCons/Variables/BoolVariable.py
rename to scons/scons-local-4.9.1/SCons/Variables/BoolVariable.py
index 815a4b786..573a0244e 100644
--- a/scons/scons-local-4.8.1/SCons/Variables/BoolVariable.py
+++ b/scons/scons-local-4.9.1/SCons/Variables/BoolVariable.py
@@ -32,7 +32,9 @@ Usage example::
...
"""
-from typing import Callable, Tuple, Union
+from __future__ import annotations
+
+from typing import Callable
import SCons.Errors
@@ -42,7 +44,7 @@ TRUE_STRINGS = ('y', 'yes', 'true', 't', '1', 'on', 'all')
FALSE_STRINGS = ('n', 'no', 'false', 'f', '0', 'off', 'none')
-def _text2bool(val: Union[str, bool]) -> bool:
+def _text2bool(val: str | bool) -> bool:
"""Convert boolean-like string to boolean.
If *val* looks like it expresses a bool-like value, based on
@@ -83,7 +85,7 @@ def _validator(key: str, val, env) -> None:
raise SCons.Errors.UserError(msg) from None
# lint: W0622: Redefining built-in 'help' (redefined-builtin)
-def BoolVariable(key, help: str, default) -> Tuple[str, str, str, Callable, Callable]:
+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 variable, using a string
diff --git a/scons/scons-local-4.8.1/SCons/Variables/EnumVariable.py b/scons/scons-local-4.9.1/SCons/Variables/EnumVariable.py
similarity index 89%
rename from scons/scons-local-4.8.1/SCons/Variables/EnumVariable.py
rename to scons/scons-local-4.9.1/SCons/Variables/EnumVariable.py
index 3698e470d..a576af513 100644
--- a/scons/scons-local-4.8.1/SCons/Variables/EnumVariable.py
+++ b/scons/scons-local-4.9.1/SCons/Variables/EnumVariable.py
@@ -43,7 +43,9 @@ Usage example::
...
"""
-from typing import Callable, List, Optional, Tuple
+from __future__ import annotations
+
+from typing import Callable
import SCons.Errors
@@ -69,25 +71,26 @@ def EnumVariable(
key,
help: str,
default: str,
- allowed_values: List[str],
- map: Optional[dict] = None,
+ allowed_values: list[str],
+ map: dict | None = None,
ignorecase: int = 0,
-) -> Tuple[str, str, str, Callable, Callable]:
+) -> 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
+ An Enum Variable is an abstraction that allows choosing one
+ value from a provided list of possibilities (*allowed_values*).
+ 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.
+ key: the name of the variable.
+ default: default value, 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.
+ allowed_values: the values for the choice.
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.
diff --git a/scons/scons-local-4.8.1/SCons/Variables/ListVariable.py b/scons/scons-local-4.9.1/SCons/Variables/ListVariable.py
similarity index 86%
rename from scons/scons-local-4.8.1/SCons/Variables/ListVariable.py
rename to scons/scons-local-4.9.1/SCons/Variables/ListVariable.py
index 7a0ce49c9..880496f70 100644
--- a/scons/scons-local-4.8.1/SCons/Variables/ListVariable.py
+++ b/scons/scons-local-4.9.1/SCons/Variables/ListVariable.py
@@ -53,8 +53,11 @@ Usage example::
# Known Bug: This should behave like a Set-Type, but does not really,
# since elements can occur twice.
+from __future__ import annotations
+
import collections
-from typing import Callable, List, Optional, Tuple, Union
+import functools
+from typing import Callable
import SCons.Util
@@ -74,7 +77,7 @@ class _ListVariable(collections.UserList):
"""
def __init__(
- self, initlist: Optional[list] = None, allowedElems: Optional[list] = None
+ self, initlist: list | None = None, allowedElems: list | None = None
) -> None:
if initlist is None:
initlist = []
@@ -178,27 +181,28 @@ def _validator(key, val, env) -> None:
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]:
+ default: str | list[str],
+ names: list[str],
+ map: dict | None = None,
+ validator: Callable | None = None,
+) -> tuple[str, str, str, Callable, 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``.
+ A List Variable is an abstraction that allows choosing one or more
+ values from a provided list of possibilities (*names). The special terms
+ ``all`` and ``none`` are also provided to help make the selection.
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.
+ the allowed values (not including any extra names from *map*).
+ default: the default value(s) for the list variable. Can be given
+ as string (use commas to -separated multiple values), or as a list
+ of strings. ``all`` or ``none`` are allowed as *default*.
+ A must-specify ListVariable can be simulated by giving a value
+ that is not part of *names*, which will cause validation to fail
+ if the variable is not given in the input sources.
+ names: the values to choose from. 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
@@ -223,7 +227,8 @@ def ListVariable(
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)
+ converter = functools.partial(_converter, allowedElems=names, mapdict=map)
+ return key, help, default, validator, converter
# Local Variables:
# tab-width:4
diff --git a/scons/scons-local-4.8.1/SCons/Variables/PackageVariable.py b/scons/scons-local-4.9.1/SCons/Variables/PackageVariable.py
similarity index 69%
rename from scons/scons-local-4.8.1/SCons/Variables/PackageVariable.py
rename to scons/scons-local-4.9.1/SCons/Variables/PackageVariable.py
index 9fa514088..c615ac424 100644
--- a/scons/scons-local-4.8.1/SCons/Variables/PackageVariable.py
+++ b/scons/scons-local-4.9.1/SCons/Variables/PackageVariable.py
@@ -50,8 +50,11 @@ Can be used as a replacement for autoconf's ``--with-xxx=yyy`` ::
... # build with x11 ...
"""
+from __future__ import annotations
+
import os
-from typing import Callable, Optional, Tuple, Union
+import functools
+from typing import Callable
import SCons.Errors
@@ -60,21 +63,33 @@ __all__ = ['PackageVariable',]
ENABLE_STRINGS = ('1', 'yes', 'true', 'on', 'enable', 'search')
DISABLE_STRINGS = ('0', 'no', 'false', 'off', 'disable')
-def _converter(val: Union[str, bool]) -> Union[str, bool]:
- """Convert package variables.
+def _converter(val: str | bool, default: str) -> str | bool:
+ """Convert a package variable.
- 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).
+ Returns *val* if it looks like a path string, and ``False`` if it
+ is a disabling string. If *val* is an enabling string, returns
+ *default* unless *default* is an enabling or disabling string,
+ in which case ignore *default* and return ``True``.
+
+ .. versionchanged: 4.9.0
+ Now returns the default in case of a truthy value, matching what the
+ public documentation always claimed, except if the default looks
+ like one of the true/false strings.
"""
if isinstance(val, bool):
- # mainly for the subst=False case: default might be a bool
- return val
- lval = val.lower()
- if lval in ENABLE_STRINGS:
- return True
+ # check for non-subst case, so we don't lower() a bool.
+ lval = str(val).lower()
+ else:
+ lval = val.lower()
if lval in DISABLE_STRINGS:
return False
+ if lval in ENABLE_STRINGS:
+ # Can't return the default if it is one of the enable/disable strings;
+ # test code expects a bool.
+ if default in ENABLE_STRINGS:
+ return True
+ else:
+ return default
return val
@@ -83,8 +98,8 @@ def _validator(key: str, val, env, searchfunc) -> None:
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:
+ # NOTE: searchfunc is not in the documentation.
if searchfunc:
env[key] = searchfunc(key, val)
# TODO: need to check path, or be sure searchfunc raises.
@@ -95,29 +110,24 @@ def _validator(key: str, val, env, searchfunc) -> None:
# 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]:
+ key: str, help: str, default, searchfunc: Callable | None = None
+) -> tuple[str, str, str, Callable, Callable]:
"""Return a tuple describing a package list SCons Variable.
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' variable may either be a truthy string from
+ A 'package list' variable may be specified as a truthy string from
:const:`ENABLE_STRINGS`, a falsy string from
- :const:`DISABLE_STRINGS`, or a pathname string.
+ :const:`DISABLE_STRINGS`, or as 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, f'( yes | no | /path/to/{key} )'))
- return (
- key,
- help,
- default,
- lambda k, v, e: _validator(k, v, e, searchfunc),
- _converter,
- )
+ validator = functools.partial(_validator, searchfunc=searchfunc)
+ converter = functools.partial(_converter, default=default)
+ return key, help, default, validator, converter
# Local Variables:
# tab-width:4
diff --git a/scons/scons-local-4.8.1/SCons/Variables/PathVariable.py b/scons/scons-local-4.9.1/SCons/Variables/PathVariable.py
similarity index 96%
rename from scons/scons-local-4.8.1/SCons/Variables/PathVariable.py
rename to scons/scons-local-4.9.1/SCons/Variables/PathVariable.py
index 43904e62c..f840a95d2 100644
--- a/scons/scons-local-4.8.1/SCons/Variables/PathVariable.py
+++ b/scons/scons-local-4.9.1/SCons/Variables/PathVariable.py
@@ -71,10 +71,11 @@ Usage example::
)
"""
+from __future__ import annotations
import os
import os.path
-from typing import Callable, Optional, Tuple
+from typing import Callable
import SCons.Errors
import SCons.Util
@@ -141,8 +142,8 @@ class _PathVariableClass:
# 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]:
+ self, key: str, help: str, default, validator: Callable | None = None
+ ) -> tuple[str, str, str, Callable, None]:
"""Return a tuple describing a path list SCons Variable.
The input parameters describe a 'path list' variable. Returns
diff --git a/scons/scons-local-4.8.1/SCons/Variables/__init__.py b/scons/scons-local-4.9.1/SCons/Variables/__init__.py
similarity index 71%
rename from scons/scons-local-4.8.1/SCons/Variables/__init__.py
rename to scons/scons-local-4.9.1/SCons/Variables/__init__.py
index 28325266f..ca1843215 100644
--- a/scons/scons-local-4.8.1/SCons/Variables/__init__.py
+++ b/scons/scons-local-4.9.1/SCons/Variables/__init__.py
@@ -23,10 +23,14 @@
"""Adds user-friendly customizable variables to an SCons build."""
+from __future__ import annotations
+
import os.path
import sys
+from contextlib import suppress
+from dataclasses import dataclass
from functools import cmp_to_key
-from typing import Callable, Dict, List, Optional, Sequence, Union
+from typing import Any, Callable, Sequence
import SCons.Errors
import SCons.Util
@@ -50,28 +54,32 @@ __all__ = [
"PathVariable",
]
+
+@dataclass(order=True)
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}, "
- f"validator={self.validator}, converter={self.converter})"
- )
+ key: str
+ aliases: list[str]
+ help: str
+ default: Any
+ validator: Callable | None
+ converter: Callable | None
+ do_subst: bool
class Variables:
- """A container for multiple Build Variables.
+ """A container for Build Variables.
- Includes methods to updates the environment with the variables,
- and to render the help text.
+ Includes a method to populate the variables with values into a
+ construction envirionment, and methods to render the help text.
+
+ Note that the pubic API for creating a ``Variables`` object is
+ :func:`SCons.Script.Variables`, a kind of factory function, which
+ defaults to supplying the contents of :attr:`~SCons.Script.ARGUMENTS`
+ as the *args* parameter if it was not otherwise given. That is the
+ behavior documented in the manpage for ``Variables`` - and different
+ from the default if you instantiate this directly.
Arguments:
files: string or list of strings naming variable config scripts
@@ -81,46 +89,53 @@ class Variables:
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).
+ The default for *is_global* changed to ``False`` (the previous
+ default ``True`` had no effect due to an implementation error).
.. deprecated:: 4.8.0
*is_global* is deprecated.
+
+ .. versionadded:: 4.9.0
+ The :attr:`defaulted` attribute now lists those variables which
+ were filled in from default values.
"""
def __init__(
self,
- files: Optional[Union[str, Sequence[str]]] = None,
- args: Optional[dict] = None,
+ files: str | Sequence[str | None] = None,
+ args: dict | None = None,
is_global: bool = False,
) -> None:
- self.options: List[Variable] = []
+ 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] = {}
+ self.unknown: dict[str, str] = {}
+ self.defaulted: list[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
+ """Provide a way to "print" a :class:`Variables` object."""
+ opts = ',\n'.join((f" {option!s}" for option in self.options))
+ return (
+ f"Variables(\n options=[\n{opts}\n ],\n"
+ f" args={self.args},\n"
+ f" files={self.files},\n"
+ f" unknown={self.unknown},\n"
+ f" defaulted={self.defaulted},\n)"
+ )
# lint: W0622: Redefining built-in 'help'
def _do_add(
self,
- key: Union[str, List[str]],
+ key: str | Sequence[str],
help: str = "",
default=None,
- validator: Optional[Callable] = None,
- converter: Optional[Callable] = None,
+ validator: Callable | None = None,
+ converter: Callable | None = None,
**kwargs,
) -> None:
- """Create a Variable and add it to the list.
+ """Create a :class:`Variable` and add it to the list.
This is the internal implementation for :meth:`Add` and
:meth:`AddVariables`. Not part of the public API.
@@ -128,30 +143,19 @@ class Variables:
.. 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.
+ # aliases needs to be a list for later concatenation operations
if SCons.Util.is_Sequence(key):
- option.key = key[0]
- option.aliases = list(key[1:])
+ name, aliases = key[0], 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?
-
+ name, aliases = key, []
+ if not name.isidentifier():
+ raise SCons.Errors.UserError(f"Illegal Variables key {name!r}")
+ do_subst = kwargs.pop("subst", True)
+ option = Variable(name, aliases, help, default, validator, converter, do_subst)
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
+ # options might be added after the 'unknown' dict has been set up:
+ # look for and 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]
@@ -162,7 +166,7 @@ class Variables:
yield option.key
def Add(
- self, key: Union[str, Sequence], *args, **kwargs,
+ self, key: str | Sequence, *args, **kwargs,
) -> None:
"""Add a Build Variable.
@@ -201,9 +205,9 @@ class Variables:
return self._do_add(key, *args, **kwargs)
def AddVariables(self, *optlist) -> None:
- """Add a list of Build Variables.
+ """Add Build Variables.
- Each list element is a tuple/list of arguments to be passed on
+ Each *optlist* element is a sequence of arguments to be passed on
to the underlying method for adding variables.
Example::
@@ -218,34 +222,60 @@ class Variables:
for opt in optlist:
self._do_add(*opt)
- def Update(self, env, args: Optional[dict] = None) -> None:
+ def Update(self, env, args: dict | None = None) -> None:
"""Update an environment with the Build Variables.
+ This is where the work of adding variables to the environment
+ happens, The input sources saved at init time are scanned for
+ variables to add, though if *args* is passed, then it is used
+ instead of the saved one. If any variable description set up
+ a callback for a validator and/or converter, those are called.
+ Variables from the input sources which do not match a variable
+ description in this object are ignored for purposes of adding
+ to *env*, but are saved in the :attr:`unknown` dict attribute.
+ Variables which are set in *env* from the default in a variable
+ description and not from the input sources are saved in the
+ :attr:`defaulted` list attribute.
+
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
+ # first pull in the defaults, except any which are None.
values = {opt.key: opt.default for opt in self.options if opt.default is not None}
+ self.defaulted = list(values)
- # next set the values specified in any options script(s)
+ # next set the values specified in any saved-variables 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)
+ # issue #4645: don't exec directly into values,
+ # so we can iterate through for unknown variables.
+ temp_values = {}
+ dirname = os.path.split(os.path.abspath(filename))[0]
+ if dirname:
+ sys.path.insert(0, dirname)
try:
- values['__name__'] = filename
+ temp_values['__name__'] = filename
with open(filename) as f:
contents = f.read()
- exec(contents, {}, values)
+ exec(contents, {}, temp_values)
finally:
- if dir:
+ if dirname:
del sys.path[0]
- del values['__name__']
+ del temp_values['__name__']
+
+ for arg, value in temp_values.items():
+ added = False
+ for option in self.options:
+ if arg in option.aliases + [option.key,]:
+ values[option.key] = value
+ with suppress(ValueError):
+ self.defaulted.remove(option.key)
+ added = True
+ if not added:
+ self.unknown[arg] = value
# set the values specified on the command line
if args is None:
@@ -256,12 +286,22 @@ class Variables:
for option in self.options:
if arg in option.aliases + [option.key,]:
values[option.key] = value
+ with suppress(ValueError):
+ self.defaulted.remove(option.key)
added = True
if not added:
self.unknown[arg] = value
- # put the variables in the environment:
+ # put the variables in the environment
# (don't copy over variables that are not declared as options)
+ #
+ # Nitpicking: in OO terms, this method increases coupling as its
+ # main work is to update a different object (env), rather than
+ # the object it's bound to (although it does update self, too).
+ # It's tricky to decouple because the algorithm counts on directly
+ # setting a var in *env* first so it can call env.subst() on it
+ # to transform it.
+
for option in self.options:
try:
env[option.key] = values[option.key]
@@ -362,7 +402,7 @@ class Variables:
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:
+ def GenerateHelpText(self, env, sort: bool | Callable = False) -> str:
"""Generate the help text for the Variables object.
Args:
@@ -372,9 +412,10 @@ class Variables:
(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.
+ # TODO this interface was designed when Python's sorted() took an
+ # optional comparison function (pre-3.0). Since it no longer does,
+ # we use functools.cmp_to_key() since can't really change the
+ # documented meaning of the "sort" argument. Maybe someday?
if callable(sort):
options = sorted(self.options, key=cmp_to_key(lambda x, y: sort(x.key, y.key)))
elif sort is True:
@@ -403,7 +444,7 @@ class Variables:
help: str,
default,
actual,
- aliases: Optional[List[str]] = None,
+ aliases: list[str | None] = None,
) -> str:
"""Format the help text for a single variable.
diff --git a/scons/scons-local-4.8.1/SCons/Warnings.py b/scons/scons-local-4.9.1/SCons/Warnings.py
similarity index 99%
rename from scons/scons-local-4.8.1/SCons/Warnings.py
rename to scons/scons-local-4.9.1/SCons/Warnings.py
index d604659c4..b9f9cc16f 100644
--- a/scons/scons-local-4.8.1/SCons/Warnings.py
+++ b/scons/scons-local-4.9.1/SCons/Warnings.py
@@ -61,8 +61,10 @@ Raising directly with an instance of a warning class bypasses the
framework and it will behave like an ordinary exception.
"""
+from __future__ import annotations
+
import sys
-from typing import Callable, Sequence, Optional
+from typing import Callable, Sequence
import SCons.Errors
@@ -75,7 +77,7 @@ _warningAsException: bool = False
# Function to emit the warning. Initialized by SCons/Main.py for regular use;
# the unit test will set to a capturing version for testing.
-_warningOut: Optional[Callable] = None
+_warningOut: Callable | None = None
class SConsWarning(SCons.Errors.UserError):
diff --git a/scons/scons-local-4.9.1/SCons/__init__.py b/scons/scons-local-4.9.1/SCons/__init__.py
new file mode 100644
index 000000000..3990ae438
--- /dev/null
+++ b/scons/scons-local-4.9.1/SCons/__init__.py
@@ -0,0 +1,9 @@
+__version__="4.9.1"
+__copyright__="Copyright (c) 2001 - 2025 The SCons Foundation"
+__developer__="bdbaddog"
+__date__="Fri, 28 Mar 2025 15:25:00 -0700"
+__buildsys__="M1Dog2021"
+__revision__="dfd6b7e45985eb73462d2efa878651c92745099c"
+__build__="dfd6b7e45985eb73462d2efa878651c92745099c"
+# make sure compatibility is always in place
+import SCons.compat # noqa
\ No newline at end of file
diff --git a/scons/scons-local-4.8.1/SCons/__main__.py b/scons/scons-local-4.9.1/SCons/__main__.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/__main__.py
rename to scons/scons-local-4.9.1/SCons/__main__.py
diff --git a/scons/scons-local-4.8.1/SCons/compat/__init__.py b/scons/scons-local-4.9.1/SCons/compat/__init__.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/compat/__init__.py
rename to scons/scons-local-4.9.1/SCons/compat/__init__.py
diff --git a/scons/scons-local-4.8.1/SCons/compat/_scons_dbm.py b/scons/scons-local-4.9.1/SCons/compat/_scons_dbm.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/compat/_scons_dbm.py
rename to scons/scons-local-4.9.1/SCons/compat/_scons_dbm.py
diff --git a/scons/scons-local-4.8.1/SCons/compat/win32.py b/scons/scons-local-4.9.1/SCons/compat/win32.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/compat/win32.py
rename to scons/scons-local-4.9.1/SCons/compat/win32.py
diff --git a/scons/scons-local-4.8.1/SCons/cpp.py b/scons/scons-local-4.9.1/SCons/cpp.py
similarity index 92%
rename from scons/scons-local-4.8.1/SCons/cpp.py
rename to scons/scons-local-4.9.1/SCons/cpp.py
index 1093ae2ac..63e49ae88 100644
--- a/scons/scons-local-4.8.1/SCons/cpp.py
+++ b/scons/scons-local-4.9.1/SCons/cpp.py
@@ -146,13 +146,27 @@ expr = '|'.join(map(re.escape, l))
# ...and compile the expression.
CPP_to_Python_Ops_Expression = re.compile(expr)
+# integer specifications
+int_suffix_opt = r'(?:[uU](?:l{1,2}|L{1,2}|[zZ]|wb|WB)?|(?:l{1,2}|L{1,2}|[zZ]|wb|WB)[uU]?)?'
+
+hex_integer = fr'(0[xX][0-9A-Fa-f]+){int_suffix_opt}'
+bin_integer = fr'(0[bB][01]+){int_suffix_opt}'
+oct_integer = fr'(0[0-7]*){int_suffix_opt}'
+dec_integer = fr'([1-9][0-9]*){int_suffix_opt}'
+
+int_boundary = r'[a-zA-Z0-9_]'
+int_neg_lookbehind = fr'(? None:
self.current_file = t[1]
+ def eval_constant_expression(self, s):
+ """
+ Evaluates a C preprocessor expression.
+
+ This is done by converting it to a Python equivalent and
+ eval()ing it in the C preprocessor namespace we use to
+ track #define values.
+
+ Returns None if the eval() result is not an integer.
+ """
+ s = CPP_to_Python(s)
+ try:
+ rval = eval(s, self.constant_expression_namespace)
+ except (NameError, TypeError, SyntaxError) as e:
+ rval = None
+ if not isinstance(rval, int):
+ rval = None
+ return rval
+
def eval_expression(self, t):
"""
Evaluates a C preprocessor expression.
@@ -507,9 +543,11 @@ class PreProcessor:
Default handling of a #define line.
"""
_, name, args, expansion = t
- try:
- expansion = int(expansion)
- except (TypeError, ValueError):
+
+ rval = self.eval_constant_expression(expansion)
+ if rval is not None:
+ expansion = rval
+ else:
# handle "defined" chain "! (defined (A) || defined (B)" ...
if "defined " in expansion:
self.cpp_namespace[name] = self.eval_expression(t[2:])
diff --git a/scons/scons-local-4.8.1/SCons/dblite.py b/scons/scons-local-4.9.1/SCons/dblite.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/dblite.py
rename to scons/scons-local-4.9.1/SCons/dblite.py
diff --git a/scons/scons-local-4.8.1/SCons/exitfuncs.py b/scons/scons-local-4.9.1/SCons/exitfuncs.py
similarity index 100%
rename from scons/scons-local-4.8.1/SCons/exitfuncs.py
rename to scons/scons-local-4.9.1/SCons/exitfuncs.py
diff --git a/scons/scons.py b/scons/scons.py
index 901f5c9ed..26cc1b3f3 100755
--- a/scons/scons.py
+++ b/scons/scons.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/scons.py 08661ed4c552323ef3a7f0ff1af38868cbabb05e Tue, 03 Sep 2024 17:46:32 -0700 bdbaddog"
+__revision__ = "scripts/scons.py 39a12f34d532ab2493e78a7b73aeab2250852790 Thu, 27 Mar 2025 11:44:24 -0700 bdbaddog"
-__version__ = "4.8.1"
+__version__ = "4.9.1"
-__build__ = "08661ed4c552323ef3a7f0ff1af38868cbabb05e"
+__build__ = "39a12f34d532ab2493e78a7b73aeab2250852790"
__buildsys__ = "M1Dog2021"
-__date__ = "Tue, 03 Sep 2024 17:46:32 -0700"
+__date__ = "Thu, 27 Mar 2025 11:44:24 -0700"
__developer__ = "bdbaddog"
@@ -42,9 +42,9 @@ import os
import sys
# Python compatibility check
-if sys.version_info < (3, 6, 0):
+if sys.version_info < (3, 7, 0):
msg = "scons: *** SCons version %s does not run under Python version %s.\n\
-Python >= 3.6.0 is required.\n"
+Python >= 3.7.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 bf6e0b9fa..2d36277ce 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 08661ed4c552323ef3a7f0ff1af38868cbabb05e Tue, 03 Sep 2024 17:46:32 -0700 bdbaddog"
+__revision__ = "scripts/sconsign.py 39a12f34d532ab2493e78a7b73aeab2250852790 Thu, 27 Mar 2025 11:44:24 -0700 bdbaddog"
-__version__ = "4.8.1"
+__version__ = "4.9.1"
-__build__ = "08661ed4c552323ef3a7f0ff1af38868cbabb05e"
+__build__ = "39a12f34d532ab2493e78a7b73aeab2250852790"
__buildsys__ = "M1Dog2021"
-__date__ = "Tue, 03 Sep 2024 17:46:32 -0700"
+__date__ = "Thu, 27 Mar 2025 11:44:24 -0700"
__developer__ = "bdbaddog"
@@ -41,9 +41,9 @@ import os
import sys
# python compatibility check
-if sys.version_info < (3, 6, 0):
+if sys.version_info < (3, 7, 0):
msg = "scons: *** SCons version %s does not run under Python version %s.\n\
-Python >= 3.6.0 is required.\n"
+Python >= 3.7.0 is required.\n"
sys.stderr.write(msg % (__version__, sys.version.split()[0]))
sys.exit(1)