boost/build
2
0
Fork 0
mirror of https://github.com/boostorg/build.git synced 2026-02-14 12:42:11 +00:00
Code Issues Projects Releases Wiki Activity

Boost Build cleanup - minor stylistic changes.

Browse Source 
[SVN r79930]
This commit is contained in:
Jurko Gospodnetić
2012-08-08 17:21:01 +00:00
parent f9ae3127db
commit 843ea4770a
3 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/build-system.jam
View File

@@ -601,7 +601,7 @@ local rule should-clean-project ( project )
# that all project files already be loaded.
# FIXME: This is not entirely true. Additional project files may be loaded
# only later via the project.find() rule when dereferencing encountered
# target ids containing absolute project references. See what to do about
# target ids containing explicit project references. See what to do about
# those as such 'lazy loading' may cause problems that are then extremely
# difficult to debug.
local build-request = [ build-request.from-command-line $(.argv)

4
src/build/project.jam
View File

@@ -585,7 +585,7 @@ local rule register-id ( id : module )
if [ MATCH (//) : $(id) ]
{
import errors ;
errors.user-error Project id may not contain multiple successive slash
errors.user-error Project id may not contain two consecutive slash
characters (project id: '$(id)'). ;
}
@@ -602,7 +602,7 @@ local rule register-id ( id : module )
local orig-name = [ $(orig-p).name ] ;
import errors ;
errors.user-error Attempt to redeclare already existing project id
errors.user-error Attempt to redeclare already registered project id
'$(id)'.
: Original project:
: " " Name: $(orig-name:E=---)

22
src/build/targets.jam
View File

@@ -209,8 +209,8 @@ class project-target : abstract-target
}
}
# This is needed only by the 'make' rule. Need to find the way to make
# 'make' work without this method.
# This is needed only by the 'make' rule. Need to find a way to make 'make'
# work without this method.
#
rule project-module ( )
{
@@ -372,7 +372,8 @@ class project-target : abstract-target
}
else
{
extra-error-message = could not find project '$(project-part)' ;
extra-error-message = could not resolve project reference
'$(project-part)' ;
}
}
else
@@ -447,7 +448,7 @@ class project-target : abstract-target
import errors : user-error : errors.user-error ;
errors.user-error Unable to find file or target named
: " " '$(id)'
: referred from project at
: referred to from project at
: " " '$(current-location)'
: $(extra-error-message) ;
}
@@ -682,7 +683,7 @@ class main-target : abstract-target
}
# Select an alternative for this main target, by finding all alternatives
# which requirements are satisfied by 'properties' and picking the one with
# whose requirements are satisfied by 'properties' and picking the one with
# the longest requirements set. Returns the result of calling 'generate' on
# that alternative.
#
@@ -1493,7 +1494,8 @@ class typed-target : basic-target
rule construct ( name : source-targets * : property-set )
{
local r = [ generators.construct $(self.project) $(name:S=) : $(self.type)
local r = [ generators.construct $(self.project) $(name:S=)
: $(self.type)
: [ property-set.create [ $(property-set).raw ]
<main-target-type>$(self.type) ]
: $(source-targets) : true ] ;
@@ -1502,15 +1504,15 @@ class typed-target : basic-target
ECHO "warn: Unable to construct" [ full-name ] ;
# Are there any top-level generators for this type/property set.
if ! [ generators.find-viable-generators $(self.type)
: $(property-set) ]
if ! [ generators.find-viable-generators $(self.type) :
$(property-set) ]
{
ECHO "error: no generators were found for type '$(self.type)'" ;
ECHO "error: and the requested properties" ;
ECHO "error: make sure you've configured the needed tools" ;
ECHO "See http://boost.org/boost-build2/doc/html/bbv2/advanced/configuration.html" ;
ECHO "To debug this problem, try the --debug-generators option." ;
EXIT ;
EXIT "To debug this problem, try the --debug-generators option."
;
}
}
return $(r) ;