Revision: 65342
http://sourceforge.net/p/brlcad/code/65342
Author: brlcad
Date: 2015-06-17 03:00:04 +0000 (Wed, 17 Jun 2015)
Log Message:
-----------
simplify, remove undocumented BRLCAD_EXTRADOCS_PDF_MAN option so that the man
pages generate to pdf when BRLCAD_EXTRADOCS_PDF is enabled. dubious value
creating individual pdf files for individual manual pages .. might want to
eliminate altogether or (better) aggregate them all into one book/pdf.
Modified Paths:
--------------
brlcad/trunk/CMakeLists.txt
brlcad/trunk/doc/docbook/system/man1/en/CMakeLists.txt
brlcad/trunk/doc/docbook/system/man3/en/CMakeLists.txt
brlcad/trunk/doc/docbook/system/man5/en/CMakeLists.txt
brlcad/trunk/doc/docbook/system/mann/en/CMakeLists.txt
Modified: brlcad/trunk/CMakeLists.txt
===================================================================
--- brlcad/trunk/CMakeLists.txt 2015-06-17 02:37:32 UTC (rev 65341)
+++ brlcad/trunk/CMakeLists.txt 2015-06-17 03:00:04 UTC (rev 65342)
@@ -1376,10 +1376,8 @@
CMAKE_DEPENDENT_OPTION(BRLCAD_EXTRADOCS_MAN "Build MAN page output from
DocBook documentation" ON "BRLCAD_EXTRADOCS;NOT MSVC" OFF)
mark_as_advanced(BRLCAD_EXTRADOCS_MAN)
-# Don't do PDF by default, and hide the option unless the tools to do it are
-# present. Provide an option to disable the PDF output for man pages without
-# disabling the rest of the PDF output - PDF generation for hundreds of man
-# pages can be expensive in time.
+# Don't do PDF by default because it's pretty expensive, and hide the
+# option unless the tools to do it are present.
set(BRLCAD_EXTRADOCS_PDF_DESCRIPTION "
Option that enables building of BRL-CAD's DocBook PDF-based documentation
(includes manuals and man pages for commands, among
@@ -1388,12 +1386,7 @@
to point to your locally installed fop executable file (which on Linux is
usually a shell script with 0755 permissions).
")
-set(BRLCAD_EXTRADOCS_PDF_MAN_DESCRIPTION "
-Option that enables building of BRL-CAD's DocBook PDF-based documentation
-for man pages only. Defaults to OFF.
-")
CMAKE_DEPENDENT_OPTION(BRLCAD_EXTRADOCS_PDF "Build PDF output from DocBook
documentation" OFF "BRLCAD_EXTRADOCS;APACHE_FOP" OFF)
-CMAKE_DEPENDENT_OPTION(BRLCAD_EXTRADOCS_PDF_MAN "Build PDF output from DocBook
documentation for man pages" ON "BRLCAD_EXTRADOCS_PDF" OFF)
# Provide an option to enable/disable XML validation as part
# of the DocBook build - sort of a "strict flags" mode for DocBook.
Modified: brlcad/trunk/doc/docbook/system/man1/en/CMakeLists.txt
===================================================================
--- brlcad/trunk/doc/docbook/system/man1/en/CMakeLists.txt 2015-06-17
02:37:32 UTC (rev 65341)
+++ brlcad/trunk/doc/docbook/system/man1/en/CMakeLists.txt 2015-06-17
03:00:04 UTC (rev 65342)
@@ -248,11 +248,8 @@
DOCBOOK_TO_HTML(man1 docbook_man1_EN html/man1/en "")
DOCBOOK_TO_PHP(man1 docbook_man1_EN html/man1/en "")
DOCBOOK_TO_MAN(man1 docbook_man1_EN 1 1 man1 "")
+DOCBOOK_TO_PDF(man1 docbook_man1_EN pdf/man1/en "")
-if(BRLCAD_EXTRADOCS_PDF_MAN)
- DOCBOOK_TO_PDF(man1 docbook_man1_EN pdf/man1/en "")
-endif(BRLCAD_EXTRADOCS_PDF_MAN)
-
CMAKEFILES(pictx.xml)
# Local Variables:
Modified: brlcad/trunk/doc/docbook/system/man3/en/CMakeLists.txt
===================================================================
--- brlcad/trunk/doc/docbook/system/man3/en/CMakeLists.txt 2015-06-17
02:37:32 UTC (rev 65341)
+++ brlcad/trunk/doc/docbook/system/man3/en/CMakeLists.txt 2015-06-17
03:00:04 UTC (rev 65342)
@@ -17,11 +17,8 @@
DOCBOOK_TO_HTML(man3 docbook_man3_EN html/man3/en "")
DOCBOOK_TO_PHP(man3 docbook_man3_EN html/man3/en "")
DOCBOOK_TO_MAN(man3 docbook_man3_EN 3 3 man3 "")
+DOCBOOK_TO_PDF(man3 docbook_man3_EN pdf/man3/en "")
-if(BRLCAD_EXTRADOCS_PDF_MAN)
- DOCBOOK_TO_PDF(man3 docbook_man3_EN pdf/man3/en "")
-endif(BRLCAD_EXTRADOCS_PDF_MAN)
-
CMAKEFILES(libbu.xml libdm.xml TODO)
# Local Variables:
Modified: brlcad/trunk/doc/docbook/system/man5/en/CMakeLists.txt
===================================================================
--- brlcad/trunk/doc/docbook/system/man5/en/CMakeLists.txt 2015-06-17
02:37:32 UTC (rev 65341)
+++ brlcad/trunk/doc/docbook/system/man5/en/CMakeLists.txt 2015-06-17
03:00:04 UTC (rev 65342)
@@ -33,11 +33,8 @@
DOCBOOK_TO_HTML(man5 docbook_man5_EN html/man5/en "${attributes_DEPS}")
DOCBOOK_TO_PHP(man5 docbook_man5_EN html/man5/en "${attributes_DEPS}")
DOCBOOK_TO_MAN(man5 docbook_man5_EN 5 5 man5 "${attributes_DEPS}")
+DOCBOOK_TO_PDF(man5 docbook_man5_EN pdf/man5/en "${attributes_DEPS}")
-if(BRLCAD_EXTRADOCS_PDF_MAN)
- DOCBOOK_TO_PDF(man5 docbook_man5_EN pdf/man5/en "${attributes_DEPS}")
-endif(BRLCAD_EXTRADOCS_PDF_MAN)
-
add_dependencies(attributes_man5_html attr_std_list_xml attr_std_table_xml)
if(BRLCAD_EXTRADOCS_MAN)
Modified: brlcad/trunk/doc/docbook/system/mann/en/CMakeLists.txt
===================================================================
--- brlcad/trunk/doc/docbook/system/mann/en/CMakeLists.txt 2015-06-17
02:37:32 UTC (rev 65341)
+++ brlcad/trunk/doc/docbook/system/mann/en/CMakeLists.txt 2015-06-17
03:00:04 UTC (rev 65342)
@@ -263,11 +263,8 @@
DOCBOOK_TO_HTML(mann docbook_mann_INTRO html/mann/en "")
DOCBOOK_TO_PHP(mann docbook_mann_INTRO html/mann/en "")
DOCBOOK_TO_MAN(mann docbook_mann_EN n nged mann "")
+DOCBOOK_TO_PDF(mann docbook_mann_EN pdf/mann/en "")
-if(BRLCAD_EXTRADOCS_PDF_MAN)
- DOCBOOK_TO_PDF(mann docbook_mann_EN pdf/mann/en "")
-endif(BRLCAD_EXTRADOCS_PDF_MAN)
-
# Local Variables:
# tab-width: 8
# mode: cmake
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
