diff options
| -rw-r--r-- | INSTALL.md | 4 | ||||
| -rw-r--r-- | doc/concepts/doc-strings.org | 2 | ||||
| -rw-r--r-- | doc/concepts/expressions.org | 4 | ||||
| -rw-r--r-- | doc/future-designs/computed-roots.org | 6 | ||||
| -rw-r--r-- | doc/future-designs/service-target-cache.org | 4 | ||||
| -rw-r--r-- | doc/tutorial/rebuild.org | 2 | ||||
| -rw-r--r-- | doc/tutorial/target-file-glob-tree.org | 2 | ||||
| -rw-r--r-- | etc/import/TARGETS.protobuf | 2 | ||||
| -rw-r--r-- | rules/CC/RULES | 6 | ||||
| -rw-r--r-- | rules/patch/RULES | 3 | ||||
| -rw-r--r-- | rules/proto/RULES | 8 | ||||
| -rw-r--r-- | src/buildtool/execution_api/bazel_msg/bazel_msg_factory.cpp | 4 | ||||
| -rw-r--r-- | test/bootstrap/RULES | 2 |
13 files changed, 25 insertions, 24 deletions
@@ -87,10 +87,10 @@ Additionally, if `SOURCE_DATE_EPOCH` is set in the build environment, it is forwarded to the build configuration as well. If, on the other hand, `CC` or `CXX` are set in the build configuration, those are also used for the initial steps of the bootstrap procedure. Remember that setting -one of those variables also requires to the the `COMPILER_FAMILY` to +one of those variables also requires the `COMPILER_FAMILY` to ensure the proper flags are used (if in doubt, set to `"unknown"`). -In any case, the resulting binary is self-contained and can be moved +In any case, the resulting binary is self contained and can be moved to an appropriate location in `PATH`. ### Bootstrapping against preinstalled dependencies (package building) diff --git a/doc/concepts/doc-strings.org b/doc/concepts/doc-strings.org index e82cef2b..d9a94dc5 100644 --- a/doc/concepts/doc-strings.org +++ b/doc/concepts/doc-strings.org @@ -100,7 +100,7 @@ documentation on the provided data. ] , "link-args": [ "List of strings that have to be added to the command line for linking actions" - , "in targets depending on on this library" + , "in targets depending on this library" ] } , "expression": { ... } diff --git a/doc/concepts/expressions.org b/doc/concepts/expressions.org index 2d10d9ff..ac66e878 100644 --- a/doc/concepts/expressions.org +++ b/doc/concepts/expressions.org @@ -37,9 +37,9 @@ mechanism; the precise evaluation is as follows. - Atomic values (~null~, booleans, strings, numbers) evaluate to themselves. - For lists, each entry is evaluated in the order they occur in the - list; the result of the valuation is the list of the results. + list; the result of the evaluation is the list of the results. - For JSON objects (wich can be understood as maps, or dicts), the - key ~"type"~ has be be present and has to be a literal string. + key ~"type"~ has to be present and has to be a literal string. That string determines the syntactical construct (sloppily also referred to as "function") the object represents, and the remaining evaluation depends on the syntactical construct. The syntactical diff --git a/doc/future-designs/computed-roots.org b/doc/future-designs/computed-roots.org index d3c355ce..a83eee67 100644 --- a/doc/future-designs/computed-roots.org +++ b/doc/future-designs/computed-roots.org @@ -60,7 +60,7 @@ file, so that it can be used during analysis. Still, the information is already present in the prebuilt binary, causing unnecessary maintenance overhead; instead, the target file could be a function of that library which can form its own content-fixed root (e.g., a -~git tree~ root), so that the computed value is easily cachable. +~git tree~ root), so that the computed value is easily cacheable. *** Simplified rule definition and alternative syntax @@ -78,14 +78,14 @@ but people argue that it is hard to write by hand. However, it is unlikely to get agreement on which syntax is best to use. Now, if rule and expression files could be generated, this argument would not be necessary. Moreover, rules are typically versioned and -unfrequently changed, so the step of generating the official syntax +infrequently changed, so the step of generating the official syntax from the convenient one would typically be in cache. ** Proposal: Support computed roots We propose computed roots as a clean principle to add the needed (and a lot more) flexibility for the described use cases, while ensuring -that all computations of roots are properly cachable at high level. +that all computations of roots are properly cacheable at high level. In this way, we do not compromise efficient builds, as the price of the additional flexibility, in the typical case, is just a single cache lookup. Of course, it is up to the user to ensure that this diff --git a/doc/future-designs/service-target-cache.org b/doc/future-designs/service-target-cache.org index 9f07351d..10138db5 100644 --- a/doc/future-designs/service-target-cache.org +++ b/doc/future-designs/service-target-cache.org @@ -158,7 +158,7 @@ serve~ endpoint has to be specified in the invocation of ~just~. **** ~just-mr~ pragma ~"absent"~ -For ~just-mr~ to know how to contruct the repository description, +For ~just-mr~ to know how to construct the repository description, the description used by ~just-mr~ is extended. More precisely, a new key ~"absent"~ is allowed in the ~"pragma"~ dictionary of a repository description. If the specified value is true, ~just-mr~ @@ -196,7 +196,7 @@ Such a repository is given by - a command that, when executed in an empty directory (anywhere in the file system) will create in that directory a directory structure containing the specified ~git~ tree (either top-level - or in some sudirectory). Moreover, that command does not modify + or in some subdirectory). Moreover, that command does not modify anything outside the directory it is called in; it is an error if the specified tree is not created in this way. In this way, content-fixed repositories can be generated in a diff --git a/doc/tutorial/rebuild.org b/doc/tutorial/rebuild.org index 115aff10..80aafb6f 100644 --- a/doc/tutorial/rebuild.org +++ b/doc/tutorial/rebuild.org @@ -206,7 +206,7 @@ non-reproducibility, however, more modifications of the environment are necessary. A simple, but effective, way for modifying the build environment -is the option ~-L~ to the set the local launcher, a list of +is the option ~-L~ to set the local launcher, a list of strings the argument vector is prefixed with before the action is executed. The default ~["env", "--"]~ simply resolves the program to be executed in the current value of ~PATH~, but a different diff --git a/doc/tutorial/target-file-glob-tree.org b/doc/tutorial/target-file-glob-tree.org index d1d29a72..84e6465b 100644 --- a/doc/tutorial/target-file-glob-tree.org +++ b/doc/tutorial/target-file-glob-tree.org @@ -252,7 +252,7 @@ to understand this in detail and the rational behind it. contains the unpatched source file ~definitions.units~. In this way, we avoid any surprises in the expansion of a glob when a new source file is added with a name equal to an already existing target. -- Only files are are considered for matching the glob. Directories +- Only files are considered for matching the glob. Directories are ignored. - Matches are only considered at the top-level directory. In this way, only one directory has to be read during analysis; allowing diff --git a/etc/import/TARGETS.protobuf b/etc/import/TARGETS.protobuf index 3f4a8537..fec905fc 100644 --- a/etc/import/TARGETS.protobuf +++ b/etc/import/TARGETS.protobuf @@ -3,7 +3,7 @@ , "doc": [ "The protobuffer compiler." , "" - , "This target typically is used as an implict dependency of" + , "This target typically is used as an implicit dependency of" , "the protobuffer rules." ] , "target": ["src/google/protobuf", "protoc"] diff --git a/rules/CC/RULES b/rules/CC/RULES index 3bfd2008..2b420fbc 100644 --- a/rules/CC/RULES +++ b/rules/CC/RULES @@ -2,7 +2,7 @@ { "doc": [ "A rule to provide defaults." , "All CC targets take their defaults for CC, CXX, flags, etc from" - , "the target [\"CC\", \"defaults\"]. This is probably the only sensibe" + , "the target [\"CC\", \"defaults\"]. This is probably the only sensible" , "use of this rule. As targets form a different root, the defaults" , "can be provided without changing this directory." ] @@ -149,7 +149,7 @@ , "with \"/\"." ] , "pure C": - [ "If non-empty, compile as C sources rathter than C++ sources." + [ "If non-empty, compile as C sources rather than C++ sources." , "In particular, CC is used to compile rather than CXX (or their" , "respective defaults)." ] @@ -235,7 +235,7 @@ ] , "link-args": [ "List of strings that have to be added to the command line for linking actions" - , "in targets depending on on this library" + , "in targets depending on this library" ] } , "anonymous": diff --git a/rules/patch/RULES b/rules/patch/RULES index bba83c21..b1ba95e3 100644 --- a/rules/patch/RULES +++ b/rules/patch/RULES @@ -5,7 +5,8 @@ , "config_vars": ["PATCH", "ENV"] , "field_doc": { "src": - ["The single source file to patch, typically an explict file reference."] + [ "The single source file to patch, typically an explicit file reference." + ] , "patch": ["The patch to apply."] , "patch-part": [ "If the patch contains hunks for multiple files, only apply hunks for" diff --git a/rules/proto/RULES b/rules/proto/RULES index 95fb87ad..a9152dde 100644 --- a/rules/proto/RULES +++ b/rules/proto/RULES @@ -1,8 +1,8 @@ { "library": { "doc": - [ "A proto library as abtract data structure." + [ "A proto library as abstract data structure." , "" - , "Such a libray does not produce any artifacts itself, but it can be" + , "Such a library does not produce any artifacts itself, but it can be" , "used as a dependency for various language-specific rules." ] , "target_fields": ["srcs", "deps"] @@ -16,7 +16,7 @@ ] , "name": ["The name of the (abstract) library."] , "service": - [ "If non empty, generate a service library (with acces sto \"rpc\"" + [ "If non empty, generate a service library (with access to \"rpc\"" , "definitions) instead of a regular one." ] } @@ -24,7 +24,7 @@ , "runfiles_doc": ["None"] , "provides_doc": { "proto": - [ "A list containing a single target-graph node with the defintion of" + [ "A list containing a single target-graph node with the definition of" , "this proto library. The node types generated are \"library\" and" , "\"service library\"." ] diff --git a/src/buildtool/execution_api/bazel_msg/bazel_msg_factory.cpp b/src/buildtool/execution_api/bazel_msg/bazel_msg_factory.cpp index edc99cff..c89a6323 100644 --- a/src/buildtool/execution_api/bazel_msg/bazel_msg_factory.cpp +++ b/src/buildtool/execution_api/bazel_msg/bazel_msg_factory.cpp @@ -241,7 +241,7 @@ template <class T> return node; } -/// \brief Create profobuf message FileNode from Artifact::ObjectInfo +/// \brief Create protobuf message FileNode from Artifact::ObjectInfo [[nodiscard]] auto CreateFileNodeFromObjectInfo( std::string const& name, Artifact::ObjectInfo const& object_info) noexcept -> bazel_re::FileNode { @@ -279,7 +279,7 @@ template <class T> return DirectoryNodeBundle::Create(msg, content_creator, digest_creator); } -/// \brief Create bundle for profobuf message Command from args strings. +/// \brief Create bundle for protobuf message Command from args strings. [[nodiscard]] auto CreateCommandBundle( std::vector<std::string> const& args, std::vector<std::string> const& output_files, diff --git a/test/bootstrap/RULES b/test/bootstrap/RULES index fb9fca0f..9b9db26e 100644 --- a/test/bootstrap/RULES +++ b/test/bootstrap/RULES @@ -4,7 +4,7 @@ , "" , "Runfiles and \"compile-deps\" of \"libs\" are staged to \"include\"," , "artifacts and \"link-deps\" to \"lib\", in a flat way." - , "Articats of \"bins\" are staged to \"bin\"." + , "Artifacts of \"bins\" are staged to \"bin\"." , "The source files underlying \"protos\" are staged to \"proto\"." , "The artifacts of \"deps\" are directly added to the stage." , "This is only for testing bootstrapping against preinstalled dependencies." |