summaryrefslogtreecommitdiff
path: root/tools/build/v2/test/unused/jamroot.jam
diff options
context:
space:
mode:
Diffstat (limited to 'tools/build/v2/test/unused/jamroot.jam')
-rw-r--r--tools/build/v2/test/unused/jamroot.jam15
1 files changed, 9 insertions, 6 deletions
diff --git a/tools/build/v2/test/unused/jamroot.jam b/tools/build/v2/test/unused/jamroot.jam
index 75832afd20..bc97c2b197 100644
--- a/tools/build/v2/test/unused/jamroot.jam
+++ b/tools/build/v2/test/unused/jamroot.jam
@@ -10,6 +10,7 @@ import virtual-target ;
import "class" : new ;
import modules ;
import targets ;
+import project ;
type.register X : x ;
@@ -21,21 +22,23 @@ class test-target-class : basic-target
basic-target.__init__ $(name) : $(project) ;
}
- rule construct ( source-targets * : property-set )
+ rule construct ( name : source-targets * : property-set )
{
if [ modules.peek : GENERATE_NOTHING ]
{
- return ;
+ return [ property-set.empty ] ;
}
else if [ modules.peek : GENERATE_ONLY_UNUSABLE ]
{
- return [ virtual-target.from-file b.x : $(self.project) ]
+ return [ property-set.empty ]
+ [ virtual-target.from-file b.x : . : $(self.project) ]
;
}
else
{
- return [ virtual-target.from-file b.x : $(self.project) ]
- [ virtual-target.from-file b.cpp : $(self.project) ]
+ return [ property-set.empty ]
+ [ virtual-target.from-file b.x : . : $(self.project) ]
+ [ virtual-target.from-file b.cpp : . : $(self.project) ]
;
}
}
@@ -48,7 +51,7 @@ class test-target-class : basic-target
rule make-b-main-target
{
- local project = [ CALLER_MODULE ] ;
+ local project = [ project.current ] ;
targets.main-target-alternative
[ new test-target-class b : $(project) ] ;