mirror of
https://github.com/boostorg/build.git
synced 2026-02-16 01:12:13 +00:00
Stylistic comment changes & typo corrections in several files. Corrected an incorrect error message in boost-build/build/project.jam displayed when a --build-dir command-line option and a non top-level project build-dir attribute are specified.
[SVN r42486]
This commit is contained in:
@@ -12,28 +12,28 @@
|
||||
# - an instance of 'project-target' class (from targets.jam)
|
||||
# (given a module name, can be obtained by 'target' rule)
|
||||
#
|
||||
# Typically, projects are created as result of loading Jamfile, which is
|
||||
# do by rules 'load' and 'initialize', below. First, module for Jamfile
|
||||
# is loaded and new project-attributes instance is created. Some rules
|
||||
# necessary for project are added to the module (see 'project-rules' module)
|
||||
# at the bottom of this file.
|
||||
# Default project attributes are set (inheriting attributes of parent project, if
|
||||
# it exists). After that, Jamfile is read. It can declare its own attributes,
|
||||
# via 'project' rule, which will be combined with already set attributes.
|
||||
#
|
||||
# Typically, projects are created as result of loading a Jamfile, which is done
|
||||
# by rules 'load' and 'initialize', below. First, module for Jamfile is loaded
|
||||
# and new project-attributes instance is created. Some rules necessary for
|
||||
# project are added to the module (see 'project-rules' module) at the bottom of
|
||||
# this file. Default project attributes are set (inheriting attributes of
|
||||
# parent project, if it exists). After that, Jamfile is read. It can declare
|
||||
# its own attributes, via 'project' rule, which will be combined with already
|
||||
# set attributes.
|
||||
#
|
||||
# The 'project' rule can also declare project id, which will be associated with
|
||||
# the project module.
|
||||
#
|
||||
# There can also be 'standalone' projects. They are created by calling 'initialize'
|
||||
# on arbitrary module, and not specifying location. After the call, the module can
|
||||
# call 'project' rule, declare main target and behave as regular projects. However,
|
||||
# since it's not associated with any location, it's better declare only prebuilt
|
||||
# targets.
|
||||
# There can also be 'standalone' projects. They are created by calling
|
||||
# 'initialize' on arbitrary module, and not specifying location. After the
|
||||
# call, the module can call 'project' rule, declare main target and behave as
|
||||
# regular projects. However, since it's not associated with any location, it's
|
||||
# better declare only prebuilt targets.
|
||||
#
|
||||
# The list of all loaded Jamfile is stored in variable .project-locations. It's possible
|
||||
# to obtain module name for a location using 'module-name' rule. The standalone projects
|
||||
# are not recorded, the only way to use them is by project id.
|
||||
# The list of all loaded Jamfile is stored in variable .project-locations. It's
|
||||
# possible to obtain module name for a location using 'module-name' rule. The
|
||||
# standalone projects are not recorded, the only way to use them is by project
|
||||
# id.
|
||||
|
||||
|
||||
import modules : peek poke ;
|
||||
@@ -67,15 +67,15 @@ rule load ( jamfile-location )
|
||||
{
|
||||
load-jamfile $(jamfile-location) ;
|
||||
|
||||
# We want to make sure that child project are loaded only
|
||||
# after parent projects. In particular, because parent projects
|
||||
# define attributes whch are inherited by children, and we don't
|
||||
# want children to be loaded before parents has defined everything.
|
||||
# We want to make sure that child project are loaded only after parent
|
||||
# projects. In particular, because parent projects define attributes
|
||||
# which are inherited by children, and we don't want children to be
|
||||
# loaded before parents has defined everything.
|
||||
#
|
||||
# While "build-project" and "use-project" can potentially refer
|
||||
# to child projects from parent projects, we don't immediately
|
||||
# loading child projects when seing those attributes. Instead,
|
||||
# we record the minimal information that will be used only later.
|
||||
# While "build-project" and "use-project" can potentially refer to child
|
||||
# projects from parent projects, we don't immediately loading child
|
||||
# projects when seing those attributes. Instead, we record the minimal
|
||||
# information that will be used only later.
|
||||
load-used-projects $(module-name) ;
|
||||
}
|
||||
return $(module-name) ;
|
||||
@@ -906,16 +906,14 @@ module project-rules
|
||||
{
|
||||
# Not Jamroot
|
||||
if $(explicit-build-dir)
|
||||
{
|
||||
errors.user-error "When --build-dir is specified, the 'build-project'"
|
||||
: "attribute is allowed only for top-level 'project' invocations" ;
|
||||
}
|
||||
}
|
||||
{
|
||||
errors.user-error "When --build-dir is specified, the 'build-dir' project"
|
||||
: "attribute is allowed only for top-level 'project' invocations" ;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
# Declare and set a project global constant. Project global constants are
|
||||
# normal variables but should not be changed. They are applied to every
|
||||
# child Jamfile.
|
||||
|
||||
@@ -334,7 +334,7 @@ a.cpp (installed copy) <--(copy) ----------------------- a.cpp (no scanner
|
||||
"bin" directory, it should be supported as well. I.e. in the
|
||||
scanario above, Jamfile in "dir" might create a main target,
|
||||
which generates "a.h". The file will be generated to "dir/bin"
|
||||
directory, but we still have to recornize the dependency.
|
||||
directory, but we still have to recognize the dependency.
|
||||
</simpara>
|
||||
</listitem>
|
||||
</orderedlist>
|
||||
|
||||
@@ -605,13 +605,12 @@ lib demangler : demangler_gcc.cpp : <toolset>gcc ; # alternative 2
|
||||
lib demangler : demangler_msvc.cpp : <toolset>msvc ; # alternative 3
|
||||
</programlisting>
|
||||
When building <filename>demangler</filename>, Boost.Build will compare
|
||||
requirements for each alternative with build properties to find the best match.
|
||||
For example, when building with with <code><toolset>gcc</code>
|
||||
alternative 2, will be selected, and when building with
|
||||
<code><toolset>msvc</code> alternative 3 will be selected. In all other
|
||||
cases, the most generic alternative 1 will be built.
|
||||
requirements for each alternative with build properties to find the best
|
||||
match. For example, when building with <code><toolset>gcc</code>
|
||||
alternative 2, will be selected, and when building with
|
||||
<code><toolset>msvc</code> alternative 3 will be selected. In all
|
||||
other cases, the most generic alternative 1 will be built.
|
||||
</para>
|
||||
|
||||
</section>
|
||||
|
||||
<section id="bbv2.tutorial.prebuilt">
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
# exe a : a.cpp helper ;
|
||||
# obj helper : helper.cpp : <optimization>off ;
|
||||
#
|
||||
# caused 'foo' to be built with with and without optimization.
|
||||
# caused 'foo' to be built with and without optimization.
|
||||
from BoostBuild import Tester, List
|
||||
|
||||
# Create a temporary working directory
|
||||
|
||||
@@ -208,11 +208,10 @@ rule update-po-dispatch
|
||||
EXISTING_PO on $(<) = $(>[1]) ;
|
||||
}
|
||||
|
||||
# Due to fancy interaction of existing and updated, this rule
|
||||
# can be called with with one source, in which case we copy
|
||||
# the lonely source into EXISTING_PO, or with two sources,
|
||||
# in which case the action body expands to nothing.
|
||||
# I'd really like to have "missing" action modifier.
|
||||
# Due to fancy interaction of existing and updated, this rule can be called with
|
||||
# one source, in which case we copy the lonely source into EXISTING_PO, or with
|
||||
# two sources, in which case the action body expands to nothing. I'd really like
|
||||
# to have "missing" action modifier.
|
||||
actions quietly existing updated create-po bind EXISTING_PO
|
||||
{
|
||||
cp$(_)"$(>[1])"$(_)"$(EXISTING_PO)"$($(>[2]:E=ok))
|
||||
|
||||
Reference in New Issue
Block a user