mirror of
https://github.com/boostorg/build.git
synced 2026-02-16 01:12:13 +00:00
Bugfix.
* new/stage.jam (stage-target-class.construct): Pass the result via 'virtual-target.register'. I wonder if virtual targets should be create via 'virtual-target.create' which will invoke 'virtual-target.register' internally. Passing via 'register' was forgotten in many places. * test/stage.py: New test. [SVN r18497]
This commit is contained in:
@@ -75,7 +75,7 @@ rule stage-target-class ( name-and-dir : project : sources * : requirements * :
|
||||
# FIXME: Since we can have <location> property, it might be better
|
||||
# to use it to distinguish staged copies with different locations.
|
||||
$(i2).set-path $(location) ;
|
||||
result += $(i2) ;
|
||||
result += [ virtual-target.register $(i2) ] ;
|
||||
}
|
||||
return $(result) ;
|
||||
}
|
||||
|
||||
@@ -30,6 +30,20 @@ t.write("auxilliary/1", "")
|
||||
t.run_build_system()
|
||||
t.expect_addition(["dist/a.dll", "dist/a.h", "dist/1"])
|
||||
|
||||
|
||||
# Regression test: the following was causing the "duplicate target name"
|
||||
# error.
|
||||
t.write(
|
||||
"Jamfile",
|
||||
"""
|
||||
project : requirements <hardcode-dll-paths>true ;
|
||||
lib a : a.cpp ;
|
||||
stage dist : a a.h auxilliary/1 ;
|
||||
alias dist-alias : dist ;
|
||||
""")
|
||||
t.run_build_system()
|
||||
|
||||
|
||||
# Test the <location> property
|
||||
t.write("Jamfile", """
|
||||
lib a : a.cpp ;
|
||||
|
||||
@@ -30,6 +30,20 @@ t.write("auxilliary/1", "")
|
||||
t.run_build_system()
|
||||
t.expect_addition(["dist/a.dll", "dist/a.h", "dist/1"])
|
||||
|
||||
|
||||
# Regression test: the following was causing the "duplicate target name"
|
||||
# error.
|
||||
t.write(
|
||||
"Jamfile",
|
||||
"""
|
||||
project : requirements <hardcode-dll-paths>true ;
|
||||
lib a : a.cpp ;
|
||||
stage dist : a a.h auxilliary/1 ;
|
||||
alias dist-alias : dist ;
|
||||
""")
|
||||
t.run_build_system()
|
||||
|
||||
|
||||
# Test the <location> property
|
||||
t.write("Jamfile", """
|
||||
lib a : a.cpp ;
|
||||
|
||||
@@ -75,7 +75,7 @@ rule stage-target-class ( name-and-dir : project : sources * : requirements * :
|
||||
# FIXME: Since we can have <location> property, it might be better
|
||||
# to use it to distinguish staged copies with different locations.
|
||||
$(i2).set-path $(location) ;
|
||||
result += $(i2) ;
|
||||
result += [ virtual-target.register $(i2) ] ;
|
||||
}
|
||||
return $(result) ;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user