diff options
| -rw-r--r-- | CMakeLists.txt | 22 | ||||
| -rw-r--r-- | CPackConfig.txt | 42 | ||||
| -rw-r--r-- | README.cmake | 4 | ||||
| -rw-r--r-- | cmake/modules/FindFOP.cmake | 25 | ||||
| -rw-r--r-- | cmake/modules/FindLYNX.cmake | 42 | ||||
| -rw-r--r-- | cmake/modules/FindPCAP.cmake | 8 | ||||
| -rw-r--r-- | cmake/modules/FindPOD.cmake | 30 | ||||
| -rw-r--r-- | cmake/modules/FindSED.cmake | 15 | ||||
| -rw-r--r-- | cmake/modules/FindXMLLINT.cmake | 48 | ||||
| -rw-r--r-- | cmake/modules/FindXSLTPROC.cmake | 115 | ||||
| -rw-r--r-- | docbook/CMakeLists.txt | 361 | ||||
| -rwxr-xr-x | docbook/check_svn_version.sh | 1 |
12 files changed, 657 insertions, 56 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 53b99e51a3..21eacc1250 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -274,6 +274,9 @@ endforeach() find_package(YAPP) +#packaging +include(CPackConfig.txt) + if(HAVE_LIBPYTHON) set(HAVE_PYTHON 1) set(PYTHON_DIR "${CMAKE_INSTALL_PREFIX}/lib/wireshark/python/${CPACK_PACKAGE_VERSION}") @@ -307,22 +310,6 @@ include(ConfigureChecks.cmake) include(TestBigEndian) test_big_endian(WORDS_BIGENDIAN) -#packaging -set(CPACK_PACKAGE_NAME wireshark) -set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "capture packet") -set(CPACK_PACKAGE_VENDOR "wireshark") -set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README") -set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/COPYING") -set(CPACK_PACKAGE_VERSION_MAJOR "1") -set(CPACK_PACKAGE_VERSION_MINOR "3") -set(CPACK_PACKAGE_VERSION_PATCH "3") -set(CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}") - -set(CPACK_SOURCE_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}") -set(CPACK_PACKAGE_INSTALL_DIRECTORY "/usr") -set(CPACK_GENERATOR "TGZ") -set(CPACK_SOURCE_GENERATOR "TGZ") - set(DATAFILE_DIR "${CMAKE_INSTALL_PREFIX}/share/${CPACK_PACKAGE_NAME}") if(ENABLE_PLUGINS) @@ -368,8 +355,7 @@ add_subdirectory( wiretap ) add_subdirectory( wsutil ) if(ENABLE_GUIDES) -# todo -# add_subdirectory( docbook ) + add_subdirectory( docbook ) endif() #Platform specific diff --git a/CPackConfig.txt b/CPackConfig.txt new file mode 100644 index 0000000000..830e10a366 --- /dev/null +++ b/CPackConfig.txt @@ -0,0 +1,42 @@ +# CPackConfig.txt +# +# $Id$ +# +# 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 +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# + +set(CPACK_PACKAGE_NAME wireshark) +set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "capture packet") +set(CPACK_PACKAGE_VENDOR "wireshark") +set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README") +set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/COPYING") +set(CPACK_PACKAGE_VERSION_MAJOR "1") +set(CPACK_PACKAGE_VERSION_MINOR "3") +set(CPACK_PACKAGE_VERSION_PATCH "3") +set(CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}") + +set(CPACK_SOURCE_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}") +set(CPACK_PACKAGE_INSTALL_DIRECTORY "/usr") +# Win: NSIS, ZIP, SORUCE_ZIP, CYGWIN_BINARY, SOURCE_CYGWIN, +# Linux/Unix: DEB, RPM, STGZ, TBZ2, TZ, SOURCE_TZ, SOURCE_TGZ +# OSX: PACKAGEMAKER, OSXX11 +# Syntax: "Type1;Type2;Type3" +set(CPACK_GENERATOR "TGZ") +#set(CPACK_SOURCE_GENERATOR "TGZ") + diff --git a/README.cmake b/README.cmake index c66201cf73..d293e4c23d 100644 --- a/README.cmake +++ b/README.cmake @@ -44,6 +44,10 @@ Note 2: On OS X, you may want to run cmake like this: cmake -DENABLE_CAP=OFF -G "Unix Makefiles" +Note 3: + After running cmake, you can always run "make help" to see + a list of all possible make targets. + Why cmake? ========== - Can create project files for some MS and Apple IDEs. diff --git a/cmake/modules/FindFOP.cmake b/cmake/modules/FindFOP.cmake new file mode 100644 index 0000000000..1ec136149b --- /dev/null +++ b/cmake/modules/FindFOP.cmake @@ -0,0 +1,25 @@ +# +# $Id$ +# +# - Find unix commands from cygwin +# This module looks for some usual Unix commands. +# + +INCLUDE(FindCygwin) + +FIND_PROGRAM(FOP_EXECUTABLE + NAMES + fop + PATHS + ${CYGWIN_INSTALL_PATH}/bin + /bin + /usr/bin + /usr/local/bin + /sbin +) + +INCLUDE(FindPackageHandleStandardArgs) +FIND_PACKAGE_HANDLE_STANDARD_ARGS(FOP DEFAULT_MSG FOP_EXECUTABLE) + +MARK_AS_ADVANCED(FOP_EXECUTABLE) + diff --git a/cmake/modules/FindLYNX.cmake b/cmake/modules/FindLYNX.cmake new file mode 100644 index 0000000000..daea96ce75 --- /dev/null +++ b/cmake/modules/FindLYNX.cmake @@ -0,0 +1,42 @@ +# +# $Id$ +# +# - Find unix commands from cygwin +# This module looks for some usual Unix commands. +# + +INCLUDE(FindCygwin) + +FIND_PROGRAM(LYNX_EXECUTABLE + NAMES + lynx + elinks + links + true + PATHS + ${CYGWIN_INSTALL_PATH}/bin + /bin + /usr/bin + /usr/local/bin + /sbin +) + +INCLUDE(FindPackageHandleStandardArgs) +FIND_PACKAGE_HANDLE_STANDARD_ARGS(LYNX DEFAULT_MSG LYNX_EXECUTABLE) + +MARK_AS_ADVANCED(LYNX_EXECUTABLE) + +# Convert html to text +IF(LYNX_EXECUTABLE MATCHES lynx$) + # (See Bug # 1446 for note re 'force-html' below) + set(HTML2TXT "lynx -dump -width=72 -nolist -stdin -force-html") +ELSEIF(LYNX_EXECUTABLE MATCHES elinks$) + set(HTML2TXT "elinks -dump -dump-width 72") +ELSEIF(LYNX_EXECUTABLE MATCHES links$) + set(HTML2TXT "links -dump -width 72") +ELSEIF(LYNX_EXECUTABLE MATCHES true$) + set(HTML2TXT "true") +ELSE() + message(ERROR "Should never be reached - please report!") +ENDIF() +message(STATUS "html2text: ${HTML2TXT}") diff --git a/cmake/modules/FindPCAP.cmake b/cmake/modules/FindPCAP.cmake index 05e92d2796..0d54c644b0 100644 --- a/cmake/modules/FindPCAP.cmake +++ b/cmake/modules/FindPCAP.cmake @@ -111,12 +111,8 @@ CHECK_FUNCTION_EXISTS("pcap_list_datalinks" HAVE_PCAP_LIST_DATALINKS) CHECK_FUNCTION_EXISTS("pcap_open_dead" HAVE_PCAP_OPEN_DEAD) CHECK_FUNCTION_EXISTS("pcap_set_datalink" HAVE_PCAP_SET_DATALINK) - -#Is pcap found ? -IF(PCAP_INCLUDE_DIRS AND PCAP_LIBRARIES) - SET( PCAP_FOUND "YES" ) -ENDIF(PCAP_INCLUDE_DIRS AND PCAP_LIBRARIES) - +INCLUDE(FindPackageHandleStandardArgs) +FIND_PACKAGE_HANDLE_STANDARD_ARGS(PCAP DEFAULT_MSG PCAP_INCLUDE_DIRS PCAP_LIBRARIES) MARK_AS_ADVANCED( PCAP_LIBRARIES diff --git a/cmake/modules/FindPOD.cmake b/cmake/modules/FindPOD.cmake index 2c09ce72b1..63e3112fad 100644 --- a/cmake/modules/FindPOD.cmake +++ b/cmake/modules/FindPOD.cmake @@ -18,18 +18,6 @@ FIND_PROGRAM(POD2MAN_EXECUTABLE /sbin ) -MARK_AS_ADVANCED(POD2MAN_EXECUTABLE) - -# search pod2man -MACRO(FIND_POD2MAN) - IF(NOT POD2MAN_EXECUTABLE) - FIND_PROGRAM(POD2MAN_EXECUTABLE pod2man) - IF (NOT POD2MAN_EXECUTABLE) - MESSAGE(FATAL_ERROR "pod2man not found - aborting") - ENDIF (NOT POD2MAN_EXECUTABLE) - ENDIF(NOT POD2MAN_EXECUTABLE) -ENDMACRO(FIND_POD2MAN) - FIND_PROGRAM(POD2HTML_EXECUTABLE NAMES pod2html @@ -41,17 +29,15 @@ FIND_PROGRAM(POD2HTML_EXECUTABLE /sbin ) -MARK_AS_ADVANCED(POD2HTML_EXECUTABLE) +# handle the QUIETLY and REQUIRED arguments and set POD2HTML_FOUND to TRUE if +# all listed variables are TRUE +INCLUDE(FindPackageHandleStandardArgs) +FIND_PACKAGE_HANDLE_STANDARD_ARGS(POD2HTML DEFAULT_MSG POD2MAN_EXECUTABLE POD2HTML_EXECUTABLE) -# search pod2html -MACRO(FIND_POD2HTML) - IF(NOT POD2HTML_EXECUTABLE) - FIND_PROGRAM(POD2HTML_EXECUTABLE pod2html) - IF (NOT POD2HTML_EXECUTABLE) - MESSAGE(FATAL_ERROR "pod2html not found - aborting") - ENDIF (NOT POD2HTML_EXECUTABLE) - ENDIF(NOT POD2HTML_EXECUTABLE) -ENDMACRO(FIND_POD2HTML) +MARK_AS_ADVANCED( + POD2MAN_EXECUTABLE + POD2HTML_EXECUTABLE +) # run pod2man and pod2html MACRO(pod2manhtml _sourcefile _manext) diff --git a/cmake/modules/FindSED.cmake b/cmake/modules/FindSED.cmake index 21b21c7cf6..ab1d84b6aa 100644 --- a/cmake/modules/FindSED.cmake +++ b/cmake/modules/FindSED.cmake @@ -18,15 +18,10 @@ FIND_PROGRAM(SED_EXECUTABLE /sbin ) -MARK_AS_ADVANCED(SED_EXECUTABLE) +# handle the QUIETLY and REQUIRED arguments and set SED_FOUND to TRUE if +# all listed variables are TRUE +INCLUDE(FindPackageHandleStandardArgs) +FIND_PACKAGE_HANDLE_STANDARD_ARGS(SED DEFAULT_MSG SED_EXECUTABLE) -# search sed -MACRO(FIND_SED) - IF(NOT SED_EXECUTABLE) - FIND_PROGRAM(SED_EXECUTABLE sed) - IF (NOT SED_EXECUTABLE) - MESSAGE(FATAL_ERROR "sed not found - aborting") - ENDIF (NOT SED_EXECUTABLE) - ENDIF(NOT SED_EXECUTABLE) -ENDMACRO(FIND_SED) +MARK_AS_ADVANCED(SED_EXECUTABLE) diff --git a/cmake/modules/FindXMLLINT.cmake b/cmake/modules/FindXMLLINT.cmake new file mode 100644 index 0000000000..f5ac6459e2 --- /dev/null +++ b/cmake/modules/FindXMLLINT.cmake @@ -0,0 +1,48 @@ +# +# $Id$ +# +# - Find unix commands from cygwin +# This module looks for some usual Unix commands. +# + +INCLUDE(FindCygwin) + +FIND_PROGRAM(XMLLINT_EXECUTABLE + NAMES + xmllint + PATHS + ${CYGWIN_INSTALL_PATH}/bin + /bin + /usr/bin + /usr/local/bin + /sbin +) + +INCLUDE(FindPackageHandleStandardArgs) +FIND_PACKAGE_HANDLE_STANDARD_ARGS(XMLLINT DEFAULT_MSG XMLLINT_EXECUTABLE) + +MARK_AS_ADVANCED(XMLLINT_EXECUTABLE) + +# Validate XML +MACRO(VALIDATE_XML _validated _sources) + message(STATUS "Source(s): ${${_sources}}") + # FIXME: How do I extract the first element of a variable containing a + # list of values? Isn't there a "cleaner" solution? + FOREACH(_source ${${_sources}}) + BREAK() + ENDFOREACH() + ADD_CUSTOM_COMMAND( + OUTPUT + ${CMAKE_CURRENT_BINARY_DIR}/${_validated} + COMMAND ${XMLLINT_EXECUTABLE} + --valid + --noout + --path "${CMAKE_CURRENT_BINARY_DIR}:${CMAKE_CURRENT_SOURCE_DIR}" + ${_source} + COMMAND touch + ${CMAKE_CURRENT_BINARY_DIR}/${_validated} + DEPENDS + ${_source} + svn_version.xml + ) +ENDMACRO(VALIDATE_XML) diff --git a/cmake/modules/FindXSLTPROC.cmake b/cmake/modules/FindXSLTPROC.cmake new file mode 100644 index 0000000000..1d18832da0 --- /dev/null +++ b/cmake/modules/FindXSLTPROC.cmake @@ -0,0 +1,115 @@ +# +# $Id$ +# +# - Find unix commands from cygwin +# This module looks for some usual Unix commands. +# + +INCLUDE(FindCygwin) + +FIND_PROGRAM(XSLTPROC_EXECUTABLE + NAMES + xsltproc + PATHS + ${CYGWIN_INSTALL_PATH}/bin + /bin + /usr/bin + /usr/local/bin + /sbin +) + +# Handle the QUIETLY and REQUIRED arguments and set XSLTPROC_FOUND to TRUE if +# all listed variables are TRUE +INCLUDE(FindPackageHandleStandardArgs) +FIND_PACKAGE_HANDLE_STANDARD_ARGS(XSLTPROC DEFAULT_MSG XSLTPROC_EXECUTABLE) + +MARK_AS_ADVANCED(XSLTPROC_EXECUTABLE) + +#XML2HTML( +# wsug.validated +# wsug_html/user-guide.html +# single-page +# wsug_html +# WSUG_SOURCE +# WSUG_GFX_SOURCE +#) + +# Translate xml to html +MACRO(XML2HTML _validated _output _mode _xmlsources _gfxsources) + MESSAGE(STATUS "XML source(s): ${${_xmlsources}}") + MESSAGE(STATUS "GFX source(s): ${${_gfxsources}}") + + GET_FILENAME_COMPONENT(_OUTDIR ${_output} PATH) + IF(${_mode} STREQUAL "chunked") + ELSE() # single-page + ENDIF() + + ADD_CUSTOM_COMMAND( + OUTPUT + ${_output} + COMMAND + cmake -E make_directory ${_OUTDIR} + COMMAND + cmake -E copy ${${_gfxsources}} ${_OUTDIR} + COMMAND + cmake -E copy ws.css ${_OUTDIR} + DEPENDS + ${${_xmlsources}} + ${${_gfxsources}} + ) +# mkdir -p wsug_html/wsug_graphics/toolbar +# cp wsug_graphics/*.* wsug_html/wsug_graphics +# cp wsug_graphics/toolbar/* wsug_html/wsug_graphics/toolbar +# cp ws.css wsug_html + +# mkdir -p wsug_html_chunked/wsug_graphics/toolbar +# cp wsug_graphics/*.* wsug_html_chunked/wsug_graphics +# cp wsug_graphics/toolbar/* wsug_html_chunked/wsug_graphics/toolbar +# cp ws.css wsug_html_chunked +ENDMACRO(XML2HTML) + +#wsug_html/user-guide.html: $(WSUG_SOURCE) +# @ echo --- WSUG - HTML SINGLE PAGE --- +# mkdir -p wsug_html/wsug_graphics/toolbar +# cp wsug_graphics/*.* wsug_html/wsug_graphics +# cp wsug_graphics/toolbar/* wsug_html/wsug_graphics/toolbar +# cp ws.css wsug_html +# $(XSLTPROC) --stringparam base.dir wsug_html/ --stringparam use.id.as.filename 1 --stringparam admon.graphics 1 --stringparam admon.graphics.path wsug_graphics/ --stringparam section.autolabel 1 --stringparam section.label.includes.component.label 1 --stringparam html.stylesheet ws.css --nonet http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl $< > $@ +# -chmod -R og+rX wsug_html +# + +#wsug_html_chunked/index.html: $(WSUG_SOURCE) +# @ echo --- WSUG - HTML CHUNKED --- +# mkdir -p wsug_html_chunked/wsug_graphics/toolbar +# cp wsug_graphics/*.* wsug_html_chunked/wsug_graphics +# cp wsug_graphics/toolbar/* wsug_html_chunked/wsug_graphics/toolbar +# cp ws.css wsug_html_chunked +# $(XSLTPROC) --stringparam base.dir wsug_html_chunked/ --stringparam use.id.as.filename 1 --stringparam admon.graphics 1 --stringparam admon.graphics.path wsug_graphics/ --stringparam section.autolabel 1 --stringparam section.label.includes.component.label 1 --stringparam html.stylesheet ws.css --nonet http://docbook.sourceforge.net/release/xsl/current/html/chunk.xsl $< +# -chmod -R og+rX wsug_html_chunked + +#XML2PDF( +# WSUG_SOURCE +# custom_layer_pdf.xsl +# A4 +#) +# +#XML2PDF( +# WSUG_SOURCE +# custom_layer_pdf.xsl +# letter +#) + +#user-guide-us.fo: $(WSUG_SOURCE) custom_layer_pdf.xsl +#ifdef FOP +# @ echo --- WSUG - PDF US PAPER --- +# $(XSLTPROC) --stringparam paper.type letter --nonet custom_layer_pdf.xsl $< > $@ +#endif +# +## create pdf file (through XSL-FO), portrait pages on A4 paper +## you will get lot's of errors, but that's ok +#user-guide-a4.fo: $(WSUG_SOURCE) custom_layer_pdf.xsl +#ifdef FOP +# @ echo --- WSUG - PDF A4 PAPER --- +# $(XSLTPROC) --stringparam paper.type A4 --nonet custom_layer_pdf.xsl $< > $@ +#endif + diff --git a/docbook/CMakeLists.txt b/docbook/CMakeLists.txt new file mode 100644 index 0000000000..d2d6d713c7 --- /dev/null +++ b/docbook/CMakeLists.txt @@ -0,0 +1,361 @@ +# CMakeLists.txt +# +# $Id$ +# +# 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 +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# + + +set(WSUG_FILES + wsug_src/WSUG_app_files.xml + wsug_src/WSUG_app_howitworks.xml + wsug_src/WSUG_app_messages.xml + wsug_src/WSUG_app_protocols.xml + wsug_src/WSUG_app_tools.xml + wsug_src/WSUG_chapter_advanced.xml + wsug_src/WSUG_chapter_build_install.xml + wsug_src/WSUG_chapter_capture.xml + wsug_src/WSUG_chapter_customize.xml + wsug_src/WSUG_chapter_introduction.xml + wsug_src/WSUG_chapter_io.xml + wsug_src/WSUG_chapter_statistics.xml + wsug_src/WSUG_chapter_telephony.xml + wsug_src/WSUG_chapter_troubleshoot.xml + wsug_src/WSUG_chapter_use.xml + wsug_src/WSUG_chapter_work.xml + wsug_src/WSUG_meta_info.xml + wsug_src/WSUG_preface.xml + wsluarm.xml + ws.css +) + +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 + wsug_graphics/ws-decode-as-show.png + wsug_graphics/ws-decode-as.png + 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-color-rule-dialog.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 + 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 + 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-gtk20.png + wsug_graphics/ws-merge-gtk24.png + wsug_graphics/ws-merge-win32.png + wsug_graphics/ws-nameresolution-preferences.png + wsug_graphics/ws-open-gtk20.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-gtk20.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 + 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 + wsug_graphics/ws-time-reference.png + wsug_graphics/ws-view-menu.png + wsug_graphics/note.png + wsug_graphics/tip.png + wsug_graphics/warning.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 +) + +set(WSDG_FILES + wsdg_src/WSDG_chapter_build_intro.xml + wsdg_src/WSDG_chapter_capture.xml + wsdg_src/WSDG_chapter_dissection.xml + wsdg_src/WSDG_chapter_env_intro.xml + wsdg_src/WSDG_chapter_libraries.xml + wsdg_src/WSDG_chapter_quick_setup.xml + wsdg_src/WSDG_chapter_sources.xml + wsdg_src/WSDG_chapter_tools.xml + wsdg_src/WSDG_chapter_userinterface.xml + wsdg_src/WSDG_chapter_works.xml + wsdg_src/WSDG_meta_info.xml + wsdg_src/WSDG_preface.xml + ws.css +) + +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 + wsdg_graphics/note.png + wsdg_graphics/tip.png + wsdg_graphics/warning.png +) + +# user-guide.xml must be first in the list +set(WSUG_SOURCE + user-guide.xml + svn_version.xml + wsluarm + ${WSUG_FILES} + ${WSUG_GRAPHICS} +) + +# developer-guide.xml must be first in the list +set(WSDG_SOURCE + developer-guide.xml + svn_version.xml + ${WSDG_FILES} + ${WSDG_GRAPHICS} +) + +set(RELEASE_NOTES_SOURCE + release-notes.xml + svn_version.xml +) + +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 + ${CMAKE_SOURCE_DIR}/epan/wslua/wslua_listener.c + ${CMAKE_SOURCE_DIR}/epan/wslua/wslua_pinfo.c + ${CMAKE_SOURCE_DIR}/epan/wslua/wslua_proto.c + ${CMAKE_SOURCE_DIR}/epan/wslua/wslua_tree.c + ${CMAKE_SOURCE_DIR}/epan/wslua/wslua_tvb.c + ${CMAKE_SOURCE_DIR}/epan/wslua/wslua_util.c +) + +find_package( FOP ) +find_package( LYNX ) +find_package( XSLTPROC ) +find_package( XMLLINT ) + +ADD_CUSTOM_COMMAND( + OUTPUT + svn_version.xml + COMMAND ${SH} + ${CMAKE_CURRENT_SOURCE_DIR}/check_svn_version.sh + DEPENDS + ${CMAKE_CURRENT_SOURCE_DIR}/check_svn_version.sh +) + +add_custom_target( + guides ALL + DEPENDS + wsug.validated +# wsug_html_chunked +# user-guide.html +# user-guide-a4.pdf +# user-guide-us.pdf +) + +VALIDATE_XML( + wsug.validated + WSUG_SOURCE +) + +XML2HTML( + wsug.validated + wsug_html/user-guide.html + single-page + WSUG_FILES + WSUG_GRAPHICS +) + +#XML2HTML( +# wsug.validated +# wsug_html_chunked/index.html +# chunked +# wsug_html_chunked +# WSUG_FILES +# WSUG_GRAPHICS +#) +# +#XML2PDF( +# WSUG_SOURCE +# custom_layer_pdf.xsl +# A4 +#) +# +#XML2PDF( +# WSUG_SOURCE +# custom_layer_pdf.xsl +# letter +#) + +# wsdg: wsdg_html_chunked developer-guide.html developer-guide-a4.pdf developer-guide-us.pdf + +# ... + +# release_notes: release-notes.html release-notes.txt release-notes-a4.pdf release-notes-us.pdf + +# ... + +# wsluarm +ADD_CUSTOM_COMMAND( + OUTPUT + wsluarm + COMMAND ${PERL_EXECUTABLE} + ${CMAKE_CURRENT_SOURCE_DIR}/make-wsluarm.pl + ${WSLUA_MODULES} + COMMAND + touch wsluarm + DEPENDS + ${CMAKE_CURRENT_SOURCE_DIR}/make-wsluarm.pl + ${WSLUA_MODULES} +) +# ... + + +# make-taps.pl depends on the current working directory +# to find the dissector files (contents of taps file +# depend on this actually, so just changing the paths +# in these lists won't help). +#ADD_CUSTOM_COMMAND( +# OUTPUT +# ${CMAKE_CURRENT_BINARY_DIR}/taps_wslua.c +# ${CMAKE_CURRENT_BINARY_DIR}/taps.txt +# COMMAND ${PERL_EXECUTABLE} +# ${CMAKE_CURRENT_SOURCE_DIR}/make-taps.pl +# ${CMAKE_CURRENT_SOURCE_DIR}/taps +# ${CMAKE_CURRENT_BINARY_DIR}/taps_wslua.c +# ${CMAKE_CURRENT_BINARY_DIR}/taps.txt +# WORKING_DIRECTORY +# ${CMAKE_CURRENT_SOURCE_DIR} +# DEPENDS +# ${CMAKE_CURRENT_SOURCE_DIR}/taps +# ${CMAKE_CURRENT_SOURCE_DIR}/make-taps.pl +# # Only here to add dependencies for the taps "source"files +# ${WSLUA_TAPS_USED} +#) + +#ADD_CUSTOM_COMMAND( +# OUTPUT +# declare_wslua.h +# register_wslua.c +# COMMAND ${PERL_EXECUTABLE} +# ${CMAKE_CURRENT_SOURCE_DIR}/make-reg.pl +# ${WSLUA_MODULES} +# DEPENDS +# ${CMAKE_CURRENT_SOURCE_DIR}/make-reg.pl +# ${WSLUA_MODULES} +# # ${CMAKE_CURRENT_BINARY_DIR}/taps_wslua.c +#) +# + +#install( +# FILES +# console.lua +# dtd_gen.lua +# ${CMAKE_CURRENT_BINARY_DIR}/init.lua +# DESTINATION +# ${CMAKE_INSTALL_DATADIR}/${CPACK_PACKAGE_NAME} +#) + diff --git a/docbook/check_svn_version.sh b/docbook/check_svn_version.sh index 1c7648e4ea..7def026cd0 100755 --- a/docbook/check_svn_version.sh +++ b/docbook/check_svn_version.sh @@ -36,3 +36,4 @@ then fi rm svn_version_tmp.xml + |