osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity
wireshark/docbook/CMakeLists.txt

472 lines
13 KiB
CMake
Raw Normal View History

- Beginnings of cmake in docbook directory - Add note about "make help" - Move beginnings of packaging into its own file: CPackConfig.txt svn path=/trunk/; revision=31379
2009-12-29 12:12:26 +00:00
# CMakeLists.txt
#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2
# of the License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
Update Free Software Foundation address. (COPYING will be updated in next commit) svn path=/trunk/; revision=43536
2012-06-28 22:56:06 +00:00
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- Beginnings of cmake in docbook directory - Add note about "make help" - Move beginnings of packaging into its own file: CPackConfig.txt svn path=/trunk/; revision=31379
2009-12-29 12:12:26 +00:00
#
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
find_package( LYNX )
find_package( XSLTPROC )
find_package( XMLLINT )
CMake: Look for FOP and HHC only when needed. FOP is only required for generating PDF output and HHC is only needed for CHM output. Don't look for them unconditionally. Change-Id: I7bec7d061c9e9e8b99431cab873e8c719469552c Reviewed-on: https://code.wireshark.org/review/6539 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-14 23:13:40 +00:00
if(ENABLE_CHM_GUIDES)
find_package( HTMLHelp )
endif()
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-07 00:59:32 +00:00
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
find_package( ASCIIDOC )
- Beginnings of cmake in docbook directory - Add note about "make help" - Move beginnings of packaging into its own file: CPackConfig.txt svn path=/trunk/; revision=31379
2009-12-29 12:12:26 +00:00
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-07 00:59:32 +00:00
if(WIN32)
CMake: Migrate to hhc.cmake. Remove FindHHC.cmake in favor of CMake's FindHTMLHelp. Remove the hhc.cmd wrapper. Change-Id: I548e58d2264c74596e9067d5053b056c35089b3c Reviewed-on: https://code.wireshark.org/review/6449 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-09 16:58:15 +00:00
macro( HHP2CHM _hhpsource )
get_filename_component( _source_base_name ${_hhpsource} NAME_WE )
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-07 00:59:32 +00:00
CMake: Migrate to hhc.cmake. Remove FindHHC.cmake in favor of CMake's FindHTMLHelp. Remove the hhc.cmd wrapper. Change-Id: I548e58d2264c74596e9067d5053b056c35089b3c Reviewed-on: https://code.wireshark.org/review/6449 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-09 16:58:15 +00:00
add_custom_command(
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-07 00:59:32 +00:00
OUTPUT ${_output_chm}
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
CMake: Migrate to hhc.cmake. Remove FindHHC.cmake in favor of CMake's FindHTMLHelp. Remove the hhc.cmd wrapper. Change-Id: I548e58d2264c74596e9067d5053b056c35089b3c Reviewed-on: https://code.wireshark.org/review/6449 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-09 16:58:15 +00:00
# The number and order of arguments MUST match hhc.cmake.
COMMAND ${CMAKE_COMMAND} -P
${CMAKE_SOURCE_DIR}/cmake/modules/hhc.cmake
"${HTML_HELP_COMPILER}"
${_hhpsource}
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-07 00:59:32 +00:00
DEPENDS
${_hhpsource}
)
CMake: Migrate to hhc.cmake. Remove FindHHC.cmake in favor of CMake's FindHTMLHelp. Remove the hhc.cmd wrapper. Change-Id: I548e58d2264c74596e9067d5053b056c35089b3c Reviewed-on: https://code.wireshark.org/review/6449 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-09 16:58:15 +00:00
endmacro()
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-07 00:59:32 +00:00
else()
CMake: Migrate to hhc.cmake. Remove FindHHC.cmake in favor of CMake's FindHTMLHelp. Remove the hhc.cmd wrapper. Change-Id: I548e58d2264c74596e9067d5053b056c35089b3c Reviewed-on: https://code.wireshark.org/review/6449 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-09 16:58:15 +00:00
macro( HHP2CHM _hhpsource )
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-07 00:59:32 +00:00
# Dummy.
CMake: Migrate to hhc.cmake. Remove FindHHC.cmake in favor of CMake's FindHTMLHelp. Remove the hhc.cmd wrapper. Change-Id: I548e58d2264c74596e9067d5053b056c35089b3c Reviewed-on: https://code.wireshark.org/review/6449 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-09 16:58:15 +00:00
endmacro()
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-07 00:59:32 +00:00
endif()
Convert admon graphics to SVG. Use a common set of SVG files for AsciiDoc / DocBook admonition graphics. Put them in a common directory. According to http://caniuse.com/svg all common browsers have had SVG support for a while now. The graphics themselves were created with Inkscape. If you would like to refine them further you are more than welcome. Use variables to assemble xsltproc commands in Autotools and Nmake while we're here. Try to update Debian rules to reflect ga92c3fb. Change-Id: If82647af27a60117c517125dff0aca81c033be72 Reviewed-on: https://code.wireshark.org/review/3206 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-07-24 01:28:32 +00:00
set(COMMON_GRAPHICS
common_graphics/note.svg
common_graphics/tip.svg
common_graphics/warning.svg
)
- Beginnings of cmake in docbook directory - Add note about "make help" - Move beginnings of packaging into its own file: CPackConfig.txt svn path=/trunk/; revision=31379
2009-12-29 12:12:26 +00:00
set(WSUG_FILES
WSUG: Convert ``Files'' to AsciiDoc. Leave most of the content intact for now. Change-Id: I78f47b8310cb41ac5a07d352e56ec907b36665f8 Reviewed-on: https://code.wireshark.org/review/5209 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-11-09 06:05:52 +00:00
wsug_src/WSUG_app_files.asciidoc
WSUG: Convert ``Protocols'', ``Messages'', and ``How Wireshark Works'' to AsciiDoc. ``How Wireshark Works'' is disabled, so its final output hasn't been checked. Leave most of the content intact for now. Change-Id: Ia78951faa3ffd9c6d2e23067dbfb954ab4042f60 Reviewed-on: https://code.wireshark.org/review/5210 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-11-09 18:07:46 +00:00
wsug_src/WSUG_app_howitworks.asciidoc
wsug_src/WSUG_app_protocols.asciidoc
wsug_src/WSUG_app_messages.asciidoc
WSUG: Convert ``Command Line Tools'' to AsciiDoc. Move the idl2wrs section to the Developer's Guide. Leave most of the other content intact for now. Change-Id: I98c6eeab62af5cc55e3ce23ab1107df02b1a22cf Reviewed-on: https://code.wireshark.org/review/5214 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-11-09 19:39:15 +00:00
wsug_src/WSUG_app_tools.asciidoc
WSUG: Convert ``Advanced Topics'' to AsciiDoc. Leave most of the content intact for now. Change-Id: Ie91fda8a3fe6ea2eb4c47acf7c41d7e6979235b0 Reviewed-on: https://code.wireshark.org/review/3938 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-09-01 01:40:56 +00:00
wsug_src/WSUG_chapter_advanced.asciidoc
Convert the build and install chapter to AsciiDoc. Add OS X content. Remove GTK+ content. Update the names in the NSIS package to match the documentation (untested). Change-Id: Id8fd08982bc26871bb8a319b0319808bcdba878c Reviewed-on: https://code.wireshark.org/review/3366 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-07-30 01:31:43 +00:00
wsug_src/WSUG_chapter_build_install.asciidoc
WSUG_chapter_capture is now an asciidoc file that gets converted into an xml file. Change-Id: I43ae59d14cbdcf460250cf62005aea4a2772d11f Reviewed-on: https://code.wireshark.org/review/3846 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-08-25 22:41:07 +00:00
wsug_src/WSUG_chapter_capture.asciidoc
WSUG: Convert ``Customizing'' to AsciiDoc. Leave most of the content intact for now. Change-Id: Id00d942f87e0a25e27333ac56eb9b99311694a13 Reviewed-on: https://code.wireshark.org/review/5063 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-11-02 03:52:34 +00:00
wsug_src/WSUG_chapter_customize.asciidoc
Start converting the User's Guide to AsciiDoc. Convert the preface and introduction. Update various makefiles. Change-Id: Id998cabadb6de458f04b7a43bdba4f98e4edb052 Reviewed-on: https://code.wireshark.org/review/3139 Reviewed-by: Gerald Combs <gerald@wireshark.org> Tested-by: Gerald Combs <gerald@wireshark.org>
2014-07-17 01:38:42 +00:00
wsug_src/WSUG_chapter_introduction.asciidoc
WSUG: Convert the ``File I/O'' chapter to AsciiDoc. Leave most of the content intact for now. Remove images for no-longer-supported versions of GTK+. Add an example for building the Guides to README.cmake. Change-Id: Id9e6a308c91b594d1fb7f107d7b9b28074a92a8b Reviewed-on: https://code.wireshark.org/review/3931 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-31 01:02:52 +00:00
wsug_src/WSUG_chapter_io.asciidoc
Convert the Statistics chapter to AsciiDoc. Don't update any content for now. Change-Id: Ib4f6402d9b23bd1ad57a57831b63c63a150391aa Reviewed-on: https://code.wireshark.org/review/3372 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-08-02 22:42:20 +00:00
wsug_src/WSUG_chapter_statistics.asciidoc
WSUG: Convert ``Telephony'' to AsciiDoc. Leave most of the content intact for now. Change-Id: I21aad681194d1bb1841e29f4ac41be4677fcb909 Reviewed-on: https://code.wireshark.org/review/3939 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-09-01 04:52:32 +00:00
wsug_src/WSUG_chapter_telephony.asciidoc
WSUG: Convert ``Troubleshooting'' to AsciiDoc. The chapter is disabled so its final output hasn't been checked. Leave most of the content intact for now. Change-Id: I2147ee2863e7ededadf892794a836b4dc8055649 Reviewed-on: https://code.wireshark.org/review/5211 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-11-09 18:20:26 +00:00
wsug_src/WSUG_chapter_troubleshoot.asciidoc
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-17 16:23:31 +00:00
wsug_src/WSUG_chapter_use.asciidoc
WSUG: Convert ``Working with captured packets'' to AsciiDoc. Leave most of the content intact for now. Change-Id: Ic264814aa8e442df100ae8533098843ef6a2e6c9 Reviewed-on: https://code.wireshark.org/review/3937 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-08-31 20:47:39 +00:00
wsug_src/WSUG_chapter_work.asciidoc
Start converting the User's Guide to AsciiDoc. Convert the preface and introduction. Update various makefiles. Change-Id: Id998cabadb6de458f04b7a43bdba4f98e4edb052 Reviewed-on: https://code.wireshark.org/review/3139 Reviewed-by: Gerald Combs <gerald@wireshark.org> Tested-by: Gerald Combs <gerald@wireshark.org>
2014-07-17 01:38:42 +00:00
wsug_src/WSUG_preface.asciidoc
Convert the Lua reference to AsciiDoc. Move it to the Developer's Guide while we're here. Nudge the markup in epan/wslua where needed. Note that we should probably convert it to AsciiDoc (if we're going to keep it in the DG) or Doxygen. Change-Id: Ie175111043f98b7a37eeeb8d185a833d8e866f8b Reviewed-on: https://code.wireshark.org/review/5203 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-11-02 21:20:08 +00:00
wsluarm.asciidoc
Finish converting the User's Guide to AsciiDoc. As with the Developer's Guide, add user-guide-docinfo.xml, which lets us carry over DocBook front matter. Remove the meta_info chapter. Most of its contents are now in user-guide-docinfo.xml. Add a DocBook revision history based on hints from the Git/SVN/CVS revision history. Remove the various makefile targets for converting AsciiDoc files to DocBook chapters. Remove GPL_appendix.xml. We use the AsciiDoc version. Change-Id: I543fa2a92f2c735c5f00c97ec65cff2187e09e3a Reviewed-on: https://code.wireshark.org/review/5216 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-11-10 02:13:57 +00:00
ws.css
Start converting the User's Guide to AsciiDoc. Convert the preface and introduction. Update various makefiles. Change-Id: Id998cabadb6de458f04b7a43bdba4f98e4edb052 Reviewed-on: https://code.wireshark.org/review/3139 Reviewed-by: Gerald Combs <gerald@wireshark.org> Tested-by: Gerald Combs <gerald@wireshark.org>
2014-07-17 01:38:42 +00:00
)
- Beginnings of cmake in docbook directory - Add note about "make help" - Move beginnings of packaging into its own file: CPackConfig.txt svn path=/trunk/; revision=31379
2009-12-29 12:12:26 +00:00
set(WSUG_GRAPHICS
wsug_graphics/ws-analyze-menu.png
wsug_graphics/ws-bytes-pane-tabs.png
wsug_graphics/ws-bytes-pane.png
wsug_graphics/ws-capture-info.png
wsug_graphics/ws-capture-interfaces.png
wsug_graphics/ws-capture-interfaces-win32.png
wsug_graphics/ws-capture-menu.png
wsug_graphics/ws-capture-options.png
wsug_graphics/ws-capture-options-remote-capture.png
wsug_graphics/ws-capture-options-remote-interface.png
wsug_graphics/ws-capture-options-remote-settings.png
wsug_graphics/ws-capture-preferences.png
wsug_graphics/ws-choose-color-rule.png
wsug_graphics/ws-coloring-fields.png
wsug_graphics/ws-coloring-rules-dialog.png
Add the graphic files to the distribution. svn path=/trunk/; revision=35444
2011-01-09 22:17:14 +00:00
wsug_graphics/ws-column-header-popup-menu.png
- Beginnings of cmake in docbook directory - Add note about "make help" - Move beginnings of packaging into its own file: CPackConfig.txt svn path=/trunk/; revision=31379
2009-12-29 12:12:26 +00:00
wsug_graphics/ws-decode-as-show.png
wsug_graphics/ws-decode-as.png
Add the graphic files to the distribution. svn path=/trunk/; revision=35444
2011-01-09 22:17:14 +00:00
wsug_graphics/ws-column-header-popup-menu.png
- Beginnings of cmake in docbook directory - Add note about "make help" - Move beginnings of packaging into its own file: CPackConfig.txt svn path=/trunk/; revision=31379
2009-12-29 12:12:26 +00:00
wsug_graphics/ws-details-pane-popup-menu.png
wsug_graphics/ws-details-pane.png
wsug_graphics/ws-display-filter-tcp.png
wsug_graphics/ws-edit-menu.png
wsug_graphics/ws-enabled-protocols.png
wsug_graphics/ws-expert-colored-tree.png
wsug_graphics/ws-expert-column.png
wsug_graphics/ws-expert-infos.png
wsug_graphics/ws-export-objects.png
wsug_graphics/ws-export-pdml.png
wsug_graphics/ws-export-plain.png
wsug_graphics/ws-export-ps.png
wsug_graphics/ws-export-psml.png
wsug_graphics/ws-export-selected.png
Add new files to cmake as well svn path=/trunk/; revision=34999
2010-11-22 12:03:28 +00:00
wsug_graphics/ws-file-import.png
- Beginnings of cmake in docbook directory - Add note about "make help" - Move beginnings of packaging into its own file: CPackConfig.txt svn path=/trunk/; revision=31379
2009-12-29 12:12:26 +00:00
wsug_graphics/ws-file-menu.png
wsug_graphics/ws-file-set-dialog.png
wsug_graphics/ws-filter-add-expression.png
wsug_graphics/ws-filter-toolbar.png
wsug_graphics/ws-filters.png
wsug_graphics/ws-find-packet.png
wsug_graphics/ws-follow-stream.png
wsug_graphics/ws-go-menu.png
wsug_graphics/ws-goto-packet.png
wsug_graphics/ws-gui-colors-preferences.png
wsug_graphics/ws-gui-columns-preferences.png
wsug_graphics/ws-gui-config-profiles.png
wsug_graphics/ws-gui-font-preferences.png
wsug_graphics/ws-gui-layout-preferences.png
wsug_graphics/ws-gui-preferences.png
wsug_graphics/ws-help-menu.png
Missing a Users Guide graphic. svn path=/trunk/; revision=35675
2011-01-27 07:26:21 +00:00
wsug_graphics/ws-internals-menu.png
- Beginnings of cmake in docbook directory - Add note about "make help" - Move beginnings of packaging into its own file: CPackConfig.txt svn path=/trunk/; revision=31379
2009-12-29 12:12:26 +00:00
wsug_graphics/ws-list-pane.png
wsug_graphics/ws-logo.png
wsug_graphics/ws-main-toolbar.png
wsug_graphics/ws-main.png
wsug_graphics/ws-menu.png
wsug_graphics/ws-merge-gtk24.png
wsug_graphics/ws-merge-win32.png
wsug_graphics/ws-nameresolution-preferences.png
wsug_graphics/ws-open-gtk24.png
wsug_graphics/ws-open-win32.png
wsug_graphics/ws-packet-format.png
wsug_graphics/ws-packet-pane-popup-menu.png
wsug_graphics/ws-packet-range.png
wsug_graphics/ws-packet-selected.png
wsug_graphics/ws-packet-sep-win.png
wsug_graphics/ws-print.png
wsug_graphics/ws-printing-preferences.png
wsug_graphics/ws-save-as-gtk24.png
wsug_graphics/ws-save-as-win32.png
wsug_graphics/ws-statistics-menu.png
wsug_graphics/ws-stats-conversations.png
wsug_graphics/ws-stats-endpoints.png
wsug_graphics/ws-stats-hierarchy.png
wsug_graphics/ws-stats-iographs.png
wsug_graphics/ws-stats-srt-dcerpc-filter.png
wsug_graphics/ws-stats-srt-dcerpc.png
wsug_graphics/ws-stats-summary.png
wsug_graphics/ws-stats-lte-mac-traffic.png
Add a simple help page for LTE RLC stats. svn path=/trunk/; revision=31616
2010-01-22 12:42:53 +00:00
wsug_graphics/ws-stats-lte-rlc-traffic.png
- Beginnings of cmake in docbook directory - Add note about "make help" - Move beginnings of packaging into its own file: CPackConfig.txt svn path=/trunk/; revision=31379
2009-12-29 12:12:26 +00:00
wsug_graphics/ws-stats-wlan-traffic.png
wsug_graphics/ws-statusbar-empty.png
wsug_graphics/ws-statusbar-loaded.png
wsug_graphics/ws-statusbar-selected.png
Add the graphic files to the distribution. svn path=/trunk/; revision=35444
2011-01-09 22:17:14 +00:00
wsug_graphics/ws-telephony-menu.png
- Beginnings of cmake in docbook directory - Add note about "make help" - Move beginnings of packaging into its own file: CPackConfig.txt svn path=/trunk/; revision=31379
2009-12-29 12:12:26 +00:00
wsug_graphics/ws-time-reference.png
Add the graphic files to the distribution. svn path=/trunk/; revision=35444
2011-01-09 22:17:14 +00:00
wsug_graphics/ws-tools-menu.png
- Beginnings of cmake in docbook directory - Add note about "make help" - Move beginnings of packaging into its own file: CPackConfig.txt svn path=/trunk/; revision=31379
2009-12-29 12:12:26 +00:00
wsug_graphics/ws-view-menu.png
wsug_graphics/toolbar/autoscroll_24.png
wsug_graphics/toolbar/capture_filter_24.png
wsug_graphics/toolbar/capture_interfaces_24.png
wsug_graphics/toolbar/capture_options_24.png
wsug_graphics/toolbar/capture_restart_24.png
wsug_graphics/toolbar/capture_start_24.png
wsug_graphics/toolbar/capture_stop_24.png
wsug_graphics/toolbar/colorize_24.png
wsug_graphics/toolbar/display_filter_24.png
wsug_graphics/toolbar/resize_columns_24.png
wsug_graphics/toolbar/stock_add_24.png
wsug_graphics/toolbar/stock_apply_20.png
wsug_graphics/toolbar/stock_bottom_24.png
wsug_graphics/toolbar/stock_clear_24.png
wsug_graphics/toolbar/stock_close_24.png
wsug_graphics/toolbar/stock_colorselector_24.png
wsug_graphics/toolbar/stock_help_24.png
wsug_graphics/toolbar/stock_jump_to_24.png
wsug_graphics/toolbar/stock_left_arrow_24.png
wsug_graphics/toolbar/stock_open_24.png
wsug_graphics/toolbar/stock_preferences_24.png
wsug_graphics/toolbar/stock_print_24.png
wsug_graphics/toolbar/stock_properties_24.png
wsug_graphics/toolbar/stock_refresh_24.png
wsug_graphics/toolbar/stock_right_arrow_24.png
wsug_graphics/toolbar/stock_save_24.png
wsug_graphics/toolbar/stock_save_as_24.png
wsug_graphics/toolbar/stock_search_24.png
wsug_graphics/toolbar/stock_stop_24.png
wsug_graphics/toolbar/stock_top_24.png
wsug_graphics/toolbar/stock_zoom_1_24.png
wsug_graphics/toolbar/stock_zoom_in_24.png
wsug_graphics/toolbar/stock_zoom_out_24.png
Convert admon graphics to SVG. Use a common set of SVG files for AsciiDoc / DocBook admonition graphics. Put them in a common directory. According to http://caniuse.com/svg all common browsers have had SVG support for a while now. The graphics themselves were created with Inkscape. If you would like to refine them further you are more than welcome. Use variables to assemble xsltproc commands in Autotools and Nmake while we're here. Try to update Debian rules to reflect ga92c3fb. Change-Id: If82647af27a60117c517125dff0aca81c033be72 Reviewed-on: https://code.wireshark.org/review/3206 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-07-24 01:28:32 +00:00
${COMMON_GRAPHICS}
- Beginnings of cmake in docbook directory - Add note about "make help" - Move beginnings of packaging into its own file: CPackConfig.txt svn path=/trunk/; revision=31379
2009-12-29 12:12:26 +00:00
)
set(WSDG_FILES
Convert three more WSDG chapters: works, build, and capture. Start adding references to Qt and wsutil. Fix a file extension in CMakeLists.txt. Change-Id: I0cbe7e802d88a05effff40b5de72669e22c0df53 Reviewed-on: https://code.wireshark.org/review/79 Reviewed-by: Gerald Combs <gerald@wireshark.org> Tested-by: Gerald Combs <gerald@wireshark.org>
2014-02-02 19:00:30 +00:00
wsdg_src/WSDG_chapter_build_intro.asciidoc
wsdg_src/WSDG_chapter_capture.asciidoc
Convert the dissection chapter to AsciiDoc. Change-Id: Ieccd2ad235576b9ec6013ddb23a8373ccf2f8cdf Reviewed-on: https://code.wireshark.org/review/92 Reviewed-by: Gerald Combs <gerald@wireshark.org> Tested-by: Gerald Combs <gerald@wireshark.org>
2014-02-03 18:28:37 +00:00
wsdg_src/WSDG_chapter_dissection.asciidoc
Migrate the build environment introduction to AsciiDoc. svn path=/trunk/; revision=54971
2014-01-27 04:20:44 +00:00
wsdg_src/WSDG_chapter_env_intro.asciidoc
Convert the libraries chapter to AsciiDoc. Add some docbook-related entries to .gitignore. Whoever maintains the Windows libraries has done a terrible job of keeping this chapter up to date. Change-Id: Ic6dcbd9e8369eae9f07403bd3f805a515886f542 Reviewed-on: https://code.wireshark.org/review/72 Reviewed-by: Gerald Combs <gerald@wireshark.org> Tested-by: Gerald Combs <gerald@wireshark.org>
2014-02-01 19:26:38 +00:00
wsdg_src/WSDG_chapter_libraries.asciidoc
Convert three more WSDG chapters: works, build, and capture. Start adding references to Qt and wsutil. Fix a file extension in CMakeLists.txt. Change-Id: I0cbe7e802d88a05effff40b5de72669e22c0df53 Reviewed-on: https://code.wireshark.org/review/79 Reviewed-by: Gerald Combs <gerald@wireshark.org> Tested-by: Gerald Combs <gerald@wireshark.org>
2014-02-02 19:00:30 +00:00
wsdg_src/WSDG_chapter_quick_setup.asciidoc
Prepare for conversion of Guide chapters to AsciiDoc. svn path=/trunk/; revision=54936
2014-01-24 01:10:10 +00:00
wsdg_src/WSDG_chapter_sources.asciidoc
Convert the tools chapter to AsciiDoc. Replace SVN text with Git, other mostly-minor edits. Change-Id: I41b602cc9334656dc8e5f37c33fb6cd660043d17 Reviewed-on: https://code.wireshark.org/review/69 Reviewed-by: Gerald Combs <gerald@wireshark.org> Tested-by: Gerald Combs <gerald@wireshark.org>
2014-02-01 01:47:21 +00:00
wsdg_src/WSDG_chapter_tools.asciidoc
Convert the user interface chapter to AsciiDoc. Start mentioning Qt. Update and add HIG links. Change-Id: Iac984045b03a96862981d58ff63c9ee6bcdbbce8 Reviewed-on: https://code.wireshark.org/review/127 Tested-by: Wireshark Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-02-06 17:16:33 +00:00
wsdg_src/WSDG_chapter_userinterface.asciidoc
Convert three more WSDG chapters: works, build, and capture. Start adding references to Qt and wsutil. Fix a file extension in CMakeLists.txt. Change-Id: I0cbe7e802d88a05effff40b5de72669e22c0df53 Reviewed-on: https://code.wireshark.org/review/79 Reviewed-by: Gerald Combs <gerald@wireshark.org> Tested-by: Gerald Combs <gerald@wireshark.org>
2014-02-02 19:00:30 +00:00
wsdg_src/WSDG_chapter_works.asciidoc
Convert the preface to AsciiDoc with minor edits. svn path=/trunk/; revision=54970
2014-01-27 03:08:01 +00:00
wsdg_src/WSDG_preface.asciidoc
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-09 19:01:49 +00:00
ws.css
Prepare for conversion of Guide chapters to AsciiDoc. svn path=/trunk/; revision=54936
2014-01-24 01:10:10 +00:00
)
- Beginnings of cmake in docbook directory - Add note about "make help" - Move beginnings of packaging into its own file: CPackConfig.txt svn path=/trunk/; revision=31379
2009-12-29 12:12:26 +00:00
set(WSDG_GRAPHICS
wsdg_graphics/ws-capture-sync.dia
wsdg_graphics/ws-capture-sync.png
wsdg_graphics/ws-capture_internals.dia
wsdg_graphics/ws-capture_internals.png
wsdg_graphics/ws-function-blocks.dia
wsdg_graphics/ws-function-blocks.png
wsdg_graphics/ws-logo.png
Convert admon graphics to SVG. Use a common set of SVG files for AsciiDoc / DocBook admonition graphics. Put them in a common directory. According to http://caniuse.com/svg all common browsers have had SVG support for a while now. The graphics themselves were created with Inkscape. If you would like to refine them further you are more than welcome. Use variables to assemble xsltproc commands in Autotools and Nmake while we're here. Try to update Debian rules to reflect ga92c3fb. Change-Id: If82647af27a60117c517125dff0aca81c033be72 Reviewed-on: https://code.wireshark.org/review/3206 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-07-24 01:28:32 +00:00
${COMMON_GRAPHICS}
- Beginnings of cmake in docbook directory - Add note about "make help" - Move beginnings of packaging into its own file: CPackConfig.txt svn path=/trunk/; revision=31379
2009-12-29 12:12:26 +00:00
)
# user-guide.xml must be first in the list
set(WSUG_SOURCE
user-guide.xml
${WSUG_FILES}
${WSUG_GRAPHICS}
)
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-17 16:23:31 +00:00
set( ASCIIDOC_CONF_FILES asciidoc.conf asciidoctor-asciidoc.conf )
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 00:50:56 +00:00
add_custom_command(
OUTPUT ws.css
COMMAND ${CMAKE_COMMAND} -E copy_if_different
${CMAKE_CURRENT_SOURCE_DIR}/ws.css
${CMAKE_CURRENT_BINARY_DIR}/ws.css
)
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-17 16:23:31 +00:00
ASCIIDOC2DOCBOOK( developer-guide.asciidoc "${ASCIIDOC_CONF_FILES}" )
Finish converting the User's Guide to AsciiDoc. As with the Developer's Guide, add user-guide-docinfo.xml, which lets us carry over DocBook front matter. Remove the meta_info chapter. Most of its contents are now in user-guide-docinfo.xml. Add a DocBook revision history based on hints from the Git/SVN/CVS revision history. Remove the various makefile targets for converting AsciiDoc files to DocBook chapters. Remove GPL_appendix.xml. We use the AsciiDoc version. Change-Id: I543fa2a92f2c735c5f00c97ec65cff2187e09e3a Reviewed-on: https://code.wireshark.org/review/5216 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-11-10 02:13:57 +00:00
ASCIIDOC2DOCBOOK( user-guide.asciidoc "${ASCIIDOC_CONF_FILES}" )
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
- Beginnings of cmake in docbook directory - Add note about "make help" - Move beginnings of packaging into its own file: CPackConfig.txt svn path=/trunk/; revision=31379
2009-12-29 12:12:26 +00:00
# developer-guide.xml must be first in the list
set(WSDG_SOURCE
developer-guide.xml
${WSDG_FILES}
${WSDG_GRAPHICS}
)
Lua: split up wslua files into class-based files The size of some of the wslua source files has grown large, and it's hard to quickly find things. So split them up based on class name, as much as seems reasonable. Also have the make-wsluarm.pl Perl script handle this. Change-Id: Ib495ec5c2a4df90495c0a05504856288a0b09213 Reviewed-on: https://code.wireshark.org/review/9579 Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
2015-07-07 15:30:44 +00:00
# Note: file order here MATTERS!
# new WSLUA_MODULE files must come right before any WSLUA_CONTINUE_MODULE
# files for the same module
- Beginnings of cmake in docbook directory - Add note about "make help" - Move beginnings of packaging into its own file: CPackConfig.txt svn path=/trunk/; revision=31379
2009-12-29 12:12:26 +00:00
set(WSLUA_MODULES
${CMAKE_SOURCE_DIR}/epan/wslua/wslua_dumper.c
${CMAKE_SOURCE_DIR}/epan/wslua/wslua_field.c
${CMAKE_SOURCE_DIR}/epan/wslua/wslua_gui.c
Adds support for Lua Int64 and UInt64 operators, functions, and general usefulness, working around bug #9162 until Lua 5.3 is released. The existing Int64 and UInt64 classes provide virtually no usefullness, other than for creating a string of their value. While one could then write Lua code to convert the string to Lua numbers and such, ultimately Lua has no native 64-bit integer support, making such a task difficult to handle in Lua. This change adds a host of functions and operators to the existing Int64 (gint64) and UInt64 (guint64) classes, to enable true 64-bit integer support on par with native Lua numbers. A test script is also provided, which tests the functions/operators. Change-Id: I4c5f8f5219b9a88198902283bd32ddf24c346bbe Reviewed-on: https://code.wireshark.org/review/83 Tested-by: Evan Huus <eapache@gmail.com> Reviewed-by: Evan Huus <eapache@gmail.com>
2014-02-03 03:49:30 +00:00
${CMAKE_SOURCE_DIR}/epan/wslua/wslua_int64.c
- Beginnings of cmake in docbook directory - Add note about "make help" - Move beginnings of packaging into its own file: CPackConfig.txt svn path=/trunk/; revision=31379
2009-12-29 12:12:26 +00:00
${CMAKE_SOURCE_DIR}/epan/wslua/wslua_listener.c
${CMAKE_SOURCE_DIR}/epan/wslua/wslua_pinfo.c
Lua: split up wslua files into class-based files The size of some of the wslua source files has grown large, and it's hard to quickly find things. So split them up based on class name, as much as seems reasonable. Also have the make-wsluarm.pl Perl script handle this. Change-Id: Ib495ec5c2a4df90495c0a05504856288a0b09213 Reviewed-on: https://code.wireshark.org/review/9579 Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
2015-07-07 15:30:44 +00:00
${CMAKE_SOURCE_DIR}/epan/wslua/wslua_address.c
${CMAKE_SOURCE_DIR}/epan/wslua/wslua_column.c
${CMAKE_SOURCE_DIR}/epan/wslua/wslua_nstime.c
- Beginnings of cmake in docbook directory - Add note about "make help" - Move beginnings of packaging into its own file: CPackConfig.txt svn path=/trunk/; revision=31379
2009-12-29 12:12:26 +00:00
${CMAKE_SOURCE_DIR}/epan/wslua/wslua_proto.c
Lua: split up wslua files into class-based files The size of some of the wslua source files has grown large, and it's hard to quickly find things. So split them up based on class name, as much as seems reasonable. Also have the make-wsluarm.pl Perl script handle this. Change-Id: Ib495ec5c2a4df90495c0a05504856288a0b09213 Reviewed-on: https://code.wireshark.org/review/9579 Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
2015-07-07 15:30:44 +00:00
${CMAKE_SOURCE_DIR}/epan/wslua/wslua_dissector.c
${CMAKE_SOURCE_DIR}/epan/wslua/wslua_pref.c
${CMAKE_SOURCE_DIR}/epan/wslua/wslua_proto_expert.c
${CMAKE_SOURCE_DIR}/epan/wslua/wslua_proto_field.c
- Beginnings of cmake in docbook directory - Add note about "make help" - Move beginnings of packaging into its own file: CPackConfig.txt svn path=/trunk/; revision=31379
2009-12-29 12:12:26 +00:00
${CMAKE_SOURCE_DIR}/epan/wslua/wslua_tree.c
${CMAKE_SOURCE_DIR}/epan/wslua/wslua_tvb.c
Lua: split up wslua files into class-based files The size of some of the wslua source files has grown large, and it's hard to quickly find things. So split them up based on class name, as much as seems reasonable. Also have the make-wsluarm.pl Perl script handle this. Change-Id: Ib495ec5c2a4df90495c0a05504856288a0b09213 Reviewed-on: https://code.wireshark.org/review/9579 Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
2015-07-07 15:30:44 +00:00
${CMAKE_SOURCE_DIR}/epan/wslua/wslua_byte_array.c
Add capture file reader/writer support for Lua so scripts can implement new capture file formats. This enables a Lua script to implement a brand new capture file format reader/writer, so that for example one could write a script to read from vendor-specific "logs" of packets, and show them as normal packets in wireshark. Change-Id: Id394edfffa94529f39789844c382b7ab6cc2d814 Reviewed-on: https://code.wireshark.org/review/431 Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com> Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-18 17:21:51 +00:00
${CMAKE_SOURCE_DIR}/epan/wslua/wslua_file.c
Lua: split up wslua files into class-based files The size of some of the wslua source files has grown large, and it's hard to quickly find things. So split them up based on class name, as much as seems reasonable. Also have the make-wsluarm.pl Perl script handle this. Change-Id: Ib495ec5c2a4df90495c0a05504856288a0b09213 Reviewed-on: https://code.wireshark.org/review/9579 Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
2015-07-07 15:30:44 +00:00
${CMAKE_SOURCE_DIR}/epan/wslua/wslua_file_handler.c
${CMAKE_SOURCE_DIR}/epan/wslua/wslua_frame_info.c
${CMAKE_SOURCE_DIR}/epan/wslua/wslua_capture_info.c
Add various functions for Lua directory handling and path info This adds new functions to get plugins path info, find out if a directory exists, make a new one, remove one, etc. It also creates a file environment for user-supplied Lua scripts, to prevent global variable contamination as well as supply the script-specific file name. Some other minor cleanup was done as I found them. A new testsuite was added to test the existing and new directory functions. Change-Id: I19bd587b5e8a73d89b8521af73670e023314fb33 Reviewed-on: https://code.wireshark.org/review/832 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-26 06:24:51 +00:00
${CMAKE_SOURCE_DIR}/epan/wslua/wslua_dir.c
- Beginnings of cmake in docbook directory - Add note about "make help" - Move beginnings of packaging into its own file: CPackConfig.txt svn path=/trunk/; revision=31379
2009-12-29 12:12:26 +00:00
${CMAKE_SOURCE_DIR}/epan/wslua/wslua_util.c
Adds support for Lua struct library so one can pack/unpack binary structures This is based on Roberto Ierusalimschy's struct library, along with additional options based on Flemming Madsen's patch to the lua-users mailing list, and some changes I made to support 64-bit integer packing/unpacking. Details are in the top comments for wslua_struct.c. This also includes a test script. Change-Id: Ifcd0116ba013d5c760927721c8d6e9f28965534b Reviewed-on: https://code.wireshark.org/review/98 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-02-03 03:49:30 +00:00
${CMAKE_SOURCE_DIR}/epan/wslua/wslua_struct.c
- Beginnings of cmake in docbook directory - Add note about "make help" - Move beginnings of packaging into its own file: CPackConfig.txt svn path=/trunk/; revision=31379
2009-12-29 12:12:26 +00:00
)
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 00:50:56 +00:00
if(ENABLE_HTML_GUIDES)
set(WSUG_HTML_OUTPUT wsug_html_chunked/index.html wsug_html/index.html)
endif()
if(ENABLE_PDF_GUIDES)
set(WSUG_PDF_OUTPUT user-guide-a4.pdf user-guide-us.pdf)
endif()
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-07 00:59:32 +00:00
if(ENABLE_CHM_GUIDES)
set(WSUG_CHM_OUTPUT user-guide.chm)
XML2HHP(wsug user-guide.xml)
HHP2CHM(user-guide.hhp)
endif()
- Beginnings of cmake in docbook directory - Add note about "make help" - Move beginnings of packaging into its own file: CPackConfig.txt svn path=/trunk/; revision=31379
2009-12-29 12:12:26 +00:00
VALIDATE_XML(
wsug.validated
WSUG_SOURCE
)
XML2HTML(
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-23 23:09:58 +00:00
wsug
- Beginnings of cmake in docbook directory - Add note about "make help" - Move beginnings of packaging into its own file: CPackConfig.txt svn path=/trunk/; revision=31379
2009-12-29 12:12:26 +00:00
single-page
Almost working out-of-tree builds for the documentation, with a few hacks right now: - The tip.png, warning.png and note.png images are missing from the pdfs and I have no idea how to tell fop how to find them. - Disabling/enabling building the guides via option currently doesn't work (probably too many macros :-), so comment out the subdir instead. - Right now, in order to build the devleopers guide we need to do the following in the source docbook directory: touch wsdg_graphics/toolbar/dummy.dummy Apart from these: The build works with a pristine docbook dir (svn status --no-ignore). svn path=/trunk/; revision=32004
2010-02-25 12:30:44 +00:00
WSUG_SOURCE
- Beginnings of cmake in docbook directory - Add note about "make help" - Move beginnings of packaging into its own file: CPackConfig.txt svn path=/trunk/; revision=31379
2009-12-29 12:12:26 +00:00
WSUG_GRAPHICS
)
Almost working out-of-tree builds for the documentation, with a few hacks right now: - The tip.png, warning.png and note.png images are missing from the pdfs and I have no idea how to tell fop how to find them. - Disabling/enabling building the guides via option currently doesn't work (probably too many macros :-), so comment out the subdir instead. - Right now, in order to build the devleopers guide we need to do the following in the source docbook directory: touch wsdg_graphics/toolbar/dummy.dummy Apart from these: The build works with a pristine docbook dir (svn status --no-ignore). svn path=/trunk/; revision=32004
2010-02-25 12:30:44 +00:00
XML2HTML(
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-23 23:09:58 +00:00
wsug
Almost working out-of-tree builds for the documentation, with a few hacks right now: - The tip.png, warning.png and note.png images are missing from the pdfs and I have no idea how to tell fop how to find them. - Disabling/enabling building the guides via option currently doesn't work (probably too many macros :-), so comment out the subdir instead. - Right now, in order to build the devleopers guide we need to do the following in the source docbook directory: touch wsdg_graphics/toolbar/dummy.dummy Apart from these: The build works with a pristine docbook dir (svn status --no-ignore). svn path=/trunk/; revision=32004
2010-02-25 12:30:44 +00:00
chunked
WSUG_SOURCE
WSUG_GRAPHICS
)
Add note about unifying a4 and letter format builds. svn path=/trunk/; revision=40844
2012-02-04 23:30:38 +00:00
# 2do: Merge A4 and letter into the smallest dimension of each format.
# Use --stringparam page.height <letter-height>mm --stringparam page.width <at-width>mm
# Test the effect of this on letter and a4 printers first (ps and non-ps).
Almost working out-of-tree builds for the documentation, with a few hacks right now: - The tip.png, warning.png and note.png images are missing from the pdfs and I have no idea how to tell fop how to find them. - Disabling/enabling building the guides via option currently doesn't work (probably too many macros :-), so comment out the subdir instead. - Right now, in order to build the devleopers guide we need to do the following in the source docbook directory: touch wsdg_graphics/toolbar/dummy.dummy Apart from these: The build works with a pristine docbook dir (svn status --no-ignore). svn path=/trunk/; revision=32004
2010-02-25 12:30:44 +00:00
XML2PDF(
user-guide-a4.pdf
WSUG_SOURCE
custom_layer_pdf.xsl
A4
)
- Beginnings of cmake in docbook directory - Add note about "make help" - Move beginnings of packaging into its own file: CPackConfig.txt svn path=/trunk/; revision=31379
2009-12-29 12:12:26 +00:00
Almost working out-of-tree builds for the documentation, with a few hacks right now: - The tip.png, warning.png and note.png images are missing from the pdfs and I have no idea how to tell fop how to find them. - Disabling/enabling building the guides via option currently doesn't work (probably too many macros :-), so comment out the subdir instead. - Right now, in order to build the devleopers guide we need to do the following in the source docbook directory: touch wsdg_graphics/toolbar/dummy.dummy Apart from these: The build works with a pristine docbook dir (svn status --no-ignore). svn path=/trunk/; revision=32004
2010-02-25 12:30:44 +00:00
XML2PDF(
user-guide-us.pdf
WSUG_SOURCE
custom_layer_pdf.xsl
letter
)
- Beginnings of cmake in docbook directory - Add note about "make help" - Move beginnings of packaging into its own file: CPackConfig.txt svn path=/trunk/; revision=31379
2009-12-29 12:12:26 +00:00
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 00:50:56 +00:00
if(ENABLE_HTML_GUIDES)
set(WSDG_HTML_OUTPUT wsdg_html_chunked/index.html wsdg_html/index.html)
endif()
if(ENABLE_PDF_GUIDES)
set(WSDG_PDF_OUTPUT developer-guide-a4.pdf developer-guide-us.pdf)
endif()
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-07 00:59:32 +00:00
if(ENABLE_CHM_GUIDES)
set(WSDG_CHM_OUTPUT developer-guide.chm)
XML2HHP(wsdg developer-guide.xml)
HHP2CHM(developer-guide.hhp)
endif()
- Beginnings of cmake in docbook directory - Add note about "make help" - Move beginnings of packaging into its own file: CPackConfig.txt svn path=/trunk/; revision=31379
2009-12-29 12:12:26 +00:00
Almost working out-of-tree builds for the documentation, with a few hacks right now: - The tip.png, warning.png and note.png images are missing from the pdfs and I have no idea how to tell fop how to find them. - Disabling/enabling building the guides via option currently doesn't work (probably too many macros :-), so comment out the subdir instead. - Right now, in order to build the devleopers guide we need to do the following in the source docbook directory: touch wsdg_graphics/toolbar/dummy.dummy Apart from these: The build works with a pristine docbook dir (svn status --no-ignore). svn path=/trunk/; revision=32004
2010-02-25 12:30:44 +00:00
VALIDATE_XML(
wsdg.validated
WSDG_SOURCE
)
XML2HTML(
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-23 23:09:58 +00:00
wsdg
Almost working out-of-tree builds for the documentation, with a few hacks right now: - The tip.png, warning.png and note.png images are missing from the pdfs and I have no idea how to tell fop how to find them. - Disabling/enabling building the guides via option currently doesn't work (probably too many macros :-), so comment out the subdir instead. - Right now, in order to build the devleopers guide we need to do the following in the source docbook directory: touch wsdg_graphics/toolbar/dummy.dummy Apart from these: The build works with a pristine docbook dir (svn status --no-ignore). svn path=/trunk/; revision=32004
2010-02-25 12:30:44 +00:00
single-page
WSDG_SOURCE
WSDG_GRAPHICS
)
XML2HTML(
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-23 23:09:58 +00:00
wsdg
Almost working out-of-tree builds for the documentation, with a few hacks right now: - The tip.png, warning.png and note.png images are missing from the pdfs and I have no idea how to tell fop how to find them. - Disabling/enabling building the guides via option currently doesn't work (probably too many macros :-), so comment out the subdir instead. - Right now, in order to build the devleopers guide we need to do the following in the source docbook directory: touch wsdg_graphics/toolbar/dummy.dummy Apart from these: The build works with a pristine docbook dir (svn status --no-ignore). svn path=/trunk/; revision=32004
2010-02-25 12:30:44 +00:00
chunked
WSDG_SOURCE
WSDG_GRAPHICS
)
XML2PDF(
developer-guide-a4.pdf
WSDG_SOURCE
custom_layer_pdf.xsl
A4
)
- Beginnings of cmake in docbook directory - Add note about "make help" - Move beginnings of packaging into its own file: CPackConfig.txt svn path=/trunk/; revision=31379
2009-12-29 12:12:26 +00:00
Almost working out-of-tree builds for the documentation, with a few hacks right now: - The tip.png, warning.png and note.png images are missing from the pdfs and I have no idea how to tell fop how to find them. - Disabling/enabling building the guides via option currently doesn't work (probably too many macros :-), so comment out the subdir instead. - Right now, in order to build the devleopers guide we need to do the following in the source docbook directory: touch wsdg_graphics/toolbar/dummy.dummy Apart from these: The build works with a pristine docbook dir (svn status --no-ignore). svn path=/trunk/; revision=32004
2010-02-25 12:30:44 +00:00
XML2PDF(
developer-guide-us.pdf
WSDG_SOURCE
custom_layer_pdf.xsl
letter
)
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-07 00:59:32 +00:00
if(ENABLE_HTML_GUIDES OR ENABLE_PDF_GUIDES OR ENABLE_CHM_GUIDES)
add_custom_target(
user_guides
DEPENDS
${WSUG_HTML_OUTPUT}
${WSUG_PDF_OUTPUT}
${WSUG_CHM_OUTPUT}
)
add_custom_target(
developer_guides
DEPENDS
wsluarm
${WSDG_HTML_OUTPUT}
${WSDG_PDF_OUTPUT}
${WSDG_CHM_OUTPUT}
)
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 00:50:56 +00:00
add_custom_target( all_guides ALL )
add_dependencies ( all_guides user_guides developer_guides )
endif()
Almost working out-of-tree builds for the documentation, with a few hacks right now: - The tip.png, warning.png and note.png images are missing from the pdfs and I have no idea how to tell fop how to find them. - Disabling/enabling building the guides via option currently doesn't work (probably too many macros :-), so comment out the subdir instead. - Right now, in order to build the devleopers guide we need to do the following in the source docbook directory: touch wsdg_graphics/toolbar/dummy.dummy Apart from these: The build works with a pristine docbook dir (svn status --no-ignore). svn path=/trunk/; revision=32004
2010-02-25 12:30:44 +00:00
# release_notes: release-notes.html release-notes.txt release-notes-a4.pdf release-notes-us.pdf
- Beginnings of cmake in docbook directory - Add note about "make help" - Move beginnings of packaging into its own file: CPackConfig.txt svn path=/trunk/; revision=31379
2009-12-29 12:12:26 +00:00
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 00:50:56 +00:00
add_custom_target( release_notes_html DEPENDS ws.css release-notes.html )
Update CMake "Project names" and Folders This gives a more structured layout in Visual Studio Change-Id: I0da87a3e5ec759c69aeee031366cf287485cdac2 Reviewed-on: https://code.wireshark.org/review/6485 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Graham Bloice <graham.bloice@trihedral.com>
2015-01-11 00:05:42 +00:00
set_target_properties(release_notes_html PROPERTIES FOLDER "Docbook")
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 00:50:56 +00:00
add_custom_target( release_notes_txt DEPENDS release-notes.txt )
Update CMake "Project names" and Folders This gives a more structured layout in Visual Studio Change-Id: I0da87a3e5ec759c69aeee031366cf287485cdac2 Reviewed-on: https://code.wireshark.org/review/6485 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Graham Bloice <graham.bloice@trihedral.com>
2015-01-11 00:05:42 +00:00
set_target_properties(release_notes_txt PROPERTIES FOLDER "Docbook")
Add generation of release notes. Regenerate NEWS file svn path=/trunk/; revision=53014
2013-11-01 09:55:26 +00:00
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 00:50:56 +00:00
# Force serial execution so that separate a2x instances don't trip on each other
add_dependencies ( release_notes_txt release_notes_html )
add_custom_target( release_notes )
Update CMake "Project names" and Folders This gives a more structured layout in Visual Studio Change-Id: I0da87a3e5ec759c69aeee031366cf287485cdac2 Reviewed-on: https://code.wireshark.org/review/6485 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Graham Bloice <graham.bloice@trihedral.com>
2015-01-11 00:05:42 +00:00
set_target_properties(release_notes PROPERTIES FOLDER "Docbook")
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 00:50:56 +00:00
add_dependencies ( release_notes release_notes_txt release_notes_html )
add_custom_target(
news
COMMAND ${CMAKE_COMMAND} -E copy_if_different
Add generation of release notes. Regenerate NEWS file svn path=/trunk/; revision=53014
2013-11-01 09:55:26 +00:00
${CMAKE_CURRENT_BINARY_DIR}/release-notes.txt
${CMAKE_SOURCE_DIR}/NEWS
DEPENDS
${CMAKE_CURRENT_BINARY_DIR}/release-notes.txt
)
Update CMake "Project names" and Folders This gives a more structured layout in Visual Studio Change-Id: I0da87a3e5ec759c69aeee031366cf287485cdac2 Reviewed-on: https://code.wireshark.org/review/6485 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Graham Bloice <graham.bloice@trihedral.com>
2015-01-11 00:05:42 +00:00
set_target_properties(news PROPERTIES FOLDER "Docbook")
Add generation of release notes. Regenerate NEWS file svn path=/trunk/; revision=53014
2013-11-01 09:55:26 +00:00
ASCIIDOC2HTML(
release-notes.html
release-notes.asciidoc
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-17 16:23:31 +00:00
"${ASCIIDOC_CONF_FILES}"
Add generation of release notes. Regenerate NEWS file svn path=/trunk/; revision=53014
2013-11-01 09:55:26 +00:00
)
ASCIIDOC2TXT(
release-notes.txt
release-notes.asciidoc
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-17 16:23:31 +00:00
"${ASCIIDOC_CONF_FILES}"
Add generation of release notes. Regenerate NEWS file svn path=/trunk/; revision=53014
2013-11-01 09:55:26 +00:00
)
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 00:50:56 +00:00
#ASCIIDOC2PDF(
# release-notes-a4.pdf
# release-notes.asciidoc
# "${ASCIIDOC_CONF_FILES}"
# A4
#)
#ASCIIDOC2PDF(
# release-notes-us.pdf
# release-notes.asciidoc
# "${ASCIIDOC_CONF_FILES}"
# letter
#)
Add generation of release notes. Regenerate NEWS file svn path=/trunk/; revision=53014
2013-11-01 09:55:26 +00:00
- Beginnings of cmake in docbook directory - Add note about "make help" - Move beginnings of packaging into its own file: CPackConfig.txt svn path=/trunk/; revision=31379
2009-12-29 12:12:26 +00:00
# wsluarm
ADD_CUSTOM_COMMAND(
OUTPUT
Install guides into DOC_DIR if defined svn path=/trunk/; revision=34198
2010-09-23 06:55:08 +00:00
wsluarm
Fix Windows asciidoc build Replace some unixisms with CMake equivalents Change-Id: I8dc125e830cdf7c31b13539c0a86df736097afef Reviewed-on: https://code.wireshark.org/review/8208 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2015-04-26 18:11:44 +00:00
COMMAND ${CMAKE_COMMAND} -E make_directory wsluarm_src
- Beginnings of cmake in docbook directory - Add note about "make help" - Move beginnings of packaging into its own file: CPackConfig.txt svn path=/trunk/; revision=31379
2009-12-29 12:12:26 +00:00
COMMAND ${PERL_EXECUTABLE}
Install guides into DOC_DIR if defined svn path=/trunk/; revision=34198
2010-09-23 06:55:08 +00:00
${CMAKE_CURRENT_SOURCE_DIR}/make-wsluarm.pl
${WSLUA_MODULES}
Fix Windows asciidoc build Replace some unixisms with CMake equivalents Change-Id: I8dc125e830cdf7c31b13539c0a86df736097afef Reviewed-on: https://code.wireshark.org/review/8208 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2015-04-26 18:11:44 +00:00
COMMAND ${CMAKE_COMMAND} -E touch
wsluarm
- Beginnings of cmake in docbook directory - Add note about "make help" - Move beginnings of packaging into its own file: CPackConfig.txt svn path=/trunk/; revision=31379
2009-12-29 12:12:26 +00:00
DEPENDS
Install guides into DOC_DIR if defined svn path=/trunk/; revision=34198
2010-09-23 06:55:08 +00:00
${CMAKE_CURRENT_SOURCE_DIR}/make-wsluarm.pl
${WSLUA_MODULES}
- Beginnings of cmake in docbook directory - Add note about "make help" - Move beginnings of packaging into its own file: CPackConfig.txt svn path=/trunk/; revision=31379
2009-12-29 12:12:26 +00:00
)