boost/build
2
0
Fork 0
mirror of https://github.com/boostorg/build.git synced 2026-02-16 13:22:11 +00:00
Code Issues Projects Releases Wiki Activity

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.

Browse Source 
[SVN r42495]
This commit is contained in:
Jurko Gospodnetić
2008-01-05 20:06:15 +00:00
parent dafd4d0cc7
commit 6de288ad4c
2 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
v2/tools/builtin.jam
View File

@@ -21,6 +21,7 @@ import project ;
import property ;
import regex ;
import scanner ;
import stage ;
import symlink ;
import type ;
import utility ;
@@ -372,9 +373,6 @@ class searched-lib-target : abstract-file-target
}
import stage ;
class c-scanner : scanner
{
import path ;

26
v2/tools/stage.jam
View File

@@ -16,14 +16,18 @@ 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
{
@@ -339,8 +343,8 @@ rule relink-file ( project : source : property-set )
}
# 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
@@ -374,8 +378,8 @@ class installed-exe-generator : generator
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
@@ -471,7 +475,7 @@ class installed-shared-lib-generator : generator
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 ] ;