Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion doc/jamfile.jam
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Doc generation works in two modes: standalone embedded and website.
For the standalone we just generate the local html for inclusion in a release
archive. This is the default when no arguments are given.

For the website we clone the website branch locally, generatate the docs in
For the website we clone the website branch locally, generate the docs in
the website tree, commit, and push. The default for those arguments is to
build as if we are doing "develop" branch docs.

Expand Down
4 changes: 2 additions & 2 deletions doc/src/abstract-target.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ link:#b2.reference.class.abstract-target[abstract-target]:
* basic-target

--
1. `rule __init__ ( name : project )`
1. `rule \\__init__ ( name : project )`
+
`name`::
The name of the target in the Jamfile.
Expand Down Expand Up @@ -62,4 +62,4 @@ On success, returns:
+
If `property-set` is empty, performs the default build of this target,
in a way specific to the derived class.
--
--
2 changes: 1 addition & 1 deletion doc/src/basic-target.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ from sources. Allows sources to be either files or other main targets
and handles generation of those dependency targets.

--
1. `rule __init__ ( name : project : sources * : requirements * : default-build * : usage-requirements * )`
1. `rule \\__init__ ( name : project : sources * : requirements * : default-build * : usage-requirements * )`
+
`name`::
The name of the target
Expand Down
15 changes: 8 additions & 7 deletions doc/src/bjam.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@ targets. Pseudo-targets are symbols representing dependencies on other
targets, but which are not themselves associated with any real file.

A file target's identifier is generally the file's name, which can be
absolutely rooted, relative to the directory of `b2`s invocation, or
absolutely rooted, relative to the directory of ``b2``s invocation, or
simply local (no directory). Most often it is the last case, and the
actual file path is bound using the `$(SEARCH)` and `$(LOCATE)` special
variables. See link:#jam.language.variables.builtins.search[SEARCH and
Expand Down Expand Up @@ -381,7 +381,7 @@ on target $(var) field1 : field2 : ... : fieldN ;
----

The variable's value names the rule (or rules) to be invoked. A rule is
invoked for each element in the list of `$(var)`s values. The fields
invoked for each element in the list of ``$(var)``s values. The fields
`field1 : field2 : ...` are passed as arguments for each invocation For the [
... ] forms, the return value is the concatenation of the return values
for all of the invocations.
Expand Down Expand Up @@ -663,7 +663,7 @@ WARNING: This is currently not fully implemented.
[[jam.language.rules.builtins.utility]]
==== Utility

The two rules `ECHO` and `EXIT` are utility rules, used only in `b2`s
The two rules `ECHO` and `EXIT` are utility rules, used only in ``b2``s
parsing phase.

[[jam.language.rules.builtins.utility._echo__]]
Expand Down Expand Up @@ -756,7 +756,7 @@ The `MATCH` rule does pattern matching.

[source]
----
rule MATCH ( regexps + : list * )
rule MATCH ( regexps * : list * )
----

Matches the `egrep`(1) style regular expressions _regexps_ against the
Expand All @@ -768,12 +768,13 @@ for each string in _list_, and for each regular expression in _regexps_.

[source]
----
rule BACKTRACE ( )
rule BACKTRACE ( levels ? )
----

Returns a list of quadruples: _filename_ _line_ _module_ _rulename_...,
describing each shallower level of the call stack. This rule can be used
to generate useful diagnostic messages from Jam rules.
describing each shallower level of the call stack, or only last _levels_
when the argument is provided. This rule can be used to generate useful
diagnostic messages from Jam rules.

[[jam.language.rules.builtins.utility._update__]]
===== `UPDATE`
Expand Down
3 changes: 3 additions & 0 deletions doc/src/history.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@
* Fix jam/{CPP} bind definitions of 4 or more values in a single
declared argument not actually adding all the definitions.
-- _Paolo Pastori_
* *New*: Argument lists description provided for all built-in rules,
HDRMACRO and NOTIME discontinued.
-- _Paolo Pastori_

== Version 5.4.2

Expand Down
2 changes: 1 addition & 1 deletion doc/src/reference.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ rule check-target-builds ( target message ? : true-properties * : false-properti
+
This function can only be used when passing requirements or usage
requirements to a metatarget rule. For example, to make an application
link to a library if it's available, one has use the following:
link to a library if it's available, one has to use the following:
+
----
exe app : app.cpp : [ check-target-builds has_foo "System has foo" : <library>foo : <define>FOO_MISSING=1 ] ;
Expand Down
2 changes: 1 addition & 1 deletion doc/src/typed-target.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ kind of target alternative. Rules for creating typed targets are defined
automatically for each type.

--
1. `rule __init__ ( name : project : type : sources * : requirements * : default-build * : usage-requirements * )`
1. `rule \\__init__ ( name : project : type : sources * : requirements * : default-build * : usage-requirements * )`
+
`name`::
The name of the target
Expand Down
2 changes: 1 addition & 1 deletion src/engine/build.bat
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ set B2_SOURCES=%B2_SOURCES% command.cpp compile.cpp constants.cpp cwd.cpp
set B2_SOURCES=%B2_SOURCES% debug.cpp debugger.cpp
set B2_SOURCES=%B2_SOURCES% events.cpp
set B2_SOURCES=%B2_SOURCES% execcmd.cpp execnt.cpp execunix.cpp filent.cpp filesys.cpp fileunix.cpp frames.cpp function.cpp
set B2_SOURCES=%B2_SOURCES% glob.cpp hash.cpp hcache.cpp hdrmacro.cpp headers.cpp jam.cpp
set B2_SOURCES=%B2_SOURCES% glob.cpp hash.cpp hcache.cpp headers.cpp jam.cpp
set B2_SOURCES=%B2_SOURCES% jamgram.cpp lists.cpp make.cpp make1.cpp md5.cpp mem.cpp modules.cpp
set B2_SOURCES=%B2_SOURCES% native.cpp output.cpp parse.cpp pathnt.cpp
set B2_SOURCES=%B2_SOURCES% pathsys.cpp pathunix.cpp regexp.cpp rules.cpp scan.cpp search.cpp jam_strings.cpp
Expand Down
1 change: 0 additions & 1 deletion src/engine/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -443,7 +443,6 @@ function.cpp \
glob.cpp \
hash.cpp \
hcache.cpp \
hdrmacro.cpp \
headers.cpp \
jam_strings.cpp \
jam.cpp \
Expand Down
Loading
Loading