From: jurko.gospodnetic_at_[hidden]
Date: 2008-01-05 13:14:20
Author: jurko
Date: 2008-01-05 13:14:20 EST (Sat, 05 Jan 2008)
New Revision: 42490
URL: http://svn.boost.org/trac/boost/changeset/42490
Log:
Simplified the used make rules. Removed some dead code. Minor stylistic changes.
Text files modified:
trunk/tools/build/v2/test/module-actions/bootstrap.jam | 46 +++++++++++++--------------------------
1 files changed, 16 insertions(+), 30 deletions(-)
Modified: trunk/tools/build/v2/test/module-actions/bootstrap.jam
==============================================================================
--- trunk/tools/build/v2/test/module-actions/bootstrap.jam (original)
+++ trunk/tools/build/v2/test/module-actions/bootstrap.jam 2008-01-05 13:14:20 EST (Sat, 05 Jan 2008)
@@ -1,35 +1,21 @@
-# Copyright 2003 Dave Abrahams
-# Copyright 2006 Rene Rivera
-# Distributed under the Boost Software License, Version 1.0.
-# (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt)
-
-# Demonstration that module variables have the right effect in actions
-
-# Set a variable which says how to dump a file to stdout
-if $(NT)
-{
- CATENATE = type ;
-}
-else
-{
- CATENATE = cat ;
-}
+# Copyright 2003 Dave Abrahams
+# Copyright 2006 Rene Rivera
+# Distributed under the Boost Software License, Version 1.0.
+# (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt)
+
+# Demonstration that module variables have the right effect in actions.
-# invoke the given action rule `act' to build target from sources
-rule do-make ( target : sources * : act )
-{
- DEPENDS $(target) : $(sources) ;
- $(act) $(target) : $(sources) ;
-}
-# top-level version of do-make which causes target to be built by
-# default
+# Top-level rule that causes a target to be built by invoking the specified
+# action.
rule make ( target : sources * : act )
{
DEPENDS all : $(target) ;
- do-make $(target) : $(sources) : $(act) ;
+ DEPENDS $(target) : $(sources) ;
+ $(act) $(target) : $(sources) ;
}
+
X1 = X1-global ;
X2 = X2-global ;
X3 = X3-global ;
@@ -37,15 +23,15 @@
module A
{
X1 = X1-A ;
-
+
rule act ( target )
{
NOTFILE $(target) ;
ALWAYS $(target) ;
}
-
+
actions act { echo A.act $(<): $(X1) $(X2) $(X3) }
-
+
make t1 : : A.act ;
make t2 : : A.act ;
make t3 : : A.act ;
@@ -54,9 +40,9 @@
module B
{
X2 = X2-B ;
-
+
actions act { echo B.act $(<): $(X1) $(X2) $(X3) }
-
+
make t1 : : B.act ;
make t2 : : B.act ;
make t3 : : B.act ;