[Plplot-cvs] SF.net SVN: plplot:[12555] trunk

[<ai...@us...>]

Revision: 12555
          http://sourceforge.net/p/plplot/code/12555
Author:   airwin
Date:     2013-09-30 20:49:54 +0000 (Mon, 30 Sep 2013)
Log Message:
-----------
Fix build-system bug in configuration and installation of
stylesheet.css for the case where the documentation is prebuilt.

Tested by Alan W. Irwin <ai...@us...> by running

scripts/make_tarball.sh -c -i /tmp/plplot_install
find /tmp/plplot-dist-prep -name "*.out" |xargs grep -i error

and browsing the resulting documentation that was installed from the
generated preliminary version of the release tarball in
/tmp/plplot_install/share/doc/plplot/html while looking carefully
for stylesheet issues.

Modified Paths:
--------------
    trunk/cmake/modules/docbook.cmake
    trunk/doc/docbook/src/CMakeLists.txt

Modified: trunk/cmake/modules/docbook.cmake
===================================================================
--- trunk/cmake/modules/docbook.cmake	2013-09-30 07:01:15 UTC (rev 12554)
+++ trunk/cmake/modules/docbook.cmake	2013-09-30 20:49:54 UTC (rev 12555)
@@ -61,11 +61,13 @@
   message(STATUS "WARNING: validate target will not be available to check for syntax issues in the PLplot DocBook documentation because onsgmls was not found.")
 endif(ONSGMLS )
 
+# This option is used for the BUILD_DOC case below and elsewhere and also
+# for the PREBUILT_DOC case elsewhere (when stylesheet.css is configured).
+option(DOCBOOK_XML_BACKEND "Use DocBook XML/XSLT backend tools to generate our documentation from DocBook source" YES)
+
 # Check for required programs and perl libraries.
 if(BUILD_DOC)
 
-  option(DOCBOOK_XML_BACKEND "Use DocBook XML/XSLT backend tools to generate our documentation from DocBook source" YES)
-
   # The info backend is implemented only with perl and XML/XSLT regardless of
   # DOCBOOK_XML_BACKEND.
   find_program(DB2X_TEXIXML db2x_texixml)

Modified: trunk/doc/docbook/src/CMakeLists.txt
===================================================================
--- trunk/doc/docbook/src/CMakeLists.txt	2013-09-30 07:01:15 UTC (rev 12554)
+++ trunk/doc/docbook/src/CMakeLists.txt	2013-09-30 20:49:54 UTC (rev 12555)
@@ -723,6 +723,18 @@
 endif(BUILD_MAN OR PREBUILT_DOC)
 
 if(BUILD_HTML OR PREBUILT_DOC)
+  if(DOCBOOK_XML_BACKEND)
+    configure_file(
+      ${CMAKE_CURRENT_SOURCE_DIR}/stylesheet.css.xsl.in
+      ${CMAKE_CURRENT_BINARY_DIR}/stylesheet.css
+      )
+  else(DOCBOOK_XML_BACKEND)
+    configure_file(
+      ${CMAKE_CURRENT_SOURCE_DIR}/stylesheet.css.dsssl.in
+      ${CMAKE_CURRENT_BINARY_DIR}/stylesheet.css
+      )
+  endif(DOCBOOK_XML_BACKEND)
+
   install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${HTML_MANIFEST} ${CMAKE_CURRENT_BINARY_DIR}/stylesheet.css DESTINATION ${DOC_DIR}/html )
   install(CODE "
 # Suppress empty element warning.

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.