Skip to content

Commit 67be57c

Browse files
committed
proof reading edits on TribitsDevelopersGuide.rst - mostly typos
1 parent 96d4fb7 commit 67be57c

File tree

1 file changed

+35
-35
lines changed

1 file changed

+35
-35
lines changed

tribits/doc/developers_guide/TribitsDevelopersGuide.rst

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ TriBITS makes no attempt to hide that fact either from the TriBITS project
4848
developers or from the users that need to configure and build the software.
4949
Therefore, to make effective usage of TriBITS, one must learn the basics of
5050
CMake (both as a developer and as a user). In particular, CMake is a
51-
Turning-complete programming language with local varaibles, global variables, macros, functions, targets, commands, and other
51+
Turning-complete programming language with local variables, global variables, macros, functions, targets, commands, and other
5252
features. One needs to understand how to define and use variables, macros,
5353
and functions in CMake. One needs to know how to debug CMakeLists.txt files
5454
and CMake code in general (i.e. using ``MESSAGE()`` print statements). One
@@ -1063,7 +1063,7 @@ processed by TriBITS:
10631063
the built-in ``PROJECT()`` command called in the top-level
10641064
`<projectDir>/CMakeLists.txt`_ file..
10651065

1066-
The following `cache varaibles` are defined for every TriBITS project:
1066+
The following `cache variables` are defined for every TriBITS project:
10671067

10681068
.. _${PROJECT_NAME}_TRIBITS_DIR:
10691069

@@ -1163,7 +1163,7 @@ In short, a TriBITS Repository:
11631163
respectively)
11641164
* Defines the base source and binary directories for the Repository
11651165
``${REPOSITORY_NAME}_SOURCE_DIR`` and ``${REPOSITORY_NAME}_BINARY_DIR``.
1166-
* Defines a common set of initializations and other hooks for a all the
1166+
* Defines a common set of initializations and other hooks for all the
11671167
packages in the repository.
11681168
* Typically maps to a VC (i.e. git) repository and therefore represents a unit
11691169
of integration, versioning and reuse. (But core TriBITS has no dependency
@@ -1356,7 +1356,7 @@ specific to this TriBITS Repository. This file must define the macro
13561356
file is processed as the top project-level scope so any local variables set
13571357
have project-wide effect. This file is processed after the project's
13581358
`<projectDir>/cmake/CallbackDefineProjectPackaging.cmake`_ file so any project
1359-
CPACK varaibles are defined for the repository-level options and commands are
1359+
CPACK variables are defined for the repository-level options and commands are
13601360
created. This file typically just sets extra excludes to remove files from
13611361
the tarball. The file:
13621362

@@ -1404,7 +1404,7 @@ are processed:
14041404
``${REPOSITORY_NAME}_SOURCE_DIR``
14051405

14061406
The absolute path to the base of a given TriBITS Repository's source
1407-
directory. CMake code, for example in a packages's ``CMakeLists.txt``
1407+
directory. CMake code, for example in a packages' ``CMakeLists.txt``
14081408
file, typically refers to this by the raw name like ``RepoX_SOURCE_DIR``.
14091409
This makes such CMake code independent of where the various TriBITS repos
14101410
are in relation to each other or the TriBITS Project (but does hard-code
@@ -1418,7 +1418,7 @@ are processed:
14181418
where the various TriBITS repos are in relation to each other or the
14191419
Project.
14201420

1421-
The following project-level local varaibles can be defined by the project or
1421+
The following project-level local variables can be defined by the project or
14221422
the user to help define the what packages from the repository
14231423
``${REPOSITORY_NAME}`` contribute to the primary meta-project packages (PMPP):
14241424

@@ -1626,7 +1626,7 @@ The final command in the package's base ``CMakeLists.txt`` file must always be
16261626
necessary post-processing by TriBITS.
16271627

16281628
It is also possible for the package's top-level ``CMakeLists.txt`` to be the
1629-
only ``CMakeLists.txt`` file for a package. Such an example can be see in the
1629+
only ``CMakeLists.txt`` file for a package. Such an example can be seen in the
16301630
example project `TribitsHelloWorld`_ in the ``HelloWorld`` package.
16311631

16321632
When a TriBITS package is broken up into subpackages (see `TriBITS
@@ -1656,7 +1656,7 @@ base ``CMakeLists.txt`` file is `TRIBITS_PACKAGE_POSTPROCESS()`_.
16561656
NOTE: The package's base ``CMakeLists.txt`` file only gets processed if the
16571657
package is actually enabled
16581658
(i.e. ``${PROJECT_NAME}_ENABLE_${PACKAGE_NAME}=ON``). This is an important
1659-
design feature of TriBITS in that the contents of non-enabled package's can't
1659+
design feature of TriBITS in that the contents of non-enabled packages can't
16601660
damage the configure, build, and test of the enabled packages based on errors
16611661
in non-enabled packages. This is critical to allow experimental `EX`_
16621662
test-group packages and lower-maturity packages to exist in the same source
@@ -1682,7 +1682,7 @@ are being processed:
16821682
``PACKAGE_NAME``
16831683

16841684
The name of the current TriBITS SE package. This is set automatically by
1685-
TriBITS before the packages's ``CMakeLists.txt`` file is processed.
1685+
TriBITS before the packages' ``CMakeLists.txt`` file is processed.
16861686
**WARNING:** This name must be globally unique across the entire project
16871687
(see `Globally unique TriBITS package names`_).
16881688

@@ -1714,7 +1714,7 @@ defined:
17141714
``PackageX_SOURCE_DIR``. This makes such CMake code independent of where
17151715
the package is in relation to other packages. NOTE: This variable is
17161716
defined for all declared packages that exist, independent of whether they
1717-
are enabled or not. This varible is set as soon as it is known if the
1717+
are enabled or not. This variable is set as soon as it is known if the
17181718
given package exists or not.
17191719

17201720
``${PACKAGE_NAME}_BINARY_DIR``
@@ -1883,7 +1883,7 @@ A TriBITS Subpackage:
18831883
and/or tests with CMake build targets for building these for which TriBITS
18841884
exports the list of include directories, libraries, and targets that are
18851885
created (along with CMake dependencies).
1886-
* Is declared in its parent packages's
1886+
* Is declared in its parent packages'
18871887
`<packageDir>/cmake/Dependencies.cmake`_ file in a call to
18881888
`TRIBITS_PACKAGE_DEFINE_DEPENDENCIES()`_ using the argument
18891889
`SUBPACKAGES_DIRS_CLASSIFICATIONS_OPTREQS`_.
@@ -2680,7 +2680,7 @@ Project Core Files`_ and `TriBITS Repository Core Files`_, respectively.
26802680

26812681
Several files from this project are used as examples in the section `TriBITS
26822682
Project Structure`_. Here, a fuller description is given of this project and
2683-
demonstrates some how TriBITS works. From this simple example project, one
2683+
a demonstration of how TriBITS works. From this simple example project, one
26842684
can quickly see how the basic structural elements of a TriBITS project,
26852685
repository, and package (and subpackage) are pulled together.
26862686

@@ -3598,7 +3598,7 @@ packages, this can produce a lot of output to stdout. One just needs to
35983598
understand what TriBITS is printing out and where to look in the output for
35993599
different information. The examples in the section `Example Enable/Disable
36003600
Use Cases`_ show what this output looks like for the various enable/disable
3601-
scenarios and tries to explains in more detail the reasons for why the given
3601+
scenarios and tries to explain in more detail the reasons for why the given
36023602
behavior is implemented the way that it is. Given this output, the rule
36033603
definitions given above, and the detailed `Example Enable/Disable Use Cases`_,
36043604
one should always be able to figure out exactly why the final set of
@@ -3632,7 +3632,7 @@ packages in its listed repositories are handled. What these variable do is to
36323632
allow a large project to turn off the auto-enable of optional SE packages in a
36333633
given TriBITS repository to provide more detailed control of what gets used
36343634
from a given TriBITS repository. This, for example, is used in the CASL VERA
3635-
project to mange some of its extra repositories and packages to further reduce
3635+
project to manage some of its extra repositories and packages to further reduce
36363636
the number of packages that get auto-enabled.
36373637

36383638
.. ToDo: We should likely change this so that only tests and example don't get
@@ -4048,7 +4048,7 @@ TriBITS Automated Testing
40484048
=========================
40494049

40504050
Much of the value provided by the TriBITS system is support for testing of
4051-
complex complex projects. Many different types of testing are required in a
4051+
complex projects. Many different types of testing are required in a
40524052
complex project and development effort. A large project with lots of
40534053
repositories and packages provides a number of testing and development
40544054
challenges but also provides a number of opportunities to do testing in an
@@ -4217,7 +4217,7 @@ More detailed descriptions of the test groups are given below.
42174217
major harm to most developers. Also, code may be marked as ``ST`` if it has
42184218
required dependencies on ``ST`` TPLs which are either hard to install or may
42194219
not be available on all platforms where developers do their development and
4220-
fro where they push changes to the global repo. In addition, code my be
4220+
from where they push changes to the global repo. In addition, code may be
42214221
marked as ``ST`` if the project is just too big and developers can't be
42224222
expected to build and test all of this code with every push (so a decision
42234223
is made to only make some code as ``PT`` so that pushes don't take too
@@ -4356,7 +4356,7 @@ The different test test categories are described below in more detail:
43564356

43574357
* Tests marked **HEAVY** are usually reserved for very expensive tests that
43584358
are too expensive to run nightly. ``HEAVY`` tests require more testing
4359-
resources and therefore may only be run on a fully optimzied build and/or
4359+
resources and therefore may only be run on a fully optimized build and/or
43604360
run less frequently. Tests marked as ``HEAVY`` are enabled only for the
43614361
value of ``${PROJECT_NAME}_TEST_CATEGORIES`` equal to ``HEAVY``.
43624362

@@ -4519,7 +4519,7 @@ The nightly builds comprise the basic "heart beat" for the project.
45194519
*Heavy Testing* builds are just an extension to the `Nightly Testing`_ builds
45204520
that add on more expensive tests marked using the `Test Test Category HEAVY`_.
45214521
For projects that define heavy tests and heavy builds, individual test cases
4522-
may be alloed to take 24 hours or longer to run so they can't even be run
4522+
may be allowed to take 24 hours or longer to run so they can't even be run
45234523
every day in nightly testing. What standard heavy builds have in common is
45244524
that they tend to select repositories, SE packages and code, and individual
45254525
tests using the following test-related classifications:
@@ -4565,7 +4565,7 @@ Test Test Category ``PERFORMANCE`` (`Test Test Category PERFORMANCE`
45654565

45664566
.. ToDo: I need to set up automated testing for TriBITS to use as the example
45674567
.. for all of these types of testing. There is no better example that one
4568-
.. that actually works. It would also be nice t have a snapshot repo of
4568+
.. that actually works. It would also be nice to have a snapshot repo of
45694569
.. TribitsExampleProject that also had this testing enabled for it but I am
45704570
.. not sure that really makes sense.
45714571
@@ -4809,7 +4809,7 @@ developed repository.
48094809

48104810
2) **REGRESSION_EMAIL_LIST** (defined in
48114811
`<packageDir>/cmake/Dependencies.cmake`_): Package-specific email address
4812-
specified in the packages's ``Dependencies.cmake`` file using
4812+
specified in the packages' ``Dependencies.cmake`` file using
48134813
`TRIBITS_PACKAGE_DEFINE_DEPENDENCIES()`_.
48144814

48154815
.. _${REPOSITORY_NAME}_REPOSITORY_EMAIL_URL_ADDRESS_BASE:
@@ -5408,7 +5408,7 @@ resulting TriBITS TPL module file ``FindTPL<tplName>.cmake`` looks like::
54085408

54095409
With this approach, the ``FindTPL<tplName>.cmake`` module preserves all of the
54105410
user behavior described in `Enabling support for an optional Third-Party
5411-
Library (TPL)`_ for overriding what TPL componets to look for, where to look
5411+
Library (TPL)`_ for overriding what TPL components to look for, where to look
54125412
and finally to override what is actually used. That is, if the user sets the
54135413
cache variables ``TPL_<tplName>_INCLUDE_DIRS``, ``TPL_<tplName>_LIBRARIES``,
54145414
or ``TPL_<tplName>_LIBRARY_DIRS``, then they should be used without question
@@ -5439,7 +5439,7 @@ return a list of include directories and libraries. Some, like
54395439
packages. therefore, in these cases, ``FIND_PACKAGE(Qt4 ...)`` must be called
54405440
on every configure. In specialized cases such as this, one must write a more
54415441
specialized ``FindTPL<tplName>.cmake`` file and can't use the
5442-
`TRIBITS_TPL_ALLOW_PRE_FIND_PACKAGE()`_ function like shown shown above. Such
5442+
`TRIBITS_TPL_ALLOW_PRE_FIND_PACKAGE()`_ function like shown above. Such
54435443
find modules cannot completely adhere to the standard behavior described in
54445444
`Enabling support for an optional Third-Party Library (TPL)`_.
54455445

@@ -5678,7 +5678,7 @@ be missing. This is demonstrated in `TribitsExampleProject`_ with the package
56785678
.. include:: ../../examples/TribitsExampleProject/PackagesList.cmake
56795679
:literal:
56805680

5681-
In this example, ``InsertedPkg`` has a required dependency on on ``SimpleCxx``
5681+
In this example, ``InsertedPkg`` has a required dependency on ``SimpleCxx``
56825682
and the SE package ``WithSubpackagesB`` has an optional dependency on
56835683
``InsertedPkg``. Therefore, the inserted package ``InsertedPkg`` has upstream
56845684
and downstream dependencies on packages in the ``TribitsExampleProject`` repo.
@@ -5767,7 +5767,7 @@ following:
57675767
(either explicitly or through auto enable/disable logic), use::
57685768

57695769
IF ("${<XXX>_ENABLE_<YYY>}" STREQUAL "")
5770-
# Variable has not be set to 'ON' or 'OFF' yet
5770+
# Variable has not been set to 'ON' or 'OFF' yet
57715771
...
57725772
ENDIF()
57735773

@@ -5933,7 +5933,7 @@ behavior such as:
59335933

59345934
3. Some TriBITS projects may require a version of Python more recent than 2.4.
59355935
In this case, the TriBITS project would set `PythonInterp_FIND_VERSION`_ to
5936-
some value higer than ``2.4``. For example, may newer systems have Python
5936+
some value higher than ``2.4``. For example, may newer systems have Python
59375937
2.6.6 or higher versions installed by default and projects developed on
59385938
such a system typically requires this version or higher.
59395939

@@ -6024,7 +6024,7 @@ TriBITS Environment Probing and Setup
60246024
Part of the TriBITS Framework is to probe the environment, set up the
60256025
compilers, and get ready to compile code. This was mentioned in `Full
60266026
Processing of TriBITS Project Files`_. This is executed by the TriBITS macro
6027-
``TRIBITS_SETUP_ENV()``. Some of to things this macro does are:
6027+
``TRIBITS_SETUP_ENV()``. Some of the things this macro does are:
60286028

60296029
.. _Probe and set up the environment:
60306030

@@ -6097,7 +6097,7 @@ this allows one to create distributions which only includes subsets of a
60976097
larger project (even a single package in some cases).
60986098

60996099
Unlike other build systems (like autotools), CMake will put **EVERYTHING**
6100-
into the source distribution (e.g. tarball) that it sitting in the source tree
6100+
into the source distribution (e.g. tarball) that is sitting in the source tree
61016101
by default. Therefore, setting up for a source distribution usually means
61026102
deciding what extra files and directories should be excluded. Beyond the
61036103
directories for non-enabled packages, further files can be selected to be
@@ -6230,7 +6230,7 @@ rebase by default) as shown in the following Trilinos commit::
62306230
Define HAVE_TEUCHOSCORE_CXX11 in TeuchosCore_config.h
62316231
62326232
This makes TeuchosCore a good example for how Trilinos (or any TriBITS)
6233-
subpackages should put in an optinal dependency on C++11.
6233+
subpackages should put in an optional dependency on C++11.
62346234
62356235
Build/Test Cases Summary
62366236
Enabled Packages: TeuchosCore
@@ -6599,7 +6599,7 @@ where, ``SYNC_BASE_DIR=~/sync_base_dir`` for example, which must already be
65996599
created.
66006600

66016601
Next, one defines a remote to pull changes for the ``ExtraRepo1`` from the
6602-
main develoment repo:
6602+
main development repo:
66036603

66046604
$ cd $SYNC_BASE_DIR/BaseProj/ExtraRepo1
66056605
$ git remote add public url2.gov:/git/ExtraRepo1
@@ -6868,7 +6868,7 @@ After the above cron job starts running (setup described above), the
68686868
into the underlying ``checkin-test.py`` script. If the emails report an
68696869
update, configure, build, or test failure, then someone will need to log onto
68706870
the machine where the ACI sync server is running and investigate what went
6871-
wrong, just like they would if the were running the ``checkin-test.py`` script
6871+
wrong, just like they would if they were running the ``checkin-test.py`` script
68726872
for testing locally modified changes before pushing.
68736873

68746874
In the above example, only a single git/TriBITS repo is integrated in this ACI
@@ -6898,7 +6898,7 @@ require non-trivial storage and CPU resources (due to the MySQL DB of test
68986898
results) and requires some amount of extra maintenance. As an intermediate
68996899
approach, one can consider just using the project's `checkin-test.py`_ script
69006900
to implement basic post-push CI and/or Nightly testing servers using simple
6901-
cron jobs and a some other helper scripts. The ``checkin-test.py`` script
6901+
cron jobs and some other helper scripts. The ``checkin-test.py`` script
69026902
will robustly pull new commits, configure the project, build, run tests, and
69036903
send out emails with results and pass/fail. A bunch of builds can be run at
69046904
once using multiple builds specified in the ``--default-builds``,
@@ -6932,7 +6932,7 @@ CI and Nightly testing using ``checkin-test.py`` may be quite adequate. In
69326932
fact, post-push testing processes implemented with ``checkin-test.py`` are
69336933
much more solid and feature-full than have been employed in many software
69346934
projects that we have seen over the years that were larger, more public, had
6935-
many developers, and and were quite important to many users and development
6935+
many developers, and were quite important to many users and development
69366936
teams.
69376937

69386938

@@ -7177,7 +7177,7 @@ work on all later version GCC and Intel compilers).
71777177
Hiding deprecated code to certify and facilitate later removal
71787178
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
71797179

7180-
In addition to adding deprecation warnings at preprecessing or compile-time,
7180+
In addition to adding deprecation warnings at preprocessing or compile-time,
71817181
it is also highly desirable to allow the deprecated code to be removed from
71827182
the build to help certify that client code indeed no longer needs the
71837183
deprecated code. The following subsections describe how to hide deprecated
@@ -7248,7 +7248,7 @@ included in the build and include path and downstream clients can use them.
72487248

72497249
Once these files need to be permanently removed, one just then needs to remove
72507250
them from the version control repository (i.e. ``git rm <files_to_remove>``)
7251-
and them remove them from the above ``CMakeLists.txt`` code.
7251+
and then remove them from the above ``CMakeLists.txt`` code.
72527252

72537253

72547254
Physically removing deprecated code
@@ -7460,7 +7460,7 @@ See `snapshot-dir.py --help`_ for more details. Note the guidance on using a
74607460
different branch for the snapshot sync followed by a merge. This allows for
74617461
one to maintain local changes to TriBITS and use git to manage the merges.
74627462
However, this will increase the changes of merge conflicts so one should
7463-
consider just directly snapshottting into the master branch to avoid merge
7463+
consider just directly snapshotting into the master branch to avoid merge
74647464
conflicts.
74657465

74667466

0 commit comments

Comments
 (0)