From 23433f501b055457cc82ed8536af48cd08ebf219 Mon Sep 17 00:00:00 2001
From: grbd <garlicbready@googlemail.com>
Date: Tue, 13 Jun 2017 14:23:08 +0100
Subject: Added support for nested tools

---
 src/engine/SCons/Tool/__init__.py | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/engine/SCons/Tool/__init__.py b/src/engine/SCons/Tool/__init__.py
index 61b7788..e15c2f3 100644
--- a/src/engine/SCons/Tool/__init__.py
+++ b/src/engine/SCons/Tool/__init__.py
@@ -118,6 +118,16 @@ class Tool(object):
         if hasattr(module, 'options'):
             self.options = module.options
 
+    def _load_dotted_module(self, short_name, full_name, searchpaths=None):
+        splitname = short_name.split('.')
+        index = 0
+        srchpths = searchpaths
+        for item in splitname:
+            file, path, desc = imp.find_module(item, srchpths)
+            mod = imp.load_module(full_name, file, path, desc)
+            srchpths = [path]
+        return mod, file
+
     def _tool_module(self):
         oldpythonpath = sys.path
         sys.path = self.toolpath + sys.path
@@ -127,10 +137,10 @@ class Tool(object):
             # Py 2 code
             try:
                 try:
-                    file, path, desc = imp.find_module(self.name, self.toolpath)
+                    file = None
                     try:
-                        return imp.load_module(self.name, file, path, desc)
-
+                        mod, file = self._load_dotted_module(self.name, self.name, self.toolpath)
+                        return mod
                     finally:
                         if file:
                             file.close()
@@ -231,8 +241,7 @@ class Tool(object):
             try:
                 smpath = sys.modules['SCons.Tool'].__path__
                 try:
-                    file, path, desc = imp.find_module(self.name, smpath)
-                    module = imp.load_module(full_name, file, path, desc)
+                    module, file = self._load_dotted_module(self.name, full_name, smpath)
                     setattr(SCons.Tool, self.name, module)
                     if file:
                         file.close()
-- 
cgit v0.12


From e38f013a4006c6734d57057258b96ce1367554f0 Mon Sep 17 00:00:00 2001
From: grbd <garlicbready@googlemail.com>
Date: Wed, 14 Jun 2017 02:08:48 +0100
Subject: Fix the loading of tools where the tool is a package instead of a
 module

---
 src/engine/SCons/Tool/__init__.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/engine/SCons/Tool/__init__.py b/src/engine/SCons/Tool/__init__.py
index e15c2f3..7eac0e0 100644
--- a/src/engine/SCons/Tool/__init__.py
+++ b/src/engine/SCons/Tool/__init__.py
@@ -189,6 +189,7 @@ class Tool(object):
                     if debug: print("file_Path:%s FOUND"%file_path)
                     break
                 elif os.path.isdir(file_package):
+                    file_package = os.path.join(file_package, '__init__.py')
                     spec = importlib.util.spec_from_file_location(self.name, file_package)
                     if debug: print("PACKAGE:%s Found"%file_package)
                     break
-- 
cgit v0.12


From a96ff49dee3669b25888e138916b6bb06c6dc363 Mon Sep 17 00:00:00 2001
From: grbd <garlicbready@googlemail.com>
Date: Wed, 14 Jun 2017 02:26:58 +0100
Subject: Nested Tool support under python 3

---
 src/engine/SCons/Tool/__init__.py | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/engine/SCons/Tool/__init__.py b/src/engine/SCons/Tool/__init__.py
index 7eac0e0..876b1d2 100644
--- a/src/engine/SCons/Tool/__init__.py
+++ b/src/engine/SCons/Tool/__init__.py
@@ -118,7 +118,7 @@ class Tool(object):
         if hasattr(module, 'options'):
             self.options = module.options
 
-    def _load_dotted_module(self, short_name, full_name, searchpaths=None):
+    def _load_dotted_module_py2(self, short_name, full_name, searchpaths=None):
         splitname = short_name.split('.')
         index = 0
         srchpths = searchpaths
@@ -139,7 +139,7 @@ class Tool(object):
                 try:
                     file = None
                     try:
-                        mod, file = self._load_dotted_module(self.name, self.name, self.toolpath)
+                        mod, file = self._load_dotted_module_py2(self.name, self.name, self.toolpath)
                         return mod
                     finally:
                         if file:
@@ -179,8 +179,9 @@ class Tool(object):
             found_name = self.name
             add_to_scons_tools_namespace = False
             for path in self.toolpath:
-                file_path = os.path.join(path, "%s.py"%self.name)
-                file_package = os.path.join(path, self.name)
+                sepname = self.name.replace('.', os.path.sep)
+                file_path = os.path.join(path, "%s.py"%sepname)
+                file_package = os.path.join(path, sepname)
 
                 if debug: sys.stderr.write("Trying:%s %s\n"%(file_path, file_package))
 
@@ -242,7 +243,7 @@ class Tool(object):
             try:
                 smpath = sys.modules['SCons.Tool'].__path__
                 try:
-                    module, file = self._load_dotted_module(self.name, full_name, smpath)
+                    module, file = self._load_dotted_module_py2(self.name, full_name, smpath)
                     setattr(SCons.Tool, self.name, module)
                     if file:
                         file.close()
-- 
cgit v0.12


From 87649e791c9241c2bf6149a16d780d525016afed Mon Sep 17 00:00:00 2001
From: grbd <garlicbready@googlemail.com>
Date: Wed, 14 Jun 2017 19:07:44 +0100
Subject: Additional fix for nested tools under python2

---
 src/engine/SCons/Tool/__init__.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/engine/SCons/Tool/__init__.py b/src/engine/SCons/Tool/__init__.py
index 876b1d2..e5b4b05 100644
--- a/src/engine/SCons/Tool/__init__.py
+++ b/src/engine/SCons/Tool/__init__.py
@@ -145,7 +145,8 @@ class Tool(object):
                         if file:
                             file.close()
                 except ImportError as e:
-                    if str(e)!="No module named %s"%self.name:
+                    splitname = self.name.split('.')
+                    if str(e)!="No module named %s"%splitname[0]:
                         raise SCons.Errors.EnvironmentError(e)
                     try:
                         import zipimport
-- 
cgit v0.12


From a25367b4f6151a7888b9446e45e234ed84c9a163 Mon Sep 17 00:00:00 2001
From: grbd <garlicbready@googlemail.com>
Date: Mon, 19 Jun 2017 15:45:03 +0100
Subject: Updated the documentation for nested tools located within subdirs

---
 doc/man/scons.xml             | 16 +++++++++++++++
 doc/user/builders-writing.xml | 47 +++++++++++++++++++++++++++++++++++++++++++
 src/CHANGES.txt               |  4 ++++
 3 files changed, 67 insertions(+)

diff --git a/doc/man/scons.xml b/doc/man/scons.xml
index b68f27a..3268860 100644
--- a/doc/man/scons.xml
+++ b/doc/man/scons.xml
@@ -2187,6 +2187,22 @@ platform name when the Environment is constructed. Changing the PATH
 variable after the Environment is constructed will not cause the tools to
 be redetected.</para>
 
+<para> One feature now present within Scons is the ability to have nested tools.
+Tools which can be located within a subdirectory in the toolpath.
+With a nested tool name the dot represents a directory seperator</para>
+
+<programlisting>
+# namespaced builder
+env = Environment(ENV = os.environ, tools = ['SubDir1.SubDir2.SomeTool'])
+env.SomeTool(targets, sources)
+
+# Search Paths
+# SCons\Tool\SubDir1\SubDir2\SomeTool.py
+# SCons\Tool\SubDir1\SubDir2\SomeTool\__init__.py
+# .\site_scons\site_tools\SubDir1\SubDir2\SomeTool.py
+# .\site_scons\site_tools\SubDir1\SubDir2\SomeTool\__init__.py
+</programlisting>
+
 <para>SCons supports the following tool specifications out of the box:</para>
 
 <!-- '\""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" -->
diff --git a/doc/user/builders-writing.xml b/doc/user/builders-writing.xml
index 07f2dec..35dd989 100644
--- a/doc/user/builders-writing.xml
+++ b/doc/user/builders-writing.xml
@@ -880,6 +880,53 @@ env2.Foo('file2')
 
   </section>
 
+  <section>
+  <title>Nested and namespace builders;</title>
+
+    <para>
+    &SCons; now supports the ability for a Builder to be located within a sub-directory of the toolpath.
+	This is similar to namespacing within python.
+
+    Normally when loading a tool into the environment, scons will search for the tool within two locations
+    </para>
+
+    <sconstruct>
+# Regular non namespace target
+env = Environment(ENV = os.environ, tools = ['SomeTool'])
+env.SomeTool(targets, sources)
+    </sconstruct>
+
+    <para>
+    The locations would include
+	<filename>SCons\Tool\SomeTool.py</filename>
+    <filename>SCons\Tool\SomeTool\__init__.py</filename>
+    <filename>.\site_scons\site_tools\SomeTool.py</filename>
+	<filename>.\site_scons\site_tools\SomeTool\__init__.py</filename>
+
+    If a toolpath is specified this is also searched as well.
+	With nested or namespaced tools we can use the dot notation to specify a sub-directoty that the tool is located under
+    </para>
+
+    <sconstruct>
+# namespaced target
+env = Environment(ENV = os.environ, tools = ['SubDir1.SubDir2.SomeTool'])
+env.SomeTool(targets, sources)
+    </sconstruct>
+
+    <para>
+    With this example the search locations would include
+	<filename>SCons\Tool\SubDir1\SubDir2\SomeTool.py</filename>
+    <filename>SCons\Tool\SubDir1\SubDir2\SomeTool\__init__.py</filename>
+    <filename>.\site_scons\site_tools\SubDir1\SubDir2\SomeTool.py</filename>
+	<filename>.\site_scons\site_tools\SubDir1\SubDir2\SomeTool\__init__.py</filename>
+
+    It's important to note when creating tools within sub-directories, there needs to be a __init__.py file within each directory.
+	This file can just be empty however.
+	This is the same constraint used by python when loading modules from within sub-directories (packages).
+
+    </para>
+  </section>
+
   <!--
 
   <section>
diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index 5d670fd..e6d9c02 100644
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -7,6 +7,10 @@
 
 RELEASE 3.0.0.alpha.20170614 - Mon, 14 Jun 2017 12:23:56 -0400
 
+  From Richard West:
+    - Added nested / namespace tool support
+    - Added a small fix to the python3 tool loader when loading a tool as a package
+
   From William Blevins:
     - Updated D language scanner support to latest: 2.071.1. (PR #1924)
       https://dlang.org/spec/module.html accessed 11 August 2016
-- 
cgit v0.12


From 7d06499e935343a60817c44169b0c4d15c6e72da Mon Sep 17 00:00:00 2001
From: grbd <garlicbready@googlemail.com>
Date: Mon, 19 Jun 2017 20:02:42 +0100
Subject: Added tests for nested / namespaced tools

---
 test/toolpath/nested.py | 140 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 140 insertions(+)
 create mode 100644 test/toolpath/nested.py

diff --git a/test/toolpath/nested.py b/test/toolpath/nested.py
new file mode 100644
index 0000000..88104a4
--- /dev/null
+++ b/test/toolpath/nested.py
@@ -0,0 +1,140 @@
+#!/usr/bin/env python
+#
+# __COPYRIGHT__
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be included
+# in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
+# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+
+__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
+
+import os.path
+import TestSCons
+
+test = TestSCons.TestSCons()
+
+
+test.write('SConstruct', """
+# Test where tools are located under site_scons/site_tools
+env1 = Environment(tools=['subdir1.Site_TestTool1', 'subdir1.subdir2.Site_TestTool2', 'subdir1.Site_TestTool3'])
+print("env1['Site_TestTool1'] =", env1.get('Site_TestTool1'))
+print("env1['Site_TestTool2'] =", env1.get('Site_TestTool2'))
+print("env1['Site_TestTool3'] =", env1.get('Site_TestTool3'))
+
+# Test where toolpath is set in the env constructor
+env2 = Environment(tools=['subdir1.Toolpath_TestTool1', 'subdir1.subdir2.Toolpath_TestTool2', 'subdir1.Toolpath_TestTool3'], toolpath=['tools'])
+print("env2['Toolpath_TestTool1'] =", env2.get('Toolpath_TestTool1'))
+print("env2['Toolpath_TestTool2'] =", env2.get('Toolpath_TestTool2'))
+print("env2['Toolpath_TestTool3'] =", env2.get('Toolpath_TestTool3'))
+
+base = Environment(tools=[], toolpath=['tools'])
+derived = base.Clone(tools=['subdir1.Toolpath_TestTool1'])
+print("derived['Toolpath_TestTool1'] =", derived.get('Toolpath_TestTool1'))
+""")
+
+
+# Test where tools are located under site_scons/site_tools
+test.subdir('site_scons', ['site_scons', 'site_tools'])
+
+# One level down - site_scons/site_tools
+test.subdir(['site_scons', 'site_tools', 'subdir1'])
+test.write(['site_scons', 'site_tools', 'subdir1', '__init__.py'], '')
+test.write(['site_scons', 'site_tools', 'subdir1', 'Site_TestTool1.py'], r"""\
+def generate(env):
+    env['Site_TestTool1'] = 1
+def exists(env):
+    return 1
+""")
+
+# Two levels down - site_scons/site_tools
+test.subdir(['site_scons', 'site_tools', 'subdir1', 'subdir2'])
+test.write(['site_scons', 'site_tools', 'subdir1', 'subdir2', '__init__.py'], '')
+test.write(['site_scons', 'site_tools', 'subdir1', 'subdir2', 'Site_TestTool2.py'], r"""\
+def generate(env):
+    env['Site_TestTool2'] = 1
+def exists(env):
+    return 1
+""")
+
+# Two levels down - site_scons/site_tools - using __init__.py within a directory
+test.subdir(['site_scons', 'site_tools', 'subdir1', 'Site_TestTool3'])
+test.write(['site_scons', 'site_tools', 'subdir1', 'Site_TestTool3', '__init__.py'], r"""\
+def generate(env):
+    env['Site_TestTool3'] = 1
+def exists(env):
+    return 1
+""")
+
+
+# Test where toolpath is set in the env constructor
+test.subdir('tools')
+
+# One level down - tools
+test.subdir(['tools', 'subdir1'])
+test.write(['tools', 'subdir1', '__init__.py'], '')
+test.write(['tools', 'subdir1', 'Toolpath_TestTool1.py'], r"""\
+def generate(env):
+    env['Toolpath_TestTool1'] = 1
+def exists(env):
+    return 1
+""")
+
+# Two levels down - tools
+test.subdir(['tools', 'subdir1', 'subdir2'])
+test.write(['tools', 'subdir1', 'subdir2', '__init__.py'], '')
+test.write(['tools', 'subdir1', 'subdir2', 'Toolpath_TestTool2.py'], r"""\
+def generate(env):
+    env['Toolpath_TestTool2'] = 1
+def exists(env):
+    return 1
+""")
+
+# Two levels down - tools - using __init__.py within a directory
+test.subdir(['tools', 'subdir1', 'Toolpath_TestTool3'])
+test.write(['tools', 'subdir1', 'Toolpath_TestTool3', '__init__.py'], r"""\
+def generate(env):
+    env['Toolpath_TestTool3'] = 1
+def exists(env):
+    return 1
+""")
+
+
+
+test.run(arguments = '.', stdout = """\
+scons: Reading SConscript files ...
+env1['Site_TestTool1'] = 1
+env1['Site_TestTool2'] = 1
+env1['Site_TestTool3'] = 1
+env2['Toolpath_TestTool1'] = 1
+env2['Toolpath_TestTool2'] = 1
+env2['Toolpath_TestTool3'] = 1
+derived['Toolpath_TestTool1'] = 1
+scons: done reading SConscript files.
+scons: Building targets ...
+scons: `.' is up to date.
+scons: done building targets.
+""")
+
+test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
-- 
cgit v0.12


From fab72bed412cb035d96b9d8415f7052540a20556 Mon Sep 17 00:00:00 2001
From: grbd <garlicbready@googlemail.com>
Date: Tue, 20 Jun 2017 19:09:22 +0100
Subject: Moved the test for nested tools to using fixtures

---
 test/toolpath/nested.py                            | 140 ---------------------
 test/toolpath/nested/image/SConstruct              |  15 +++
 .../site_tools/subdir1/Site_TestTool1.py           |   4 +
 .../site_tools/subdir1/Site_TestTool3/__init__.py  |   4 +
 .../subdir1/Site_TestTool3/sconstest.skip          |   0
 .../site_scons/site_tools/subdir1/__init__.py      |   0
 .../site_scons/site_tools/subdir1/sconstest.skip   |   0
 .../site_tools/subdir1/subdir2/Site_TestTool2.py   |   4 +
 .../site_tools/subdir1/subdir2/__init__.py         |   0
 .../site_tools/subdir1/subdir2/sconstest.skip      |   0
 .../image/tools/subdir1/Toolpath_TestTool1.py      |   4 +
 .../tools/subdir1/Toolpath_TestTool3/__init__.py   |   4 +
 .../subdir1/Toolpath_TestTool3/sconstest.skip      |   0
 .../nested/image/tools/subdir1/__init__.py         |   0
 .../nested/image/tools/subdir1/sconstest.skip      |   0
 .../tools/subdir1/subdir2/Toolpath_TestTool2.py    |   4 +
 .../nested/image/tools/subdir1/subdir2/__init__.py |   0
 .../image/tools/subdir1/subdir2/sconstest.skip     |   0
 test/toolpath/nested/nested.py                     |  55 ++++++++
 19 files changed, 94 insertions(+), 140 deletions(-)
 delete mode 100644 test/toolpath/nested.py
 create mode 100644 test/toolpath/nested/image/SConstruct
 create mode 100644 test/toolpath/nested/image/site_scons/site_tools/subdir1/Site_TestTool1.py
 create mode 100644 test/toolpath/nested/image/site_scons/site_tools/subdir1/Site_TestTool3/__init__.py
 create mode 100644 test/toolpath/nested/image/site_scons/site_tools/subdir1/Site_TestTool3/sconstest.skip
 create mode 100644 test/toolpath/nested/image/site_scons/site_tools/subdir1/__init__.py
 create mode 100644 test/toolpath/nested/image/site_scons/site_tools/subdir1/sconstest.skip
 create mode 100644 test/toolpath/nested/image/site_scons/site_tools/subdir1/subdir2/Site_TestTool2.py
 create mode 100644 test/toolpath/nested/image/site_scons/site_tools/subdir1/subdir2/__init__.py
 create mode 100644 test/toolpath/nested/image/site_scons/site_tools/subdir1/subdir2/sconstest.skip
 create mode 100644 test/toolpath/nested/image/tools/subdir1/Toolpath_TestTool1.py
 create mode 100644 test/toolpath/nested/image/tools/subdir1/Toolpath_TestTool3/__init__.py
 create mode 100644 test/toolpath/nested/image/tools/subdir1/Toolpath_TestTool3/sconstest.skip
 create mode 100644 test/toolpath/nested/image/tools/subdir1/__init__.py
 create mode 100644 test/toolpath/nested/image/tools/subdir1/sconstest.skip
 create mode 100644 test/toolpath/nested/image/tools/subdir1/subdir2/Toolpath_TestTool2.py
 create mode 100644 test/toolpath/nested/image/tools/subdir1/subdir2/__init__.py
 create mode 100644 test/toolpath/nested/image/tools/subdir1/subdir2/sconstest.skip
 create mode 100644 test/toolpath/nested/nested.py

diff --git a/test/toolpath/nested.py b/test/toolpath/nested.py
deleted file mode 100644
index 88104a4..0000000
--- a/test/toolpath/nested.py
+++ /dev/null
@@ -1,140 +0,0 @@
-#!/usr/bin/env python
-#
-# __COPYRIGHT__
-#
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-#
-# The above copyright notice and this permission notice shall be included
-# in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
-# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
-# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#
-
-__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
-
-import os.path
-import TestSCons
-
-test = TestSCons.TestSCons()
-
-
-test.write('SConstruct', """
-# Test where tools are located under site_scons/site_tools
-env1 = Environment(tools=['subdir1.Site_TestTool1', 'subdir1.subdir2.Site_TestTool2', 'subdir1.Site_TestTool3'])
-print("env1['Site_TestTool1'] =", env1.get('Site_TestTool1'))
-print("env1['Site_TestTool2'] =", env1.get('Site_TestTool2'))
-print("env1['Site_TestTool3'] =", env1.get('Site_TestTool3'))
-
-# Test where toolpath is set in the env constructor
-env2 = Environment(tools=['subdir1.Toolpath_TestTool1', 'subdir1.subdir2.Toolpath_TestTool2', 'subdir1.Toolpath_TestTool3'], toolpath=['tools'])
-print("env2['Toolpath_TestTool1'] =", env2.get('Toolpath_TestTool1'))
-print("env2['Toolpath_TestTool2'] =", env2.get('Toolpath_TestTool2'))
-print("env2['Toolpath_TestTool3'] =", env2.get('Toolpath_TestTool3'))
-
-base = Environment(tools=[], toolpath=['tools'])
-derived = base.Clone(tools=['subdir1.Toolpath_TestTool1'])
-print("derived['Toolpath_TestTool1'] =", derived.get('Toolpath_TestTool1'))
-""")
-
-
-# Test where tools are located under site_scons/site_tools
-test.subdir('site_scons', ['site_scons', 'site_tools'])
-
-# One level down - site_scons/site_tools
-test.subdir(['site_scons', 'site_tools', 'subdir1'])
-test.write(['site_scons', 'site_tools', 'subdir1', '__init__.py'], '')
-test.write(['site_scons', 'site_tools', 'subdir1', 'Site_TestTool1.py'], r"""\
-def generate(env):
-    env['Site_TestTool1'] = 1
-def exists(env):
-    return 1
-""")
-
-# Two levels down - site_scons/site_tools
-test.subdir(['site_scons', 'site_tools', 'subdir1', 'subdir2'])
-test.write(['site_scons', 'site_tools', 'subdir1', 'subdir2', '__init__.py'], '')
-test.write(['site_scons', 'site_tools', 'subdir1', 'subdir2', 'Site_TestTool2.py'], r"""\
-def generate(env):
-    env['Site_TestTool2'] = 1
-def exists(env):
-    return 1
-""")
-
-# Two levels down - site_scons/site_tools - using __init__.py within a directory
-test.subdir(['site_scons', 'site_tools', 'subdir1', 'Site_TestTool3'])
-test.write(['site_scons', 'site_tools', 'subdir1', 'Site_TestTool3', '__init__.py'], r"""\
-def generate(env):
-    env['Site_TestTool3'] = 1
-def exists(env):
-    return 1
-""")
-
-
-# Test where toolpath is set in the env constructor
-test.subdir('tools')
-
-# One level down - tools
-test.subdir(['tools', 'subdir1'])
-test.write(['tools', 'subdir1', '__init__.py'], '')
-test.write(['tools', 'subdir1', 'Toolpath_TestTool1.py'], r"""\
-def generate(env):
-    env['Toolpath_TestTool1'] = 1
-def exists(env):
-    return 1
-""")
-
-# Two levels down - tools
-test.subdir(['tools', 'subdir1', 'subdir2'])
-test.write(['tools', 'subdir1', 'subdir2', '__init__.py'], '')
-test.write(['tools', 'subdir1', 'subdir2', 'Toolpath_TestTool2.py'], r"""\
-def generate(env):
-    env['Toolpath_TestTool2'] = 1
-def exists(env):
-    return 1
-""")
-
-# Two levels down - tools - using __init__.py within a directory
-test.subdir(['tools', 'subdir1', 'Toolpath_TestTool3'])
-test.write(['tools', 'subdir1', 'Toolpath_TestTool3', '__init__.py'], r"""\
-def generate(env):
-    env['Toolpath_TestTool3'] = 1
-def exists(env):
-    return 1
-""")
-
-
-
-test.run(arguments = '.', stdout = """\
-scons: Reading SConscript files ...
-env1['Site_TestTool1'] = 1
-env1['Site_TestTool2'] = 1
-env1['Site_TestTool3'] = 1
-env2['Toolpath_TestTool1'] = 1
-env2['Toolpath_TestTool2'] = 1
-env2['Toolpath_TestTool3'] = 1
-derived['Toolpath_TestTool1'] = 1
-scons: done reading SConscript files.
-scons: Building targets ...
-scons: `.' is up to date.
-scons: done building targets.
-""")
-
-test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/toolpath/nested/image/SConstruct b/test/toolpath/nested/image/SConstruct
new file mode 100644
index 0000000..284f21c
--- /dev/null
+++ b/test/toolpath/nested/image/SConstruct
@@ -0,0 +1,15 @@
+# Test where tools are located under site_scons/site_tools
+env1 = Environment(tools=['subdir1.Site_TestTool1', 'subdir1.subdir2.Site_TestTool2', 'subdir1.Site_TestTool3'])
+print("env1['Site_TestTool1'] =", env1.get('Site_TestTool1'))
+print("env1['Site_TestTool2'] =", env1.get('Site_TestTool2'))
+print("env1['Site_TestTool3'] =", env1.get('Site_TestTool3'))
+
+# Test where toolpath is set in the env constructor
+env2 = Environment(tools=['subdir1.Toolpath_TestTool1', 'subdir1.subdir2.Toolpath_TestTool2', 'subdir1.Toolpath_TestTool3'], toolpath=['tools'])
+print("env2['Toolpath_TestTool1'] =", env2.get('Toolpath_TestTool1'))
+print("env2['Toolpath_TestTool2'] =", env2.get('Toolpath_TestTool2'))
+print("env2['Toolpath_TestTool3'] =", env2.get('Toolpath_TestTool3'))
+
+base = Environment(tools=[], toolpath=['tools'])
+derived = base.Clone(tools=['subdir1.Toolpath_TestTool1'])
+print("derived['Toolpath_TestTool1'] =", derived.get('Toolpath_TestTool1'))
diff --git a/test/toolpath/nested/image/site_scons/site_tools/subdir1/Site_TestTool1.py b/test/toolpath/nested/image/site_scons/site_tools/subdir1/Site_TestTool1.py
new file mode 100644
index 0000000..d4a19a8
--- /dev/null
+++ b/test/toolpath/nested/image/site_scons/site_tools/subdir1/Site_TestTool1.py
@@ -0,0 +1,4 @@
+def generate(env):
+    env['Site_TestTool1'] = 1
+def exists(env):
+    return 1
diff --git a/test/toolpath/nested/image/site_scons/site_tools/subdir1/Site_TestTool3/__init__.py b/test/toolpath/nested/image/site_scons/site_tools/subdir1/Site_TestTool3/__init__.py
new file mode 100644
index 0000000..60bbd02
--- /dev/null
+++ b/test/toolpath/nested/image/site_scons/site_tools/subdir1/Site_TestTool3/__init__.py
@@ -0,0 +1,4 @@
+def generate(env):
+    env['Site_TestTool3'] = 1
+def exists(env):
+    return 1
diff --git a/test/toolpath/nested/image/site_scons/site_tools/subdir1/Site_TestTool3/sconstest.skip b/test/toolpath/nested/image/site_scons/site_tools/subdir1/Site_TestTool3/sconstest.skip
new file mode 100644
index 0000000..e69de29
diff --git a/test/toolpath/nested/image/site_scons/site_tools/subdir1/__init__.py b/test/toolpath/nested/image/site_scons/site_tools/subdir1/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/test/toolpath/nested/image/site_scons/site_tools/subdir1/sconstest.skip b/test/toolpath/nested/image/site_scons/site_tools/subdir1/sconstest.skip
new file mode 100644
index 0000000..e69de29
diff --git a/test/toolpath/nested/image/site_scons/site_tools/subdir1/subdir2/Site_TestTool2.py b/test/toolpath/nested/image/site_scons/site_tools/subdir1/subdir2/Site_TestTool2.py
new file mode 100644
index 0000000..adae55b
--- /dev/null
+++ b/test/toolpath/nested/image/site_scons/site_tools/subdir1/subdir2/Site_TestTool2.py
@@ -0,0 +1,4 @@
+def generate(env):
+    env['Site_TestTool2'] = 1
+def exists(env):
+    return 1
diff --git a/test/toolpath/nested/image/site_scons/site_tools/subdir1/subdir2/__init__.py b/test/toolpath/nested/image/site_scons/site_tools/subdir1/subdir2/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/test/toolpath/nested/image/site_scons/site_tools/subdir1/subdir2/sconstest.skip b/test/toolpath/nested/image/site_scons/site_tools/subdir1/subdir2/sconstest.skip
new file mode 100644
index 0000000..e69de29
diff --git a/test/toolpath/nested/image/tools/subdir1/Toolpath_TestTool1.py b/test/toolpath/nested/image/tools/subdir1/Toolpath_TestTool1.py
new file mode 100644
index 0000000..072daf0
--- /dev/null
+++ b/test/toolpath/nested/image/tools/subdir1/Toolpath_TestTool1.py
@@ -0,0 +1,4 @@
+def generate(env):
+    env['Toolpath_TestTool1'] = 1
+def exists(env):
+    return 1
diff --git a/test/toolpath/nested/image/tools/subdir1/Toolpath_TestTool3/__init__.py b/test/toolpath/nested/image/tools/subdir1/Toolpath_TestTool3/__init__.py
new file mode 100644
index 0000000..26bc748
--- /dev/null
+++ b/test/toolpath/nested/image/tools/subdir1/Toolpath_TestTool3/__init__.py
@@ -0,0 +1,4 @@
+def generate(env):
+    env['Toolpath_TestTool3'] = 1
+def exists(env):
+    return 1
diff --git a/test/toolpath/nested/image/tools/subdir1/Toolpath_TestTool3/sconstest.skip b/test/toolpath/nested/image/tools/subdir1/Toolpath_TestTool3/sconstest.skip
new file mode 100644
index 0000000..e69de29
diff --git a/test/toolpath/nested/image/tools/subdir1/__init__.py b/test/toolpath/nested/image/tools/subdir1/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/test/toolpath/nested/image/tools/subdir1/sconstest.skip b/test/toolpath/nested/image/tools/subdir1/sconstest.skip
new file mode 100644
index 0000000..e69de29
diff --git a/test/toolpath/nested/image/tools/subdir1/subdir2/Toolpath_TestTool2.py b/test/toolpath/nested/image/tools/subdir1/subdir2/Toolpath_TestTool2.py
new file mode 100644
index 0000000..f4ccefe
--- /dev/null
+++ b/test/toolpath/nested/image/tools/subdir1/subdir2/Toolpath_TestTool2.py
@@ -0,0 +1,4 @@
+def generate(env):
+    env['Toolpath_TestTool2'] = 1
+def exists(env):
+    return 1
diff --git a/test/toolpath/nested/image/tools/subdir1/subdir2/__init__.py b/test/toolpath/nested/image/tools/subdir1/subdir2/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/test/toolpath/nested/image/tools/subdir1/subdir2/sconstest.skip b/test/toolpath/nested/image/tools/subdir1/subdir2/sconstest.skip
new file mode 100644
index 0000000..e69de29
diff --git a/test/toolpath/nested/nested.py b/test/toolpath/nested/nested.py
new file mode 100644
index 0000000..7304dd5
--- /dev/null
+++ b/test/toolpath/nested/nested.py
@@ -0,0 +1,55 @@
+#!/usr/bin/env python
+#
+# __COPYRIGHT__
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be included
+# in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
+# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+
+__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
+
+import os.path
+import TestSCons
+
+test = TestSCons.TestSCons()
+
+test.dir_fixture('image')
+
+test.run(arguments = '.', stdout = """\
+scons: Reading SConscript files ...
+env1['Site_TestTool1'] = 1
+env1['Site_TestTool2'] = 1
+env1['Site_TestTool3'] = 1
+env2['Toolpath_TestTool1'] = 1
+env2['Toolpath_TestTool2'] = 1
+env2['Toolpath_TestTool3'] = 1
+derived['Toolpath_TestTool1'] = 1
+scons: done reading SConscript files.
+scons: Building targets ...
+scons: `.' is up to date.
+scons: done building targets.
+""")
+
+test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
-- 
cgit v0.12