diff --git a/v2/tools/stage.jam b/v2/tools/stage.jam index 15488944a..bdc42eabf 100644 --- a/v2/tools/stage.jam +++ b/v2/tools/stage.jam @@ -22,14 +22,6 @@ import types/register ; feature.feature : off on : incidental ; feature.feature : : free incidental ; feature.feature : : free path ; -# must not be a path feature since it always specifies a -# path relative to the install action's property and not the Jamfile. -# TODO: We should find a way to make this feature be converted to the internal -# path format when specified from the outside as a command line parameter but be -# interpreted as already being in internal path format when read from the -# Jamfile. However, unlike 'path' features these values should not be rebased to -# point to their target relative to the Jamfile location. -feature.feature : : free ; feature.feature : : free incidental ; # If 'on', version symlinks for shared libraries will not be created. Affects @@ -125,30 +117,6 @@ class install-target-class : basic-target ps-raw += $(d:G=) ; } - local d = [ $(build-property-set).get ] ; - if $(d) - { - # We need to manually convert the property - # value into internal Boost Build path representation since its - # feature does not represent a path relative to the project's - # Jamfile and so could not be marked with the 'path' attribute. - d = [ path.make $(d) ] ; - if [ path.is-rooted $(d) ] - { - local error-message = - "The property must specify a relative" - "and not an absolute path. That is the path prepended to" - "all target names installed with this property." ; - if ! ( "--debug-building" in [ modules.peek : ARGV ] ) - { - error-message += "Use the --debug-building command line" - "option to get more detailed information." ; - } - errors.user-error $(error-message) ; - } - } - ps-raw += $(d:G=) ; - if $(ps-raw) { return [ property-set.create $(ps-raw) ] ; @@ -322,7 +290,6 @@ rule copy-file ( project name ? : source : properties ) local new-a = [ new non-scanning-action $(source) : common.copy : $(properties) ] ; - local target-root = [ $(properties).get ] ; local source-root = [ $(properties).get ] ; if $(source-root) { @@ -342,7 +309,7 @@ rule copy-file ( project name ? : source : properties ) # need to explicitly check that relative is not ".", otherwise we might get # paths like '/boost/.', try to create it and mkdir would obviously # fail. - name = [ path.join $(target-root) $(relative) $(name:D=) ] ; + name = [ path.join $(relative) $(name:D=) ] ; return [ new file-target $(name) exact : [ $(source).type ] : $(project) : $(new-a) ] ;