[Boost-commit] svn:boost r40195 - branches/build/python_port/python/boost/build/build

From: ghost_at_[hidden]
Date: 2007-10-19 15:12:19

Author: vladimir_prus
Date: 2007-10-19 15:12:19 EDT (Fri, 19 Oct 2007)
New Revision: 40195
URL: http://svn.boost.org/trac/boost/changeset/40195

Log:
Kill the nasty @error since it's never generated.

Text files modified: 
   branches/build/python_port/python/boost/build/build/property_set.py |     6 +-----                                  
   branches/build/python_port/python/boost/build/build/targets.py      |    30 +++++-------------------------          
   2 files changed, 6 insertions(+), 30 deletions(-)

Modified: branches/build/python_port/python/boost/build/build/property_set.py
==============================================================================
--- branches/build/python_port/python/boost/build/build/property_set.py	(original)
+++ branches/build/python_port/python/boost/build/build/property_set.py	2007-10-19 15:12:19 EDT (Fri, 19 Oct 2007)
@@ -249,11 +249,7 @@
         if not self.refined_.has_key (str_req):
             r = property.refine (self.raw (), requirements.raw ())
 
-            # TODO: what's the idea? Can this be done using exceptions?
-            if not "@error" in str (r):
-                self.refined_ [str_req] = create (r)
-            else:
-                self.refined_ [str_req] = r
+            self.refined_ [str_req] = create (r)
 
         return self.refined_ [str_req]
 

Modified: branches/build/python_port/python/boost/build/build/targets.py
==============================================================================
--- branches/build/python_port/python/boost/build/build/targets.py	(original)
+++ branches/build/python_port/python/boost/build/build/targets.py	2007-10-19 15:12:19 EDT (Fri, 19 Oct 2007)
@@ -139,11 +139,6 @@
             project.get("requirements"), specification,
             project.project_module, project.get("location"))
 
-        # FIXME:
-        #if $(requirements[1]) = "@error" 
-        #{
-        #    errors.error "Conflicting requirements for target:" $(requirements) ;
-        #    }
         return requirements
 
     def main_target_usage_requirements (self, specification, project):
@@ -1081,9 +1076,7 @@
             if self.manager ().logger ().on ():
                 self.manager ().logger ().log (__name__, "Common properties are '%s'" % str (rproperties.raw ()))
             
-            # FIXME: check use of "@error".
-            if not "@error" in str (rproperties) \
-                   and rproperties.get("<build>") != "no":
+            if rproperties.get("<build>") != "no":
                 
                 result = GenerateResult ()
 
@@ -1140,16 +1133,8 @@
                     
                     self.generated_ [str (ps)] = GenerateResult (ur, result)
             else:
-
-# FIXME:
-##                 if $(rproperties[1]) = "@error" 
-##                 {
-##                     ECHO [ targets.indent ] 
-##                       "Skipping build: cannot compute common properties" ;
-##                 }
-##                 else if [ $(rproperties).get <build> ] = no
-##                 {
-##                     ECHO [ targets.indent ] 
+                # FIXME
+##                ECHO [ targets.indent ] 
 ##                       "Skipping build: <build>no in common properties" ;
 ##                 }
 ##                 else
@@ -1157,11 +1142,10 @@
 ##                     ECHO [ targets.indent ] "Skipping build: unknown reason" ;
 ##                 }                
 
-
                 # We're here either because there's error computing
                 # properties, or there's <build>no in properties.
                 # In the latter case we don't want any diagnostic.
-                # In the former case, we need diagnostics. FIXME.                                  
+                # In the former case, we need diagnostics. TODOo
                 self.generated_ [str (ps)] = GenerateResult (rproperties, [])
         else:
             if self.manager ().logger ().on ():
@@ -1187,11 +1171,7 @@
         # with source-specific requirements.
         propagated = property_set.propagated ()
         rproperties = propagated.refine (sproperties)
-        
-        # TODO: check usage of @error
-        if "@error" in str (rproperties):
-            raise BaseException ("When building '%s' with properties '%s'\nInvalid properties specified: '%s'" % (self.full_name (), property_set.raw (), rproperties [1:]))
-    
+            
         return target.generate (rproperties)
     
     def compute_usage_requirements (self, subvariant):