Commit Graph

36 Commits

Author SHA1 Message Date
Gerald Combs d31011572d 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-08-24 02:56:35 +00:00
Jeff Morriss 0c3e0db5f1 Add a few more NEWS items.
Fix a typo in the generation of top_srcdir NEWS.

Change-Id: I20a140a68b9afca5096d33d99a3ea5d24e776f05
Reviewed-on: https://code.wireshark.org/review/3626
Tested-by: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-08-17 04:16:52 +00:00
Jeff Morriss 7bf2f2edfd Support building the NEWS file in out-of-source-tree builds.
Copy the built file into the source directory (since it's generated but checked
in).  Don't fail to build, though, if we can't do that copy.

Change-Id: Ia94a19b6f813ee78b191cd09d51198462f95b223
Reviewed-on: https://code.wireshark.org/review/3425
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-08-06 17:24:46 +00:00
Gerald Combs 700a474d3b 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-21 15:31:16 +00:00
Stig Bjørlykke 066a9f3d2d Support out-of-source docbook build
Change-Id: I273a6317c459664a247d3f5623ef54b0a70a9ab8
Reviewed-on: https://code.wireshark.org/review/2232
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-16 14:19:13 +00:00
Alexis La Goutte 757aa33220 Continue to remove $Id$ from top of file
(Using sed : sed -i '/^\# \$Id\$/,+1 d') (start with dash)

Change-Id: Ia4b5a6c2302f6a531f6a86c1ec3a2f8205c8c2dd
Reviewed-on: https://code.wireshark.org/review/881
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-31 18:48:06 +00:00
Michael Mann d8265cd8c6 Remove Visual Studio solution and project files (and their existence from Makefiles)
There have been discussions on -dev about removing this and I believe I was the last holdout. Finally convinced that I should just have a local copy (ignored by git)

Change-Id: Ic72a22baf58e3412023cf851f0fce16eb07113b0
Reviewed-on: https://code.wireshark.org/review/681
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-16 18:03:41 +00:00
Gerald Combs c55c57ad72 Add Git+Gerrit command line instructions.
Add a Git+Gerrit command line example to the Developer's Guide. Convert
some Subversion text to Git.

Skip building the Developer's Guide if we don't have a2x.

Change-Id: I62e9e71eb3ffc07d8677df35b4b197f53f77b4f2
Reviewed-on: https://code.wireshark.org/review/384
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-02-25 20:26:50 +00:00
Gerald Combs 30b53c3331 Try to fix dist. Change the .asciidoc.xml inference rule to a pattern
rule specific to wsug_src similar to the nmake change in gedc06c1.

Change-Id: I6d4bffc5391bd84a83fca8acb6a3688805e05de6
Reviewed-on: https://code.wireshark.org/review/179
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-02-11 20:03:59 +00:00
Gerald Combs 5e3113e7c9 Finish converting the Developer's Guide to AsciiDoc.
Add developer-guide-docinfo.xml, which lets us carry over DocBook front
matter. Remove the meta_info chapter. Most of its contents are now in
developer-guide-docinfo.xml. Add a DocBook revision history based on
hints from the Git/SVN/CVS revision history.

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

Change-Id: Ib6d50c821ca906fff50a84ad4d6af3212ebdff0a
Reviewed-on: https://code.wireshark.org/review/155
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Tested-by: Gerald Combs <gerald@wireshark.org>
2014-02-11 18:04:45 +00:00
Gerald Combs e61a6533e7 Convert the preface to AsciiDoc with minor edits.
svn path=/trunk/; revision=54970
2014-01-27 03:08:01 +00:00
Gerald Combs 927914a2cf Fix xpath selector. Clean up whitespace.
svn path=/trunk/; revision=54955
2014-01-25 01:09:28 +00:00
Gerald Combs 8997fb0d89 Start migrating the Developer's Guide to AsciiDoc. So far only one
chapter (WSDG_chapter_sources) has been converted.

Conversion was done using the script in
https://code.wireshark.org/review/#/c/9/ along with manual cleanup.
Changes are mostly limited formatting.

It's helpful to have a copy of the pre-conversion guide for comparison.
I've placed a chunked copy online at
http://www.wireshark.org/~gerald/wsdg_html_2014_01/ .

Tested under Autotools. Nmake and CMake will likely break. I'll take a
look shortly. If only we had documention adding a feature branch to
Gerrit and using it to test different platforms...

svn path=/trunk/; revision=54945
2014-01-24 18:55:27 +00:00
Gerald Combs a9ddc06adc Prepare for conversion of Guide chapters to AsciiDoc.
svn path=/trunk/; revision=54936
2014-01-24 01:10:10 +00:00
Gerald Combs 2b26c1e216 Prepare for Git migration.
Mass-replace "svn" with "git". Add commented code to use git to fetch
the repository version.

svn path=/trunk/; revision=54905
2014-01-22 18:15:44 +00:00
Gerald Combs e9d8fb754d Have docbook/Makefile.nmake use index.html similar to r51021. Make some
target names less confusing.

svn path=/trunk/; revision=51032
2013-07-30 17:57:20 +00:00
Gerald Combs 58ee866ec8 Name our index pages "index.html". This is follows a well-established
convention and lets us avoid a bit of juggling on the server side.

svn path=/trunk/; revision=51021
2013-07-29 21:12:05 +00:00
Jeff Morriss bd25e827be Oops: revert 49636. We tell a2x to use fop to generate the PDFs.
svn path=/trunk/; revision=49638
2013-05-30 21:41:17 +00:00
Jeff Morriss 3428bf9168 Which release notes targets we can build no longer depends on whether we HAVE_FOP.
svn path=/trunk/; revision=49636
2013-05-30 21:33:04 +00:00
Gerald Combs fc6e505dac Switch to Asciidoc for the release notes. The initial conversion from
Docbook was done using Pandoc and cleaned up by hand. Add an
asciidoc.conf which contains macros for linking to Wireshark bugs and
CVE IDs.

Remove the release-notes.chm target. I don't think we ever used it and
we're probably better off generating PDF or HTML if we need something
fancier than plain text.

In configure.ac, consolidate program path discovery a bit and add a2x
discovery.

svn path=/trunk/; revision=48307
2013-03-15 00:08:18 +00:00
Jeff Morriss abad990926 Print an explanatory message when asked to build a PDF but FOP is not installed.
svn path=/trunk/; revision=46015
2012-11-12 22:55:02 +00:00
Bill Meier 0a3ff69656 From Ed Beroset: Fix a typo in Makefile
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6482

svn path=/trunk/; revision=39548
2011-10-25 00:09:52 +00:00
Guy Harris b8e798fa3f More tpo fixes.
svn path=/trunk/; revision=39202
2011-09-30 19:39:43 +00:00
Gerald Combs 5371f016f8 s/wsug_/wsdg_/g in the Developer's Guide targets.
svn path=/trunk/; revision=39199
2011-09-30 16:55:41 +00:00
Guy Harris 8526fa4086 wsdg_graphics/toolbar is a directory; fix the rules that weren't already
fixed to cope with that.

svn path=/trunk/; revision=39021
2011-09-16 00:21:21 +00:00
Anders Broman 51d8ad3a45 Remove some stuff again.
svn path=/trunk/; revision=37437
2011-05-27 13:16:28 +00:00
Anders Broman df7717126d Include missing files in distribution.
svn path=/trunk/; revision=37435
2011-05-27 12:22:20 +00:00
Jörg Mayer fc575f1c8e Install guides into DOC_DIR if defined
svn path=/trunk/; revision=34198
2010-09-23 06:55:08 +00:00
Gerald Combs bc9f8d0cd7 Add Visual C++ project files to the distribution.
svn path=/trunk/; revision=33386
2010-06-30 23:20:03 +00:00
Jeff Morriss 54082c6ed0 Add Cmake stuff to the source distribution so more people can try it out.
svn path=/trunk/; revision=32807
2010-05-14 16:27:03 +00:00
Bill Meier fd26f6ccd7 Disable the possible use of 'links' to generate release-notes.txt
"Fixes" Bug #4631.
See https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4631

svn path=/trunk/; revision=32389
2010-04-05 21:04:37 +00:00
Jaap Keuter 0b1e0293c5 'lint' the XML source even when building individual documents.
svn path=/trunk/; revision=31867
2010-02-12 07:54:14 +00:00
Jeff Morriss feec8e9dda We don't want to deliver the (generated) Makefile. Since Makefile.common is always a dependency, add references to it only once (in Makefile.common). Should it be a dependency?
svn path=/trunk/; revision=31863
2010-02-11 01:14:24 +00:00
Gerald Combs 398ff623d5 Fix the GNU build.
svn path=/trunk/; revision=31862
2010-02-11 00:28:18 +00:00
Gerald Combs 81793ee828 Make the build dependencies more consistent between platforms. Try to
fix the Windows build (without breaking the GNU toolchain build).

svn path=/trunk/; revision=31861
2010-02-10 23:34:46 +00:00
Jeff Morriss e6b0f7cdfd Use automake to build things in docbook/ .
This at least gets the docbook source distributed, as requested in:

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3871

Still to do:
	1) get out-of-source-tree builds working
	2) automatically check that everything is distributed with distcheck
	   (requires (1) but it may also require building the docbook
	   directory as part of "make all")
	3) (optional) use automake rules to actually build the stuff (currently
	   Makefile.am is basically some automake stuff wrapped around standard
	   Makefile rules. Could this done better?)

svn path=/trunk/; revision=31858
2010-02-10 22:12:22 +00:00