Install PDML files to DOCDIR

Add README because this stuff is somewhat obscure and move XSLT
file to DOCDIR because it is not used by wireshark directly.
This commit is contained in:
João Valverde 2023-01-19 16:19:46 +00:00
parent c06a38da31
commit 74909f1499
5 changed files with 11 additions and 11 deletions

View File

@ -1935,13 +1935,14 @@ set(INSTALL_FILES
resources/share/wireshark/colorfilters
resources/share/wireshark/dfilter_macros
resources/share/wireshark/dfilters
resources/share/wireshark/pdml2html.xsl
resources/share/wireshark/smi_modules
services
wka
)
set(DOC_FILES
resources/share/doc/wireshark/ipmap.html
resources/share/doc/wireshark/pdml2html.xsl
doc/README.xml-output
)
if (BUILD_logray)
@ -3800,6 +3801,13 @@ install(
${CMAKE_INSTALL_DATADIR}
)
install(
FILES
${DOC_FILES}
DESTINATION
${CMAKE_INSTALL_DOCDIR}
)
set(SHARK_PUBLIC_HEADERS
cfile.h
cli_main.h

View File

@ -133,10 +133,6 @@ if(ASCIIDOCTOR_FOUND)
)
endif()
list(APPEND HTML_INSTALL_FILES
${CMAKE_SOURCE_DIR}/resources/share/doc/wireshark/ipmap.html
)
install(
FILES
${HTML_INSTALL_FILES}

View File

@ -251,6 +251,7 @@ proto_tree_print_node(proto_node *node, gpointer data)
}
#define PDML2HTML_XSL "pdml2html.xsl"
#define PDML2HTML_URL "https://gitlab.com/wireshark/wireshark/-/tree/master/resources/share/doc/wireshark/"
void
write_pdml_preamble(FILE *fh, const gchar *filename)
{
@ -270,7 +271,7 @@ write_pdml_preamble(FILE *fh, const gchar *filename)
fprintf(fh, "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n");
fprintf(fh, "<?xml-stylesheet type=\"text/xsl\" href=\"" PDML2HTML_XSL "\"?>\n");
fprintf(fh, "<!-- You can find " PDML2HTML_XSL " in %s or at https://gitlab.com/wireshark/wireshark/-/raw/master/" PDML2HTML_XSL ". -->\n", get_datafile_dir());
fprintf(fh, "<!-- You can find " PDML2HTML_XSL " in %s or at "PDML2HTML_URL PDML2HTML_XSL ". -->\n", get_doc_dir());
fprintf(fh, "<pdml version=\"" PDML_VERSION "\" creator=\"%s/%s\" time=\"%s\" capture_file=\"", PACKAGE, VERSION, ts);
if (filename) {
/* \todo filename should be converted to UTF-8. */

View File

@ -472,12 +472,7 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
%defattr(-,root,root)
%doc AUTHORS COPYING NEWS README.md
%doc %{_datadir}/doc/wireshark/*.html
# Include the User Guide:
%if %{with guides}
%docdir %{_datadir}/doc/wireshark/
%endif
# Don't pick up any of the wireshark (GUI) binaries here
%exclude %{_bindir}/wireshark*