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

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

Revision: 12495
          http://sourceforge.net/p/plplot/code/12495
Author:   airwin
Date:     2013-08-24 05:34:58 +0000 (Sat, 24 Aug 2013)
Log Message:
-----------
For default -DDOCBOOK_XML_BACKEND=ON case, implement a dvi build.

N.B. This dvi build only works if the patch given at
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=720624 is applied
to /usr/share/pyshared/dbtexmf/dblatex/unient.py to fix a bug
in the dblatex package.

Use different inline-print_???.ent files depending on whether
-DDOCBOOK_XML_BACKEND=ON or OFF.

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

Added Paths:
-----------
    trunk/doc/docbook/src/inline-print_dsl.ent
    trunk/doc/docbook/src/inline-print_xsl.ent

Removed Paths:
-------------
    trunk/doc/docbook/src/inline-print.ent

Modified: trunk/cmake/modules/docbook.cmake
===================================================================
--- trunk/cmake/modules/docbook.cmake	2013-08-21 22:10:51 UTC (rev 12494)
+++ trunk/cmake/modules/docbook.cmake	2013-08-24 05:34:58 UTC (rev 12495)
@@ -119,13 +119,7 @@
       set(BUILD_HTML ON)
       if(GZIP)
 	set(BUILD_PRINT ON)
-	option(BUILD_DVI "BUILD dvi form of documentation" OFF)
-	if(NOT BUILD_DVI)
-	  message(STATUS
-	    "WARNING: Not building dvi documentation - "
-	    "Bugs in xmlto for this case."
-	    )
-	endif(NOT BUILD_DVI)
+	option(BUILD_DVI "BUILD dvi form of documentation" ON)
       else(GZIP)
 	set(BUILD_PRINT OFF)
 	message(STATUS

Modified: trunk/doc/docbook/src/CMakeLists.txt
===================================================================
--- trunk/doc/docbook/src/CMakeLists.txt	2013-08-21 22:10:51 UTC (rev 12494)
+++ trunk/doc/docbook/src/CMakeLists.txt	2013-08-24 05:34:58 UTC (rev 12495)
@@ -27,7 +27,13 @@
 set(MANVOL "3plplot")
 
 foreach(suffix info html print)
-  set(inline_entities ${CMAKE_CURRENT_SOURCE_DIR}/inline-${suffix}.ent)
+  if(suffix STREQUAL "print" AND DOCBOOK_XML_BACKEND)
+    set(inline_entities ${CMAKE_CURRENT_SOURCE_DIR}/inline-${suffix}_xsl.ent)
+  elseif(suffix STREQUAL "print" AND NOT DOCBOOK_XML_BACKEND)
+    set(inline_entities ${CMAKE_CURRENT_SOURCE_DIR}/inline-${suffix}_dsl.ent)
+  else(suffix STREQUAL "print" AND DOCBOOK_XML_BACKEND)
+    set(inline_entities ${CMAKE_CURRENT_SOURCE_DIR}/inline-${suffix}.ent)
+  endif(suffix STREQUAL "print" AND DOCBOOK_XML_BACKEND)
   configure_file(
     ${CMAKE_CURRENT_SOURCE_DIR}/${PLPLOTDOC}.xml.in
     ${CMAKE_CURRENT_BINARY_DIR}/${PLPLOTDOC}-${suffix}.xml
@@ -359,6 +365,37 @@
 	  @ONLY
 	  )
 
+	if(BUILD_DVI)
+	  add_custom_command(
+	    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${BASE}.dvi
+	    # Drop -x ${CMAKE_CURRENT_BINARY_DIR}/${STYLESHEET_PRINT} option
+            # since it doesn't appear to work with --with-dblatex
+	    COMMAND ${XMLTO} -vv --with-dblatex dvi ${CMAKE_CURRENT_BINARY_DIR}/${PLPLOTDOC}-print.xml
+	    COMMAND ${CMAKE_COMMAND} -E rename ${CMAKE_CURRENT_BINARY_DIR}/plplotdoc-print.dvi ${CMAKE_CURRENT_BINARY_DIR}/${BASE}.dvi
+	    DEPENDS
+	    ${SOURCE_FILES} 
+	    ${CMAKE_CURRENT_BINARY_DIR}/${PLPLOTDOC}-print.xml
+	    ${CMAKE_CURRENT_SOURCE_DIR}/inline-print_xsl.ent
+	    )
+	  add_custom_target(
+	    dvi_target ALL 
+	    DEPENDS 
+	    ${CMAKE_CURRENT_BINARY_DIR}/${BASE}.dvi
+	    )
+	  # These files used for more than one target.  Therefore must
+	  # use target dependencies rather than file dependencies to build
+	  # them.  Otherwise, parallel builds won't work.
+	  add_dependencies(dvi_target
+	    docbook_plplot-symbols_txt
+	    docbook_plplot-structs_txt
+	    )
+
+	  file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/static_built_files
+	    "${BASE}.ps.gz\n"
+	    )
+
+	endif(BUILD_DVI)
+
 	add_custom_command(
 	  OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${BASE}.ps.gz
 	  COMMAND ${XMLTO} -vv --with-fop -x ${CMAKE_CURRENT_BINARY_DIR}/${STYLESHEET_PRINT} ps ${CMAKE_CURRENT_BINARY_DIR}/${PLPLOTDOC}-print.xml
@@ -367,7 +404,7 @@
 	  DEPENDS
 	  ${SOURCE_FILES} 
 	  ${CMAKE_CURRENT_BINARY_DIR}/${PLPLOTDOC}-print.xml
-	  ${CMAKE_CURRENT_SOURCE_DIR}/inline-print.ent
+	  ${CMAKE_CURRENT_SOURCE_DIR}/inline-print_xsl.ent
 	  )
 	add_custom_target(
 	  ps_target ALL 
@@ -393,7 +430,7 @@
 	  DEPENDS
 	  ${SOURCE_FILES} 
 	  ${CMAKE_CURRENT_BINARY_DIR}/${PLPLOTDOC}-print.xml
-	  ${CMAKE_CURRENT_SOURCE_DIR}/inline-print.ent
+	  ${CMAKE_CURRENT_SOURCE_DIR}/inline-print_xsl.ent
 	  )
 	add_custom_target(
 	  pdf_target ALL 
@@ -415,6 +452,9 @@
 	  print ALL 
 	  )
 	add_dependencies(print ps_target pdf_target)
+	if(BUILD_DVI)
+	  add_dependencies(print dvi_target)
+	endif(BUILD_DVI)
       endif(BUILD_PRINT)
     else(DOCBOOK_XML_BACKEND)
       if(BUILD_HTML)
@@ -490,7 +530,7 @@
 	  ${SOURCE_FILES}
 	  ${CMAKE_CURRENT_BINARY_DIR}/${PLPLOTDOC}-print.xml
 	  ${CMAKE_CURRENT_BINARY_DIR}/${STYLESHEET_PRINT}
-	  ${CMAKE_CURRENT_SOURCE_DIR}/inline-print.ent
+	  ${CMAKE_CURRENT_SOURCE_DIR}/inline-print_xsl.ent
 	  )
 
 	# Following approach used in our ABS, use shell commands to recurse

Deleted: trunk/doc/docbook/src/inline-print.ent
===================================================================
--- trunk/doc/docbook/src/inline-print.ent	2013-08-21 22:10:51 UTC (rev 12494)
+++ trunk/doc/docbook/src/inline-print.ent	2013-08-24 05:34:58 UTC (rev 12495)
@@ -1 +0,0 @@
-<!ENTITY over-under "&#1025;">

Copied: trunk/doc/docbook/src/inline-print_dsl.ent (from rev 12492, trunk/doc/docbook/src/inline-print.ent)
===================================================================
--- trunk/doc/docbook/src/inline-print_dsl.ent	                        (rev 0)
+++ trunk/doc/docbook/src/inline-print_dsl.ent	2013-08-24 05:34:58 UTC (rev 12495)
@@ -0,0 +1 @@
+<!ENTITY over-under "&#1025;">

Added: trunk/doc/docbook/src/inline-print_xsl.ent
===================================================================
--- trunk/doc/docbook/src/inline-print_xsl.ent	                        (rev 0)
+++ trunk/doc/docbook/src/inline-print_xsl.ent	2013-08-24 05:34:58 UTC (rev 12495)
@@ -0,0 +1 @@
+<!ENTITY over-under "S(freq)">

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