Wireshark-commits: [Wireshark-commits] master cd7408e: CMake: Enable DocBook on Windows.
Date Index · Thread Index · Other Months · All Mailing Lists
Date Prev · Date Next · Thread Prev · Thread Next
From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Thu, 8 Jan 2015 22:05:42 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=cd7408e526df2596b478ab622b90a8a2a60890c2
Submitter: Gerald Combs (gerald@xxxxxxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

cd7408e by Gerald Combs (gerald@xxxxxxxxxxxxx):

    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@xxxxxxxxxxxxx>
    

Actions performed:

    from  4b8c668   To register an SCTP port, register in "sctp.port", not "udp.port".
    adds  cd7408e   CMake: Enable DocBook on Windows.


Summary of changes:
 CMakeLists.txt                                |    6 +-
 CMakeOptions.txt                              |    1 +
 cmake/modules/FindASCIIDOC.cmake              |  131 +++++++++++++++++++------
 cmake/modules/FindFOP.cmake                   |    8 +-
 cmake/modules/FindHHC.cmake                   |   30 ++++++
 cmake/modules/FindXSLTPROC.cmake              |   71 ++++++++++++--
 docbook/CMakeLists.txt                        |  102 ++++++++++---------
 tools/Makefile.am                             |    2 +
 tools/hhc.cmd.in                              |    6 ++
 asn1/Makefile.preinc.nmake => tools/runa2x.sh |   38 +++++--
 10 files changed, 293 insertions(+), 102 deletions(-)
 create mode 100644 cmake/modules/FindHHC.cmake
 create mode 100644 tools/hhc.cmd.in
 copy asn1/Makefile.preinc.nmake => tools/runa2x.sh (51%)