From 5f0728f3faee58b018edeb506702654e775b0901 Mon Sep 17 00:00:00 2001 From: Vladimir Prus Date: Thu, 11 Jul 2002 09:41:29 +0000 Subject: [PATCH] Renamed the 'subproject' rule to 'build-project' in UI. [SVN r14403] --- new/project.jam | 17 +++++++++-------- new/property.jam | 3 ++- new/targets.jam | 2 +- test/project-test1/Jamfile | 4 ++-- test/project-test3/Jamfile | 4 ++-- test/project_test1.py | 6 +++--- v2/build/project.jam | 17 +++++++++-------- v2/build/property.jam | 3 ++- v2/build/targets.jam | 2 +- v2/test/project-test1/Jamfile | 4 ++-- v2/test/project-test3/Jamfile | 4 ++-- v2/test/project_test1.py | 6 +++--- 12 files changed, 38 insertions(+), 34 deletions(-) diff --git a/new/project.jam b/new/project.jam index 3fe225a2b..704d2ec10 100644 --- a/new/project.jam +++ b/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) ; } } diff --git a/new/property.jam b/new/property.jam index 6b8ca0237..8fdabfab4 100644 --- a/new/property.jam +++ b/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 { diff --git a/new/targets.jam b/new/targets.jam index 968c7c2ff..0f9a85642 100644 --- a/new/targets.jam +++ b/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 ] ] ; diff --git a/test/project-test1/Jamfile b/test/project-test1/Jamfile index 31d599be0..34bca8fdb 100644 --- a/test/project-test1/Jamfile +++ b/test/project-test1/Jamfile @@ -1,5 +1,5 @@ project /boost-build-test-project-1 : requirements multi /home/ghost/local/include ; -subproject dir2 ; -subproject dir ; +build-project dir2 ; +build-project dir ; diff --git a/test/project-test3/Jamfile b/test/project-test3/Jamfile index 98e5c6be3..d11250e7f 100644 --- a/test/project-test3/Jamfile +++ b/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 ; \ No newline at end of file +build-project lib2 ; +build-project lib ; \ No newline at end of file diff --git a/test/project_test1.py b/test/project_test1.py index b7829cbfb..3f494c6d6 100644 --- a/test/project_test1.py +++ b/test/project_test1.py @@ -27,7 +27,7 @@ Projects: * Requirements: /home/ghost/build/boost-cvs * Default build: debug * Source location: %(root-dir-prefix)sdir2 -* Subprojects: +* Projects to build: """ @@ -44,7 +44,7 @@ Projects: * Requirements: multi /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: multi /home/ghost/local/include * Default build: release * Source location: %(root-dir-prefix)sdir/src -* Subprojects: +* Projects to build: """ diff --git a/v2/build/project.jam b/v2/build/project.jam index 3fe225a2b..704d2ec10 100644 --- a/v2/build/project.jam +++ b/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) ; } } diff --git a/v2/build/property.jam b/v2/build/property.jam index 6b8ca0237..8fdabfab4 100644 --- a/v2/build/property.jam +++ b/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 { diff --git a/v2/build/targets.jam b/v2/build/targets.jam index 968c7c2ff..0f9a85642 100644 --- a/v2/build/targets.jam +++ b/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 ] ] ; diff --git a/v2/test/project-test1/Jamfile b/v2/test/project-test1/Jamfile index 31d599be0..34bca8fdb 100644 --- a/v2/test/project-test1/Jamfile +++ b/v2/test/project-test1/Jamfile @@ -1,5 +1,5 @@ project /boost-build-test-project-1 : requirements multi /home/ghost/local/include ; -subproject dir2 ; -subproject dir ; +build-project dir2 ; +build-project dir ; diff --git a/v2/test/project-test3/Jamfile b/v2/test/project-test3/Jamfile index 98e5c6be3..d11250e7f 100644 --- a/v2/test/project-test3/Jamfile +++ b/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 ; \ No newline at end of file +build-project lib2 ; +build-project lib ; \ No newline at end of file diff --git a/v2/test/project_test1.py b/v2/test/project_test1.py index b7829cbfb..3f494c6d6 100644 --- a/v2/test/project_test1.py +++ b/v2/test/project_test1.py @@ -27,7 +27,7 @@ Projects: * Requirements: /home/ghost/build/boost-cvs * Default build: debug * Source location: %(root-dir-prefix)sdir2 -* Subprojects: +* Projects to build: """ @@ -44,7 +44,7 @@ Projects: * Requirements: multi /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: multi /home/ghost/local/include * Default build: release * Source location: %(root-dir-prefix)sdir/src -* Subprojects: +* Projects to build: """