Fixed feature.minimize call with unexpanded properties.

* fixed feature.minimize precondition check, test case added into __test__ rule
* optimized feature.add-defaults precondition check, test case added into __test__ rule

fixes #573

Author: paolopas

doc/src/history.adoc

@@ -32,6 +32,8 @@
   -- _Paolo Pastori_
 * Fix python linking to missing libutil.
   -- _Paolo Pastori_
+* Fix properties minimization during target configuration.
+  -- _Paolo Pastori_
 
 == Version 5.4.2
 

src/build/ac.jam

@@ -253,7 +253,9 @@ class ac-library : basic-target
                 [ $(property-set).raw ] ] ;
             relevant = [ property.select $(relevant) <link> :
                 [ $(property-set).raw ] ] ;
-            local min = [ property.as-path [ SORT [ feature.minimize $(relevant) ] ] ] ;
+            # NOTE: properties returned by feature.minimize are unexpanded (no grist).
+            local sorted = [ SORT [ feature.minimize $(relevant) ] ] ;
+            local min = [ property.as-path $(sorted) : dont-minimize ] ;
 
             local key = ac-library-$(name)-$(relevant:J=-) ;
             local lookup = [ config-cache.get $(key) ] ;

src/build/configure.jam

@@ -193,7 +193,9 @@ rule try-build ( targets * : ps : what : retry ? )
     local cache-name = $(what) $(cache-props) ;
     cache-name = $(cache-name:J=-) ;
     local value = [ config-cache.get $(cache-name) ] ;
-    local cache-min = [ property.as-path [ SORT [ feature.minimize $(cache-props) ] ] ] ;
+    # NOTE: properties returned by feature.minimize are unexpanded (no grist).
+    local cache-sorted = [ SORT [ feature.minimize $(cache-props) ] ] ;
+    local cache-min = [ property.as-path $(cache-sorted) : dont-minimize ] ;
 
     local result ;
     local jam-targets ;
@@ -269,7 +271,9 @@ rule try-find-build ( ps : what : * )
     local cache-name = $(what) $($(args)[1]) $(cache-props) ;
     cache-name = $(cache-name:J=-) ;
     local value = [ config-cache.get $(cache-name) ] ;
-    local cache-min = [ property.as-path [ SORT [ feature.minimize $(cache-props) ] ] ] ;
+    # NOTE: properties returned by feature.minimize are unexpanded (no grist).
+    local cache-sorted = [ SORT [ feature.minimize $(cache-props) ] ] ;
+    local cache-min = [ property.as-path $(cache-sorted) : dont-minimize ] ;
 
     local result ;
     local jam-targets ;

src/build/feature.jam

@@ -925,7 +925,7 @@ local rule move-subfeatures-to-the-end ( properties * )
 rule minimize ( properties * )
 {
     # Precondition checking
-    local implicits = [ set.intersection $(p:G=) : $(p:G) ] ;
+    local implicits = [ set.intersection $(properties:G=) : $(properties) ] ;
     if $(implicits)
     {
         import errors ;
@@ -1066,16 +1066,16 @@ local rule split-top-feature ( feature-plus )
 #
 rule add-defaults ( properties * )
 {
-    for local v in $(properties:G=)
+    # Precondition checking
+    local implicits = [ set.intersection $(properties:G=) : $(properties) ] ;
+    if $(implicits)
     {
-        if $(v) in $(properties)
-        {
-            import errors ;
-            errors.error add-defaults requires explicitly specified features,
-                but \"$(v)\" appears to be the value of an un-expanded implicit
-                feature ;
-        }
+        import errors ;
+        errors.error add-defaults requires explicitly specified features,
+            but \"$(implicits[1])\" appears to be the value of an un-expanded
+            implicit feature ;
     }
+
     local missing-top = [ set.difference $(.all-top-features) : $(properties:G) ] ;
     local more =  [ defaults $(missing-top) ] ;
 
@@ -1384,6 +1384,18 @@ rule __test__ ( )
     }
     catch explicitly-specified values of non-free feature <optimization> conflict ;
 
+    try ;
+    {
+        minimize debug <variant>debug ;
+    }
+    catch minimize requires an expanded property set, but \"debug\" appears to be the value of an un-expanded implicit feature ;
+
+    try ;
+    {
+        add-defaults debug <variant>debug ;
+    }
+    catch add-defaults requires explicitly specified features, but \"debug\" appears to be the value of an un-expanded implicit feature ;
+
     try ;
     {
         validate-feature <foobar> ;

src/build/property.jam

@@ -294,16 +294,23 @@ else
 }
 
 
-# Returns a path representing the given expanded property set.
+# Returns a path representing the given property set.
 #
-rule as-path ( properties * )
+rule as-path (
+    properties *
+    : dont-minimize ?  # IF set, do not try to minimize properties,
+                       # which are likely to be unexpanded.
+)
 {
     local entry = .result.$(properties:J=-) ;
 
     if ! $($(entry))
     {
-        # Trim redundancy.
-        properties = [ feature.minimize $(properties) ] ;
+        if ! $(dont-minimize)
+        {
+            # Trim redundancy.
+            properties = [ feature.minimize $(properties) ] ;
+        }
 
         # Sort according to path-order.
         properties = [ sequence.insertion-sort $(properties) : path-order ] ;
@@ -831,7 +838,7 @@ class property-map
         if $(best[2])
         {
             import errors : error : errors.error ;
-	        properties = [ $(property-set).raw ] ;
+            properties = [ $(property-set).raw ] ;
             errors.error "Ambiguous key $(properties:J= :E=)" ;
         }
         return $(best) ;