Changeset 42495


Ignore:
Timestamp:
Jan 5, 2008, 8:06:15 PM (11 years ago)
Author:
Jurko Gospodnetic
Message:

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.

Location:
trunk/tools/build/v2/tools
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/tools/build/v2/tools/builtin.jam

    r42494 r42495  
    2222import regex ;
    2323import scanner ;
     24import stage ;
    2425import symlink ;
    2526import type ;
     
    371372    }
    372373}
    373 
    374 
    375 import stage ;
    376374
    377375
  • trunk/tools/build/v2/tools/stage.jam

    r42489 r42495  
    1717import virtual-target ;
    1818import path ;
    19 
    20 feature.feature <install-dependencies> : off on : incidental ;
    21 feature.feature <install-type> : : free incidental ;
    22 feature.feature <install-source-root> : : free path  ;
    23 # If 'on', version symblinks for shared libraries won't be created
    24 # This feature has effect only on Unix.
     19import types/register ;
     20
     21
     22feature.feature <install-dependencies> : off on : incidental      ;
     23feature.feature <install-type>         :        : free incidental ;
     24feature.feature <install-source-root>  :        : free path       ;
     25feature.feature <so-version>           :        : free incidental ;
     26
     27# If 'on', version symlinks for shared libraries won't be created. Affects Unix
     28# builds only.
    2529feature.feature <install-no-version-symlinks> : on : optional incidental ;
    26 feature.feature <so-version> : : free incidental ;
     30
    2731
    2832class install-target-class : basic-target
     
    340344
    341345
    342 # Declare installed version of the EXE type. Generator for this type will
    343 # cause relinking to the new location.
     346# Declare installed version of the EXE type. Generator for this type will cause
     347# relinking to the new location.
    344348type.register INSTALLED_EXE : : EXE ;
    345349
     
    375379
    376380
    377 # Installing shared link on Unix might cause a creation of
    378 # versioned symbolic links.
     381# Installing a shared link on Unix might cause a creation of versioned symbolic
     382# links.
    379383type.register INSTALLED_SHARED_LIB : : SHARED_LIB ;
    380384
     
    472476
    473477
    474 # Main target rule for 'install'
     478# Main target rule for 'install'.
    475479rule install ( name : sources * : requirements * : default-build * )
    476480{
Note: See TracChangeset for help on using the changeset viewer.