From bce9f20c7b22121af522be79f2a43a18f4c554bf Mon Sep 17 00:00:00 2001
From: Vladimir Prus <ghost@cs.msu.su>
Date: Tue, 28 Oct 2003 07:54:35 +0000
Subject: [PATCH] Minor rename.

* build/virtual-targets.jam
  (action.properties): Renamed from 'properties-ps'.


[SVN r20517]
---
 v2/build/modifiers.jam      |  2 +-
 v2/build/targets.jam        |  2 +-
 v2/build/virtual-target.jam | 14 +++++++-------
 v2/tools/stage.jam          |  4 ++--
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/v2/build/modifiers.jam b/v2/build/modifiers.jam
index 0570c2a88..fc02284a0 100644
--- a/v2/build/modifiers.jam
+++ b/v2/build/modifiers.jam
@@ -128,7 +128,7 @@ rule modifier (
         local action = [ $(target).action ] ;
         local action-class = [ modules.peek $(action) : __class__ ] ;
         
-        local ps = [ $(action).properties-ps ] ;
+        local ps = [ $(action).properties ] ;
         local cloned-action = [ new $(action-class) $(result) : 
           [ $(action).sources ] : [ $(action).action-name ] : $(ps) ] ;
         $(result).action $(cloned-action) ;
diff --git a/v2/build/targets.jam b/v2/build/targets.jam
index fc35d4202..134e87585 100644
--- a/v2/build/targets.jam
+++ b/v2/build/targets.jam
@@ -1021,7 +1021,7 @@ class basic-target : abstract-target
             local a = [ $(t).action ] ;
             if $(a)
             {
-                local p = [ $(a).properties-ps ] ;
+                local p = [ $(a).properties ] ;
                 if ! $(p) in $(cheched)
                 {
                     if [ $(p).link-incompatible-with $(build-request) ]
diff --git a/v2/build/virtual-target.jam b/v2/build/virtual-target.jam
index b6b86f405..4826ee090 100644
--- a/v2/build/virtual-target.jam
+++ b/v2/build/virtual-target.jam
@@ -345,7 +345,7 @@ class abstract-file-target : virtual-target
             local properties ;
             if $(self.action)
             {
-                local ps = [ $(self.action).properties-ps ] ;     
+                local ps = [ $(self.action).properties ] ;     
                 local property-grist = [ $(ps).as-path ] ;
                 grist = $(location-grist)/$(property-grist) ;
                 properties = [ $(ps).raw ] ;
@@ -546,7 +546,7 @@ class action
         return $(self.action-name) ;
     }
 
-    rule properties-ps ( )
+    rule properties ( )
     {
         return $(self.properties) ;
     }
@@ -558,7 +558,7 @@ class action
         {
             self.actualized = true ;
 
-            local ps = [ properties-ps ] ;
+            local ps = [ properties ] ;
             local properties = [ adjust-properties [ $(ps).raw ] ] ;
 
 
@@ -728,8 +728,8 @@ rule register ( target )
                 if $(a1) && $(a2) && [ $(a1).action-name ] = [ $(a2).action-name ] && 
                   [ $(a1).sources ] = [ $(a2).sources ]
                 {
-                    local ps1 = [ $(a1).properties-ps ] ;
-                    local ps2 = [ $(a2).properties-ps ] ;
+                    local ps1 = [ $(a1).properties ] ;
+                    local ps2 = [ $(a2).properties ] ;
                     local p1 = [ $(ps1).base ] [ $(ps1).free ] [ $(ps1).dependency ] ;
                     local p2 = [ $(ps2).base ] [ $(ps2).free ] [ $(ps2).dependency ] ;
                     if $(p1) = $(p2) 
@@ -882,7 +882,7 @@ local rule clone-action-template ( action from cloned-from : new-source )
 
     local action-class = [ modules.peek $(action) : __class__ ] ;
 
-    local ps = [ $(action).properties-ps ] ;
+    local ps = [ $(action).properties ] ;
     local cloned = [ new $(action-class) [ $(action).targets ] : $(sources)
                      : [ $(action).action-name ] : $(ps) ] ;
 
@@ -920,7 +920,7 @@ class subvariant-dg
         return $(self.main-target) ;
     }
 
-    rule properties-ps ( )
+    rule properties ( )
     {
         return $(self.properties) ;
     }
diff --git a/v2/tools/stage.jam b/v2/tools/stage.jam
index a55a228e3..75192b564 100644
--- a/v2/tools/stage.jam
+++ b/v2/tools/stage.jam
@@ -97,7 +97,7 @@ class stage-target-class : basic-target
                 {                    
                     # Copy the properties of original target. They, in particular
                     # can affect the suffix of the target.
-                    new-a = [ new action $(i2) : $(i) : common.copy : [ $(a).properties-ps ] ] ;
+                    new-a = [ new action $(i2) : $(i) : common.copy : [ $(a).properties ] ] ;
                 }
                 else
                 {
@@ -156,7 +156,7 @@ class stage-exe-generator : generator
 
         # Add our free properties to the property set, so that 
         # stage can affect the relinking details.
-        local ps = [ $(action).properties-ps ] ;
+        local ps = [ $(action).properties ] ;
         local new-ps = [ $(ps).add [ property-set.create [ $(property-set).free ] ] ] ;
         local cloned-action = [ class.new $(action-class) $(cloned-target) : 
           [ $(action).sources ] : [ $(action).action-name ] : $(new-ps) ] ;