From f45b1c5f2582840d2751f9075abdb4fde28a6bd8 Mon Sep 17 00:00:00 2001 From: Chuck Craft Date: Thu, 29 Sep 2022 19:32:59 -0500 Subject: [PATCH] wsdg: nocheck (no pytests) when building debian packages --- docbook/wsdg_src/WSDG_chapter_quick_setup.adoc | 13 ++++++++----- docbook/wsdg_src/WSDG_chapter_sources.adoc | 1 + 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/docbook/wsdg_src/WSDG_chapter_quick_setup.adoc b/docbook/wsdg_src/WSDG_chapter_quick_setup.adoc index 95c42f4035..848f4de7f4 100644 --- a/docbook/wsdg_src/WSDG_chapter_quick_setup.adoc +++ b/docbook/wsdg_src/WSDG_chapter_quick_setup.adoc @@ -84,9 +84,9 @@ and Ninja. Building with make took nearly 2x time as Ninja in one experiment. CMake builds are best done in a separate build directory, such as a -`build` subdirectory of the top-level source directory. If that -directory is a subdirectory of the top-level source directory, to -generate the build files, change to the build directory and enter the +`build` subdirectory of the top-level source directory. + +If that directory is a subdirectory of the top-level source directory, +to generate the build files, change to the build directory and enter the following command: ---- @@ -99,7 +99,9 @@ to use make as the build tool or $ cmake -G Ninja .. ---- -to use Ninja as the build tool. If you create the build tool in the +to use Ninja as the build tool. + +If you created the build directory in the same directory that contains the top-level Wireshark source directory, to generate the build files, change to the build directory and enter the following command: @@ -114,7 +116,8 @@ to use make as the build tool or $ cmake -G Ninja ../{source directory} ---- -to use Ninja as the build tool. `{source directory}` is the name of the +to use Ninja as the build tool. + +`{source directory}` is the name of the top-level Wireshark source directory. If you need to build with a non-standard configuration, you can run diff --git a/docbook/wsdg_src/WSDG_chapter_sources.adoc b/docbook/wsdg_src/WSDG_chapter_sources.adoc index a824925886..1c6241ab30 100644 --- a/docbook/wsdg_src/WSDG_chapter_sources.adoc +++ b/docbook/wsdg_src/WSDG_chapter_sources.adoc @@ -931,6 +931,7 @@ In the wireshark directory, type: [source,sh] ---- ln -snf packaging/debian +export DEB_BUILD_OPTIONS="nocheck" dpkg-buildpackage -b -us -uc -jauto ----