Wireshark-commits: [Wireshark-commits] master 1ce64e7: CMake: Make it easier to generate the releas
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=1ce64e75ab4ac16e00cd664599b9b31c57a59f1a
Submitter: Gerald Combs (gerald@xxxxxxxxxxxxx)
Changed: branch: master
Repository: wireshark
Commits:
1ce64e7 by Gerald Combs (gerald@xxxxxxxxxxxxx):
CMake: Make it easier to generate the release notes & NEWS.
Add convenience targets for generating the release notes and the NEWS
file. Make sure we don't run multiple instances of a2x + AsciiDoc at the
same time.
Add the docbook directory to the build by default unless we're running
Windows. Explain why we don't yet build docs on Windows. Make each
docbook makefile target optional.
Split the ENABLE_GUIDES option into ENABLE_HTML_GUIDES and
ENABLE_PDF_GUIDES. Add a default "all_guides" target if either is on.
Remove the Debian patch that hacked around the PDF requirement.
Copy ws.css to the docbook build directory. Don't build PDF release
notes. I'm not sure we ever used them and I don't want to install Java
and FOP just to make a release.
Change-Id: Ia2f710000c17f9e0b4b514fd373d9a5902889553
Reviewed-on: https://code.wireshark.org/review/5712
Petri-Dish: Gerald Combs <gerald@xxxxxxxxxxxxx>
Reviewed-by: Gerald Combs <gerald@xxxxxxxxxxxxx>
Actions performed:
from 425bc30 eth,mp2t: Rename ei[] filter names duplicating hf[] filter names.
adds 1ce64e7 CMake: Make it easier to generate the release notes & NEWS.
Summary of changes:
CMakeLists.txt | 11 +--
CMakeOptions.txt | 3 +-
Makefile.am | 1 -
NEWS | 52 ++++++-----
README.cmake | 3 +-
cmake/modules/FindASCIIDOC.cmake | 21 +++--
...lding-documentation-in-PDF-and-release-no.patch | 48 ----------
debian/patches/series | 1 -
debian/rules | 2 +-
docbook/CMakeLists.txt | 94 ++++++++++++--------
10 files changed, 108 insertions(+), 128 deletions(-)
delete mode 100644 debian/patches/01_Disable-building-documentation-in-PDF-and-release-no.patch
