[Boost-build] import cleanup in tools/builtin.jam.

From: Jurko Gospodnetiæ (jurko.gospodnetic_at_[hidden])
Date: 2008-01-02 11:45:25

   Hi.

   I'm attaching a patch for tools/builtin.jam and tools/stage.jam. See 
the comment embedded in the patch file for more details.

   Should be applied after the patches I sent on 27 & 28.12.2007 and 
02.01.2007. Note that that last patch might arrive to the list only 
after this post due to a a bit oversized patch file :-))

   Hope this helps.

   Best regards,
     Jurko Gospodnetiæ

Cleaned up where the stage module is imported in tools/builtin.jam. Added a
missing import in tools/stage.jam that causes errors with the previous fix.
Minor stylistic changes in tools/stage.jam.

Left base folder: X:\Boost_Build\20071228_nightly_build\Original
Right base folder: X:\Boost_Build\20071228_nightly_build\Modified
--- boost-build\tools\builtin.jam	2008-01-02 14:28:09.000000000 +-0100
+++ boost-build\tools\builtin.jam	2008-01-02 17:22:27.000000000 +-0100
@@ -18,12 +18,13 @@
 import os ;
 import print ;
 import project ;
 import property ;
 import regex ;
 import scanner ;
+import stage ;
 import symlink ;
 import type ;
 import utility ;
 import virtual-target ;
 import types/register ;
 
@@ -369,15 +370,12 @@
     rule path ( )
     {
     }
 }
 
 
-import stage ;
-
-
 class c-scanner : scanner
 {
     import path ;
     import regex ;
     import scanner ;
     import virtual-target ;
--- boost-build\tools\stage.jam	2007-12-28 20:52:40.000000000 +-0100
+++ boost-build\tools\stage.jam	2008-01-02 17:22:17.000000000 +-0100
@@ -13,20 +13,24 @@
 import type ;
 import generators ;
 import feature ;
 import project ;
 import virtual-target ;
 import path ;
+import types/register ;
 
-feature.feature <install-dependencies> : off on : incidental ;
-feature.feature <install-type> : : free incidental ;
-feature.feature <install-source-root> : : free path  ;
-# If 'on', version symblinks for shared libraries won't be created
-# This feature has effect only on Unix.
+
+feature.feature <install-dependencies> : off on : incidental      ;
+feature.feature <install-type>         :        : free incidental ;
+feature.feature <install-source-root>  :        : free path       ;
+feature.feature <so-version>           :        : free incidental ;
+
+# If 'on', version symlinks for shared libraries won't be created. Affects Unix
+# builds only.
 feature.feature <install-no-version-symlinks> : on : optional incidental ;
-feature.feature <so-version> : : free incidental ;
+
 
 class install-target-class : basic-target
 {
     import feature ;
     import project ;
     import type ;
@@ -336,14 +340,14 @@
     local result = [ $(cloned-action).targets ] ;
 
     return $(result) ;
 }
 
 
-# Declare installed version of the EXE type. Generator for this type will
-# cause relinking to the new location.
+# Declare installed version of the EXE type. Generator for this type will cause
+# relinking to the new location.
 type.register INSTALLED_EXE : : EXE ;
 
 class installed-exe-generator : generator
 {
     import type ;
     import property-set ;
@@ -371,14 +375,14 @@
     }
 }
 
 generators.register [ new installed-exe-generator ] ;
 
 
-# Installing shared link on Unix might cause a creation of
-# versioned symbolic links.
+# Installing a shared link on Unix might cause a creation of versioned symbolic
+# links.
 type.register INSTALLED_SHARED_LIB : : SHARED_LIB ;
 
 class installed-shared-lib-generator : generator
 {
     import type ;
     import property-set ;
@@ -468,13 +472,13 @@
     }
 }
 
 generators.register [ new installed-shared-lib-generator ] ;
 
 
-# Main target rule for 'install'
+# Main target rule for 'install'.
 rule install ( name : sources * : requirements * : default-build * )
 {
     local project = [ project.current ] ;
 
     # Unless the user has explicitly asked us to hardcode dll paths, add
     # <hardcode-dll-paths>false in requirements, to override default