Expand build system docs
This updates the GN build system's documentation to more generally
describe how to configure a Pigweed project using GN, instead of
specifically explaining the upstream build structure.
Change-Id: Ic3d9423a34400ccfd57da8f642ced7721fe835e4
Reviewed-on: https://pigweed-review.googlesource.com/c/pigweed/pigweed/+/17402
Commit-Queue: Alexei Frolov <frolv@google.com>
Reviewed-by: Keir Mierle <keir@google.com>
diff --git a/docs/build_system.rst b/docs/build_system.rst
index a9d465c..fbe699d 100644
--- a/docs/build_system.rst
+++ b/docs/build_system.rst
@@ -1,17 +1,189 @@
.. _chapter-build-system:
+
============
Build system
============
+Building software for embedded devices is a complex process. Projects often have
+custom toolchains, target different hardware platforms, and require additional
+configuration and post-processing of artifacts.
-Pigweed's primary build system is `GN`_, which is used for all upstream
-development. Some other common build systems are supported for integration into
-existing project, which are described in :ref:`chapter-pw-build`. We recommend
-using GN where possible.
+As a modern embedded framework, Pigweed's goal is to collect these embedded use
+cases into a powerful and flexible build system, then extend it with support for
+modern software development practices.
-.. _GN: https://gn.googlesource.com/gn/
+What's in a build system?
+=========================
+A quality build system provides a variety of features beyond compiling code.
+Throughout our experience with embedded development, we've found several build
+features to be especially useful, and designed Pigweed's build system with them
+in mind.
-This document describes Pigweed's upstream build structure.
+Simple toolchain configuration
+------------------------------
+Embedded projects often use custom build toolchains for their specific hardware.
+Configuring these should be a simple process, both in their initial setup and
+later adjustments.
+
+Multi-target builds
+-------------------
+Virtually every consumer product has firmware that targets different boards or
+MCUs during development. While building for a single board is simple enough, the
+complexity of supporting different targets ranges from changing compiler flags
+to swapping out entire libraries of firmware and drivers. This is often done by
+running multiple builds, configuring each one accordingly. In Pigweed, we've
+designed our build system with first-class multi-target support in mind,
+allowing any number of target configurations to be built simultaneously.
+
+Multi-language support
+----------------------
+Embedded projects are typically written in C, C++, and assembly. However, it is
+possible to have firmware written in other languages, such as Rust.
+Additionally, projects may have host-side tooling written in a wide variety of
+languages. Having all of these build together proves to be a large time saver.
+
+Custom scripting
+----------------
+Embedded projects often require post-processing of build artifacts; these may
+include:
+
+* Extracting ELF sections into a different container
+* Injecting metadata into firmware images
+* Image signing
+* Creating databases of symbols for debugging
+* Extracting string tokens into a database (for example, with
+ :ref:`chapter-pw-tokenizer`)
+
+These are run as steps during a build, facilitated by the build system.
+
+See also
+^^^^^^^^
+
+* :ref:`pw-build-python-script`
+
+Python packaging
+----------------
+Python is a favorite scripting language of many development teams, and here at
+Pigweed, we're no exception. Much of Pigweed's host-side tooling is written in
+Python. While Python works great for local development, problems can arise when
+scripts need to be packaged and distributed for vendors or factory teams. Having
+proper support for packaging Python within a build system allows teams to focus
+on writing code instead of worrying about distribution.
+
+Size reporting
+--------------
+On embedded devices, memory is everything. Most projects have some sort of
+custom tooling to determine how much flash and RAM space their firmware uses.
+Being able to run size reports as part of a build ensures that they are always
+up-to-date and allows space usage to be tracked over time.
+
+See also
+^^^^^^^^
+
+* :ref:`chapter-pw-bloat`
+
+Documentation
+-------------
+An oft-neglected part of software development, documentation is invaluable for
+future maintainers of a project. As such, Pigweed has integrated documentation
+which builds alongside its code and combines with other build features, such as
+size reports, to provide high quality, up-to-date references for developers.
+
+See also
+^^^^^^^^
+
+* :ref:`chapter-pw-docgen`
+
+Unit testing
+------------
+Unit tests are essential to ensure that the functionality of code remains
+consistent as changes are made to avoid accidental regressions. Running unit
+tests as part of a build keeps developers constantly aware of the impact of
+their changes.
+
+Host-side unit tests
+^^^^^^^^^^^^^^^^^^^^
+Though Pigweed targets embedded devices, a lot of its code can be run and tested
+on a host desktop by swapping out backends to host platform libraries. This is
+highly beneficial during development, as it allows tests to consistently run
+without having to go through the process of flashing a device.
+
+Device-side unit tests
+^^^^^^^^^^^^^^^^^^^^^^
+As useful as host-side tests are, they are not sufficient for developing actual
+firmware, and it is critical to run tests on the actual hardware. Pigweed has
+invested into creating a test framework and build integration for running tests
+across physical devices as part of a build.
+
+See also
+^^^^^^^^
+
+* :ref:`chapter-pw-unit-test`
+* :ref:`chapter-pw-target-runner`
+
+Bonus: pw watch
+---------------
+In web development, it is common to have a file system watcher listening for
+source file changes and triggering a build for quick iteration. When combined
+with a fast incremental build system, this becomes a powerful feature, allowing
+things such as unit tests and size reports to re-run whenever any dependent
+code is modified.
+
+While initially seen as somewhat of a gimmick, Pigweed's watcher has become a
+staple of Pigweed development, with most Pigweed users having it permanently
+running in a terminal window.
+
+See also
+^^^^^^^^
+
+* :ref:`chapter-pw-watch`
+
+Pigweed's build systems
+=======================
+Pigweed can be used either as a monolith or à la carte, slotting into an
+existing project. To this end, Pigweed supports multiple build systems, allowing
+Pigweed-based projects to choose the most suitable one for them.
+
+Of the supported build systems, GN is the most full-featured, followed by CMake,
+and finally Bazel.
+
+CMake
+-----
+A well-known name in C/C++ development, `CMake`_ is widely used by all kinds of
+projects, including embedded devices. Pigweed's CMake support is provided
+primarily for projects that have an existing CMake build and wish to integrate
+Pigweed modules.
+
+Bazel
+-----
+The open source version of Google's internal build system. `Bazel`_ has been
+growing in popularity within the open source world, as well as being adopted by
+various proprietary projects. Its modular structure makes it a great fit for
+à la carte usage.
+
+GN
+--
+A perhaps unfamiliar name, `GN (Generate Ninja)`_ is a meta-build system that
+outputs `Ninja`_ build files, originally designed for use in Chromium. Pigweed
+first experimented with GN after hearing about it from another team, and we
+quickly came to appreciate its speed and simplicity. GN has become Pigweed's
+primary build system; it is used for all upstream development and strongly
+recommended for Pigweed-based projects where possible.
+
+.. _CMake: https://cmake.org/
+.. _Bazel: https://bazel.build/
+.. _GN (Generate Ninja): https://gn.googlesource.com/gn
+.. _Ninja: https://ninja-build.org/
+
+The GN build
+============
+This section describes Pigweed's GN build structure, how it is used upstream,
+build conventions, and recommendations for Pigweed-based projects. While
+containing some details about how GN works in general, this section is not
+intended to be a guide on how to use GN. To learn more about the tool itself,
+refer to the official `GN reference`_.
+
+.. _GN reference: https://gn.googlesource.com/gn/+/master/docs/reference.md
.. note::
A quick note on terminology: the word "target" is overloaded within GN (and
@@ -22,44 +194,139 @@
To avoid confusing the two, we refer to the former as "GN targets" and the
latter as "Pigweed targets".
-.gn
-===
-The entrypoint to the GN build is the ``.gn`` file, which defines the project's
-root directory (henceforth ``//``). In Pigweed, its only purpose is to point GN
-to the location of the BUILDCONFIG file.
+Entrypoint: .gn
+---------------
+The entrypoint to a GN build is the ``.gn`` file, which defines a project's root
+directory (henceforth ``//``).
-BUILDCONFIG.gn
-==============
-``//BUILDCONFIG.gn`` configures the GN build by defining global configuration
-options. Most of Pigweed's configuration is left to individual build targets,
-so the BUILDCONFIG file is relatively empty. It sets Pigweed's default
-toolchain, which GN requires before evaluating any BUILD files.
+``.gn`` must point to the location of a ``BUILDCONFIG.gn`` file for the project.
+In Pigweed upstream, this is its only purpose.
-//BUILD.gn
-==========
+Downstream projects may additionally use ``.gn`` to set global overrides for
+Pigweed's build arguments, which apply across all Pigweed targets. For example,
+a project could configure the protobuf libraries that it uses. This is done by
+defining a ``default_args`` scope containing the overrides.
+
+.. code::
+
+ # The location of the BUILDCONFIG file.
+ buildconfig = "//BUILDCONFIG.gn"
+
+ # Build arguments set across all Pigweed targets.
+ default_args = {
+ pw_protobuf_GENERATORS = [ "nanopb_rpc" ]
+ dir_pw_third_party_nanopb = "//third_party/nanopb-0.4.2"
+ }
+
+Configuration: BUILDCONFIG.gn
+-----------------------------
+The file ``BUILDCONFIG.gn`` configures the GN build by defining any desired
+global variables/options. It can be located anywhere in the build tree, but is
+conventionally placed at the root. ``.gn`` points GN to this file.
+
+``BUILDCONFIG.gn`` is evaluated before any other GN files, and variables defined
+within it are placed into GN's global scope, becoming available in every file
+without requiring imports.
+
+The options configured in this file differ from those in ``.gn`` in two ways:
+
+1. ``BUILDCONFIG.gn`` is evaluated for every GN toolchain (and Pigweed target),
+ whereas ``.gn`` is only evaluated once. This allows ``BUILDCONFIG.gn`` to set
+ different options for each Pigweed target.
+2. In ``.gn``, only GN build arguments can be overridden. ``BUILDCONFIG.gn``
+ allows defining arbitrary variables.
+
+Generally, it is preferable to expose configuration options through build args
+instead of globals in ``BUILDCONFIG.gn`` (something Pigweed's build previously
+did), as they are more flexible, greppable, and easier to manage. However, it
+may make sense to define project-specific constants in ``BUILDCONFIG.gn``.
+
+Pigweed's upstream ``BUILDCONFIG.gn`` does not define any variables; it just
+sets Pigweed's default toolchain, which GN requires.
+
+.. _top-level-build:
+
+Top-level GN targets: //BUILD.gn
+--------------------------------
The root ``BUILD.gn`` file defines all of the libraries, images, tests, and
-binaries built within Pigweed. These are split across a few logical groups,
-which are described below. In order to build a GN target, it *must* be listed in
-one of the groups in this file.
+binaries built by a Pigweed project. This file is evaluated immediately after
+``BUILDCONFIG.gn``, with the active toolchain (which is the default toolchain
+at the start of a build).
-``//BUILD.gn`` is also responsible for enumerating each of the Pigweed targets
-that Pigweed supports. These targets are defined as toolchains providing their
-custom configuration options. ``/BUILD.gn`` instantiates a version of its GN
-target groups for each of these toolchains.
+``//BUILD.gn`` is responsible for enumerating each of the Pigweed targets built
+by a project. This is done by instantiating a version of each of the project's
+GN target groups with each Pigweed target's toolchain. For example, in upstream,
+all of Pigweed's GN targets are contained within the ``pigweed_default`` group.
+This group is instantiated multiple times, with different Pigweed target
+toolchains.
+
+.. code::
+
+ # Snippit from Pigweed's //BUILD.gn
+
+ group("host_clang") {
+ deps = [ ":pigweed_default($dir_pigweed/targets/host:host_clang_$pw_optimization_level)" ]
+ }
+
+ group("stm32f429i") {
+ deps = [ ":pigweed_default($dir_pigweed/targets/stm32f429i-disc1:stm32f429i_disc1_$pw_optimization_level)" ]
+ }
+
+ group("docs") {
+ deps = [ ":pigweed_default($dir_pigweed/targets/docs)" ]
+ }
+
+Pigweed projects are recommended to follow this pattern, creating a top-level
+group for each of its Pigweed targets, which builds a common GN target with the
+appropriate toolchain.
+
+It is important that no dependencies are listed under the default toolchain
+within ``//BUILD.gn``, as it does not configure any build parameters, and
+therefore should not evaluate any other GN files. The pattern that Pigweed uses
+to achieve this is to wrap all dependencies within a condition checking the
+toolchain.
+
+.. code::
+
+ group("my_application_images") {
+ deps = [] # Empty in the default toolchain.
+
+ if (current_toolchain != default_toolchain) {
+ # This is only evaluated by Pigweed target toolchains, which configure
+ # all of the required options to build Pigweed code.
+ deps += [ "//images:evt" ]
+ }
+ }
+
+ # The images group is instantiated for each of the project's Pigweed targets.
+ group("my_pigwed_target") {
+ deps = [ ":my_application_images(//toolchains:my_pigweed_target)" ]
+ }
.. warning::
Pigweed's default toolchain is never used, so it is set to a dummy toolchain
which doesn't define any tools. ``//BUILD.gn`` contains conditions which check
that the current toolchain is not the default before declaring any GN target
dependencies to prevent the default toolchain from evaluating any other BUILD
- files. All GN targets added to the build must be placed in one of these
+ files. All GN targets added to the build must be placed under one of these
conditional scopes.
-Groups
-------
+"default" group
+^^^^^^^^^^^^^^^
+The root ``BUILD.gn`` file can define a special group named ``default``. If
+present, Ninja will build this group when invoked without arguments.
+
+.. tip::
+ Defining a ``default`` group makes using ``pw watch`` simple!
+
+Upstream GN target groups
+^^^^^^^^^^^^^^^^^^^^^^^^^
+In upstream, Pigweed splits its top-level GN targets into a few logical groups,
+which are described below. In order to build a GN target, it *must* be listed in
+one of the groups in this file.
apps
-^^^^
+~~~~
This group defines the application images built in Pigweed. It lists all of the
common images built across all Pigweed targets, such as modules' example
executables. Each Pigweed target can additionally provide its own specific
@@ -67,44 +334,110 @@
this group.
host_tools
-^^^^^^^^^^
+~~~~~~~~~~
This group defines host-side tooling binaries built for Pigweed.
pw_modules
-^^^^^^^^^^
+~~~~~~~~~~
This group lists the main libraries for all of Pigweed's modules.
pw_module_tests
-^^^^^^^^^^^^^^^
+~~~~~~~~~~~~~~~
All modules' unit tests are collected here, so that they can all be run at once.
pigweed_default
-^^^^^^^^^^^^^^^
+~~~~~~~~~~~~~~~
This group defines everything built in a Pigweed build invocation by collecting
-the above groups and conditionally adding them, based on the Pigweed target
-configuration. Generally, new dependencies should not be added here; instead use
-one of the groups listed above.
+the above groups and conditionally depending on them based on the active Pigweed
+target's configuration. Generally, new dependencies should not be added here;
+instead, use one of the groups listed above.
-The ``pigweed_default`` group is instantiated for each of the Pigweed target
-toolchains.
+The ``pigweed_default`` group is instantiated for each upstream Pigweed target's
+toolchain.
Pigweed target instantiations
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
These groups wrap ``pigweed_default`` with a specific target toolchain. They are
named after the Pigweed target, e.g. ``host_clang``, ``stm32f429i``, etc.
+Other BUILD files: //\*\*/BUILD.gn
+----------------------------------
+The rest of the ``BUILD.gn`` files in the tree define libraries, configs, and
+build args for each of the modules in a Pigweed project.
+
+Project configuration: //build_overrides/pigweed.gni
+----------------------------------------------------
+Each Pigweed project must contain a Pigweed configuration file at a known
+location in the GN build tree. Currently, this file only contains a single build
+argument, which must be set to the GN build path to the root of the Pigweed
+repository within the project.
+
+Module variables
+----------------
+As Pigweed is inteded to be a subcomponent of a larger project, it cannot assume
+where it or its modules is located. Therefore, Pigweed's upstream BUILD.gn files
+do not use absolute paths; instead, variables are defined pointing to each of
+Pigweed's modules, set relative to a project-specific ``dir_pigweed``.
+
+To depend on Pigweed modules from GN code, import Pigweed's overrides file and
+reference these module variables.
+
+.. code::
+
+ # This must be imported before .gni files from any other Pigweed modules.
+ # To prevent gn format from reordering this import, a comment is added above.
+ import("//build_overrides/pigweed.gni")
+
+GN target type wrappers
+-----------------------
+To faciliate injecting global configuration options, Pigweed defines wrappers
+around builtin GN target types such as ``source_set`` and ``executable``. These
+are defined within ``$dir_pw_build/target_types.gni``.
+
+.. note::
+ To take advantage of Pigweed's flexible target configuration system, use
+ ``pw_*`` target types (e.g. ``pw_source_set``) in your BUILD.gn files instead
+ of GN builtins.
+
Pigweed targets
-===============
-Each Pigweed target is defined as a GN toolchain which provides its own build
-tool and output binary configs, and custom overrides for Pigweed's build
-configuration arguments. For more information on Pigweed's target system, as
-well as each of the supported targets, refer to :ref:`chapter-targets`.
+---------------
+To build for a specific hardware platform, builds define Pigweed targets. These
+are essentially GN toolchains which set special arguments telling Pigweed how to
+build. For information on Pigweed's target system, refer to
+:ref:`chapter-targets`.
-Usage examples
-==============
+The dummy toolchain
+-------------------
+Pigweed's ``BUILDCONFIG.gn`` sets the project's default toolchain to a "dummy"
+toolchain which does not specify any compilers or override any build arguments.
+Downstream projects are recommended to do the same, following the steps
+described in :ref:`top-level-build` to configure builds for each of their
+Pigweed targets.
-Building a custom executable
-----------------------------
+.. admonition:: Why use a dummy?
+
+ To support some of its advanced (and useful!) build features, Pigweed requires
+ the ability to generate new toolchains on the fly. This requires having
+ knowledge of the full configuration of the current toolchain (which is easy if
+ it's all defined within a scope), something which is impractical to achieve
+ using the default toolchain.
+
+ Additionally, there are some cases where GN treats default and non-default
+ toolchains differently. By not using the default toolchain, we avoid having
+ to deal with these inconsistencies.
+
+ It is possible to build Pigweed using only the default toolchain, but it
+ requires a more complicated setup to get everything working and should be
+ avoided unless necessary (for example, when integrating with a large existing
+ GN-based project).
+
+Upstream development examples
+-----------------------------
+If developing for upstream Pigweed, some common build use cases are described
+below.
+
+Building a custom executable/app image
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
1. Define your executable GN target using the ``pw_executable`` template.
diff --git a/docs/targets.rst b/docs/targets.rst
index 22784ce..19ee129 100644
--- a/docs/targets.rst
+++ b/docs/targets.rst
@@ -3,9 +3,113 @@
=======
Targets
=======
-Pigweed is designed to support many 32-bit targets. This section contains
-documentation for the targets used for upstream Pigweed development,
-though more may exist outside the main Pigweed repository.
+Pigweed is designed to be portable to many different hardware platforms.
+Pigweed's GN build comes with an extensible target system that allows it to be
+configured to build for any number of platforms, which all build simultaneously.
+
+Defining a target
+=================
+Each Pigweed target built by a project is defined within the GN build as a
+toolchain providing the target's build parameters.
+
+In Pigweed, these target toolchains are defined as GN scopes, which are fed into
+a ``generate_toolchain`` template to create the complete GN toolchain.
+
+Hierarchical target structure
+-----------------------------
+The rationale for scope-based toolchains is to make Pigweed targets extensible.
+Variables from a toolchain can be forwarded into new scopes and then extended
+or overriden. This facilitates the sharing of common configuration options
+between toolchains, and allows for hierarchical structures. Upstream Pigweed
+makes use of this heavily; it defines basic compiler-only configurations, uses
+these as a base for board-specific toolchains, then creates its final targets on
+top of those.
+
+.. blockdiag::
+
+ blockdiag {
+ default_fontsize = 14;
+ orientation = portrait;
+
+ arm_gcc [label = "arm_gcc"];
+ arm_gcc_cortex_m4 [label = "cortex_m4"];
+ arm_gcc_cortex_m4f [label = "cortex_m4f"];
+ arm_gcc_cortex_m4f_debug [label = "cortex_m4f_debug"];
+ arm_gcc_cortex_m4f_size_optimized [label = "cortex_m4f_size_optimized"];
+ stm32f429i_disc1_debug [label = "stm32f429i_disc1_debug"];
+ arm_gcc -> arm_gcc_cortex_m4
+ arm_gcc -> arm_gcc_cortex_m4f
+ arm_gcc_cortex_m4f -> arm_gcc_cortex_m4f_debug
+ arm_gcc_cortex_m4f -> arm_gcc_cortex_m4f_size_optimized
+ arm_gcc_cortex_m4f_debug -> stm32f429i_disc1_debug
+ }
+
+Toolchain target variables
+--------------------------
+The core of a toolchain is defining the tools it uses. This is done by setting
+the variables ``ar``, ``cc``, and ``cxx`` to the appropirate compilers. Pigweed
+provides many commonly used compiler configurations in the ``pw_toolchain``
+module.
+
+The rest of the a Pigweed target's configuration is listed within a ``defaults``
+scope in its toolchain. Every variable in this scope is an override of a GN
+build argument defined in Pigweed. Some notable arguments include:
+
+* ``default_configs``: A list of GN configs to apply to every ``pw_*`` GN
+ template. This is typically used to set compiler flags, optimization levels,
+ global #defines, etc.
+* ``default_public_deps``: List of GN targets which are added as a dependency
+ to all ``pw_*`` GN targets. This is used to add global module dependencies;
+ for example, in upstream, ``pw_polyfill`` is added here to provide C++17
+ features in C++11/C++14 code.
+* Facade backends: Pigweed defines facades to provide a common interface for
+ core system features such as logging without assuming an implementation.
+ When building a Pigweed target, the implementations for each of these must be
+ chosen. The ``*_BACKEND`` build args that Pigweed defines are used to set
+ these.
+
+There are many other build arguments that can be set, some of which are
+module-specific. A full list can be seen by running ``gn args --list out``,
+and further documentation can be found within their respective modules.
+
+Example Pigweed target
+======================
+The code below demonstrates how a project might configure one of its Pigweed
+targets.
+
+.. code::
+
+ # Prevent gn format from reordering this import.
+ import("//build_overrides/pigweed.gni")
+
+ import("$dir_pw_toolchain/arm_gcc/toolchains.gni")
+ import("$dir_pw_toolchain/generate_toolchain.gni")
+
+ my_target_scope = {
+ # Use Pigweed's Cortex M4 toolchain as a base.
+ _toolchain_base = pw_toolchain_arm_gcc.cortex_m4f_debug
+
+ # Forward everything except the defaults scope from that toolchain.
+ forward_variables_from(_toolchain_base, "*", [ "defaults" ])
+
+ defaults = {
+ # Forward everything from the base toolchain's defaults.
+ forward_variables_from(_toolchain_base.defaults, "*")
+
+ # Extend with custom build arguments for the target.
+ pw_log_BACKEND = dir_pw_log_tokenized
+ pw_protobuf_GENERATORS = [ "nanopb" ]
+ }
+ }
+
+ # Create the actual GN toolchain from the scope.
+ generate_toolchain("my_target") {
+ forward_variables_from(my_target_scope, "*")
+ }
+
+Upstream targets
+================
+The following is a list of targets used for upstream Pigweed development.
.. toctree::
:maxdepth: 1
diff --git a/pw_bloat/docs.rst b/pw_bloat/docs.rst
index bbbbb48..4faa7a5 100644
--- a/pw_bloat/docs.rst
+++ b/pw_bloat/docs.rst
@@ -2,7 +2,7 @@
.. highlight:: sh
-.. _chapter-bloat:
+.. _chapter-pw-bloat:
--------
pw_bloat
diff --git a/pw_build/docs.rst b/pw_build/docs.rst
index 16e9d9f..9fa2944 100644
--- a/pw_build/docs.rst
+++ b/pw_build/docs.rst
@@ -79,6 +79,8 @@
All of the ``pw_*`` target type overrides accept any arguments, as they simply
forward them through to the underlying target.
+.. _pw-build-python-script:
+
pw_python_script
^^^^^^^^^^^^^^^^
The ``pw_python_script`` template is a convenience wrapper around ``action`` for
diff --git a/pw_docgen/docs.rst b/pw_docgen/docs.rst
index 10600b2..8e9b05f 100644
--- a/pw_docgen/docs.rst
+++ b/pw_docgen/docs.rst
@@ -1,9 +1,9 @@
-.. _chapter-docgen:
-
.. default-domain:: cpp
.. highlight:: sh
+.. _chapter-pw-docgen:
+
---------
pw_docgen
---------
diff --git a/pw_fuzzer/docs.rst b/pw_fuzzer/docs.rst
index e383566..4c94a91 100644
--- a/pw_fuzzer/docs.rst
+++ b/pw_fuzzer/docs.rst
@@ -1,8 +1,9 @@
-.. _chapter-pw-unit-test:
.. default-domain:: cpp
.. highlight:: sh
+.. _chapter-pw-fuzzer:
+
---------
pw_fuzzer
---------
diff --git a/pw_target_runner/docs.rst b/pw_target_runner/docs.rst
index 2b8b8ca..9306692 100644
--- a/pw_target_runner/docs.rst
+++ b/pw_target_runner/docs.rst
@@ -1,9 +1,9 @@
-.. _chapter-target-runner:
-
.. default-domain:: cpp
.. highlight:: sh
+.. _chapter-pw-target-runner:
+
----------------
pw_target_runner
----------------
diff --git a/pw_unit_test/docs.rst b/pw_unit_test/docs.rst
index 7955f6c..34c7d57 100644
--- a/pw_unit_test/docs.rst
+++ b/pw_unit_test/docs.rst
@@ -1,8 +1,9 @@
-.. _chapter-pw-unit-test:
.. default-domain:: cpp
.. highlight:: sh
+.. _chapter-pw-unit-test:
+
------------
pw_unit_test
------------
diff --git a/pw_watch/docs.rst b/pw_watch/docs.rst
index e1967d2..df6c059 100644
--- a/pw_watch/docs.rst
+++ b/pw_watch/docs.rst
@@ -2,7 +2,7 @@
.. highlight:: sh
-.. _chapter-watch:
+.. _chapter-pw-watch:
--------
pw_watch