Commit Graph

17 Commits

Author SHA1 Message Date
Gerald Combs 0626e766cf CMake: Try to fix generated docbook dependencies.
Add custom {developer,user}_guide_docbook targets for docbook output. Make
sure the HTML, PDF, and CHM outputs depend on their associated docbook
target and not on the output .xml file. This keeps us from running a2x
instances in parallel.

Change-Id: I73b0db50ae92f62eb08ae284d498cdf2d697ac00
Reviewed-on: https://code.wireshark.org/review/9920
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-08-08 21:51:56 +00:00
Graham Bloice 4e9ff477d9 CMake minor updates
Fix up generation messages for Windows build
Remove some superfluous Lua messages

Change-Id: I405e7edfcb043fc842fe4f0cca8d23d5755527f9
Reviewed-on: https://code.wireshark.org/review/8138
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2015-04-20 16:46:38 +00:00
Jörg Mayer 63d8e44580 Fix ASCIIDOC detection broken by commit ae2888aeb2
Change-Id: I36cd42a9040e8f8ab2b11ff4211a1298663909a2
Reviewed-on: https://code.wireshark.org/review/6512
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2015-01-13 01:39:28 +00:00
Gerald Combs ae2888aeb2 CMake: Try to fix Cygwin a2x discovery.
Change-Id: I46ddd10ab533ff7114aa6a4241a9a261da19329c
Reviewed-on: https://code.wireshark.org/review/6487
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-11 17:44:17 +00:00
Joerg Mayer a2abf8b37f Fix CMake Warning "Argument not separated from preceding token by whitespace."
Change-Id: I1ecd3bd0081c2f69d4e4f21f84cb46d086b657a2
Reviewed-on: https://code.wireshark.org/review/6437
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2015-01-09 01:07:59 +00:00
Gerald Combs 315cc729a8 CMake: Revert the release notes xsltproc command.
Should fix the release_notes_txt target.

Change-Id: Ie930c49ad34ad70070b8f7d28d79bee55f263c40
Reviewed-on: https://code.wireshark.org/review/6434
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-09 00:29:49 +00:00
Gerald Combs cd7408e526 CMake: Enable DocBook on Windows.
Add a wrapper script and CMake macros which lets us run Cygwin's a2x
from Windows. Add *another* wrapper script that ignores the return value
of hhc.exe.

Move the ASCIIDOC2DOCBOOK macro to FindASCIIDOC.cmake. Add FindHHC.cmake.
Add hints to FindFOP.cmake.

Use unique file names in the HTML Help chain in an attempt to avoid a
race condition.

To do:
- Fix curly quote in HHC title.

Change-Id: I9b154b7fbd02703656e2ab380199ec0a6db4e36d
Reviewed-on: https://code.wireshark.org/review/6379
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-08 22:05:38 +00:00
Gerald Combs 1ce64e75ab 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@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-12-11 21:41:44 +00:00
Joerg Mayer 7f05ae67d3 As long as NEWS is still part of the git tree: At least don't differ
because of different timezones.

Change-Id: I93809447db29c2cc5f848edb438ee16372b57453
Reviewed-on: https://code.wireshark.org/review/3824
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-08-25 22:16:02 +00:00
Gerald Combs a92c3fb2fa CMake: More a2x / asciidoc fixes.
Create graphics directories and copy files into them similar
to Autotools and Nmake. Adjust some xsltproc arguments. Fix the
--asciidoc-opts flag.

Note: Admon graphics are broken pending change 3206.

Change-Id: I94d498de36150a7cb4ffd080581523300b222bd4
Reviewed-on: https://code.wireshark.org/review/3805
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-08-24 00:11:32 +00:00
Gerald Combs 02c5a12ee4 WSUG: Convert the "User Interface" chapter to AsciiDoc.
Add the "asciidoc.conf" compatibility configuration file from
Asciidoctor. Although we don't use Asciidoctor it gives us macros that
keep us from losing some useful DocBook elements. Update various CMake
files to support multiple AsciiDoc configuration files.

Leave most of the content intact for now. Hopefully the other chapters
aren't as laden with markup.

Change-Id: Id69757342b86abb2b3130cb61e90f5695a26ea8a
Reviewed-on: https://code.wireshark.org/review/3680
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-08-23 18:32:51 +00:00
Joerg Mayer 95b694fc94 Fix message about detection of asciidoc package (would always report
not found before).

Change-Id: Iaac974e5db3e605e0b9f7256d2724ae777eaebc3
Reviewed-on: https://code.wireshark.org/review/1963
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-06-04 22:12:56 +00:00
Alexis La Goutte 757aa33220 Continue to remove $Id$ from top of file
(Using sed : sed -i '/^\# \$Id\$/,+1 d') (start with dash)

Change-Id: Ia4b5a6c2302f6a531f6a86c1ec3a2f8205c8c2dd
Reviewed-on: https://code.wireshark.org/review/881
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-31 18:48:06 +00:00
Gerald Combs 5e3113e7c9 Finish converting the Developer's Guide to AsciiDoc.
Add developer-guide-docinfo.xml, which lets us carry over DocBook front
matter. Remove the meta_info chapter. Most of its contents are now in
developer-guide-docinfo.xml. Add a DocBook revision history based on
hints from the Git/SVN/CVS revision history.

Comment out or note makefile content that's no longer necessary for
converting the Developer's Guide but will be useful for converting the
User's Guide. Fix building the release notes with CMake. Other minor
changes. Tested with Autotools, nmake, and CMake.

Change-Id: Ib6d50c821ca906fff50a84ad4d6af3212ebdff0a
Reviewed-on: https://code.wireshark.org/review/155
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Tested-by: Gerald Combs <gerald@wireshark.org>
2014-02-11 18:04:45 +00:00
Gerald Combs c57ac03e65 Try to get CMake to build the Developer Guide again. I don't have
dblatex installed so the release notes fail to build but the WSDG
targets appear to work.

svn path=/trunk/; revision=54952
2014-01-25 00:17:19 +00:00
Gerald Combs a9ddc06adc Prepare for conversion of Guide chapters to AsciiDoc.
svn path=/trunk/; revision=54936
2014-01-24 01:10:10 +00:00
Jörg Mayer ec34959796 Add generation of release notes.
Regenerate NEWS file

svn path=/trunk/; revision=53014
2013-11-01 09:55:26 +00:00