aboutsummaryrefslogtreecommitdiffstats
path: root/docbook/Makefile.nmake
AgeCommit message (Collapse)AuthorFilesLines
2014-09-01Removed unnecessary chmod commandsGraham Bloice1-3/+0
Change-Id: Ia6e3f8c567159fc2cf19a8d427a29c5c6dcdf038 Reviewed-on: https://code.wireshark.org/review/3942 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-08-25As long as NEWS is still part of the git tree: At least don't differJoerg Mayer1-0/+1
because of different timezones. Change-Id: I93809447db29c2cc5f848edb438ee16372b57453 Reviewed-on: https://code.wireshark.org/review/3824 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-08-25Updates for docbook builds on WindowsGraham Bloice1-0/+7
In config.nmake search for multiple versions of fop in a couple of places, preferring fop 1.1 In Makefile.nmake remove any PYTHONPATH env var (as that's probably for Windows) and not the Cygwin python used in asciidoc In Readme.txt update some Cygwin package info Change-Id: I117ec6bbdabc34829b421fd514508383b925090f Reviewed-on: https://code.wireshark.org/review/3816 Reviewed-by: Gerald Combs <gerald@wireshark.org> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2014-08-24Try to get HTML Help to render SVG.Gerald Combs1-3/+3
Add a custom stylesheet that inserts <meta http-equiv="X-UA-Compatible" content="IE=9" > at the top of our HTML Help output. This *should* convince the WebBrowser control to draw our new SVG images. Change-Id: Iae491128195d3738951f3d19e2f82dd3fc73d1d8 Reviewed-on: https://code.wireshark.org/review/3814 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-08-24Fix admon.graphics.path.Gerald Combs1-6/+6
Change-Id: I43d7d56f0fc2bd73efc54a685aea90f635b145ff Reviewed-on: https://code.wireshark.org/review/3807 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-08-24Convert admon graphics to SVG.Gerald Combs1-15/+26
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-23WSUG: Convert the "User Interface" chapter to AsciiDoc.Gerald Combs1-3/+2
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-07-21Start converting the User's Guide to AsciiDoc.Gerald Combs1-13/+13
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-06-20Fix documentation generation on WindowsPascal Quantin1-1/+1
Change-Id: I7166528e312c99b8477361140869ebeb2b7c03b9 Reviewed-on: https://code.wireshark.org/review/2487 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-06-17Get the Windows doc builds going again: define top_srcdir because it's used ↵Jeff Morriss1-0/+1
in Makefile.common. Change-Id: I4e8905b28bd6fb8c7bf3d38dbf3882c393732bcf Reviewed-on: https://code.wireshark.org/review/2291 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-16Use correct dependencies for 'release_notes' target so that 'nmake ... ↵Bill Meier1-2/+2
release_notes' will work. Change-Id: I8397c2b9c635996744d119e67ffc4fedf63493ef Reviewed-on: https://code.wireshark.org/review/2259 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-03-31Continue to remove $Id$ from top of fileAlexis La Goutte1-2/+0
(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-02-11Comment out the .asciidoc → .xml rule for now.Gerald Combs1-14/+14
Change-Id: I174fdb875030e10cee641e936d3fa9a7e66a23b2 Reviewed-on: https://code.wireshark.org/review/181 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-02-11Make sure the .asciidoc.xml inference rule only applies to the wsug_srcGerald Combs1-2/+2
directory. This keeps us from trying to clobber GPL_appendix.xml if GPL_appendix.asciidoc has a more recent timestamp. Change-Id: I37962c7a6c5357709a4dd269340c333673d44539 Reviewed-on: https://code.wireshark.org/review/176 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-02-11Finish converting the Developer's Guide to AsciiDoc.Gerald Combs1-1/+14
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-01-27Try to fix the path selector argument.Gerald Combs1-1/+1
svn path=/trunk/; revision=54974
2014-01-27Convert the preface to AsciiDoc with minor edits.Gerald Combs1-1/+1
svn path=/trunk/; revision=54970
2014-01-25Fix Windows build.Gerald Combs1-1/+0
svn path=/trunk/; revision=54956
2014-01-25Fix xpath selector. Clean up whitespace.Gerald Combs1-0/+2
svn path=/trunk/; revision=54955
2014-01-24Make "all" the default target again.Gerald Combs1-10/+11
svn path=/trunk/; revision=54947
2014-01-24Fix AsciiDoc WSDG build on Windows.Gerald Combs1-3/+9
svn path=/trunk/; revision=54946
2014-01-24Prepare for conversion of Guide chapters to AsciiDoc.Gerald Combs1-0/+13
svn path=/trunk/; revision=54936
2014-01-22Prepare for Git migration.Gerald Combs1-2/+2
Mass-replace "svn" with "git". Add commented code to use git to fetch the repository version. svn path=/trunk/; revision=54905
2013-07-30Have docbook/Makefile.nmake use index.html similar to r51021. Make someGerald Combs1-14/+8
target names less confusing. svn path=/trunk/; revision=51032
2013-03-15There doesn't appear to be a clean, portable way to run FOP underGerald Combs1-2/+2
Cygwin. Try using dblatex for AsciiDoc → PDF conversion. svn path=/trunk/; revision=48327
2013-03-15Get release note conversion working on Windows.Gerald Combs1-2/+18
svn path=/trunk/; revision=48321
2013-03-15Switch to Asciidoc for the release notes. The initial conversion fromGerald Combs1-35/+28
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
2011-12-03Do 'md wsluarm_src' only if dir doesn't alreay exist.Bill Meier1-1/+1
svn path=/trunk/; revision=40084
2011-09-30More tpo fixes.Guy Harris1-3/+3
svn path=/trunk/; revision=39202
2011-09-30graphhics → graphicsGerald Combs1-5/+5
svn path=/trunk/; revision=39201
2011-09-30s/wsug_/wsdg_/g in the Developer's Guide targets.Gerald Combs1-12/+11
svn path=/trunk/; revision=39199
2011-09-16wsdg_graphics/toolbar is a directory; fix the rules that weren't alreadyGuy Harris1-3/+9
fixed to cope with that. svn path=/trunk/; revision=39021
2011-08-11Add "distclean" and "maintainer-clean" rules to the docbook directoryGuy Harris1-0/+4
Makefile.nmake. Have "clean", "distclean", and "maintainer-clean" in the top-level Makefile.nmake file clean out the docbook directory. Add a "docbook" target to the top-level Makefile.nmake file. svn path=/trunk/; revision=38468
2011-07-14As with Makefile.am, so with Makefile.nmake. To quote the comment forGuy Harris1-0/+1
rev 37866: Removed empty directory docbook/wsluarm_src. It's generated during 'make', and now removed during 'make clean'. so we have to generate it now during nmake as well. svn path=/trunk/; revision=38011
2010-02-11We don't want to deliver the (generated) Makefile. Since Makefile.common is ↵Jeff Morriss1-3/+3
always a dependency, add references to it only once (in Makefile.common). Should it be a dependency? svn path=/trunk/; revision=31863
2010-02-10Use automake to build things in docbook/ .Jeff Morriss1-7/+7
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
2009-05-27Implement a simpler way to check for a change in the svn version.Bill Meier1-28/+22
svn path=/trunk/; revision=28510
2009-05-26docbook: Windows: rebuild docs only when source or svn_version actually changes.Bill Meier1-11/+36
Also: rebuild docs if docbook/Makefile.nmake or docbook/Makefile.common changes; rebuilding individual target (wdug, wsdg,...) will check for svn_version change. svn path=/trunk/; revision=28497
2009-05-26Move xml validation to the individual wsug, wsdg & release_notes targets.Bill Meier1-4/+4
Enables proper making of just one of the targets. svn path=/trunk/; revision=28489
2009-05-19Use the xhtml stylesheet to generate the release notes instead of theGerald Combs1-2/+2
html stylesheet. This makes xsltproc use utf-8 instead of iso-8859-1. svn path=/trunk/; revision=28407
2008-12-18Define the path to the tools directory.Gerald Combs1-0/+1
svn path=/trunk/; revision=27054
2008-05-05Replace leading spaces by a TABJörg Mayer1-2/+2
svn path=/trunk/; revision=25228
2007-07-21work out dependencies in a .common way and make sure we nmake wsluarmLuis Ontanon1-0/+6
svn path=/trunk/; revision=22374
2007-02-03move docbook related settings from docbook/Makefile.nmake to config.nmake - ↵Ulf Lamping1-40/+6
having only one place to configure it all :-) svn path=/trunk/; revision=20690
2007-02-03remove Unix related stuff, as this file is Win32 onlyUlf Lamping1-20/+9
svn path=/trunk/; revision=20689
2007-02-01The contents of the NEWS file come from the release notes. Back-portGerald Combs1-1/+4
the changes in r20642 to release-notes.xml. Add "news" targes to the docbook makefiles to copy release-notes.txt to NEWS. svn path=/trunk/; revision=20669
2007-02-01Let the user (e.g. one named "buildbot") specify the location of FOP.Gerald Combs1-0/+2
svn path=/trunk/; revision=20659
2007-01-29split docbook generation makefiles into nmake and GNU make variants ↵Ulf Lamping1-0/+255
(together with Makefile.common), just like all the other directories have it. This way makes it easier to get settings from config.nmake and probably makefile.am will be easier to do. In addition we don't need GNU make for Win32 generation. svn path=/trunk/; revision=20613