diff options
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/manual.cli | 31 |
1 files changed, 15 insertions, 16 deletions
diff --git a/doc/manual.cli b/doc/manual.cli index d196b30..5f4452d 100644 --- a/doc/manual.cli +++ b/doc/manual.cli @@ -303,8 +303,7 @@ build configuration to use for building the package. \li|\n\c{target: <target-triplet>}\n - The target triplet to build for. If not specified, then the default target - for this machine is used (which is usually the machine itself). + The target triplet to build for. Compared to the autotools terminology, the \c{machine} value corresponds to \c{--build} (the machine we are building on) and \c{target} \- to @@ -544,17 +543,17 @@ system modules, and configuration variables. Setting up of the environment is performed by an executable (script, batch file, etc). Specifically, upon receiving a build task, the worker obtains its target and looks for the environment setup executable with this name in a -specific directory. If not found or if the target is unspecified, then the -worker looks for the executable called \c{default}. Not being able to locate -the environment executable is an error. +specific directory. If not found, then the worker looks for the executable +called \c{default}. Not being able to locate the environment executable is an +error. Once the environment setup executable is determined, the worker re-executes itself as that executable passing to it as command line arguments the target -name (or empty value if not specified), the path to the \c{bbot} worker to be -executed once the environment is setup, and any additional options that need -to be propagated to the re-executed worker. The environment setup executable -is executed in the build directory as its current working directory. The build -directory contains the build task \c{manifest} file. +name, the path to the \c{bbot} worker to be executed once the environment is +setup, and any additional options that need to be propagated to the re-executed +worker. The environment setup executable is executed in the build directory as +its current working directory. The build directory contains the build task +\c{manifest} file. The environment setup executable sets up the necessary execution environment for example by adjusting \c{PATH} or running a suitable \c{vcvars} batch file. @@ -611,12 +610,12 @@ machines (as reported by agents) to \i{build configurations} according to the are ignored. All other lines in this file have the following format: \ -<machine-pattern> <config> [<target>] [<config-vars>] [<warning-regex>] +<machine-pattern> <config> <target> [<config-vars>] [<warning-regex>] \ Where \c{<machine-pattern>} is filesystem wildcard pattern that is matched against available machine names, \c{<config>} is the -configuration name, optional \c{<target>} is the build target, optional +configuration name, \c{<target>} is the build target, optional \c{<config-vars>} is a list of additional build system configuration variables, and optional \c{<warning-regex>} is a list of additional regular expressions that should be used to detect warnings in the logs. @@ -650,11 +649,11 @@ windows*-vc_14* windows-vc_14-64-release x86_64-microsoft-win32-msvc14.0 config. \ As another example, let's say we have \c{linux_fedora_25-gcc_6} and -\c{linux_ubuntu_16.04-gcc_6}. If all we cared about it testing GCC 6 on Linux, -then our configurations could look like this (note the missing target): +\c{linux_ubuntu_16.04-gcc_6}. If all we cared about is testing GCC 6 64-bit +builds on Linux, then our configurations could look like this: \ -linux*-gcc-6 linux-gcc_6-debug config.cc.coptions=-g -linux*-gcc-6 linux-gcc_6-release config.cc.coptions=-O3 +linux*-gcc-6 linux-gcc_6-debug x86_64-linux-gnu config.cc.coptions=-g +linux*-gcc-6 linux-gcc_6-release x86_64-linux-gnu config.cc.coptions=-O3 \ " |