diff options
| author | Guy Harris <guy@alum.mit.edu> | 2018-05-14 23:38:22 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2018-05-15 06:38:56 +0000 |
| commit | 81bfa3f7b84b708f87ac57f97afb472a0518784a (patch) | |
| tree | e9a2b992323b0cfcde213f7994a1fc4f8873beb0 | |
| parent | 9c20675d0e2526c72ab381615c2a3ca3f16f422d (diff) | |
Don't speak of "UNIX".
macOS is a UNIX(R) and FreeBSD isn't a UNIX(R), but we mentioned macOS
along with UNIX but didn't mention FreeBSD along with UNIX.
Instead, just speak of "UN*Xes" and give Linux, macOS, and *BSD as
examples. Feel free to add Solaris, AIX, or HP-UX if you want, assuming
you can build Wireshark on them.
Change-Id: I85be3861fa0bc603b93d077a2d9d587d43cb6e7e
Reviewed-on: https://code.wireshark.org/review/27549
Reviewed-by: Guy Harris <guy@alum.mit.edu>
| -rw-r--r-- | docbook/wsdg_src/WSDG_chapter_tools.asciidoc | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/docbook/wsdg_src/WSDG_chapter_tools.asciidoc b/docbook/wsdg_src/WSDG_chapter_tools.asciidoc index b17f950ebd..641df262cf 100644 --- a/docbook/wsdg_src/WSDG_chapter_tools.asciidoc +++ b/docbook/wsdg_src/WSDG_chapter_tools.asciidoc @@ -97,13 +97,14 @@ case. === CMake -Wireshark’s build environment can be configured using CMake on Windows, -Linux, macOS, and UNIX. CMake is designed to support out of tree builds. -So much so, that in tree builds do not work properly in all cases. Along -with being cross-platform, CMake supports many build tools and -environments including traditional make, Ninja, and MSBuild. Our -Buildbot runs CMake steps on Ubuntu, Win32, Win64, and macOS. In -particular, the macOS and Windows packages are built using CMake. +Wireshark’s build environment can be configured using CMake on Windo +and various UN*Xes, including Linux, macOS, and *BSD. CMake is designed +to support out of tree builds. So much so, that in tree builds do not +work properly in all cases. Along with being cross-platform, CMake +supports many build tools and environments including traditional make, +Ninja, and MSBuild. Our Buildbot runs CMake steps on Ubuntu, Win32, +Win64, and macOS. In particular, the macOS and Windows packages are +built using CMake. Building with CMake typically includes creating a build directory and specifying a *generator*, aka a build tool. For example, to build |