Renamed the 'subproject' rule to 'build-project' in UI.

[SVN r14403]

new/project.jam

@@ -36,9 +36,9 @@ rule load ( jamfile-location )
     {
         .projects += $(jamfile-location) ;
 
-        for local subproject in [ attribute $(module-name) subprojects ]
+        for local p in [ attribute $(module-name) projects-to-build ]
         {
-            load [ os.path.join $(jamfile-location) $(subproject) ] ;
+            load [ os.path.join $(jamfile-location) $(p) ] ;
         }
     }
     return $(module-name) ;
@@ -358,7 +358,7 @@ rule register-id ( id : location )
 # Class keeping all the attributes of a project.
 #
 # The standard attributes are "id", "location", "project-root", "parent"
-# "requirements", "default-build", "source-location" and "subprojects".
+# "requirements", "default-build", "source-location" and "projects-to-build".
 rule project-attributes ( location )
 {
     self.location = $(location) ;
@@ -398,7 +398,7 @@ rule project-attributes ( location )
             self.source-location = [ os.path.join $(self.location) $(specification) ] ;
         }            
         else if ! $(attribute) in "id" "default-build" "location" "source-location"
-           "project-root" "project-root-module" "parent" "subprojects" 
+           "project-root" "project-root-module" "parent" "projects-to-build" 
         {
             print.wrapped-text "Invalid project attribute '$(attribute)' specified "
                                "for project at '$(self.location)'" ;
@@ -431,7 +431,8 @@ rule project-attributes ( location )
         print.list-item "Requirements:" $(self.requirements) ;
         print.list-item "Default build:" $(self.default-build) ;
         print.list-item "Source location:" $(self.source-location) ;
-        print.list-item "Subprojects:" [ sequence.insertion-sort $(self.subprojects) ] ;
+        print.list-item "Projects to build:" 
+                            [ sequence.insertion-sort $(self.projects-to-build) ] ;
         print.list-end ;
     }
     
@@ -511,13 +512,13 @@ module project-rules {
         }
     }
 
-    rule subproject ( dir )
+    rule build-project ( dir )
     {
         import project ;
         local attributes = [ project.attributes $(__name__) ] ;
 
-        local now = [ $(attributes).get subprojects ] ;
-        $(attributes).set subprojects : $(now) $(dir) ;
+        local now = [ $(attributes).get projects-to-build ] ;
+        $(attributes).set projects-to-build : $(now) $(dir) ;
     }
 }
 

new/property.jam

@@ -190,7 +190,8 @@ rule make ( specification * )
         }
         else if [ feature.is-implicit-value $(e) ]
         {
-            result += [ feature.implied-feature $(e) ] ;      
+            local feature = [ feature.implied-feature $(e) ] ;
+            result += $(feature)$(e) ;      
         }
         else
         {

new/targets.jam

@@ -91,7 +91,7 @@ rule project-target ( name : project : requirements * : default-build * )
             local t = [ main-target $(name) ] ;
             result += [ $(t).generate $(properties) ] ;
         }
-        for local pn in [ project.attribute $(self.project) subprojects ]
+        for local pn in [ project.attribute $(self.project) projects-to-build ]
         {
             local p = [ project.module-name $(pn) ] ;
             local t = [ project.target [ project.attribute $(p) location ] ] ;

test/project-test1/Jamfile

@@ -1,5 +1,5 @@
 project /boost-build-test-project-1
     : requirements <threading>multi <include>/home/ghost/local/include ;
 
-subproject dir2 ;
-subproject dir ;
+build-project dir2 ;
+build-project dir ;

test/project-test3/Jamfile

@@ -5,5 +5,5 @@ use-project /lib3 : lib3 ;
 make a.exe : a.obj lib/b.obj @/lib2/c.obj lib2@d.obj lib2@helper/e.obj @/lib3/f.obj : yfc-link ;
 make a.obj : a.cpp : yfc-compile ; 
 
-subproject lib2 ;
-subproject lib ;
+build-project lib2 ;
+build-project lib ;

test/project_test1.py

@@ -27,7 +27,7 @@ Projects:
 * Requirements: <include>/home/ghost/build/boost-cvs
 * Default build: debug
 * Source location: %(root-dir-prefix)sdir2
-* Subprojects:
+* Projects to build:
 
 """
 
@@ -44,7 +44,7 @@ Projects:
 * Requirements: <threading>multi <include>/home/ghost/local/include
 * Default build: debug
 * Source location: %(root-dir)s
-* Subprojects: dir dir2
+* Projects to build: dir dir2
 
 '/boost-build-test-project-1/dir':
 
@@ -53,7 +53,7 @@ Projects:
 * Requirements: <threading>multi <include>/home/ghost/local/include
 * Default build: release
 * Source location: %(root-dir-prefix)sdir/src
-* Subprojects:
+* Projects to build:
 
 """
 

v2/build/project.jam

@@ -36,9 +36,9 @@ rule load ( jamfile-location )
     {
         .projects += $(jamfile-location) ;
 
-        for local subproject in [ attribute $(module-name) subprojects ]
+        for local p in [ attribute $(module-name) projects-to-build ]
         {
-            load [ os.path.join $(jamfile-location) $(subproject) ] ;
+            load [ os.path.join $(jamfile-location) $(p) ] ;
         }
     }
     return $(module-name) ;
@@ -358,7 +358,7 @@ rule register-id ( id : location )
 # Class keeping all the attributes of a project.
 #
 # The standard attributes are "id", "location", "project-root", "parent"
-# "requirements", "default-build", "source-location" and "subprojects".
+# "requirements", "default-build", "source-location" and "projects-to-build".
 rule project-attributes ( location )
 {
     self.location = $(location) ;
@@ -398,7 +398,7 @@ rule project-attributes ( location )
             self.source-location = [ os.path.join $(self.location) $(specification) ] ;
         }            
         else if ! $(attribute) in "id" "default-build" "location" "source-location"
-           "project-root" "project-root-module" "parent" "subprojects" 
+           "project-root" "project-root-module" "parent" "projects-to-build" 
         {
             print.wrapped-text "Invalid project attribute '$(attribute)' specified "
                                "for project at '$(self.location)'" ;
@@ -431,7 +431,8 @@ rule project-attributes ( location )
         print.list-item "Requirements:" $(self.requirements) ;
         print.list-item "Default build:" $(self.default-build) ;
         print.list-item "Source location:" $(self.source-location) ;
-        print.list-item "Subprojects:" [ sequence.insertion-sort $(self.subprojects) ] ;
+        print.list-item "Projects to build:" 
+                            [ sequence.insertion-sort $(self.projects-to-build) ] ;
         print.list-end ;
     }
     
@@ -511,13 +512,13 @@ module project-rules {
         }
     }
 
-    rule subproject ( dir )
+    rule build-project ( dir )
     {
         import project ;
         local attributes = [ project.attributes $(__name__) ] ;
 
-        local now = [ $(attributes).get subprojects ] ;
-        $(attributes).set subprojects : $(now) $(dir) ;
+        local now = [ $(attributes).get projects-to-build ] ;
+        $(attributes).set projects-to-build : $(now) $(dir) ;
     }
 }
 

v2/build/property.jam

@@ -190,7 +190,8 @@ rule make ( specification * )
         }
         else if [ feature.is-implicit-value $(e) ]
         {
-            result += [ feature.implied-feature $(e) ] ;      
+            local feature = [ feature.implied-feature $(e) ] ;
+            result += $(feature)$(e) ;      
         }
         else
         {

v2/build/targets.jam

@@ -91,7 +91,7 @@ rule project-target ( name : project : requirements * : default-build * )
             local t = [ main-target $(name) ] ;
             result += [ $(t).generate $(properties) ] ;
         }
-        for local pn in [ project.attribute $(self.project) subprojects ]
+        for local pn in [ project.attribute $(self.project) projects-to-build ]
         {
             local p = [ project.module-name $(pn) ] ;
             local t = [ project.target [ project.attribute $(p) location ] ] ;

v2/test/project-test1/Jamfile

@@ -1,5 +1,5 @@
 project /boost-build-test-project-1
     : requirements <threading>multi <include>/home/ghost/local/include ;
 
-subproject dir2 ;
-subproject dir ;
+build-project dir2 ;
+build-project dir ;

v2/test/project-test3/Jamfile

@@ -5,5 +5,5 @@ use-project /lib3 : lib3 ;
 make a.exe : a.obj lib/b.obj @/lib2/c.obj lib2@d.obj lib2@helper/e.obj @/lib3/f.obj : yfc-link ;
 make a.obj : a.cpp : yfc-compile ; 
 
-subproject lib2 ;
-subproject lib ;
+build-project lib2 ;
+build-project lib ;

v2/test/project_test1.py

@@ -27,7 +27,7 @@ Projects:
 * Requirements: <include>/home/ghost/build/boost-cvs
 * Default build: debug
 * Source location: %(root-dir-prefix)sdir2
-* Subprojects:
+* Projects to build:
 
 """
 
@@ -44,7 +44,7 @@ Projects:
 * Requirements: <threading>multi <include>/home/ghost/local/include
 * Default build: debug
 * Source location: %(root-dir)s
-* Subprojects: dir dir2
+* Projects to build: dir dir2
 
 '/boost-build-test-project-1/dir':
 
@@ -53,7 +53,7 @@ Projects:
 * Requirements: <threading>multi <include>/home/ghost/local/include
 * Default build: release
 * Source location: %(root-dir-prefix)sdir/src
-* Subprojects:
+* Projects to build:
 
 """