Menu
▾
▴
plplot-cvs — For PLplot svn commit messages
You can subscribe to this list here.
| 2000 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(33) |
Jun
|
Jul
(30) |
Aug
(2) |
Sep
|
Oct
(30) |
Nov
(136) |
Dec
(59) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2001 |
Jan
(255) |
Feb
(169) |
Mar
(322) |
Apr
(185) |
May
(33) |
Jun
(89) |
Jul
(47) |
Aug
(59) |
Sep
(40) |
Oct
(31) |
Nov
(74) |
Dec
(84) |
| 2002 |
Jan
(163) |
Feb
(78) |
Mar
(23) |
Apr
(5) |
May
(22) |
Jun
(75) |
Jul
(143) |
Aug
(48) |
Sep
(111) |
Oct
(58) |
Nov
(124) |
Dec
(278) |
| 2003 |
Jan
(106) |
Feb
(276) |
Mar
(354) |
Apr
(97) |
May
(14) |
Jun
(3) |
Jul
(7) |
Aug
(21) |
Sep
(83) |
Oct
(110) |
Nov
(3) |
Dec
(119) |
| 2004 |
Jan
(318) |
Feb
(409) |
Mar
(68) |
Apr
(23) |
May
(105) |
Jun
(147) |
Jul
(69) |
Aug
(53) |
Sep
(23) |
Oct
(14) |
Nov
(15) |
Dec
(63) |
| 2005 |
Jan
(146) |
Feb
(69) |
Mar
(157) |
Apr
(127) |
May
(166) |
Jun
(8) |
Jul
(5) |
Aug
(3) |
Sep
(8) |
Oct
(17) |
Nov
(29) |
Dec
(34) |
| 2006 |
Jan
(3) |
Feb
(4) |
Mar
(1) |
Apr
(70) |
May
(241) |
Jun
(82) |
Jul
(344) |
Aug
(196) |
Sep
(87) |
Oct
(57) |
Nov
(121) |
Dec
(86) |
| 2007 |
Jan
(60) |
Feb
(67) |
Mar
(102) |
Apr
(28) |
May
(13) |
Jun
(29) |
Jul
(38) |
Aug
(56) |
Sep
(91) |
Oct
(89) |
Nov
(50) |
Dec
(68) |
| 2008 |
Jan
(87) |
Feb
(47) |
Mar
(100) |
Apr
(34) |
May
(65) |
Jun
(54) |
Jul
(98) |
Aug
(128) |
Sep
(109) |
Oct
(141) |
Nov
(40) |
Dec
(206) |
| 2009 |
Jan
(176) |
Feb
(226) |
Mar
(134) |
Apr
(84) |
May
(152) |
Jun
(85) |
Jul
(91) |
Aug
(153) |
Sep
(141) |
Oct
(59) |
Nov
(87) |
Dec
(75) |
| 2010 |
Jan
(58) |
Feb
(41) |
Mar
(51) |
Apr
(74) |
May
(81) |
Jun
(39) |
Jul
(30) |
Aug
(43) |
Sep
(76) |
Oct
(59) |
Nov
(62) |
Dec
(52) |
| 2011 |
Jan
(125) |
Feb
(41) |
Mar
(96) |
Apr
(53) |
May
(21) |
Jun
(23) |
Jul
(48) |
Aug
(71) |
Sep
(37) |
Oct
(81) |
Nov
(60) |
Dec
(32) |
| 2012 |
Jan
(51) |
Feb
(23) |
Mar
|
Apr
(8) |
May
(2) |
Jun
|
Jul
(8) |
Aug
(25) |
Sep
(4) |
Oct
(32) |
Nov
(17) |
Dec
(2) |
| 2013 |
Jan
(8) |
Feb
(2) |
Mar
(9) |
Apr
(9) |
May
(37) |
Jun
(48) |
Jul
(63) |
Aug
(42) |
Sep
(59) |
Oct
(83) |
Nov
(141) |
Dec
(133) |
| 2014 |
Jan
(57) |
Feb
(58) |
Mar
(58) |
Apr
(25) |
May
(14) |
Jun
(3) |
Jul
(6) |
Aug
(1) |
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <ai...@us...> - 2013-08-19 21:55:37
|
Revision: 12489
http://sourceforge.net/p/plplot/code/12489
Author: airwin
Date: 2013-08-19 21:55:31 +0000 (Mon, 19 Aug 2013)
Log Message:
-----------
Reorder so that doxygen-generated documentation is last in the list on
our website.
Modified Paths:
--------------
trunk/www/documentation.php.in
Modified: trunk/www/documentation.php.in
===================================================================
--- trunk/www/documentation.php.in 2013-08-19 20:42:06 UTC (rev 12488)
+++ trunk/www/documentation.php.in 2013-08-19 21:55:31 UTC (rev 12489)
@@ -14,7 +14,6 @@
<div id="leftside">
<h3>PLplot Documentation</h3>
<ul class="arrowlist">
- <li> <a href="doxygen/html">Browse doxygen-generated documentation</a> </li>
<li> <a href="docbook-manual/@BASE_HTML@">Browse the latest on-line documentation</a> </li>
<li> <a href="docbook-manual/@BASE@.ps.gz">PostScript form of documentation (<?php $size = number_format((filesize("docbook-manual/@BASE@.ps.gz")/1024/1024),2); echo $size;?> MB)</a> </li>
<li> <a href="docbook-manual/@BASE@.pdf">PDF form of documentation (<?php $size = number_format((filesize("docbook-manual/@BASE@.pdf")/1024/1024),2); echo $size;?> MB)</a> </li>
@@ -22,35 +21,36 @@
<li> <a href="docbook-manual/@BASE_INFO@.tar.gz">Info documentation tarball (<?php $size = number_format((filesize("docbook-manual/@BASE_INFO@.tar.gz")/1024/1024),2); echo $size;?> MB)</a> </li>
<li> <a href="docbook-manual/@BASE_MAN@.tar.gz">Man pages tarball (API chapter in nroff format) (<?php $size = number_format((filesize("docbook-manual/@BASE_MAN@.tar.gz")/1024/1024),2); echo $size;?> MB)</a> </li>
<li> <a href="docbook-manual/@BASE_HTML@.tar.gz">HTML results tarball (<?php $size = number_format((filesize("docbook-manual/@BASE_HTML@.tar.gz")/1024/1024),2); echo $size;?> MB)</a> </li>
+ <li> <a href="doxygen/html">Browse doxygen-generated documentation</a> </li>
</ul>
<p>
-The first documentation results above have been generated by doxygen
-directly from a special form of comments in our source code. The
-remaining documentation results above have been generated from our
-DocBook/XML source files in doc/docbook/src using a variety of DocBook
-backend tools. The doxygen and DocBook documentation builds happen
+All but the doxygen-generated results above have been generated from
+our DocBook/XML source files in doc/docbook/src using a variety of
+DocBook backend tools. The doxygen results above have been generated
+by doxygen directly from a special form of comments in our source
+code. The DocBook and doxygen documentation builds happen
automatically (only on Linux since the required tools are only
-available for that O/S) with our CMake-based build system if you
-specify the cmake options "-DBUILD_DOX_DOC=ON -DBUILD_DOC=ON". For
+available for that platform) with our CMake-based build system if you
+specify the cmake options "-DBUILD_DOC=ON -DBUILD_DOX_DOC=ON". For
more details about building the DocBook form of our documentation and
testing it, please look at the file doc/docbook/README.developers in
the source tree.
</p>
<p>
For those wishing to make some contribution to PLplot, helping out
-with either/both the doxygen or DocBook documentation is a good place
-to start. For the doxygen case, the documentation is controlled by a
-special form of comments in our source files. See src/plllegend.c for
-a good example of how to document arguments of PLplot functions. Note
-there are many other files in src without this argument documentation
-at the present time so there is plenty of scope to help out here. For
-the DocBook case, the DocBook/XML syntax is quite straightforward to
-understand if you simply follow the form of what is already done in
-the files in the doc/docbook/src subdirectory of the source
-tree. However, if you want to dig a little deeper into DocBook, then
-this on-line book, <a
+with either/both the DocBook or doxygen documentation is a good place
+to start. For the DocBook case, the DocBook/XML syntax is quite
+straightforward to understand if you simply follow the form of what is
+already done in the files in the doc/docbook/src subdirectory of the
+source tree. However, if you want to dig a little deeper into DocBook,
+then this on-line book, <a
href="http://www.docbook.org/tdg/en/html/docbook.html">"DocBook: The
-Definitive Guide"</a>, is an excellent reference.
+Definitive Guide"</a>, is an excellent reference. For the doxygen
+case, the documentation is controlled by a special form of comments in
+our source files. See src/plllegend.c for a good example of how to
+document arguments of PLplot functions. Note there are many other
+files in src without this argument documentation at the present time
+so there is plenty of scope to help out here.
</p>
</div>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2013-08-19 20:42:12
|
Revision: 12488
http://sourceforge.net/p/plplot/code/12488
Author: airwin
Date: 2013-08-19 20:42:06 +0000 (Mon, 19 Aug 2013)
Log Message:
-----------
Implement BUILD_DVI variable in anticipation of the case where
the dvi build of documentation may not be implemented (for the future
XML backend case).
Improve build system logic for the case where a component
of the documentatin build is missing.
Improve build system logic for install of info, man, and html
documentation files so that there is exact consistency between
what is in the manifest files and what is installed that than
relying on file(GLOB...
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-08-19 18:37:30 UTC (rev 12487)
+++ trunk/cmake/modules/docbook.cmake 2013-08-19 20:42:06 UTC (rev 12488)
@@ -104,6 +104,7 @@
if(DOCBOOK_XML_BACKEND)
message(STATUS "DOCBOOK_XML_BACKEND not implemented yet")
+ option(BUILD_DVI "BUILD dvi form of documentation" OFF)
else(DOCBOOK_XML_BACKEND)
# Deprecated SGML/DSSSL backends to generate html and print documentation.
@@ -223,6 +224,7 @@
if(OPENJADE AND JADETEX AND PDFJADETEX AND DVIPS AND GZIP)
if(HAVE_DSSSL_DTD AND HAVE_PRINT_SS AND HAVE_DB_DTD)
set(BUILD_PRINT ON)
+ set(BUILD_DVI ON CACHE BOOL "Build dvi form of documentation" FORCE)
else(HAVE_DSSSL_DTD AND HAVE_PRINT_SS AND HAVE_DB_DTD)
set(BUILD_PRINT OFF)
message(STATUS
Modified: trunk/doc/docbook/src/CMakeLists.txt
===================================================================
--- trunk/doc/docbook/src/CMakeLists.txt 2013-08-19 18:37:30 UTC (rev 12487)
+++ trunk/doc/docbook/src/CMakeLists.txt 2013-08-19 20:42:06 UTC (rev 12488)
@@ -507,49 +507,68 @@
)
########### install files ###############
+# Where appropriate, use contents of manifest files rather than
+# file(GLOB... for best consistency.
-# We use file(GLOB ...) to generate lists of html, info and man files
-# to install. These need to be generated at install time, not at
-# Makefile creation time and so we also need to use the install(CODE ...)
-# command. This makes for slightly ugly looking code.
-
-if(BUILD_HTML OR PREBUILT_DOC)
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${HTML_MANIFEST} stylesheet.css DESTINATION ${DOC_DIR}/html )
+if(BUILD_INFO OR PREBUILT_DOC)
install(CODE "
-file(GLOB HTML_FILES ${CMAKE_CURRENT_BINARY_DIR}/*.${HTML_EXT})
-foreach(file \${HTML_FILES})
- file(INSTALL DESTINATION ${DOC_DIR}/html TYPE FILE FILES \"\${file}\")
-endforeach (file \"\${HTML_FILES}\")
+# Suppress empty element warning.
+cmake_policy(SET CMP0007 NEW)
+file(READ ${CMAKE_CURRENT_BINARY_DIR}/${INFO_MANIFEST} INFO_FILES)
+# Convert to list with trailing empty element
+string(REGEX REPLACE \"\n\" \";\" INFO_FILES \"\${INFO_FILES}\")
+# Delete trailing empty element
+list(REMOVE_ITEM INFO_FILES \"\")
+foreach(file \${INFO_FILES})
+ # INSTALL_DESTINATION signature automatically honors DESTDIR.
+ file(INSTALL DESTINATION ${INFO_DIR} TYPE FILE FILES \"\${file}\")
+endforeach (file \"\${INFO_FILES}\")
"
)
-endif(BUILD_HTML OR PREBUILT_DOC)
+endif(BUILD_INFO OR PREBUILT_DOC)
-if(BUILD_PRINT OR PREBUILT_DOC)
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${BASE}.pdf ${CMAKE_CURRENT_BINARY_DIR}/${BASE}.dvi ${CMAKE_CURRENT_BINARY_DIR}/${BASE}.ps.gz DESTINATION ${DOC_DIR})
-endif(BUILD_PRINT OR PREBUILT_DOC)
-
if(BUILD_MAN OR PREBUILT_DOC)
- #install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${MAN_MANIFEST} DESTINATION ${MAN_DIR}/man3 )
install(CODE "
-file(GLOB MAN_FILES ${CMAKE_CURRENT_BINARY_DIR}/*.${MANVOL})
+# Suppress empty element warning.
+cmake_policy(SET CMP0007 NEW)
+file(READ ${CMAKE_CURRENT_BINARY_DIR}/${MAN_MANIFEST} MAN_FILES)
+# Convert to list with trailing empty element
+string(REGEX REPLACE \"\n\" \";\" MAN_FILES \"\${MAN_FILES}\")
+# Delete trailing empty element
+list(REMOVE_ITEM MAN_FILES \"\")
foreach(file \${MAN_FILES})
+ # INSTALL_DESTINATION signature automatically honors DESTDIR.
file(INSTALL DESTINATION ${MAN_DIR}/man3 TYPE FILE FILES \"\${file}\")
-endforeach(file \"\${MAN_FILES}\")
+endforeach (file \"\${MAN_FILES}\")
"
)
endif(BUILD_MAN OR PREBUILT_DOC)
-if(BUILD_INFO OR PREBUILT_DOC)
- #install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${INFO_MANIFEST} DESTINATION ${INFO_DIR} )
+if(BUILD_HTML OR PREBUILT_DOC)
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${HTML_MANIFEST} stylesheet.css DESTINATION ${DOC_DIR}/html )
install(CODE "
-file(GLOB INFO_FILES ${CMAKE_CURRENT_BINARY_DIR}/*.info*)
-foreach(file \${INFO_FILES})
- file(INSTALL DESTINATION ${INFO_DIR} TYPE FILE FILES \"\${file}\")
-endforeach (file \"\${INFO_FILES}\")
+# Suppress empty element warning.
+cmake_policy(SET CMP0007 NEW)
+file(READ ${CMAKE_CURRENT_BINARY_DIR}/${HTML_MANIFEST} HTML_FILES)
+# Convert to list with trailing empty element
+string(REGEX REPLACE \"\n\" \";\" HTML_FILES \"\${HTML_FILES}\")
+# Delete trailing empty element
+list(REMOVE_ITEM HTML_FILES \"\")
+foreach(file \${HTML_FILES})
+ # INSTALL_DESTINATION signature automatically honors DESTDIR.
+ file(INSTALL DESTINATION ${DOC_DIR}/html TYPE FILE FILES \"\${file}\")
+endforeach (file \"\${HTML_FILES}\")
"
)
-endif(BUILD_INFO OR PREBUILT_DOC)
+endif(BUILD_HTML OR PREBUILT_DOC)
+if(BUILD_PRINT OR PREBUILT_DOC)
+ if(BUILD_DVI)
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${BASE}.dvi DESTINATION ${DOC_DIR})
+ endif(BUILD_DVI)
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${BASE}.pdf ${CMAKE_CURRENT_BINARY_DIR}/${BASE}.ps.gz DESTINATION ${DOC_DIR})
+endif(BUILD_PRINT OR PREBUILT_DOC)
+
# Everything below here has to do with the custom target www-install
if((BUILD_DOC OR PREBUILT_DOC) AND (WWW_USER AND WWW_GROUP AND WWW_HOST AND WWW_DIR))
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2013-08-19 18:37:33
|
Revision: 12487
http://sourceforge.net/p/plplot/code/12487
Author: airwin
Date: 2013-08-19 18:37:30 +0000 (Mon, 19 Aug 2013)
Log Message:
-----------
More changes to improve (i.e., make less obfuscated/more modular) the
build system for the documentation in preparation for implementing XML
backend tools.
Tested by Alan W. Irwin <ai...@us...> using
scripts/generate_website.sh (which includes using the -DBUILD_DOC=ON
cmake option and the prebuild_dist www-install-base, and www-install
targets, but which does not test the -DPREBUILT_DOC=ON case).
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-08-18 05:56:52 UTC (rev 12486)
+++ trunk/cmake/modules/docbook.cmake 2013-08-19 18:37:30 UTC (rev 12487)
@@ -141,10 +141,10 @@
if(NOT DVIPS)
message(STATUS "WARNING: dvips not found")
endif(NOT DVIPS)
- # Use include style here since FindUnixCommands is a simple module and
- # clearly not meant to be an official FindXXX module.
- include(FindUnixCommands)
- find_program(MKDIR mkdir)
+ find_program(GZIP gzip)
+ if(NOT GZIP)
+ message(STATUS "WARNING: gzip not found")
+ endif(NOT GZIP)
# These DSSSL stylesheets needed for SGML/DSSSL builds.
set(DSSSL_DTD_PUBID "-//James Clark//DTD DSSSL Style Sheet//EN")
@@ -241,21 +241,16 @@
endif(DOCBOOK_XML_BACKEND)
endif(BUILD_DOC)
+# The "BASE" variables needed for www/documentation.php.in configuration and
+# in doc/docbook/src/CMakeLists.txt.
+# The "MANIFEST" variables needed in top-level CMakeLists.txt and
+# in doc/docbook/src/CMakeLists.txt.
if(BUILD_DOC OR PREBUILT_DOC)
set(BASE "${PACKAGE}-${VERSION}")
-
- set(HTML_MANIFEST "HTML-MANIFEST")
- set(BASE_HTML "${PACKAGE}-html-${VERSION}")
-
- if(NOT DEFINED HTML_EXT)
- set(HTML_EXT "html")
- endif(NOT DEFINED HTML_EXT)
-
set(INFO_MANIFEST "INFO-MANIFEST")
set(BASE_INFO "${PACKAGE}-info-${VERSION}")
-
set(MAN_MANIFEST "MAN-MANIFEST")
set(BASE_MAN "${PACKAGE}-man-${VERSION}")
-
- set(MANVOL "3plplot")
+ set(HTML_MANIFEST "HTML-MANIFEST")
+ set(BASE_HTML "${PACKAGE}-html-${VERSION}")
endif(BUILD_DOC OR PREBUILT_DOC)
Modified: trunk/doc/docbook/src/CMakeLists.txt
===================================================================
--- trunk/doc/docbook/src/CMakeLists.txt 2013-08-18 05:56:52 UTC (rev 12486)
+++ trunk/doc/docbook/src/CMakeLists.txt 2013-08-19 18:37:30 UTC (rev 12487)
@@ -20,100 +20,111 @@
# along with PLplot; if not, write to the Free Software
set(BINDIR ${CMAKE_CURRENT_SOURCE_DIR}/../bin)
+set(PLPLOTDOC plplotdoc)
+if(NOT DEFINED HTML_EXT)
+ set(HTML_EXT "html")
+endif(NOT DEFINED HTML_EXT)
+set(MANVOL "3plplot")
foreach(suffix info html print)
set(inline_entities ${CMAKE_CURRENT_SOURCE_DIR}/inline-${suffix}.ent)
configure_file(
- ${CMAKE_CURRENT_SOURCE_DIR}/plplotdoc.xml.in
- ${CMAKE_CURRENT_BINARY_DIR}/plplotdoc-${suffix}.xml
+ ${CMAKE_CURRENT_SOURCE_DIR}/${PLPLOTDOC}.xml.in
+ ${CMAKE_CURRENT_BINARY_DIR}/${PLPLOTDOC}-${suffix}.xml
)
endforeach(suffix info html print)
set(
-SOURCE_FILES
-${CMAKE_CURRENT_SOURCE_DIR}/ada.xml
-${CMAKE_CURRENT_SOURCE_DIR}/advanced.xml
-${CMAKE_CURRENT_SOURCE_DIR}/api.xml
-${CMAKE_CURRENT_SOURCE_DIR}/api-c.xml
-${CMAKE_CURRENT_SOURCE_DIR}/api-compat.xml
-${CMAKE_CURRENT_SOURCE_DIR}/api-fortran77.xml
-${CMAKE_CURRENT_SOURCE_DIR}/api-fortran95.xml
-${CMAKE_CURRENT_SOURCE_DIR}/api-internal.xml
-${CMAKE_CURRENT_SOURCE_DIR}/api-obsolete.xml
-${CMAKE_CURRENT_SOURCE_DIR}/bibliography.xml
-${CMAKE_CURRENT_SOURCE_DIR}/c.xml
-${CMAKE_CURRENT_SOURCE_DIR}/deploying.xml
-${CMAKE_CURRENT_SOURCE_DIR}/fortran77.xml
-${CMAKE_CURRENT_SOURCE_DIR}/fortran95.xml
-${CMAKE_CURRENT_SOURCE_DIR}/cplus.xml
-${CMAKE_CURRENT_SOURCE_DIR}/drivers.xml
-${CMAKE_CURRENT_SOURCE_DIR}/gui.xml
-${CMAKE_CURRENT_SOURCE_DIR}/intro.xml
-${CMAKE_CURRENT_SOURCE_DIR}/libraries.xml
-${CMAKE_CURRENT_SOURCE_DIR}/ocaml.xml
-${CMAKE_CURRENT_SOURCE_DIR}/os_notes.xml
-${CMAKE_CURRENT_SOURCE_DIR}/perl.xml
-${CMAKE_CURRENT_SOURCE_DIR}/python.xml
-${CMAKE_CURRENT_SOURCE_DIR}/simple.xml
-${CMAKE_CURRENT_SOURCE_DIR}/tcl.xml
-${CMAKE_CURRENT_SOURCE_DIR}/wish.xml
-${CMAKE_CURRENT_SOURCE_DIR}/math.ent
-)
+ SOURCE_FILES
+ ${CMAKE_CURRENT_SOURCE_DIR}/ada.xml
+ ${CMAKE_CURRENT_SOURCE_DIR}/advanced.xml
+ ${CMAKE_CURRENT_SOURCE_DIR}/api.xml
+ ${CMAKE_CURRENT_SOURCE_DIR}/api-c.xml
+ ${CMAKE_CURRENT_SOURCE_DIR}/api-compat.xml
+ ${CMAKE_CURRENT_SOURCE_DIR}/api-fortran77.xml
+ ${CMAKE_CURRENT_SOURCE_DIR}/api-fortran95.xml
+ ${CMAKE_CURRENT_SOURCE_DIR}/api-internal.xml
+ ${CMAKE_CURRENT_SOURCE_DIR}/api-obsolete.xml
+ ${CMAKE_CURRENT_SOURCE_DIR}/bibliography.xml
+ ${CMAKE_CURRENT_SOURCE_DIR}/c.xml
+ ${CMAKE_CURRENT_SOURCE_DIR}/deploying.xml
+ ${CMAKE_CURRENT_SOURCE_DIR}/fortran77.xml
+ ${CMAKE_CURRENT_SOURCE_DIR}/fortran95.xml
+ ${CMAKE_CURRENT_SOURCE_DIR}/cplus.xml
+ ${CMAKE_CURRENT_SOURCE_DIR}/drivers.xml
+ ${CMAKE_CURRENT_SOURCE_DIR}/gui.xml
+ ${CMAKE_CURRENT_SOURCE_DIR}/intro.xml
+ ${CMAKE_CURRENT_SOURCE_DIR}/libraries.xml
+ ${CMAKE_CURRENT_SOURCE_DIR}/ocaml.xml
+ ${CMAKE_CURRENT_SOURCE_DIR}/os_notes.xml
+ ${CMAKE_CURRENT_SOURCE_DIR}/perl.xml
+ ${CMAKE_CURRENT_SOURCE_DIR}/python.xml
+ ${CMAKE_CURRENT_SOURCE_DIR}/simple.xml
+ ${CMAKE_CURRENT_SOURCE_DIR}/tcl.xml
+ ${CMAKE_CURRENT_SOURCE_DIR}/wish.xml
+ ${CMAKE_CURRENT_SOURCE_DIR}/math.ent
+ )
execute_process(
COMMAND
${CMAKE_COMMAND} -E copy_if_different
${CMAKE_CURRENT_SOURCE_DIR}/jadetex.cfg
${CMAKE_CURRENT_BINARY_DIR}/jadetex.cfg
-)
+ )
if(
-PREBUILT_DOC
-AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/static_built_files
-AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${INFO_MANIFEST}
-AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${MAN_MANIFEST}
-AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${HTML_MANIFEST}
-)
+ PREBUILT_DOC
+ AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/static_built_files
+ AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${INFO_MANIFEST}
+ AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${MAN_MANIFEST}
+ AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${HTML_MANIFEST}
+ )
+
+ # Copy pre-built documentation (whose filenames are contained in the
+ # files "static_built_files", ${INFO_MANIFEST}, ${MAN_MANIFEST}, and
+ # ${HTML_MANIFEST}) in the source tree to the build tree just as if
+ # it had been created there by the alternative BUILD_DOC=ON case.
if(CMAKE_BINARY_DIR STREQUAL "${CMAKE_SOURCE_DIR}")
add_custom_target(copy_prebuiltdoc ALL)
else(CMAKE_BINARY_DIR STREQUAL "${CMAKE_SOURCE_DIR}")
add_custom_command(
- OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/static_built_files
- COMMAND cp
- `cat static_built_files ${INFO_MANIFEST} ${MAN_MANIFEST} ${HTML_MANIFEST}`
- ${CMAKE_BINARY_DIR}/doc/docbook/src
- WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/doc/docbook/src
- )
+ OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/static_built_files
+ COMMAND cp
+ `cat static_built_files ${INFO_MANIFEST} ${MAN_MANIFEST} ${HTML_MANIFEST}`
+ ${CMAKE_BINARY_DIR}/doc/docbook/src
+ WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/doc/docbook/src
+ )
add_custom_target(
- copy_prebuiltdoc ALL
- DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/static_built_files
- )
+ copy_prebuiltdoc ALL
+ DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/static_built_files
+ )
endif(CMAKE_BINARY_DIR STREQUAL "${CMAKE_SOURCE_DIR}")
-
+
if(ONSGMLS)
set(VALIDATE_OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/validate.out)
# Custom target for validating xml file
add_custom_target(validate
- COMMAND ${ONSGMLS} ${XML_DECL} ${CMAKE_CURRENT_BINARY_DIR}/plplotdoc-html.xml > ${VALIDATE_OUTPUT}
- )
+ COMMAND ${ONSGMLS} ${XML_DECL} ${CMAKE_CURRENT_BINARY_DIR}/${PLPLOTDOC}-html.xml > ${VALIDATE_OUTPUT}
+ )
add_dependencies(validate copy_prebuiltdoc)
endif(ONSGMLS)
else(
-PREBUILT_DOC
-AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/static_built_files
-AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${INFO_MANIFEST}
-AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${MAN_MANIFEST}
-AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${HTML_MANIFEST}
-)
+ PREBUILT_DOC
+ AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/static_built_files
+ AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${INFO_MANIFEST}
+ AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${MAN_MANIFEST}
+ AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${HTML_MANIFEST}
+ )
# Include this file in what is copied back from build tree to source tree
# for the custom top-level prebuild_dist target.
file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/static_built_files
- "static_built_files\n"
- )
+ "static_built_files\n"
+ )
- # The following files are defined as entities in plplotdoc.xml and are
+ # The following files are defined as entities in the various forms
+ # of the configured ${PLPLOTDOC}-*.xml files and are
# used to help build the documentation. Of course, these files are
# required for validation as well.
# N.B. if PERL_FOUND is false, then BUILD_DOC is false.
@@ -168,273 +179,332 @@
set(VALIDATE_OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/validate.out)
add_custom_target(validate
- COMMAND ${ONSGMLS} ${XML_DECL} ${CMAKE_CURRENT_BINARY_DIR}/plplotdoc-html.xml > ${VALIDATE_OUTPUT}
- )
+ COMMAND ${ONSGMLS} ${XML_DECL} ${CMAKE_CURRENT_BINARY_DIR}/${PLPLOTDOC}-html.xml > ${VALIDATE_OUTPUT}
+ )
add_dependencies(validate
- docbook_plplot-symbols_txt
- docbook_plplot-structs_txt
- )
+ docbook_plplot-symbols_txt
+ docbook_plplot-structs_txt
+ )
else(ONSGMLS)
add_custom_target(validate
- ${CMAKE_COMMAND} -E echo "Unable to validate xml file - missing dependencies"
- )
+ ${CMAKE_COMMAND} -E echo "Unable to validate xml file - missing dependencies"
+ )
endif(ONSGMLS)
# N.B. if PERL_FOUND is false, then BUILD_DOC is false.
if(BUILD_DOC)
- set(STYLESHEET_HTML plplotdoc-html.dsl)
- set(STYLESHEET_PRINT plplotdoc-print.dsl)
- set(STYLESHEET_HTML_IN ${STYLESHEET_HTML}.in)
- set(STYLESHEET_PRINT_IN ${STYLESHEET_PRINT}.in)
- configure_file(
- ${CMAKE_CURRENT_SOURCE_DIR}/${STYLESHEET_HTML_IN}
- ${CMAKE_CURRENT_BINARY_DIR}/${STYLESHEET_HTML}
- )
- configure_file(
- ${CMAKE_CURRENT_SOURCE_DIR}/${STYLESHEET_PRINT_IN}
- ${CMAKE_CURRENT_BINARY_DIR}/${STYLESHEET_PRINT}
- )
+ if(BUILD_INFO)
+ # Custom commands for building info version of documentation
+ add_custom_command(
+ OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${PLPLOTDOC}-clean.xml
+ COMMAND ${PERL_EXECUTABLE}
+ ${BINDIR}/info-clean.pl ${CMAKE_CURRENT_BINARY_DIR}/${PLPLOTDOC}-info.xml > ${CMAKE_CURRENT_BINARY_DIR}/${PLPLOTDOC}-clean.xml
+ DEPENDS
+ ${SOURCE_FILES}
+ ${CMAKE_CURRENT_BINARY_DIR}/${PLPLOTDOC}-info.xml
+ ${CMAKE_CURRENT_SOURCE_DIR}/inline-info.ent
+ )
- configure_file(
- ${CMAKE_CURRENT_SOURCE_DIR}/pdftex.map.in
- ${CMAKE_CURRENT_BINARY_DIR}/pdftex.map
- )
+ add_custom_command(
+ OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${PLPLOTDOC}.txml
+ COMMAND ${CMAKE_COMMAND} -E echo "Note that no information is lost when \"too deep\" warning messages indicate"
+ COMMAND ${CMAKE_COMMAND} -E echo "where flat organization has replaced hierarchical organization."
+ COMMAND ${DB2X_XSLTPROC}
+ -s texi -o ${CMAKE_CURRENT_BINARY_DIR}/${PLPLOTDOC}.txml ${CMAKE_CURRENT_BINARY_DIR}/${PLPLOTDOC}-clean.xml
+ DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${PLPLOTDOC}-clean.xml
+ VERBATIM
+ )
- # Custom commands for building print version of documentation
- add_custom_command(
- OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${BASE}.jadetex
- COMMAND ${OPENJADE} -b utf-8
- ${SGML_CATALOGS} -d ${CMAKE_CURRENT_BINARY_DIR}/${STYLESHEET_PRINT}
- -t tex -o ${CMAKE_CURRENT_BINARY_DIR}/${BASE}.jadetex
- ${XML_DECL} ${CMAKE_CURRENT_BINARY_DIR}/plplotdoc-print.xml
- DEPENDS
- ${SOURCE_FILES}
- ${CMAKE_CURRENT_BINARY_DIR}/plplotdoc-print.xml
- ${CMAKE_CURRENT_BINARY_DIR}/${STYLESHEET_PRINT}
- ${CMAKE_CURRENT_SOURCE_DIR}/inline-print.ent
- )
+ add_custom_command(
+ OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${PLPLOTDOC}.texi
+ COMMAND ${DB2X_TEXIXML} --encoding=utf-8 ${CMAKE_CURRENT_BINARY_DIR}/${PLPLOTDOC}.txml
+ COMMAND ${CMAKE_COMMAND} -E remove ${CMAKE_CURRENT_BINARY_DIR}/${PLPLOTDOC}.texi_sed
+ COMMAND sed "s?The PLplot Plotting Library: (${PLPLOTDOC})?PLplot: (${PLPLOTDOC})?" < ${CMAKE_CURRENT_BINARY_DIR}/${PLPLOTDOC}.texi > ${CMAKE_CURRENT_BINARY_DIR}/${PLPLOTDOC}.texi_sed
+ COMMAND ${CMAKE_COMMAND} -E remove ${CMAKE_CURRENT_BINARY_DIR}/${PLPLOTDOC}.texi
+ COMMAND ${CMAKE_COMMAND} -E rename ${CMAKE_CURRENT_BINARY_DIR}/${PLPLOTDOC}.texi_sed ${CMAKE_CURRENT_BINARY_DIR}/${PLPLOTDOC}.texi
+ DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${PLPLOTDOC}.txml
+ VERBATIM
+ )
- # Following approach used in our ABS, use shell commands to recurse
- # ${PDFJADETEX} ${BASE}.jadetex five times or until the *.aux file that is
- # produced doesn't change.
- add_custom_command(
- OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${BASE}.pdf
- COMMAND ${PDFJADETEX} ${BASE}.jadetex
- COMMAND
- if ! cmp ${BASE}.aux prior-pdf.aux 2>/dev/null \; then
- cp -pf ${BASE}.aux prior-pdf.aux \;
- ${PDFJADETEX} ${BASE}.jadetex \;
- fi
- COMMAND
- if ! cmp ${BASE}.aux prior-pdf.aux 2>/dev/null \; then
- cp -pf ${BASE}.aux prior-pdf.aux \;
- ${PDFJADETEX} ${BASE}.jadetex \;
- fi
- COMMAND
- if ! cmp ${BASE}.aux prior-pdf.aux 2>/dev/null \; then
- cp -pf ${BASE}.aux prior-pdf.aux \;
- ${PDFJADETEX} ${BASE}.jadetex \;
- fi
- COMMAND
- if ! cmp ${BASE}.aux prior-pdf.aux 2>/dev/null \; then
- cp -pf ${BASE}.aux prior-pdf.aux \;
- ${PDFJADETEX} ${BASE}.jadetex \;
- fi
- DEPENDS
- ${CMAKE_CURRENT_BINARY_DIR}/${BASE}.jadetex
- ${CMAKE_CURRENT_SOURCE_DIR}/jadetex.cfg
- ${CMAKE_CURRENT_BINARY_DIR}/pdftex.map
- )
+ set(INFO_TMPDIR ${CMAKE_CURRENT_BINARY_DIR}/info)
- # Following approach used in our ABS, use shell commands to recurse
- # ${JADETEX} ${BASE}.jadetex five times or until the *.aux file that is
- # produced doesn't change.
- add_custom_command(
- OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${BASE}.dvi
- COMMAND ${JADETEX} ${BASE}.jadetex
- COMMAND
- if ! cmp ${BASE}.aux prior-dvi.aux 2>/dev/null \; then
- cp -pf ${BASE}.aux prior-dvi.aux \;
- ${JADETEX} ${BASE}.jadetex \;
- fi
- COMMAND
- if ! cmp ${BASE}.aux prior-dvi.aux 2>/dev/null \; then
- cp -pf ${BASE}.aux prior-dvi.aux \;
- ${JADETEX} ${BASE}.jadetex \;
- fi
- COMMAND
- if ! cmp ${BASE}.aux prior-dvi.aux 2>/dev/null \; then
- cp -pf ${BASE}.aux prior-dvi.aux \;
- ${JADETEX} ${BASE}.jadetex \;
- fi
- COMMAND
- if ! cmp ${BASE}.aux prior-dvi.aux 2>/dev/null \; then
- cp -pf ${BASE}.aux prior-dvi.aux \;
- ${JADETEX} ${BASE}.jadetex \;
- fi
- # dependence on ${CMAKE_CURRENT_BINARY_DIR}/${BASE}.pdf simply
- # to serialize for parallel build case since both custom commands use
- # the same *.aux files.
- DEPENDS
- ${CMAKE_CURRENT_BINARY_DIR}/${BASE}.jadetex
- ${CMAKE_CURRENT_SOURCE_DIR}/jadetex.cfg
- ${CMAKE_CURRENT_BINARY_DIR}/pdftex.map
- ${CMAKE_CURRENT_BINARY_DIR}/${BASE}.pdf
- )
+ file(MAKE_DIRECTORY ${INFO_TMPDIR})
- add_custom_command(
- OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${BASE}.ps.gz
- COMMAND ${DVIPS} ${BASE}.dvi
- COMMAND ${GZIP} -f ${BASE}.ps
- DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${BASE}.dvi
- )
+ add_custom_command(
+ OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${INFO_MANIFEST}
+ COMMAND ${CMAKE_COMMAND}
+ -E remove -f ${INFO_TMPDIR}/*
+ COMMAND ${MAKEINFO}
+ --force -o ${INFO_TMPDIR}/${PLPLOTDOC}.info ${CMAKE_CURRENT_BINARY_DIR}/${PLPLOTDOC}.texi
+ COMMAND ${CMAKE_COMMAND}
+ -E chdir ${INFO_TMPDIR} ls |cat > ${CMAKE_CURRENT_BINARY_DIR}/${INFO_MANIFEST}
+ COMMAND mv
+ ${INFO_TMPDIR}/* ${CMAKE_CURRENT_BINARY_DIR}
+ DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${PLPLOTDOC}.texi
+ COMMAND rmdir ${INFO_TMPDIR}
+ )
- if(BUILD_PRINT)
add_custom_target(
- print ALL
- DEPENDS
- ${CMAKE_CURRENT_BINARY_DIR}/${BASE}.pdf
- ${CMAKE_CURRENT_BINARY_DIR}/${BASE}.ps.gz
- )
- file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/static_built_files
- "${BASE}.jadetex\n"
- "${BASE}.dvi\n"
- "${BASE}.ps.gz\n"
- "${BASE}.pdf\n"
- )
+ info ALL
+ DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${INFO_MANIFEST}
+ )
# 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(print
- docbook_plplot-symbols_txt
- docbook_plplot-structs_txt
+ add_dependencies(info
+ docbook_plplot-symbols_txt
+ docbook_plplot-structs_txt
+ )
+ else(BUILD_INFO)
+ add_custom_target(
+ info ALL
+ COMMAND ${CMAKE_COMMAND} -E remove ${CMAKE_CURRENT_BINARY_DIR}/${INFO_MANIFEST}
+ COMMAND ${CMAKE_COMMAND} -E touch ${CMAKE_CURRENT_BINARY_DIR}/${INFO_MANIFEST}
+ )
+ endif(BUILD_INFO)
+ file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/static_built_files
+ "${INFO_MANIFEST}\n"
)
- endif(BUILD_PRINT)
- # Custom commands for building info version of documentation
- add_custom_command(
- OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/plplotdoc-clean.xml
- COMMAND ${PERL_EXECUTABLE}
- ${BINDIR}/info-clean.pl ${CMAKE_CURRENT_BINARY_DIR}/plplotdoc-info.xml > ${CMAKE_CURRENT_BINARY_DIR}/plplotdoc-clean.xml
- DEPENDS
- ${SOURCE_FILES}
- ${CMAKE_CURRENT_BINARY_DIR}/plplotdoc-info.xml
- ${CMAKE_CURRENT_SOURCE_DIR}/inline-info.ent
- )
+ if(BUILD_MAN)
+ # Custom commands for building man version of documentation
- add_custom_command(
- OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/plplotdoc.txml
- COMMAND ${DB2X_XSLTPROC}
- -s texi -o ${CMAKE_CURRENT_BINARY_DIR}/plplotdoc.txml ${CMAKE_CURRENT_BINARY_DIR}/plplotdoc-clean.xml
- DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/plplotdoc-clean.xml
- )
+ add_custom_command(
+ OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${MAN_MANIFEST}
+ COMMAND ${PERL_EXECUTABLE}
+ ${CMAKE_CURRENT_BINARY_DIR}/../bin/api2man.pl ${PLPLOTDOC}-info.xml ${CMAKE_CURRENT_SOURCE_DIR}/api.xml ${MANVOL} > ${CMAKE_CURRENT_BINARY_DIR}/${MAN_MANIFEST}
+ DEPENDS
+ ${CMAKE_CURRENT_BINARY_DIR}/${PLPLOTDOC}-info.xml
+ ${CMAKE_CURRENT_SOURCE_DIR}/inline-info.ent
+ ${CMAKE_CURRENT_SOURCE_DIR}/api.xml
+ )
- add_custom_command(
- OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/plplotdoc.texi
- COMMAND ${DB2X_TEXIXML} --encoding=utf-8 ${CMAKE_CURRENT_BINARY_DIR}/plplotdoc.txml
- COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/plplotdoc.texi ${CMAKE_CURRENT_BINARY_DIR}/plplotdoc.texi_raw
- COMMAND ${CMAKE_COMMAND} -E remove ${CMAKE_CURRENT_BINARY_DIR}/plplotdoc.texi
- COMMAND sed "s?The PLplot Plotting Library: (plplotdoc)?PLplot: (plplotdoc)?" < ${CMAKE_CURRENT_BINARY_DIR}/plplotdoc.texi_raw > ${CMAKE_CURRENT_BINARY_DIR}/plplotdoc.texi
- DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/plplotdoc.txml
- VERBATIM
- )
+ add_custom_target(
+ man ALL
+ DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${MAN_MANIFEST}
+ )
+ else(BUILD_MAN)
+ add_custom_target(
+ man ALL
+ COMMAND ${CMAKE_COMMAND} -E remove ${CMAKE_CURRENT_BINARY_DIR}/${MAN_MANIFEST}
+ COMMAND ${CMAKE_COMMAND} -E touch ${CMAKE_CURRENT_BINARY_DIR}/${MAN_MANIFEST}
+ )
+ endif(BUILD_MAN)
+ file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/static_built_files
+ "${MAN_MANIFEST}\n"
+ )
- set(INFO_TMPDIR ${CMAKE_CURRENT_BINARY_DIR}/info)
+ if(BUILD_HTML)
+ # Custom commands for building html version of documentation
- file(MAKE_DIRECTORY ${INFO_TMPDIR})
+ set(STYLESHEET_HTML ${PLPLOTDOC}-html.dsl)
+ set(STYLESHEET_HTML_IN ${STYLESHEET_HTML}.in)
+ configure_file(
+ ${CMAKE_CURRENT_SOURCE_DIR}/${STYLESHEET_HTML_IN}
+ ${CMAKE_CURRENT_BINARY_DIR}/${STYLESHEET_HTML}
+ )
+ add_custom_command(
+ OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${HTML_MANIFEST}
+ COMMAND ${OPENJADE} -b utf-8
+ ${SGML_CATALOGS} -d ${STYLESHEET_HTML} -t sgml ${XML_DECL} ${CMAKE_CURRENT_BINARY_DIR}/${PLPLOTDOC}-html.xml
+ COMMAND ${PERL_EXECUTABLE}
+ -pi -e 's/&\#13;//g' `cat ${CMAKE_CURRENT_BINARY_DIR}/${HTML_MANIFEST}`
+ DEPENDS
+ ${SOURCE_FILES}
+ ${CMAKE_CURRENT_BINARY_DIR}/${PLPLOTDOC}-html.xml
+ ${CMAKE_CURRENT_SOURCE_DIR}/inline-html.ent
+ )
- add_custom_command(
- OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${INFO_MANIFEST}
- COMMAND ${CMAKE_COMMAND}
- -E remove -f ${INFO_TMPDIR}/*
- COMMAND ${MAKEINFO}
- --force -o ${INFO_TMPDIR}/plplotdoc.info ${CMAKE_CURRENT_BINARY_DIR}/plplotdoc.texi
- COMMAND ${CMAKE_COMMAND}
- -E chdir ${INFO_TMPDIR} ls |cat > ${CMAKE_CURRENT_BINARY_DIR}/${INFO_MANIFEST}
- COMMAND mv
- ${INFO_TMPDIR}/* ${CMAKE_CURRENT_BINARY_DIR}
- DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/plplotdoc.texi
- COMMAND rmdir ${INFO_TMPDIR}
- )
-
- if(BUILD_INFO)
add_custom_target(
- info ALL
- DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${INFO_MANIFEST})
- file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/static_built_files
- "plplotdoc-clean.xml\n"
- "plplotdoc.txml\n"
- "plplotdoc.texi\n"
- "${INFO_MANIFEST}\n"
- )
+ html ALL
+ DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${HTML_MANIFEST}
+ )
# 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(info
- docbook_plplot-symbols_txt
- docbook_plplot-structs_txt
+ add_dependencies(html
+ docbook_plplot-symbols_txt
+ docbook_plplot-structs_txt
+ )
+ else(BUILD_HTML)
+ add_custom_target(
+ html ALL
+ COMMAND ${CMAKE_COMMAND} -E remove ${CMAKE_CURRENT_BINARY_DIR}/${HTML_MANIFEST}
+ COMMAND ${CMAKE_COMMAND} -E touch ${CMAKE_CURRENT_BINARY_DIR}/${HTML_MANIFEST}
+ )
+ endif(BUILD_HTML)
+ file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/static_built_files
+ "${HTML_MANIFEST}\n"
)
- endif(BUILD_INFO)
- # Custom commands for building man version of documentation
+ if(BUILD_PRINT)
+ set(STYLESHEET_PRINT ${PLPLOTDOC}-print.dsl)
+ set(STYLESHEET_PRINT_IN ${STYLESHEET_PRINT}.in)
- add_custom_command(
- OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${MAN_MANIFEST}
- COMMAND ${PERL_EXECUTABLE}
- ${CMAKE_CURRENT_BINARY_DIR}/../bin/api2man.pl plplotdoc-info.xml ${CMAKE_CURRENT_SOURCE_DIR}/api.xml ${MANVOL} > ${CMAKE_CURRENT_BINARY_DIR}/${MAN_MANIFEST}
- DEPENDS
- ${CMAKE_CURRENT_BINARY_DIR}/plplotdoc-info.xml
- ${CMAKE_CURRENT_SOURCE_DIR}/inline-info.ent
- ${CMAKE_CURRENT_SOURCE_DIR}/api.xml
- )
+ configure_file(
+ ${CMAKE_CURRENT_SOURCE_DIR}/${STYLESHEET_PRINT_IN}
+ ${CMAKE_CURRENT_BINARY_DIR}/${STYLESHEET_PRINT}
+ )
- if(BUILD_MAN)
- add_custom_target(
- man ALL
- DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${MAN_MANIFEST})
- file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/static_built_files
- "${MAN_MANIFEST}\n"
- )
- endif(BUILD_MAN)
+ configure_file(
+ ${CMAKE_CURRENT_SOURCE_DIR}/pdftex.map.in
+ ${CMAKE_CURRENT_BINARY_DIR}/pdftex.map
+ )
- # Custom commands for building html version of documentation
+ # Custom commands for building print version of documentation
+ add_custom_command(
+ OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${BASE}.jadetex
+ COMMAND ${OPENJADE} -b utf-8
+ ${SGML_CATALOGS} -d ${CMAKE_CURRENT_BINARY_DIR}/${STYLESHEET_PRINT}
+ -t tex -o ${CMAKE_CURRENT_BINARY_DIR}/${BASE}.jadetex
+ ${XML_DECL} ${CMAKE_CURRENT_BINARY_DIR}/${PLPLOTDOC}-print.xml
+ DEPENDS
+ ${SOURCE_FILES}
+ ${CMAKE_CURRENT_BINARY_DIR}/${PLPLOTDOC}-print.xml
+ ${CMAKE_CURRENT_BINARY_DIR}/${STYLESHEET_PRINT}
+ ${CMAKE_CURRENT_SOURCE_DIR}/inline-print.ent
+ )
- add_custom_command(
- OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${HTML_MANIFEST}
- COMMAND ${OPENJADE} -b utf-8
- ${SGML_CATALOGS} -d ${STYLESHEET_HTML} -t sgml ${XML_DECL} ${CMAKE_CURRENT_BINARY_DIR}/plplotdoc-html.xml
- COMMAND ${PERL_EXECUTABLE}
- -pi -e 's/&\#13;//g' `cat ${CMAKE_CURRENT_BINARY_DIR}/${HTML_MANIFEST}`
- DEPENDS
- ${SOURCE_FILES}
- ${CMAKE_CURRENT_BINARY_DIR}/plplotdoc-html.xml
- ${CMAKE_CURRENT_SOURCE_DIR}/inline-html.ent
- )
+ # Following approach used in our ABS, use shell commands to recurse
+ # ${PDFJADETEX} ${BASE}.jadetex five times or until the *.aux file that is
+ # produced doesn't change.
+ add_custom_command(
+ OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${BASE}.pdf
+ COMMAND ${PDFJADETEX} ${BASE}.jadetex
+ COMMAND
+ if ! cmp ${BASE}.aux prior-pdf.aux 2>/dev/null \; then
+ cp -pf ${BASE}.aux prior-pdf.aux \;
+ ${PDFJADETEX} ${BASE}.jadetex \;
+ fi
+ COMMAND
+ if ! cmp ${BASE}.aux prior-pdf.aux 2>/dev/null \; then
+ cp -pf ${BASE}.aux prior-pdf.aux \;
+ ${PDFJADETEX} ${BASE}.jadetex \;
+ fi
+ COMMAND
+ if ! cmp ${BASE}.aux prior-pdf.aux 2>/dev/null \; then
+ cp -pf ${BASE}.aux prior-pdf.aux \;
+ ${PDFJADETEX} ${BASE}.jadetex \;
+ fi
+ COMMAND
+ if ! cmp ${BASE}.aux prior-pdf.aux 2>/dev/null \; then
+ cp -pf ${BASE}.aux prior-pdf.aux \;
+ ${PDFJADETEX} ${BASE}.jadetex \;
+ fi
+ DEPENDS
+ ${CMAKE_CURRENT_BINARY_DIR}/${BASE}.jadetex
+ ${CMAKE_CURRENT_SOURCE_DIR}/jadetex.cfg
+ ${CMAKE_CURRENT_BINARY_DIR}/pdftex.map
+ )
- if(BUILD_HTML)
+ # Following approach used in our ABS, use shell commands to recurse
+ # ${JADETEX} ${BASE}.jadetex five times or until the *.aux file that is
+ # produced doesn't change.
+ add_custom_command(
+ OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${BASE}.dvi
+ COMMAND ${JADETEX} ${BASE}.jadetex
+ COMMAND
+ if ! cmp ${BASE}.aux prior-dvi.aux 2>/dev/null \; then
+ cp -pf ${BASE}.aux prior-dvi.aux \;
+ ${JADETEX} ${BASE}.jadetex \;
+ fi
+ COMMAND
+ if ! cmp ${BASE}.aux prior-dvi.aux 2>/dev/null \; then
+ cp -pf ${BASE}.aux prior-dvi.aux \;
+ ${JADETEX} ${BASE}.jadetex \;
+ fi
+ COMMAND
+ if ! cmp ${BASE}.aux prior-dvi.aux 2>/dev/null \; then
+ cp -pf ${BASE}.aux prior-dvi.aux \;
+ ${JADETEX} ${BASE}.jadetex \;
+ fi
+ COMMAND
+ if ! cmp ${BASE}.aux prior-dvi.aux 2>/dev/null \; then
+ cp -pf ${BASE}.aux prior-dvi.aux \;
+ ${JADETEX} ${BASE}.jadetex \;
+ fi
+ DEPENDS
+ ${CMAKE_CURRENT_BINARY_DIR}/${BASE}.jadetex
+ ${CMAKE_CURRENT_SOURCE_DIR}/jadetex.cfg
+ ${CMAKE_CURRENT_BINARY_DIR}/pdftex.map
+ )
+
+ add_custom_command(
+ OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${BASE}.ps.gz
+ COMMAND ${DVIPS} ${BASE}.dvi
+ COMMAND ${GZIP} -f ${BASE}.ps
+ DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${BASE}.dvi
+ )
+
add_custom_target(
- html ALL
- DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${HTML_MANIFEST})
+ 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
- "${HTML_MANIFEST}\n"
- )
+ "${BASE}.dvi\n"
+ )
+ add_custom_target(
+ ps_target ALL
+ DEPENDS
+ ${CMAKE_CURRENT_BINARY_DIR}/${BASE}.ps.gz
+ )
# 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(html
- docbook_plplot-symbols_txt
- docbook_plplot-structs_txt
- )
- endif(BUILD_HTML)
+ add_dependencies(ps_target
+ docbook_plplot-symbols_txt
+ docbook_plplot-structs_txt
+ )
+
+ # dvi_target must complete before ps_target is executed for parallel builds.
+ add_dependencies(ps_target dvi_target)
+
+ file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/static_built_files
+ "${BASE}.ps.gz\n"
+ )
+ add_custom_target(
+ pdf_target ALL
+ DEPENDS
+ ${CMAKE_CURRENT_BINARY_DIR}/${BASE}.pdf
+ )
+ # 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(pdf_target
+ docbook_plplot-symbols_txt
+ docbook_plplot-structs_txt
+ )
+
+ # dvi_target must complete before pdf_target is executed for parallel builds.
+ add_dependencies(pdf_target dvi_target)
+
+ file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/static_built_files
+ "${BASE}.pdf\n"
+ )
+ add_custom_target(
+ print ALL
+ )
+ add_dependencies(print dvi_target ps_target pdf_target)
+
+ endif(BUILD_PRINT)
endif(BUILD_DOC)
endif(
-PREBUILT_DOC
-AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/static_built_files
-AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${INFO_MANIFEST}
-AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${MAN_MANIFEST}
-AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${HTML_MANIFEST}
-)
+ PREBUILT_DOC
+ AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/static_built_files
+ AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${INFO_MANIFEST}
+ AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${MAN_MANIFEST}
+ AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${HTML_MANIFEST}
+ )
########### install files ###############
@@ -481,18 +551,18 @@
endif(BUILD_INFO OR PREBUILT_DOC)
# Everything below here has to do with the custom target www-install
-if(BUILD_INFO OR PREBUILT_DOC)
- if(WWW_USER)
- set(TARBALL tarball.tgz)
- set(HTML_TARBALL ${BASE_HTML}.tar.gz)
- set(INFO_TARBALL ${BASE_INFO}.tar.gz)
- set(MAN_TARBALL ${BASE_MAN}.tar.gz)
+if((BUILD_DOC OR PREBUILT_DOC) AND (WWW_USER AND WWW_GROUP AND WWW_HOST AND WWW_DIR))
- set(WWW_USERAT ${WWW_USER}@)
- set(RCP_PREFIX ${WWW_USERAT}${WWW_HOST}:)
- set(RSH_COMMAND ${RSH} ${WWW_USERAT}${WWW_HOST})
+ set(TARBALL tarball.tgz)
+ set(HTML_TARBALL ${BASE_HTML}.tar.gz)
+ set(INFO_TARBALL ${BASE_INFO}.tar.gz)
+ set(MAN_TARBALL ${BASE_MAN}.tar.gz)
- add_custom_command(
+ set(WWW_USERAT ${WWW_USER}@)
+ set(RCP_PREFIX ${WWW_USERAT}${WWW_HOST}:)
+ set(RSH_COMMAND ${RSH} ${WWW_USERAT}${WWW_HOST})
+
+ add_custom_command(
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${HTML_TARBALL}
COMMAND rm -rf ${BASE_HTML}
COMMAND mkdir ${BASE_HTML}
@@ -503,7 +573,7 @@
DEPENDS ${HTML_MANIFEST} ${CMAKE_CURRENT_SOURCE_DIR}/stylesheet.css
)
- add_custom_command(
+ add_custom_command(
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${INFO_TARBALL}
COMMAND rm -rf ${BASE_INFO}
COMMAND mkdir ${BASE_INFO}
@@ -513,7 +583,7 @@
DEPENDS ${INFO_MANIFEST}
)
- add_custom_command(
+ add_custom_command(
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${MAN_TARBALL}
COMMAND rm -rf ${BASE_MAN}
COMMAND mkdir ${BASE_MAN}
@@ -523,7 +593,7 @@
DEPENDS ${MAN_MANIFEST}
)
- add_custom_command(
+ add_custom_command(
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${TARBALL}
COMMAND tar cfz ${TARBALL}
${HTML_TARBALL}
@@ -543,12 +613,14 @@
${CMAKE_CURRENT_SOURCE_DIR}/../COPYING
)
- add_custom_target(www-uninstall COMMAND ${RSH_COMMAND} rm -rf ${WWW_DIR}/htdocs/docbook-manual)
+ add_custom_target(www-uninstall
+ COMMAND ${RSH_COMMAND} rm -rf ${WWW_DIR}/htdocs/docbook-manual
+ )
- add_custom_target(
+ add_custom_target(
www-install
COMMAND ${RSH_COMMAND} mkdir -p ${WWW_DIR}/htdocs/docbook-manual
- COMMAND ${RCP} ${TARBALL} ${RCP_PREFIX}${WWW_DIR}/htdocs/docbook-manual
+ COMMAND ${RCP} ${CMAKE_CURRENT_BINARY_DIR}/${TARBALL} ${RCP_PREFIX}${WWW_DIR}/htdocs/docbook-manual
COMMAND ${RSH_COMMAND} tar xfz ${WWW_DIR}/htdocs/docbook-manual/${TARBALL} -C ${WWW_DIR}/htdocs/docbook-manual
COMMAND ${RSH_COMMAND} tar xfz ${WWW_DIR}/htdocs/docbook-manual/${HTML_TARBALL} -C ${WWW_DIR}/htdocs/docbook-manual
COMMAND ${RSH_COMMAND} chgrp -R ${WWW_GROUP} ${WWW_DIR}/htdocs/docbook-manual
@@ -558,28 +630,27 @@
${CMAKE_CURRENT_BINARY_DIR}/${TARBALL}
)
- if(
+ if(
+ PREBUILT_DOC
+ AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/static_built_files
+ AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${INFO_MANIFEST}
+ AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${MAN_MANIFEST}
+ AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${HTML_MANIFEST}
+ )
+ add_dependencies(www-install copy_prebuiltdoc www-uninstall)
+ else(
+ PREBUILT_DOC
+ AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/static_built_files
+ AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${INFO_MANIFEST}
+ AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${MAN_MANIFEST}
+ AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${HTML_MANIFEST}
+ )
+ add_dependencies(www-install www-uninstall)
+ endif(
PREBUILT_DOC
AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/static_built_files
AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${INFO_MANIFEST}
AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${MAN_MANIFEST}
AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${HTML_MANIFEST}
)
- add_dependencies(www-install copy_prebuiltdoc www-uninstall)
- else(
- PREBUILT_DOC
- AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/static_built_files
- AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${INFO_MANIFEST}
- AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${MAN_MANIFEST}
- AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${HTML_MANIFEST}
- )
- add_dependencies(www-install www-uninstall)
- endif(
- PREBUILT_DOC
- AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/static_built_files
- AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${INFO_MANIFEST}
- AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${MAN_MANIFEST}
- AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${HTML_MANIFEST}
- )
- endif(WWW_USER)
-endif(BUILD_INFO OR PREBUILT_DOC)
+endif((BUILD_DOC OR PREBUILT_DOC) AND (WWW_USER AND WWW_GROUP AND WWW_HOST AND WWW_DIR))
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2013-08-18 05:56:56
|
Revision: 12486
http://sourceforge.net/p/plplot/code/12486
Author: airwin
Date: 2013-08-18 05:56:52 +0000 (Sun, 18 Aug 2013)
Log Message:
-----------
Improve CMake logic for building DocBook documentation.
Replace destroying and creating the inline.ent symlink idea for
various forms of the inline entities with properly configured info,
print, and html variants of plplotdoc-?.xml. This change removes the
dependencies of the various backend documentation between each other
since there is no longer the parallel build race condition to be
avoided for the various kinds of inline.ent symlinks.
Non-configured *.xml and *.ent files are referred to directly in the
source tree rather than as symlinks in the build tree. This makes
establishing file dependencies much more straightforward.
Drop if(PERL_FOUND) logic since that is redundant. (Earlier in build
process, BUILD_DOC is set to OFF if perl cannot be found.)
Use actual Linux filesystem commands (like mv) rather than relying on
FindUnixCommands.cmake to define the ${MV} equivalent of mv. (ToDo,
replace Linux filesystem commmands used for the documentation build
such as "mv" with their cmake -E equivalents just on general
principles.)
Use slightly improved naming conventions for intermediate files created by info
target.
Tested by Alan W. Irwin <ai...@us...> using the
-DBUILD_DOC cmake option and the "all" target in doc/docbook/src.
Modified Paths:
--------------
trunk/doc/docbook/src/CMakeLists.txt
trunk/doc/docbook/src/plplotdoc.xml.in
Modified: trunk/doc/docbook/src/CMakeLists.txt
===================================================================
--- trunk/doc/docbook/src/CMakeLists.txt 2013-08-16 19:36:39 UTC (rev 12485)
+++ trunk/doc/docbook/src/CMakeLists.txt 2013-08-18 05:56:52 UTC (rev 12486)
@@ -19,15 +19,15 @@
# You should have received a copy of the GNU Library General Public License
# along with PLplot; if not, write to the Free Software
-set(MASTER_XML plplotdoc.xml)
-set(MASTER_XML_IN ${MASTER_XML}.in)
-
set(BINDIR ${CMAKE_CURRENT_SOURCE_DIR}/../bin)
-configure_file(
-${CMAKE_CURRENT_SOURCE_DIR}/${MASTER_XML_IN}
-${CMAKE_CURRENT_BINARY_DIR}/${MASTER_XML}
-)
+foreach(suffix info html print)
+ set(inline_entities ${CMAKE_CURRENT_SOURCE_DIR}/inline-${suffix}.ent)
+ configure_file(
+ ${CMAKE_CURRENT_SOURCE_DIR}/plplotdoc.xml.in
+ ${CMAKE_CURRENT_BINARY_DIR}/plplotdoc-${suffix}.xml
+ )
+endforeach(suffix info html print)
set(
SOURCE_FILES
@@ -48,8 +48,6 @@
${CMAKE_CURRENT_SOURCE_DIR}/cplus.xml
${CMAKE_CURRENT_SOURCE_DIR}/drivers.xml
${CMAKE_CURRENT_SOURCE_DIR}/gui.xml
-${CMAKE_CURRENT_SOURCE_DIR}/inline-html.ent
-${CMAKE_CURRENT_SOURCE_DIR}/inline-print.ent
${CMAKE_CURRENT_SOURCE_DIR}/intro.xml
${CMAKE_CURRENT_SOURCE_DIR}/libraries.xml
${CMAKE_CURRENT_SOURCE_DIR}/ocaml.xml
@@ -62,27 +60,12 @@
${CMAKE_CURRENT_SOURCE_DIR}/math.ent
)
-if(NOT CMAKE_BINARY_DIR STREQUAL "${CMAKE_SOURCE_DIR}")
- foreach(
- file
- ${SOURCE_FILES}
+execute_process(
+ COMMAND
+ ${CMAKE_COMMAND} -E copy_if_different
${CMAKE_CURRENT_SOURCE_DIR}/jadetex.cfg
- )
- get_filename_component(filename ${file} NAME)
- if(NOT EXISTS ${CMAKE_CURRENT_BINARY_DIR}/${filename})
- execute_process(
- COMMAND
- ${CMAKE_COMMAND} -E create_symlink
- ${CMAKE_CURRENT_SOURCE_DIR}/${filename}
- ${CMAKE_CURRENT_BINARY_DIR}/${filename}
- )
- endif(NOT EXISTS ${CMAKE_CURRENT_BINARY_DIR}/${filename})
- endforeach(
- file
- ${SOURCE_FILES}
- ${CMAKE_CURRENT_SOURCE_DIR}/jadetex.cfg
- )
-endif(NOT CMAKE_BINARY_DIR STREQUAL "${CMAKE_SOURCE_DIR}")
+ ${CMAKE_CURRENT_BINARY_DIR}/jadetex.cfg
+)
if(
PREBUILT_DOC
@@ -112,14 +95,7 @@
# Custom target for validating xml file
add_custom_target(validate
- ${CMAKE_COMMAND} -E remove ${CMAKE_CURRENT_BINARY_DIR}/inline.ent
- COMMAND ${CMAKE_COMMAND} -E create_symlink
- ${CMAKE_CURRENT_SOURCE_DIR}/inline-html.ent
- ${CMAKE_CURRENT_BINARY_DIR}/inline.ent
- COMMAND ${ONSGMLS} ${XML_DECL} ${CMAKE_CURRENT_BINARY_DIR}/${MASTER_XML} > ${VALIDATE_OUTPUT}
- DEPENDS
- ${CMAKE_CURRENT_BINARY_DIR}/${MASTER_XML}
- ${CMAKE_CURRENT_SOURCE_DIR}/inline-html.ent
+ COMMAND ${ONSGMLS} ${XML_DECL} ${CMAKE_CURRENT_BINARY_DIR}/plplotdoc-html.xml > ${VALIDATE_OUTPUT}
)
add_dependencies(validate copy_prebuiltdoc)
endif(ONSGMLS)
@@ -141,75 +117,69 @@
# used to help build the documentation. Of course, these files are
# required for validation as well.
# N.B. if PERL_FOUND is false, then BUILD_DOC is false.
- if(PERL_FOUND)
- add_custom_command(
+ add_custom_command(
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/plplot-symbols.txt
COMMAND ${PERL_EXECUTABLE}
${BINDIR}/get-library-symbols.pl > ${CMAKE_CURRENT_BINARY_DIR}/plplot-symbols.txt ${CMAKE_BINARY_DIR}/src/libplplot${LIB_TAG}.so ${CMAKE_SOURCE_DIR}/include/plplot.h 3
DEPENDS ${CMAKE_SOURCE_DIR}/include/plplot.h
)
- # For parallel builds to work must have all file dependency chains of
- # targets independent of each other. Thus, since several targets
- # need plplot-symbols.txt, must create the target
- # docbook_plplot-symbols_txt and have the targets depend on that target
- # rather than have each target file depend directly on
- # ${CMAKE_CURRENT_BINARY_DIR}/plplot-symbols.txt.
- add_custom_target(
+ # For parallel builds to work must have all file dependency chains of
+ # targets independent of each other. Thus, since several targets
+ # need plplot-symbols.txt, must create the target
+ # docbook_plplot-symbols_txt and have the targets depend on that target
+ # rather than have each target file depend directly on
+ # ${CMAKE_CURRENT_BINARY_DIR}/plplot-symbols.txt.
+ add_custom_target(
docbook_plplot-symbols_txt
DEPENDS
${CMAKE_CURRENT_BINARY_DIR}/plplot-symbols.txt
)
- # libplplot should be created before plplot-symbols.txt since
- # get-library-symbols.pl depends upon libplplot.
- add_dependencies(docbook_plplot-symbols_txt plplot${LIB_TAG})
- file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/static_built_files
+ # libplplot should be created before plplot-symbols.txt since
+ # get-library-symbols.pl depends upon libplplot.
+ add_dependencies(docbook_plplot-symbols_txt plplot${LIB_TAG})
+ file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/static_built_files
"plplot-symbols.txt\n"
)
- add_custom_command(
+ add_custom_command(
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/plplot-structs.txt
COMMAND ${PERL_EXECUTABLE}
${BINDIR}/get-library-structs.pl > ${CMAKE_CURRENT_BINARY_DIR}/plplot-structs.txt ${CMAKE_SOURCE_DIR}/include/plplot.h
DEPENDS ${CMAKE_SOURCE_DIR}/include/plplot.h
)
- # For parallel builds to work must have all file dependency chains of
- # targets independent of each other. Thus, since several targets
- # need plplot-structs.txt, must use target dependencies rather than
- # file dependencies to build this file.
- add_custom_target(
+ # For parallel builds to work must have all file dependency chains of
+ # targets independent of each other. Thus, since several targets
+ # need plplot-structs.txt, must use target dependencies rather than
+ # file dependencies to build this file.
+ add_custom_target(
docbook_plplot-structs_txt
DEPENDS
${CMAKE_CURRENT_BINARY_DIR}/plplot-structs.txt
)
- file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/static_built_files
+ file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/static_built_files
"plplot-structs.txt\n"
)
- endif(PERL_FOUND)
# Custom command for validating xml file
- if(PERL_FOUND AND ONSGMLS)
+ # This one different from alternative above used in PREBUILT_DOC case
+ # because this one has dependencies which have to be built first.
+ if(ONSGMLS)
set(VALIDATE_OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/validate.out)
add_custom_target(validate
- ${CMAKE_COMMAND} -E remove ${CMAKE_CURRENT_BINARY_DIR}/inline.ent
- COMMAND ${CMAKE_COMMAND} -E create_symlink
- ${CMAKE_CURRENT_SOURCE_DIR}/inline-html.ent
- ${CMAKE_CURRENT_BINARY_DIR}/inline.ent
- COMMAND ${ONSGMLS} ${XML_DECL} ${CMAKE_CURRENT_BINARY_DIR}/${MASTER_XML} > ${VALIDATE_OUTPUT}
- DEPENDS
- ${CMAKE_CURRENT_BINARY_DIR}/${MASTER_XML}
- ${CMAKE_CURRENT_SOURCE_DIR}/inline-html.ent
+ COMMAND ${ONSGMLS} ${XML_DECL} ${CMAKE_CURRENT_BINARY_DIR}/plplotdoc-html.xml > ${VALIDATE_OUTPUT}
)
add_dependencies(validate
docbook_plplot-symbols_txt
docbook_plplot-structs_txt
)
- else(PERL_FOUND AND ONSGMLS)
+ else(ONSGMLS)
add_custom_target(validate
${CMAKE_COMMAND} -E echo "Unable to validate xml file - missing dependencies"
)
- endif(PERL_FOUND AND ONSGMLS)
+ endif(ONSGMLS)
+
# N.B. if PERL_FOUND is false, then BUILD_DOC is false.
if(BUILD_DOC)
set(STYLESHEET_HTML plplotdoc-html.dsl)
@@ -234,17 +204,13 @@
# Custom commands for building print version of documentation
add_custom_command(
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${BASE}.jadetex
- COMMAND ${CMAKE_COMMAND} -E remove ${CMAKE_CURRENT_BINARY_DIR}/inline.ent
- COMMAND ${CMAKE_COMMAND} -E create_symlink
- ${CMAKE_CURRENT_SOURCE_DIR}/inline-print.ent
- ${CMAKE_CURRENT_BINARY_DIR}/inline.ent
COMMAND ${OPENJADE} -b utf-8
${SGML_CATALOGS} -d ${CMAKE_CURRENT_BINARY_DIR}/${STYLESHEET_PRINT}
-t tex -o ${CMAKE_CURRENT_BINARY_DIR}/${BASE}.jadetex
- ${XML_DECL} ${CMAKE_CURRENT_BINARY_DIR}/${MASTER_XML}
+ ${XML_DECL} ${CMAKE_CURRENT_BINARY_DIR}/plplotdoc-print.xml
DEPENDS
${SOURCE_FILES}
- ${CMAKE_CURRENT_BINARY_DIR}/${MASTER_XML}
+ ${CMAKE_CURRENT_BINARY_DIR}/plplotdoc-print.xml
${CMAKE_CURRENT_BINARY_DIR}/${STYLESHEET_PRINT}
${CMAKE_CURRENT_SOURCE_DIR}/inline-print.ent
)
@@ -324,8 +290,6 @@
DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${BASE}.dvi
)
- # Use this variable to serialize inline.ent use in parallel builds.
- set(SERIALIZE_INLINE_DEPENDS)
if(BUILD_PRINT)
add_custom_target(
print ALL
@@ -345,32 +309,25 @@
add_dependencies(print
docbook_plplot-symbols_txt
docbook_plplot-structs_txt
- ${SERIALIZE_INLINE_DEPENDS}
)
- list(APPEND SERIALIZE_INLINE_DEPENDS print)
endif(BUILD_PRINT)
# Custom commands for building info version of documentation
add_custom_command(
- OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/plplotdoc.xml-info
- COMMAND ${CMAKE_COMMAND}
- -E remove ${CMAKE_CURRENT_BINARY_DIR}/inline.ent
- COMMAND ${CMAKE_COMMAND} -E create_symlink
- ${CMAKE_CURRENT_SOURCE_DIR}/inline-info.ent
- ${CMAKE_CURRENT_BINARY_DIR}/inline.ent
+ OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/plplotdoc-clean.xml
COMMAND ${PERL_EXECUTABLE}
- ${BINDIR}/info-clean.pl ${CMAKE_CURRENT_BINARY_DIR}/${MASTER_XML} > ${CMAKE_CURRENT_BINARY_DIR}/plplotdoc.xml-info
+ ${BINDIR}/info-clean.pl ${CMAKE_CURRENT_BINARY_DIR}/plplotdoc-info.xml > ${CMAKE_CURRENT_BINARY_DIR}/plplotdoc-clean.xml
DEPENDS
${SOURCE_FILES}
- ${CMAKE_CURRENT_BINARY_DIR}/${MASTER_XML}
+ ${CMAKE_CURRENT_BINARY_DIR}/plplotdoc-info.xml
${CMAKE_CURRENT_SOURCE_DIR}/inline-info.ent
)
add_custom_command(
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/plplotdoc.txml
COMMAND ${DB2X_XSLTPROC}
- -s texi -o ${CMAKE_CURRENT_BINARY_DIR}/plplotdoc.txml ${CMAKE_CURRENT_BINARY_DIR}/plplotdoc.xml-info
- DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/plplotdoc.xml-info
+ -s texi -o ${CMAKE_CURRENT_BINARY_DIR}/plplotdoc.txml ${CMAKE_CURRENT_BINARY_DIR}/plplotdoc-clean.xml
+ DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/plplotdoc-clean.xml
)
add_custom_command(
@@ -395,9 +352,10 @@
--force -o ${INFO_TMPDIR}/plplotdoc.info ${CMAKE_CURRENT_BINARY_DIR}/plplotdoc.texi
COMMAND ${CMAKE_COMMAND}
-E chdir ${INFO_TMPDIR} ls |cat > ${CMAKE_CURRENT_BINARY_DIR}/${INFO_MANIFEST}
- COMMAND ${MV}
+ COMMAND mv
${INFO_TMPDIR}/* ${CMAKE_CURRENT_BINARY_DIR}
DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/plplotdoc.texi
+ COMMAND rmdir ${INFO_TMPDIR}
)
if(BUILD_INFO)
@@ -405,7 +363,7 @@
info ALL
DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${INFO_MANIFEST})
file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/static_built_files
- "plplotdoc.xml-info\n"
+ "plplotdoc-clean.xml\n"
"plplotdoc.txml\n"
"plplotdoc.texi\n"
"${INFO_MANIFEST}\n"
@@ -416,9 +374,7 @@
add_dependencies(info
docbook_plplot-symbols_txt
docbook_plplot-structs_txt
- ${SERIALIZE_INLINE_DEPENDS}
)
- list(APPEND SERIALIZE_INLINE_DEPENDS info)
endif(BUILD_INFO)
# Custom commands for building man version of documentation
@@ -426,8 +382,11 @@
add_custom_command(
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${MAN_MANIFEST}
COMMAND ${PERL_EXECUTABLE}
- ${CMAKE_CURRENT_BINARY_DIR}/../bin/api2man.pl ${MASTER_XML} api.xml ${MANVOL} > ${CMAKE_CURRENT_BINARY_DIR}/${MAN_MANIFEST}
- DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${MASTER_XML} api.xml
+ ${CMAKE_CURRENT_BINARY_DIR}/../bin/api2man.pl plplotdoc-info.xml ${CMAKE_CURRENT_SOURCE_DIR}/api.xml ${MANVOL} > ${CMAKE_CURRENT_BINARY_DIR}/${MAN_MANIFEST}
+ DEPENDS
+ ${CMAKE_CURRENT_BINARY_DIR}/plplotdoc-info.xml
+ ${CMAKE_CURRENT_SOURCE_DIR}/inline-info.ent
+ ${CMAKE_CURRENT_SOURCE_DIR}/api.xml
)
if(BUILD_MAN)
@@ -443,18 +402,13 @@
add_custom_command(
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${HTML_MANIFEST}
- COMMAND ${CMAKE_COMMAND}
- -E remove ${CMAKE_CURRENT_BINARY_DIR}/inline.ent
- COMMAND ${CMAKE_COMMAND} -E create_symlink
- ${CMAKE_CURRENT_SOURCE_DIR}/inline-html.ent
- ${CMAKE_CURRENT_BINARY_DIR}/inline.ent
COMMAND ${OPENJADE} -b utf-8
- ${SGML_CATALOGS} -d ${STYLESHEET_HTML} -t sgml ${XML_DECL} ${CMAKE_CURRENT_BINARY_DIR}/${MASTER_XML}
+ ${SGML_CATALOGS} -d ${STYLESHEET_HTML} -t sgml ${XML_DECL} ${CMAKE_CURRENT_BINARY_DIR}/plplotdoc-html.xml
COMMAND ${PERL_EXECUTABLE}
-pi -e 's/&\#13;//g' `cat ${CMAKE_CURRENT_BINARY_DIR}/${HTML_MANIFEST}`
DEPENDS
${SOURCE_FILES}
- ${CMAKE_CURRENT_BINARY_DIR}/${MASTER_XML}
+ ${CMAKE_CURRENT_BINARY_DIR}/plplotdoc-html.xml
${CMAKE_CURRENT_SOURCE_DIR}/inline-html.ent
)
@@ -471,9 +425,7 @@
add_dependencies(html
docbook_plplot-symbols_txt
docbook_plplot-structs_txt
- ${SERIALIZE_INLINE_DEPENDS}
)
- list(APPEND SERIALIZE_INLINE_DEPENDS html)
endif(BUILD_HTML)
endif(BUILD_DOC)
endif(
Modified: trunk/doc/docbook/src/plplotdoc.xml.in
===================================================================
--- trunk/doc/docbook/src/plplotdoc.xml.in 2013-08-16 19:36:39 UTC (rev 12485)
+++ trunk/doc/docbook/src/plplotdoc.xml.in 2013-08-18 05:56:52 UTC (rev 12486)
@@ -46,34 +46,34 @@
<!ENTITY Project-Date "$Date$">
<!ENTITY Release-Date "@RELEASE_DATE@">
-<!ENTITY chap-intro SYSTEM "intro.xml">
-<!ENTITY chap-simple SYSTEM "simple.xml">
-<!ENTITY chap-advanced SYSTEM "advanced.xml">
-<!ENTITY chap-deploying SYSTEM "deploying.xml">
-<!ENTITY chap-drivers SYSTEM "drivers.xml">
-<!ENTITY chap-ada SYSTEM "ada.xml">
-<!ENTITY chap-c SYSTEM "c.xml">
-<!ENTITY chap-cplus SYSTEM "cplus.xml">
-<!ENTITY chap-fortran77 SYSTEM "fortran77.xml">
-<!ENTITY chap-fortran95 SYSTEM "fortran95.xml">
-<!ENTITY chap-ocaml SYSTEM "ocaml.xml">
-<!ENTITY chap-perl SYSTEM "perl.xml">
-<!ENTITY chap-python SYSTEM "python.xml">
-<!ENTITY chap-tcl SYSTEM "tcl.xml">
-<!ENTITY chap-wish SYSTEM "wish.xml">
-<!ENTITY chap-gui SYSTEM "gui.xml">
-<!ENTITY chap-bibliography SYSTEM "bibliography.xml">
-<!ENTITY chap-api SYSTEM "api.xml">
-<!ENTITY chap-api-c SYSTEM "api-c.xml">
-<!ENTITY chap-api-fortran95 SYSTEM "api-fortran95.xml">
-<!ENTITY chap-api-fortran77 SYSTEM "api-fortran77.xml">
-<!ENTITY chap-api-compat SYSTEM "api-compat.xml">
-<!ENTITY chap-api-obsolete SYSTEM "api-obsolete.xml">
-<!ENTITY chap-api-internal SYSTEM "api-internal.xml">
-<!ENTITY chap-libraries SYSTEM "libraries.xml">
+<!ENTITY chap-intro SYSTEM "@CMAKE_CURRENT_SOURCE_DIR@/intro.xml">
+<!ENTITY chap-simple SYSTEM "@CMAKE_CURRENT_SOURCE_DIR@/simple.xml">
+<!ENTITY chap-advanced SYSTEM "@CMAKE_CURRENT_SOURCE_DIR@/advanced.xml">
+<!ENTITY chap-deploying SYSTEM "@CMAKE_CURRENT_SOURCE_DIR@/deploying.xml">
+<!ENTITY chap-drivers SYSTEM "@CMAKE_CURRENT_SOURCE_DIR@/drivers.xml">
+<!ENTITY chap-ada SYSTEM "@CMAKE_CURRENT_SOURCE_DIR@/ada.xml">
+<!ENTITY chap-c SYSTEM "@CMAKE_CURRENT_SOURCE_DIR@/c.xml">
+<!ENTITY chap-cplus SYSTEM "@CMAKE_CURRENT_SOURCE_DIR@/cplus.xml">
+<!ENTITY chap-fortran77 SYSTEM "@CMAKE_CURRENT_SOURCE_DIR@/fortran77.xml">
+<!ENTITY chap-fortran95 SYSTEM "@CMAKE_CURRENT_SOURCE_DIR@/fortran95.xml">
+<!ENTITY chap-ocaml SYSTEM "@CMAKE_CURRENT_SOURCE_DIR@/ocaml.xml">
+<!ENTITY chap-perl SYSTEM "@CMAKE_CURRENT_SOURCE_DIR@/perl.xml">
+<!ENTITY chap-python SYSTEM "@CMAKE_CURRENT_SOURCE_DIR@/python.xml">
+<!ENTITY chap-tcl SYSTEM "@CMAKE_CURRENT_SOURCE_DIR@/tcl.xml">
+<!ENTITY chap-wish SYSTEM "@CMAKE_CURRENT_SOURCE_DIR@/wish.xml">
+<!ENTITY chap-gui SYSTEM "@CMAKE_CURRENT_SOURCE_DIR@/gui.xml">
+<!ENTITY chap-bibliography SYSTEM "@CMAKE_CURRENT_SOURCE_DIR@/bibliography.xml">
+<!ENTITY chap-api SYSTEM "@CMAKE_CURRENT_SOURCE_DIR@/api.xml">
+<!ENTITY chap-api-c SYSTEM "@CMAKE_CURRENT_SOURCE_DIR@/api-c.xml">
+<!ENTITY chap-api-fortran95 SYSTEM "@CMAKE_CURRENT_SOURCE_DIR@/api-fortran95.xml">
+<!ENTITY chap-api-fortran77 SYSTEM "@CMAKE_CURRENT_SOURCE_DIR@/api-fortran77.xml">
+<!ENTITY chap-api-compat SYSTEM "@CMAKE_CURRENT_SOURCE_DIR@/api-compat.xml">
+<!ENTITY chap-api-obsolete SYSTEM "@CMAKE_CURRENT_SOURCE_DIR@/api-obsolete.xml">
+<!ENTITY chap-api-internal SYSTEM "@CMAKE_CURRENT_SOURCE_DIR@/api-internal.xml">
+<!ENTITY chap-libraries SYSTEM "@CMAKE_CURRENT_SOURCE_DIR@/libraries.xml">
<!ENTITY plplot-symbols SYSTEM "plplot-symbols.txt">
<!ENTITY plplot-structs SYSTEM "plplot-structs.txt">
-<!ENTITY chap-os-notes SYSTEM "os_notes.xml">
+<!ENTITY chap-os-notes SYSTEM "@CMAKE_CURRENT_SOURCE_DIR@/os_notes.xml">
<!ENTITY plP_checkdriverinit '<link linkend="plP_checkdriverinit"><function>plP_checkdriverinit</function></link>'>
<!ENTITY plP_getinitdriverlist '<link linkend="plP_getinitdriverlist"><function>plP_getinitdriverlist</function></link>'>
<!ENTITY pl_setcontlabelformat '<link linkend="pl_setcontlabelformat"><function>pl_setcontlabelformat</function></link>'>
@@ -259,9 +259,9 @@
<!ENTITY PLGraphicsIn '<link linkend="PLGraphicsIn"><structname>PLGraphicsIn</structname></link>'>
<!ENTITY PLOptionTable '<link linkend="PLOptionTable"><structname>PLOptionTable</structname></link>'>
<!ENTITY PLplot-website '@PLPLOT_WEBSITE@'>
-<!ENTITY % Math-Entities SYSTEM "math.ent">
+<!ENTITY % Math-Entities SYSTEM "@CMAKE_CURRENT_SOURCE_DIR@/math.ent">
%Math-Entities;
-<!ENTITY % Inline-Entities SYSTEM "inline.ent">
+<!ENTITY % Inline-Entities SYSTEM "@inline_entities@">
%Inline-Entities;
]
>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2013-08-16 19:36:43
|
Revision: 12485
http://sourceforge.net/p/plplot/code/12485
Author: airwin
Date: 2013-08-16 19:36:39 +0000 (Fri, 16 Aug 2013)
Log Message:
-----------
If perl cannot be found, then do not allow a build of the docbook
documentation since all backends for that build require perl.
Modified Paths:
--------------
trunk/cmake/modules/docbook.cmake
Modified: trunk/cmake/modules/docbook.cmake
===================================================================
--- trunk/cmake/modules/docbook.cmake 2013-08-16 18:02:59 UTC (rev 12484)
+++ trunk/cmake/modules/docbook.cmake 2013-08-16 19:36:39 UTC (rev 12485)
@@ -21,12 +21,12 @@
# Configuration for the building of DocBook documentation
option(BUILD_DOC "Enable build of DocBook documentation" OFF)
-if(NOT CMAKE_SYSTEM_NAME STREQUAL "Linux")
+if(NOT (PERL_FOUND AND CMAKE_SYSTEM_NAME STREQUAL "Linux"))
set(
BUILD_DOC OFF CACHE INTERNAL
"Enable build of DocBook documentation"
)
-endif(NOT CMAKE_SYSTEM_NAME STREQUAL "Linux")
+endif(NOT (PERL_FOUND AND CMAKE_SYSTEM_NAME STREQUAL "Linux"))
option(PREBUILT_DOC "Assume documentation is already built and present in doc/docbooks/src, ready to be installed. This option is useful for package maintainers" OFF)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2013-08-16 18:03:04
|
Revision: 12484
http://sourceforge.net/p/plplot/code/12484
Author: airwin
Date: 2013-08-16 18:02:59 +0000 (Fri, 16 Aug 2013)
Log Message:
-----------
Reorganize CMake logic in preparation for implementing
DOCBOOK_XML_BACKEND option.
Tested by Alan W. Irwin <ai...@us...> using
-DBUILD_DOC=ON cmake option and clean followed by all target in doc/docbook/src.
Modified Paths:
--------------
trunk/cmake/modules/docbook.cmake
Modified: trunk/cmake/modules/docbook.cmake
===================================================================
--- trunk/cmake/modules/docbook.cmake 2013-08-14 20:58:11 UTC (rev 12483)
+++ trunk/cmake/modules/docbook.cmake 2013-08-16 18:02:59 UTC (rev 12484)
@@ -63,19 +63,11 @@
# Check for required programs and perl libraries.
if(BUILD_DOC)
- # EC_PDFTEX needed to configure pdftex.map which is used in general for
- # the documentation build. The specific location in
- # /usr/share/texmf/dvips/base is used in Debian sarge and may cover other
- # distributions which still use tetex.
- find_file(EC_ENC_NAME EC.enc /usr/share/texmf/dvips/base)
- if(EC_ENC_NAME)
- # Value appropriate for tetex
- set(EC_PDFTEX EC)
- else(EC_ENC_NAME)
- # Value appropriate for texlive
- set(EC_PDFTEX ec)
- endif(EC_ENC_NAME)
-
+
+ option(DOCBOOK_XML_BACKEND "Use DocBook XML/XSLT backend tools to generate our documentation from DocBook source" OFF)
+
+ # The info backend is implemented only with perl and XML/XSLT regardless of
+ # DOCBOOK_XML_BACKEND.
find_program(DB2X_TEXIXML db2x_texixml)
if(NOT DB2X_TEXIXML)
message(STATUS "WARNING: db2x_texixml not found")
@@ -84,147 +76,169 @@
if(NOT DB2X_XSLTPROC)
message(STATUS "WARNING: db2x_xsltproc not found")
endif(NOT DB2X_XSLTPROC)
- find_program(OPENJADE openjade)
- if(NOT OPENJADE)
- message(STATUS "WARNING: openjade not found")
- endif(NOT OPENJADE)
- find_program(JADETEX jadetex)
- if(NOT JADETEX)
- message(STATUS "WARNING: jadetex not found")
- endif(NOT JADETEX)
- find_program(PDFJADETEX pdfjadetex)
- if(NOT PDFJADETEX)
- message(STATUS "WARNING: pdfjadetex not found")
- endif(NOT PDFJADETEX)
- find_program(DVIPS dvips)
- if(NOT DVIPS)
- message(STATUS "WARNING: dvips not found")
- endif(NOT DVIPS)
find_program(MAKEINFO makeinfo)
if(NOT MAKEINFO)
message(STATUS "WARNING: makeinfo not found")
endif(NOT MAKEINFO)
- # Use include style here since FindUnixCommands is a simple module and
- # clearly not meant to be an official FindXXX module.
- include(FindUnixCommands)
- find_program(MKDIR mkdir)
-
- # Check requirements for different doc types
- set(BUILD_INFO ON)
- set(BUILD_MAN ON)
- set(BUILD_HTML ON)
- set(BUILD_PRINT ON)
-
- if(NOT PERL_FOUND OR NOT DB2X_TEXIXML OR NOT DB2X_XSLTPROC OR NOT MAKEINFO)
+ if(PERL_FOUND AND DB2X_TEXIXML AND DB2X_XSLTPROC AND MAKEINFO)
+ set(BUILD_INFO ON)
+ else(PERL_FOUND AND DB2X_TEXIXML AND DB2X_XSLTPROC AND MAKEINFO)
set(BUILD_INFO OFF)
message(STATUS
"WARNING: Not building info documentation - "
"required programs are missing"
)
- endif(NOT PERL_FOUND OR NOT DB2X_TEXIXML OR NOT DB2X_XSLTPROC OR NOT MAKEINFO)
-
- if(NOT PERL_FOUND OR NOT PERL_XML_PARSER OR NOT PERL_XML_DOM)
+ endif(PERL_FOUND AND DB2X_TEXIXML AND DB2X_XSLTPROC AND MAKEINFO)
+
+ # The man backend is implemented only with perl and XML regardless of
+ # DOCBOOK_XML_BACKEND.
+ if(PERL_FOUND AND PERL_XML_PARSER AND PERL_XML_DOM)
+ set(BUILD_MAN ON)
+ else(PERL_FOUND AND PERL_XML_PARSER AND PERL_XML_DOM)
set(BUILD_MAN OFF)
message(STATUS
"WARNING: Not building man documentation - "
"required programs are missing"
)
- endif(NOT PERL_FOUND OR NOT PERL_XML_PARSER OR NOT PERL_XML_DOM)
+ endif(PERL_FOUND AND PERL_XML_PARSER AND PERL_XML_DOM)
- if(NOT OPENJADE)
- set(BUILD_HTML OFF)
- message(STATUS
- "WARNING: Not building html documentation - "
- "required programs are missing"
- )
- endif(NOT OPENJADE)
+ if(DOCBOOK_XML_BACKEND)
+ message(STATUS "DOCBOOK_XML_BACKEND not implemented yet")
+ else(DOCBOOK_XML_BACKEND)
+ # Deprecated SGML/DSSSL backends to generate html and print documentation.
- if(NOT OPENJADE OR NOT JADETEX OR NOT PDFJADETEX OR NOT DVIPS OR NOT GZIP)
- set(BUILD_PRINT OFF)
- message(STATUS
- "WARNING: Not building print documentation - "
- "required programs are missing"
- )
- endif(NOT OPENJADE OR NOT JADETEX OR NOT PDFJADETEX OR NOT DVIPS OR NOT GZIP)
-
- set(JADELOG "jadeout.log")
+ # These JADELOG and EC_PDFTEX variables used during course of
+ # SGML/DSSSL builds
+ set(JADELOG "jadeout.log")
- # DTD definitions
- set(DSSSL_DTD_PUBID "-//James Clark//DTD DSSSL Style Sheet//EN")
- set(DB_SS_HTML_PUBID "-//Norman Walsh//DOCUMENT DocBook HTML Stylesheet//EN")
- set(DB_SS_PRINT_PUBID "-//Norman Walsh//DOCUMENT DocBook Print Stylesheet//EN")
+ # EC_PDFTEX needed to configure pdftex.map which is used in general for
+ # the documentation build. The specific location in
+ # /usr/share/texmf/dvips/base is used in Debian sarge and may cover other
+ # distributions which still use tetex.
+ find_file(EC_ENC_NAME EC.enc /usr/share/texmf/dvips/base)
+ if(EC_ENC_NAME)
+ # Value appropriate for tetex
+ set(EC_PDFTEX EC)
+ else(EC_ENC_NAME)
+ # Value appropriate for texlive
+ set(EC_PDFTEX ec)
+ endif(EC_ENC_NAME)
- # Check public identifiers
- include(CheckDTD)
+ # Find programmes required for SGML/DSSSL builds.
+ find_program(OPENJADE openjade)
+ if(NOT OPENJADE)
+ message(STATUS "WARNING: openjade not found")
+ endif(NOT OPENJADE)
+ find_program(JADETEX jadetex)
+ if(NOT JADETEX)
+ message(STATUS "WARNING: jadetex not found")
+ endif(NOT JADETEX)
+ find_program(PDFJADETEX pdfjadetex)
+ if(NOT PDFJADETEX)
+ message(STATUS "WARNING: pdfjadetex not found")
+ endif(NOT PDFJADETEX)
+ find_program(DVIPS dvips)
+ if(NOT DVIPS)
+ message(STATUS "WARNING: dvips not found")
+ endif(NOT DVIPS)
+ # Use include style here since FindUnixCommands is a simple module and
+ # clearly not meant to be an official FindXXX module.
+ include(FindUnixCommands)
+ find_program(MKDIR mkdir)
- CheckDTD(HAVE_DSSSL_DTD
- "DSSSL Style Sheet DTD"
- ""
- ""
- ""
- "[<!ELEMENT book - O (#PCDATA)>]"
- "sgml"
- "\"${DSSSL_DTD_PUBID}\""
- "style-sheet.dtd"
- "jade"
- )
+ # These DSSSL stylesheets needed for SGML/DSSSL builds.
+ set(DSSSL_DTD_PUBID "-//James Clark//DTD DSSSL Style Sheet//EN")
+ set(DB_SS_HTML_PUBID "-//Norman Walsh//DOCUMENT DocBook HTML Stylesheet//EN")
+ set(DB_SS_PRINT_PUBID "-//Norman Walsh//DOCUMENT DocBook Print Stylesheet//EN")
- CheckDTD(HAVE_HTML_SS
- "DocBook HTML Stylesheet"
- "[<!ENTITY dbstyle PUBLIC \"${DB_SS_HTML_PUBID}\" CDATA DSSSL>]"
- "use=\"docbook\""
- "<external-specification id=\"docbook\" document=\"dbstyle\">"
- "[<!ELEMENT book - O (#PCDATA)>]"
- "sgml"
- "\"${DB_SS_HTML_PUBID}\""
- "html/docbook.dsl"
- "docbook-stylesheets"
- )
+ # Check public identifiers
+ include(CheckDTD)
- CheckDTD(HAVE_PRINT_SS
- "DocBook Print Stylesheet"
- "[<!ENTITY dbstyle PUBLIC \"${DB_SS_PRINT_PUBID}\" CDATA DSSSL>]"
- "use=\"docbook\""
- "<external-specification id=\"docbook\" document=\"dbstyle\">"
- "[<!ELEMENT book - O (#PCDATA)>]"
- "tex"
- "\"${DB_SS_PRINT_PUBID}\""
- "print/docbook.dsl"
- "docbook-stylesheets"
- )
+ CheckDTD(HAVE_DSSSL_DTD
+ "DSSSL Style Sheet DTD"
+ ""
+ ""
+ ""
+ "[<!ELEMENT book - O (#PCDATA)>]"
+ "sgml"
+ "\"${DSSSL_DTD_PUBID}\""
+ "style-sheet.dtd"
+ "jade"
+ )
- CheckDTD(HAVE_DB_DTD
- "DocBook DTD"
- ""
- ""
- ""
- "PUBLIC \"${DOCBOOK_DTD_PUBID}\""
- "sgml"
- "\"${DOCBOOK_DTD_PUBID}\""
- "docbookx.dtd"
- "docbook-xml (DTD version 3.1.3)"
- )
+ CheckDTD(HAVE_HTML_SS
+ "DocBook HTML Stylesheet"
+ "[<!ENTITY dbstyle PUBLIC \"${DB_SS_HTML_PUBID}\" CDATA DSSSL>]"
+ "use=\"docbook\""
+ "<external-specification id=\"docbook\" document=\"dbstyle\">"
+ "[<!ELEMENT book - O (#PCDATA)>]"
+ "sgml"
+ "\"${DB_SS_HTML_PUBID}\""
+ "html/docbook.dsl"
+ "docbook-stylesheets"
+ )
- if(BUILD_PRINT)
- if(NOT HAVE_DSSSL_DTD OR NOT HAVE_PRINT_SS OR NOT HAVE_DB_DTD)
- set(BUILD_PRINT OFF)
- message(STATUS
- "WARNING: Not building print documentation - "
- "dtd files / style sheets are missing"
+ CheckDTD(HAVE_PRINT_SS
+ "DocBook Print Stylesheet"
+ "[<!ENTITY dbstyle PUBLIC \"${DB_SS_PRINT_PUBID}\" CDATA DSSSL>]"
+ "use=\"docbook\""
+ "<external-specification id=\"docbook\" document=\"dbstyle\">"
+ "[<!ELEMENT book - O (#PCDATA)>]"
+ "tex"
+ "\"${DB_SS_PRINT_PUBID}\""
+ "print/docbook.dsl"
+ "docbook-stylesheets"
)
- endif(NOT HAVE_DSSSL_DTD OR NOT HAVE_PRINT_SS OR NOT HAVE_DB_DTD)
- endif(BUILD_PRINT)
- if(BUILD_HTML)
- if(NOT HAVE_DSSSL_DTD OR NOT HAVE_HTML_SS OR NOT HAVE_DB_DTD)
+ CheckDTD(HAVE_DB_DTD
+ "DocBook DTD"
+ ""
+ ""
+ ""
+ "PUBLIC \"${DOCBOOK_DTD_PUBID}\""
+ "sgml"
+ "\"${DOCBOOK_DTD_PUBID}\""
+ "docbookx.dtd"
+ "docbook-xml (DTD version 3.1.3)"
+ )
+
+ if(OPENJADE)
+ if(HAVE_DSSSL_DTD AND HAVE_HTML_SS AND HAVE_DB_DTD)
+ set(BUILD_HTML ON)
+ else(HAVE_DSSSL_DTD AND HAVE_HTML_SS AND HAVE_DB_DTD)
+ set(BUILD_HTML OFF)
+ message(STATUS
+ "WARNING: Not building html documentation - "
+ "dtd files / style sheets are missing"
+ )
+ endif(HAVE_DSSSL_DTD AND HAVE_HTML_SS AND HAVE_DB_DTD)
+ else(OPENJADE)
set(BUILD_HTML OFF)
message(STATUS
- "WARNING: Not building html documentation - "
- "dtd files / style sheets are missing"
- )
- endif(NOT HAVE_DSSSL_DTD OR NOT HAVE_HTML_SS OR NOT HAVE_DB_DTD)
- endif(BUILD_HTML)
+ "WARNING: Not building html documentation - "
+ "required programs are missing"
+ )
+ endif(OPENJADE)
+ if(OPENJADE AND JADETEX AND PDFJADETEX AND DVIPS AND GZIP)
+ if(HAVE_DSSSL_DTD AND HAVE_PRINT_SS AND HAVE_DB_DTD)
+ set(BUILD_PRINT ON)
+ else(HAVE_DSSSL_DTD AND HAVE_PRINT_SS AND HAVE_DB_DTD)
+ set(BUILD_PRINT OFF)
+ message(STATUS
+ "WARNING: Not building print documentation - "
+ "dtd files / style sheets are missing"
+ )
+ endif(HAVE_DSSSL_DTD AND HAVE_PRINT_SS AND HAVE_DB_DTD)
+ else(OPENJADE AND JADETEX AND PDFJADETEX AND DVIPS AND GZIP)
+ set(BUILD_PRINT OFF)
+ message(STATUS
+ "WARNING: Not building print documentation - "
+ "required programs are missing"
+ )
+ endif(OPENJADE AND JADETEX AND PDFJADETEX AND DVIPS AND GZIP)
+
+ endif(DOCBOOK_XML_BACKEND)
endif(BUILD_DOC)
if(BUILD_DOC OR PREBUILT_DOC)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2013-08-14 20:58:15
|
Revision: 12483
http://sourceforge.net/p/plplot/code/12483
Author: airwin
Date: 2013-08-14 20:58:11 +0000 (Wed, 14 Aug 2013)
Log Message:
-----------
Generate info form of documentation using utf-8 encoding rather than
us-ascii encoding.
This change means we don't have to replace the entities defined in
math.ent by their written out (in ascii) equivalents for the info
case, and Table 3-4 looks correct (for the first time ever) in the generated
info form of our documentation.
Tested by: Alan W. Irwin <ai...@us...> using the
cmake -DBUILD_DOC=ON option and the "info" target.
Modified Paths:
--------------
trunk/doc/docbook/bin/info-clean.pl
trunk/doc/docbook/src/CMakeLists.txt
trunk/doc/docbook/src/inline-info.ent
Modified: trunk/doc/docbook/bin/info-clean.pl
===================================================================
--- trunk/doc/docbook/bin/info-clean.pl 2013-08-13 11:40:19 UTC (rev 12482)
+++ trunk/doc/docbook/bin/info-clean.pl 2013-08-14 20:58:11 UTC (rev 12483)
@@ -47,8 +47,7 @@
if (m{(.*)%([^;]+);(.*)}) {
print "$1";
$tmp = "$3\n";
- print `cat $sysent{$2}`
- if (not m{%Math-Entities;});
+ print `cat $sysent{$2}`;
$_ = $tmp;
redo
}
Modified: trunk/doc/docbook/src/CMakeLists.txt
===================================================================
--- trunk/doc/docbook/src/CMakeLists.txt 2013-08-13 11:40:19 UTC (rev 12482)
+++ trunk/doc/docbook/src/CMakeLists.txt 2013-08-14 20:58:11 UTC (rev 12483)
@@ -375,7 +375,7 @@
add_custom_command(
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/plplotdoc.texi
- COMMAND ${DB2X_TEXIXML} ${CMAKE_CURRENT_BINARY_DIR}/plplotdoc.txml
+ COMMAND ${DB2X_TEXIXML} --encoding=utf-8 ${CMAKE_CURRENT_BINARY_DIR}/plplotdoc.txml
COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/plplotdoc.texi ${CMAKE_CURRENT_BINARY_DIR}/plplotdoc.texi_raw
COMMAND ${CMAKE_COMMAND} -E remove ${CMAKE_CURRENT_BINARY_DIR}/plplotdoc.texi
COMMAND sed "s?The PLplot Plotting Library: (plplotdoc)?PLplot: (plplotdoc)?" < ${CMAKE_CURRENT_BINARY_DIR}/plplotdoc.texi_raw > ${CMAKE_CURRENT_BINARY_DIR}/plplotdoc.texi
Modified: trunk/doc/docbook/src/inline-info.ent
===================================================================
--- trunk/doc/docbook/src/inline-info.ent 2013-08-13 11:40:19 UTC (rev 12482)
+++ trunk/doc/docbook/src/inline-info.ent 2013-08-14 20:58:11 UTC (rev 12483)
@@ -1,57 +1,5 @@
-<!ENTITY Alpha "Alpha">
-<!ENTITY Beta "Beta">
-<!ENTITY Gamma "Gamma">
-<!ENTITY Delta "Delta">
-<!ENTITY Epsilon "Epsilon">
-<!ENTITY Zeta "Zeta">
-<!ENTITY Eta "Eta">
-<!ENTITY Theta "Theta">
-<!ENTITY Iota "Iota">
-<!ENTITY Kappa "Kappa">
-<!ENTITY Lambda "Lambda">
-<!ENTITY Mu "Mu">
-<!ENTITY Nu "Nu">
-<!ENTITY Xi "Xi">
-<!ENTITY Omicron "Omicron">
-<!ENTITY Pi "Pi">
-<!ENTITY Rho "Rho">
-<!ENTITY Sigma "Sigma">
-<!ENTITY Tau "Tau">
-<!ENTITY Upsilon "Upsilon">
-<!ENTITY Phi "Phi">
-<!ENTITY Chi "Chi">
-<!ENTITY Psi "Psi">
-<!ENTITY Omega "Omega">
-<!ENTITY alpha "alpha">
-<!ENTITY beta "beta">
-<!ENTITY gamma "gamma">
-<!ENTITY delta "delta">
-<!ENTITY epsilon "epsilon">
-<!ENTITY zeta "zeta">
-<!ENTITY eta "eta">
-<!ENTITY theta "theta">
-<!ENTITY iota "iota">
-<!ENTITY kappa "kappa">
-<!ENTITY lambda "lambda">
-<!ENTITY mu "mu">
-<!ENTITY nu "nu">
-<!ENTITY xi "xi">
-<!ENTITY omicron "omicron">
-<!ENTITY pi "pi">
-<!ENTITY rho "rho">
-<!ENTITY varsigma "varsigma">
-<!ENTITY sigma "sigma">
-<!ENTITY tau "tau">
-<!ENTITY upsilon "upsilon">
-<!ENTITY phi "phi">
-<!ENTITY chi "chi">
-<!ENTITY psi "psi">
-<!ENTITY omega "omega">
<!ENTITY deg " degrees">
-<!ENTITY less "<">
-<!ENTITY leq "<=">
<!ENTITY ndash "--">
<!ENTITY nbsp " ">
<!ENTITY mdash "---">
-<!ENTITY egrave "e">
<!ENTITY over-under "S-freq">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2013-08-13 11:40:23
|
Revision: 12482
http://sourceforge.net/p/plplot/code/12482
Author: airwin
Date: 2013-08-13 11:40:19 +0000 (Tue, 13 Aug 2013)
Log Message:
-----------
Remove fake system identifiers imposed by the perl scripts that parse
our DocBook XML source documentation.
Those identifiers were required before to work around the issue that
our source documentation incorrectly did not have a system identifier.
That has now been rectified with revision 12481 so the fake system
identifiers imposed by the perl scripts are no longer needed, and, in
fact, they must be removed because they conflict with the real system
identifier
"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"
which is now configured into plplotdoc.xml(.in) so that
xmllint validation produces a good result.
Tested by Alan W. Irwin <ai...@us...> using the
cmake options -DBUILD_TEST=ON -DBUILD_DOC=ON and with the targets
check_swig_documentation, make_documentation, and all.
Revision Links:
--------------
http://sourceforge.net/p/plplot/code/12481
Modified Paths:
--------------
trunk/doc/docbook/bin/api2man.pl.in
trunk/doc/docbook/bin/api2swigdoc.pl
trunk/doc/docbook/bin/api2text.pl
trunk/doc/docbook/bin/info-clean.pl
Modified: trunk/doc/docbook/bin/api2man.pl.in
===================================================================
--- trunk/doc/docbook/bin/api2man.pl.in 2013-08-12 23:11:08 UTC (rev 12481)
+++ trunk/doc/docbook/bin/api2man.pl.in 2013-08-13 11:40:19 UTC (rev 12482)
@@ -62,7 +62,7 @@
open (MASTER, "< $ARGV[0]");
while (<MASTER>) {
if (/^(<!DOCTYPE.*)\[/) {
- $api .= "$1 \"\" [\n";
+ $api .= "$1 [\n";
}
elsif (/^<\?xml/) {
$api .= '<?xml version="1.0" standalone="yes"?>
Modified: trunk/doc/docbook/bin/api2swigdoc.pl
===================================================================
--- trunk/doc/docbook/bin/api2swigdoc.pl 2013-08-12 23:11:08 UTC (rev 12481)
+++ trunk/doc/docbook/bin/api2swigdoc.pl 2013-08-13 11:40:19 UTC (rev 12482)
@@ -70,7 +70,7 @@
open (MASTER, "< $ARGV[0]");
while (<MASTER>) {
if (/^(<!DOCTYPE.*)\[/) {
- $api .= "$1 \"\" [\n";
+ $api .= "$1 [\n";
}
elsif (/^<\?xml/) {
$api .= '<?xml version="1.0" standalone="yes"?>
Modified: trunk/doc/docbook/bin/api2text.pl
===================================================================
--- trunk/doc/docbook/bin/api2text.pl 2013-08-12 23:11:08 UTC (rev 12481)
+++ trunk/doc/docbook/bin/api2text.pl 2013-08-13 11:40:19 UTC (rev 12482)
@@ -66,7 +66,7 @@
open (MASTER, "< $ARGV[0]");
while (<MASTER>) {
if (/^(<!DOCTYPE.*)\[/) {
- $api .= "$1 \"\" [\n";
+ $api .= "$1 [\n";
}
elsif (/^<\?xml/) {
$api .= '<?xml version="1.0" standalone="yes"?>
Modified: trunk/doc/docbook/bin/info-clean.pl
===================================================================
--- trunk/doc/docbook/bin/info-clean.pl 2013-08-12 23:11:08 UTC (rev 12481)
+++ trunk/doc/docbook/bin/info-clean.pl 2013-08-13 11:40:19 UTC (rev 12482)
@@ -4,7 +4,7 @@
$intoc = 0;
while (<>) {
if (/(<!DOCTYPE.*)\[(.*)/) {
- print "$1 \"foobar\" [$2\n" ; next}
+ print "$1 [$2\n" ; next}
if (/(.*)<part(.*)>(.*)/) {
$inpart = 1;
print "$1<!--<part$2>";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2013-08-12 23:11:11
|
Revision: 12481
http://sourceforge.net/p/plplot/code/12481
Author: airwin
Date: 2013-08-12 23:11:08 +0000 (Mon, 12 Aug 2013)
Log Message:
-----------
Change DocBook configuration and source files so that
xmllint --noout --nonet --xinclude --postvalid --noent plplotdoc.xml
validates without errors.
It appears this validation command (also used by the xmlto script) is
more sensitive to DocBook XML issues than the onsgmls validator which
we currently use to validate our DocBook source. For example, before
and after the current changes our validate target showed no validation
issues.
Modified Paths:
--------------
trunk/cmake/modules/docbook.cmake
trunk/doc/docbook/src/advanced.xml
trunk/doc/docbook/src/plplotdoc.xml.in
Modified: trunk/cmake/modules/docbook.cmake
===================================================================
--- trunk/cmake/modules/docbook.cmake 2013-08-12 22:59:06 UTC (rev 12480)
+++ trunk/cmake/modules/docbook.cmake 2013-08-12 23:11:08 UTC (rev 12481)
@@ -51,6 +51,8 @@
# Required for validation regardless of whether BUILD_DOC is set
set(XML_DECL "/usr/share/xml/declaration/xml.dcl" CACHE STRING "Full path to xml.dcl file.")
set(DOCBOOK_DTD_PUBID "-//OASIS//DTD DocBook XML V4.5//EN")
+set(DOCBOOK_DTD_SYSID "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd")
+
find_program(ONSGMLS onsgmls)
if(ONSGMLS )
Modified: trunk/doc/docbook/src/advanced.xml
===================================================================
--- trunk/doc/docbook/src/advanced.xml 2013-08-12 22:59:06 UTC (rev 12480)
+++ trunk/doc/docbook/src/advanced.xml 2013-08-12 23:11:08 UTC (rev 12481)
@@ -2321,17 +2321,19 @@
<literal>(X, Y, Z)</literal> in terms of some meaningful
user-specified coordinate system. These are called
<emphasis>three-dimensional world coordinates</emphasis>. We need to
- specify the ranges of these coordinates, so that the entire surface
- is contained within the cuboid defined by <literal>xmin &less; x &less;
- xmax</literal>, <literal>ymin &less; y &less; ymax</literal>, and
- <literal>zmin &less; z &less; zmax</literal>. Typically, we shall want
- to view the surface from a variety of angles, and to facilitate this,
- a two-stage mapping of the enclosing cuboid is performed. Firstly,
- it is mapped into another cuboid called the <emphasis>normalized
- box</emphasis> whose size must also be specified by the user, and
- secondly this normalized box is viewed from a particular azimuth and
- elevation so that it can be projected onto the two-dimensional
- window.
+ specify the ranges of these coordinates, so that the entire surface is
+ contained within the cuboid defined by <literal>xmin</literal> <
+ <literal>x</literal> < <literal>xmax</literal>,
+ <literal>ymin</literal> < <literal>y</literal> <
+ <literal>ymax</literal>, and <literal>zmin</literal> <
+ <literal>z</literal> < <literal>zmax</literal>. Typically, we
+ shall want to view the surface from a variety of angles, and to
+ facilitate this, a two-stage mapping of the enclosing cuboid is
+ performed. Firstly, it is mapped into another cuboid called the
+ <emphasis>normalized box</emphasis> whose size must also be specified
+ by the user, and secondly this normalized box is viewed from a
+ particular azimuth and elevation so that it can be projected onto the
+ two-dimensional window.
</para>
<para>
Modified: trunk/doc/docbook/src/plplotdoc.xml.in
===================================================================
--- trunk/doc/docbook/src/plplotdoc.xml.in 2013-08-12 22:59:06 UTC (rev 12480)
+++ trunk/doc/docbook/src/plplotdoc.xml.in 2013-08-12 23:11:08 UTC (rev 12481)
@@ -40,7 +40,7 @@
EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-->
-<!DOCTYPE book PUBLIC "@DOCBOOK_DTD_PUBID@" [
+<!DOCTYPE book PUBLIC "@DOCBOOK_DTD_PUBID@" "@DOCBOOK_DTD_SYSID@" [
<!ENTITY Project-Version "@VERSION@">
<!ENTITY Project-Date "$Date$">
@@ -431,5 +431,4 @@
&chap-os-notes;
&chap-libraries;
</part>
-
</book>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2013-08-12 22:59:09
|
Revision: 12480
http://sourceforge.net/p/plplot/code/12480
Author: airwin
Date: 2013-08-12 22:59:06 +0000 (Mon, 12 Aug 2013)
Log Message:
-----------
The *.h.cmake glob fails now since all of those have been renamed as
*.h.in. So remove that glob from the list of C sources to style.
Modified Paths:
--------------
trunk/scripts/style_source.sh
Modified: trunk/scripts/style_source.sh
===================================================================
--- trunk/scripts/style_source.sh 2013-08-09 23:38:29 UTC (rev 12479)
+++ trunk/scripts/style_source.sh 2013-08-12 22:59:06 UTC (rev 12480)
@@ -193,13 +193,13 @@
export csource_LIST
# Top level directory.
-csource_LIST="config.h.cmake"
+csource_LIST="config.h.in"
# src directory
csource_LIST="$csource_LIST src/*.[ch]"
# All C source (i.e., exclude qt.h) in include directory.
-csource_LIST="$csource_LIST $(ls include/*.h include/*.h.in include/*.h.cmake |grep -v qt.h)"
+csource_LIST="$csource_LIST $(ls include/*.h include/*.h.in |grep -v qt.h)"
# Every subdirectory of lib.
csource_LIST="$csource_LIST lib/*/*.[ch] lib/qsastime/qsastimeP.h.in"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2013-08-09 23:38:31
|
Revision: 12479
http://sourceforge.net/p/plplot/code/12479
Author: airwin
Date: 2013-08-09 23:38:29 +0000 (Fri, 09 Aug 2013)
Log Message:
-----------
Remove \$ENV{DESTDIR} references from install(CODE...) commands and
also reformat those commands to make them more human-readable.
Note, these are all examples of where file(INSTALL...) is used inside
install(CODE...). According to the documentation file(INSTALL...) is
the workhorse signature normall used for install commands so it is
reasonable to infer that file(INSTALL...) already does its own
\$ENV{DESTDIR} handling. Anyhow, it turns out our own use of
\$ENV{DESTDIR} is redundant and causes an error (double use of DESTDIR
for the docbook documentation) found by Orion Poplawski and which I
have confirmed. Note, for all other uses of install(CODE...) that
does not have a call to file(INSTALL...) inside the code fragment
(e.g., doc/CMakeLists.txt) it is necessary to use \$ENV{DESTDIR}.
Tested by Alan W. Irwin <ai...@us...> using the
cmake options -DCMAKE_INSTALL_PREFIX=/usr -DBUILD_DOC=ON -DBUILD_DOX_DOC=ON
and "make -j4 DESTDIR=tmp install >& install.out". The
resulting files (including both doxgen-generated ones and
docbook-generated ones) were all installed to tmp/usr/... in the build_tree
with no double use of DESTDIR and no attempt to install files to /usr.
Modified Paths:
--------------
trunk/doc/docbook/src/CMakeLists.txt
Modified: trunk/doc/docbook/src/CMakeLists.txt
===================================================================
--- trunk/doc/docbook/src/CMakeLists.txt 2013-08-09 22:40:34 UTC (rev 12478)
+++ trunk/doc/docbook/src/CMakeLists.txt 2013-08-09 23:38:29 UTC (rev 12479)
@@ -492,8 +492,14 @@
# command. This makes for slightly ugly looking code.
if(BUILD_HTML OR PREBUILT_DOC)
- install(CODE "file(GLOB HTML_FILES ${CMAKE_CURRENT_BINARY_DIR}/*.${HTML_EXT})\n foreach(file \${HTML_FILES}) \n file(INSTALL DESTINATION \$ENV{DESTDIR}${DOC_DIR}/html TYPE FILE FILES \"\${file}\") \n endforeach (file \"\${HTML_FILES}\")")
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${HTML_MANIFEST} stylesheet.css DESTINATION ${DOC_DIR}/html )
+ install(CODE "
+file(GLOB HTML_FILES ${CMAKE_CURRENT_BINARY_DIR}/*.${HTML_EXT})
+foreach(file \${HTML_FILES})
+ file(INSTALL DESTINATION ${DOC_DIR}/html TYPE FILE FILES \"\${file}\")
+endforeach (file \"\${HTML_FILES}\")
+"
+ )
endif(BUILD_HTML OR PREBUILT_DOC)
if(BUILD_PRINT OR PREBUILT_DOC)
@@ -501,13 +507,25 @@
endif(BUILD_PRINT OR PREBUILT_DOC)
if(BUILD_MAN OR PREBUILT_DOC)
- install(CODE "file(GLOB MAN_FILES ${CMAKE_CURRENT_BINARY_DIR}/*.${MANVOL})\n foreach(file \${MAN_FILES}) \n file(INSTALL DESTINATION \$ENV{DESTDIR}${MAN_DIR}/man3 TYPE FILE FILES \"\${file}\") \n endforeach (file \"\${MAN_FILES}\")")
-# install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${MAN_MANIFEST} DESTINATION ${MAN_DIR}/man3 )
+ #install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${MAN_MANIFEST} DESTINATION ${MAN_DIR}/man3 )
+ install(CODE "
+file(GLOB MAN_FILES ${CMAKE_CURRENT_BINARY_DIR}/*.${MANVOL})
+foreach(file \${MAN_FILES})
+ file(INSTALL DESTINATION ${MAN_DIR}/man3 TYPE FILE FILES \"\${file}\")
+endforeach(file \"\${MAN_FILES}\")
+"
+ )
endif(BUILD_MAN OR PREBUILT_DOC)
if(BUILD_INFO OR PREBUILT_DOC)
- install(CODE "file(GLOB INFO_FILES ${CMAKE_CURRENT_BINARY_DIR}/*.info*)\n foreach(file \${INFO_FILES}) \n file(INSTALL DESTINATION \$ENV{DESTDIR}${INFO_DIR} TYPE FILE FILES \"\${file}\") \n endforeach (file \"\${INFO_FILES}\")")
-# install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${INFO_MANIFEST} DESTINATION ${INFO_DIR} )
+ #install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${INFO_MANIFEST} DESTINATION ${INFO_DIR} )
+ install(CODE "
+file(GLOB INFO_FILES ${CMAKE_CURRENT_BINARY_DIR}/*.info*)
+foreach(file \${INFO_FILES})
+ file(INSTALL DESTINATION ${INFO_DIR} TYPE FILE FILES \"\${file}\")
+endforeach (file \"\${INFO_FILES}\")
+"
+ )
endif(BUILD_INFO OR PREBUILT_DOC)
# Everything below here has to do with the custom target www-install
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2013-08-09 22:40:37
|
Revision: 12478
http://sourceforge.net/p/plplot/code/12478
Author: airwin
Date: 2013-08-09 22:40:34 +0000 (Fri, 09 Aug 2013)
Log Message:
-----------
Exclude bindings/python/plplot.py (the user-friendly python interface
to PLplot) from doxygen consideration. For an unknown reason, that
file (which includes no specific doxygen commands) generates a doxgyen
segfault.
Modified Paths:
--------------
trunk/doc/Doxyfile.in
Modified: trunk/doc/Doxyfile.in
===================================================================
--- trunk/doc/Doxyfile.in 2013-08-09 21:41:36 UTC (rev 12477)
+++ trunk/doc/Doxyfile.in 2013-08-09 22:40:34 UTC (rev 12478)
@@ -707,7 +707,9 @@
EXCLUDE = "@CMAKE_BINARY_DIR@/bindings/f77/plplot_parameters.h" \
"@CMAKE_SOURCE_DIR@/bindings/f95/plplot_parameters.h" \
- "@CMAKE_BINARY_DIR@/bindings/f95/plplot_parameters.h"
+ "@CMAKE_BINARY_DIR@/bindings/f95/plplot_parameters.h" \
+ "@CMAKE_SOURCE_DIR@/bindings/python/plplot.py" \
+ "@CMAKE_BINARY_DIR@/bindings/python/plplot.py"
# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
# directories that are symbolic links (a Unix file system feature) are excluded
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2013-08-09 21:41:41
|
Revision: 12477
http://sourceforge.net/p/plplot/code/12477
Author: airwin
Date: 2013-08-09 21:41:36 +0000 (Fri, 09 Aug 2013)
Log Message:
-----------
Update from Doxyfile 1.7.1 to Doxyfile 1.8.1.2 using the "doxygen -u"
command.
Note, this update of the configuration file to be consistent with my
doxygen version did not get rid of a segfault that has been introduced
by some fairly recent change (either in my doxygen version or in our
code).
Modified Paths:
--------------
trunk/doc/Doxyfile.in
Modified: trunk/doc/Doxyfile.in
===================================================================
--- trunk/doc/Doxyfile.in 2013-08-09 16:48:32 UTC (rev 12476)
+++ trunk/doc/Doxyfile.in 2013-08-09 21:41:36 UTC (rev 12477)
@@ -1,14 +1,14 @@
-# Doxyfile 1.7.1
+# Doxyfile 1.8.1.2
# This file describes the settings to be used by the documentation system
-# doxygen (www.doxygen.org) for a project
+# doxygen (www.doxygen.org) for a project.
#
-# All text after a hash (#) is considered a comment and will be ignored
+# All text after a hash (#) is considered a comment and will be ignored.
# The format is:
# TAG = value [value, ...]
# For lists items can also be appended using:
# TAG += value [value, ...]
-# Values that contain spaces should be placed between quotes (" ")
+# Values that contain spaces should be placed between quotes (" ").
#---------------------------------------------------------------------------
# Project related configuration options
@@ -22,8 +22,9 @@
DOXYFILE_ENCODING = UTF-8
-# The PROJECT_NAME tag is a single word (or a sequence of words surrounded
-# by quotes) that should identify the project.
+# The PROJECT_NAME tag is a single word (or sequence of words) that should
+# identify the project. Note that if you do not use Doxywizard you need
+# to put quotes around the project name if it contains spaces.
PROJECT_NAME = PLplot
@@ -33,6 +34,19 @@
PROJECT_NUMBER = @VERSION@
+# Using the PROJECT_BRIEF tag one can provide an optional one line description
+# for a project that appears at the top of each page and should give viewer
+# a quick idea about the purpose of the project. Keep the description short.
+
+PROJECT_BRIEF =
+
+# With the PROJECT_LOGO tag one can specify an logo or icon that is
+# included in the documentation. The maximum height of the logo should not
+# exceed 55 pixels and the maximum width should not exceed 200 pixels.
+# Doxygen will copy the logo to the output directory.
+
+PROJECT_LOGO =
+
# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
# base path where the generated documentation will be put.
# If a relative path is entered, it will be relative to the location
@@ -57,7 +71,7 @@
# Croatian, Czech, Danish, Dutch, Esperanto, Farsi, Finnish, French, German,
# Greek, Hungarian, Italian, Japanese, Japanese-en (Japanese with English
# messages), Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian,
-# Polish, Portuguese, Romanian, Russian, Serbian, Serbian-Cyrilic, Slovak,
+# Polish, Portuguese, Romanian, Russian, Serbian, Serbian-Cyrillic, Slovak,
# Slovene, Spanish, Swedish, Ukrainian, and Vietnamese.
OUTPUT_LANGUAGE = English
@@ -126,7 +140,7 @@
STRIP_FROM_INC_PATH =
# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter
-# (but less readable) file names. This can be useful is your file systems
+# (but less readable) file names. This can be useful if your file system
# doesn't support long names like on DOS, Mac, or CD-ROM.
SHORT_NAMES = NO
@@ -181,6 +195,13 @@
ALIASES =
+# This tag can be used to specify a number of word-keyword mappings (TCL only).
+# A mapping has the form "name=value". For example adding
+# "class=itcl::class" will allow you to use the command class in the
+# itcl::class meaning.
+
+TCL_SUBST =
+
# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C
# sources only. Doxygen will then generate output that is more tailored for C.
# For instance, some of the names that are used will be different. The list
@@ -219,11 +240,20 @@
EXTENSION_MAPPING =
+# If MARKDOWN_SUPPORT is enabled (the default) then doxygen pre-processes all
+# comments according to the Markdown format, which allows for more readable
+# documentation. See http://daringfireball.net/projects/markdown/ for details.
+# The output of markdown processing is further processed by doxygen, so you
+# can mix doxygen, HTML, and XML commands with Markdown formatting.
+# Disable only in case of backward compatibilities issues.
+
+MARKDOWN_SUPPORT = YES
+
# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want
# to include (a tag file for) the STL sources as input, then you should
# set this tag to YES in order to let doxygen match functions declarations and
# definitions whose arguments contain STL classes (e.g. func(std::string); v.s.
-# func(std::string) {}). This also make the inheritance and collaboration
+# func(std::string) {}). This also makes the inheritance and collaboration
# diagrams that involve STL classes more complete and accurate.
BUILTIN_STL_SUPPORT = NO
@@ -241,7 +271,7 @@
# For Microsoft's IDL there are propget and propput attributes to indicate getter
# and setter methods for a property. Setting this option to YES (the default)
-# will make doxygen to replace the get and set methods by a property in the
+# will make doxygen replace the get and set methods by a property in the
# documentation. This will only work if the methods are indeed getting or
# setting a simple type. If this is not the case, or you want to show the
# methods anyway, you should set this option to NO.
@@ -263,6 +293,22 @@
SUBGROUPING = YES
+# When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and
+# unions are shown inside the group in which they are included (e.g. using
+# @ingroup) instead of on a separate page (for HTML and Man pages) or
+# section (for LaTeX and RTF).
+
+INLINE_GROUPED_CLASSES = NO
+
+# When the INLINE_SIMPLE_STRUCTS tag is set to YES, structs, classes, and
+# unions with only public data fields will be shown inline in the documentation
+# of the scope in which they are defined (i.e. file, namespace, or group
+# documentation), provided this scope is documented. If set to NO (the default),
+# structs, classes, and unions are shown on a separate page (for HTML and Man
+# pages) or section (for LaTeX and RTF).
+
+INLINE_SIMPLE_STRUCTS = NO
+
# When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum
# is documented as struct, union, or enum with the name of the typedef. So
# typedef struct TypeS {} TypeT, will appear in the documentation as a struct
@@ -279,16 +325,27 @@
# For small to medium size projects (<1000 input files) the default value is
# probably good enough. For larger projects a too small cache size can cause
# doxygen to be busy swapping symbols to and from disk most of the time
-# causing a significant performance penality.
+# causing a significant performance penalty.
# If the system has enough physical memory increasing the cache will improve the
# performance by keeping more symbols in memory. Note that the value works on
-# a logarithmic scale so increasing the size by one will rougly double the
+# a logarithmic scale so increasing the size by one will roughly double the
# memory usage. The cache size is given by this formula:
# 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0,
-# corresponding to a cache size of 2^16 = 65536 symbols
+# corresponding to a cache size of 2^16 = 65536 symbols.
SYMBOL_CACHE_SIZE = 0
+# Similar to the SYMBOL_CACHE_SIZE the size of the symbol lookup cache can be
+# set using LOOKUP_CACHE_SIZE. This cache is used to resolve symbols given
+# their name and scope. Since this can be an expensive process and often the
+# same symbol appear multiple times in the code, doxygen keeps a cache of
+# pre-resolved symbols. If the cache is too small doxygen will become slower.
+# If the cache is too large, memory is wasted. The cache size is given by this
+# formula: 2^(16+LOOKUP_CACHE_SIZE). The valid range is 0..9, the default is 0,
+# corresponding to a cache size of 2^16 = 65536 symbols.
+
+LOOKUP_CACHE_SIZE = 0
+
#---------------------------------------------------------------------------
# Build related configuration options
#---------------------------------------------------------------------------
@@ -305,6 +362,10 @@
EXTRACT_PRIVATE = YES
+# If the EXTRACT_PACKAGE tag is set to YES all members with package or internal scope will be included in the documentation.
+
+EXTRACT_PACKAGE = NO
+
# If the EXTRACT_STATIC tag is set to YES all static members of a file
# will be included in the documentation.
@@ -327,7 +388,7 @@
# extracted and appear in the documentation as a namespace called
# 'anonymous_namespace{file}', where file will be replaced with the base
# name of the file that contains the anonymous namespace. By default
-# anonymous namespace are hidden.
+# anonymous namespaces are hidden.
EXTRACT_ANON_NSPACES = NO
@@ -438,6 +499,15 @@
SORT_BY_SCOPE_NAME = NO
+# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to
+# do proper type resolution of all parameters of a function it will reject a
+# match between the prototype and the implementation of a member function even
+# if there is only one candidate or it is obvious which candidate to choose
+# by doing a simple string match. By disabling STRICT_PROTO_MATCHING doxygen
+# will still accept a match between prototype and implementation in such cases.
+
+STRICT_PROTO_MATCHING = NO
+
# The GENERATE_TODOLIST tag can be used to enable (YES) or
# disable (NO) the todo list. This list is created by putting \todo
# commands in the documentation.
@@ -468,10 +538,10 @@
ENABLED_SECTIONS =
# The MAX_INITIALIZER_LINES tag determines the maximum number of lines
-# the initial value of a variable or define consists of for it to appear in
+# the initial value of a variable or macro consists of for it to appear in
# the documentation. If the initializer consists of more lines than specified
# here it will be hidden. Use a value of 0 to hide initializers completely.
-# The appearance of the initializer of individual variables and defines in the
+# The appearance of the initializer of individual variables and macros in the
# documentation can be controlled using \showinitializer or \hideinitializer
# command in the documentation regardless of this setting.
@@ -483,12 +553,6 @@
SHOW_USED_FILES = YES
-# If the sources in your project are distributed over multiple directories
-# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy
-# in the documentation. The default is NO.
-
-SHOW_DIRECTORIES = NO
-
# Set the SHOW_FILES tag to NO to disable the generation of the Files page.
# This will remove the Files entry from the Quick Index and from the
# Folder Tree View (if specified). The default is YES.
@@ -514,13 +578,23 @@
# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed
# by doxygen. The layout file controls the global structure of the generated
-# output files in an output format independent way. The create the layout file
+# output files in an output format independent way. To create the layout file
# that represents doxygen's defaults, run doxygen with the -l option.
# You can optionally specify a file name after the option, if omitted
# DoxygenLayout.xml will be used as the name of the layout file.
LAYOUT_FILE =
+# The CITE_BIB_FILES tag can be used to specify one or more bib files
+# containing the references data. This must be a list of .bib files. The
+# .bib extension is automatically appended if omitted. Using this command
+# requires the bibtex tool to be installed. See also
+# http://en.wikipedia.org/wiki/BibTeX for more info. For LaTeX the style
+# of the bibliography can be controlled using LATEX_BIB_STYLE. To use this
+# feature you need bibtex and perl available in the search path.
+
+CITE_BIB_FILES =
+
#---------------------------------------------------------------------------
# configuration options related to warning and progress messages
#---------------------------------------------------------------------------
@@ -549,7 +623,7 @@
WARN_IF_DOC_ERROR = YES
-# This WARN_NO_PARAMDOC option can be abled to get warnings for
+# The WARN_NO_PARAMDOC option can be enabled to get warnings for
# functions that are documented, but have no documentation for their parameters
# or return value. If set to NO (the default) doxygen will only warn about
# wrong or incomplete parameter documentation, but not about the absence of
@@ -581,16 +655,15 @@
# directories like "/usr/src/myproject". Separate the files or directories
# with spaces.
-INPUT = \
- "@CMAKE_SOURCE_DIR@/lib" \
- "@CMAKE_SOURCE_DIR@/src" \
+INPUT = "@CMAKE_SOURCE_DIR@/lib" \
+ "@CMAKE_SOURCE_DIR@/src" \
"@CMAKE_SOURCE_DIR@/drivers" \
"@CMAKE_SOURCE_DIR@/bindings" \
"@CMAKE_SOURCE_DIR@/include" \
"@CMAKE_BINARY_DIR@/config.h" \
"@CMAKE_BINARY_DIR@/lib" \
"@CMAKE_BINARY_DIR@/bindings" \
- "@CMAKE_BINARY_DIR@/include" \
+ "@CMAKE_BINARY_DIR@/include"
# This tag can be used to specify the character encoding of the source files
# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
@@ -604,10 +677,10 @@
# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
# and *.h) to filter out the source-files in the directories. If left
# blank the following patterns are tested:
-# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx
-# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py *.f90
+# *.c *.cc *.cxx *.cpp *.c++ *.d *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh
+# *.hxx *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.dox *.py
+# *.f90 *.f *.for *.vhd *.vhdl
-# Only process C, C++, D, Java, Python, and Fortran files.
FILE_PATTERNS = *.c \
*.cc \
*.cxx \
@@ -618,7 +691,7 @@
*.h \
*.py \
*.f90 \
- *.f \
+ *.f
# The RECURSIVE tag can be used to turn specify whether or not subdirectories
# should be searched for input files as well. Possible values are YES and NO.
@@ -626,20 +699,18 @@
RECURSIVE = YES
-# The EXCLUDE tag can be used to specify files and/or directories that should
+# The EXCLUDE tag can be used to specify files and/or directories that should be
# excluded from the INPUT source files. This way you can easily exclude a
# subdirectory from a directory tree whose root is specified with the INPUT tag.
+# Note that relative paths are relative to the directory from which doxygen is
+# run.
-# These files are Fortran, but their extension confuses doxygen
-# into thinking they are C/C++ headers so exclude them as a workaround.
-EXCLUDE = \
- "@CMAKE_BINARY_DIR@/bindings/f77/plplot_parameters.h" \
+EXCLUDE = "@CMAKE_BINARY_DIR@/bindings/f77/plplot_parameters.h" \
"@CMAKE_SOURCE_DIR@/bindings/f95/plplot_parameters.h" \
- "@CMAKE_BINARY_DIR@/bindings/f95/plplot_parameters.h" \
-
+ "@CMAKE_BINARY_DIR@/bindings/f95/plplot_parameters.h"
-# The EXCLUDE_SYMLINKS tag can be used select whether or not files or
-# directories that are symbolic links (a Unix filesystem feature) are excluded
+# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
+# directories that are symbolic links (a Unix file system feature) are excluded
# from the input.
EXCLUDE_SYMLINKS = NO
@@ -650,9 +721,8 @@
# against the file with absolute path, so to exclude all test directories
# for example use the pattern */test/*
-# Ignore .svn directories in the source tree and CMakeFiles directories
-# in the build tree.
-EXCLUDE_PATTERNS = */.svn/* */CMakeFiles/*
+EXCLUDE_PATTERNS = */.svn/* \
+ */CMakeFiles/*
# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
# (namespaces, classes, functions, etc.) that should be excluded from the
@@ -705,8 +775,8 @@
# filter if there is a match.
# The filters are a list of the form:
# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further
-# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER
-# is applied to all files.
+# info on how filters are used. If FILTER_PATTERNS is empty or if
+# non of the patterns match the file name, INPUT_FILTER is applied.
FILTER_PATTERNS =
@@ -716,6 +786,14 @@
FILTER_SOURCE_FILES = NO
+# The FILTER_SOURCE_PATTERNS tag can be used to specify source filters per file
+# pattern. A pattern will override the setting for FILTER_PATTERN (if any)
+# and it is also possible to disable source filtering for a specific pattern
+# using *.ext= (so without naming a filter). This option only has effect when
+# FILTER_SOURCE_FILES is enabled.
+
+FILTER_SOURCE_PATTERNS =
+
#---------------------------------------------------------------------------
# configuration options related to source browsing
#---------------------------------------------------------------------------
@@ -734,7 +812,7 @@
# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct
# doxygen to hide any special comment blocks from generated source code
-# fragments. Normal C and C++ comments will always remain visible.
+# fragments. Normal C, C++ and Fortran comments will always remain visible.
STRIP_CODE_COMMENTS = YES
@@ -818,7 +896,14 @@
# The HTML_HEADER tag can be used to specify a personal HTML header for
# each generated HTML page. If it is left blank doxygen will generate a
-# standard header.
+# standard header. Note that when using a custom header you are responsible
+# for the proper inclusion of any scripts and style sheets that doxygen
+# needs, which is dependent on the configuration options used.
+# It is advised to generate a default header using "doxygen -w html
+# header.html footer.html stylesheet.css YourConfigFile" and then modify
+# that header. Note that the header is subject to change so you typically
+# have to redo this when upgrading to a newer version of doxygen or when
+# changing the value of configuration settings such as GENERATE_TREEVIEW!
HTML_HEADER =
@@ -833,12 +918,21 @@
# fine-tune the look of the HTML output. If the tag is left blank doxygen
# will generate a default style sheet. Note that doxygen will try to copy
# the style sheet file to the HTML output directory, so don't put your own
-# stylesheet in the HTML output directory as well, or it will be erased!
+# style sheet in the HTML output directory as well, or it will be erased!
HTML_STYLESHEET =
+# The HTML_EXTRA_FILES tag can be used to specify one or more extra images or
+# other source files which should be copied to the HTML output directory. Note
+# that these files will be copied to the base HTML output directory. Use the
+# $relpath$ marker in the HTML_HEADER and/or HTML_FOOTER files to load these
+# files. In the HTML_STYLESHEET file, use the file name only. Also note that
+# the files will be copied as-is; there are no commands or markers available.
+
+HTML_EXTRA_FILES =
+
# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output.
-# Doxygen will adjust the colors in the stylesheet and background images
+# Doxygen will adjust the colors in the style sheet and background images
# according to this color. Hue is specified as an angle on a colorwheel,
# see http://en.wikipedia.org/wiki/Hue for more information.
# For instance the value 0 represents red, 60 is yellow, 120 is green,
@@ -868,20 +962,23 @@
HTML_TIMESTAMP = YES
-# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes,
-# files or namespaces will be aligned in HTML using tables. If set to
-# NO a bullet list will be used.
-
-HTML_ALIGN_MEMBERS = YES
-
# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
# documentation will contain sections that can be hidden and shown after the
-# page has loaded. For this to work a browser that supports
-# JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox
-# Netscape 6.0+, Internet explorer 5.0+, Konqueror, or Safari).
+# page has loaded.
HTML_DYNAMIC_SECTIONS = NO
+# With HTML_INDEX_NUM_ENTRIES one can control the preferred number of
+# entries shown in the various tree structured indices initially; the user
+# can expand and collapse entries dynamically later on. Doxygen will expand
+# the tree to such a level that at most the specified number of entries are
+# visible (unless a fully collapsed tree already exceeds this amount).
+# So setting the number of entries 1 will produce a full collapsed tree by
+# default. 0 is a special value representing an infinite number of entries
+# and will result in a full expanded tree by default.
+
+HTML_INDEX_NUM_ENTRIES = 100
+
# If the GENERATE_DOCSET tag is set to YES, additional index files
# will be generated that can be used as input for Apple's Xcode 3
# integrated development environment, introduced with OSX 10.5 (Leopard).
@@ -1033,17 +1130,14 @@
ECLIPSE_DOC_ID = org.doxygen.Project
-# The DISABLE_INDEX tag can be used to turn on/off the condensed index at
-# top of each HTML page. The value NO (the default) enables the index and
-# the value YES disables it.
+# The DISABLE_INDEX tag can be used to turn on/off the condensed index (tabs)
+# at top of each HTML page. The value NO (the default) enables the index and
+# the value YES disables it. Since the tabs have the same information as the
+# navigation tree you can set this option to NO if you already set
+# GENERATE_TREEVIEW to YES.
DISABLE_INDEX = NO
-# This tag can be used to set the number of enum values (range [1..20])
-# that doxygen will group on one line in the generated HTML documentation.
-
-ENUM_VALUES_PER_LINE = 4
-
# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index
# structure should be generated to display hierarchical information.
# If the tag value is set to YES, a side panel will be generated
@@ -1051,13 +1145,17 @@
# is generated for HTML Help). For this to work a browser that supports
# JavaScript, DHTML, CSS and frames is required (i.e. any modern browser).
# Windows users are probably better off using the HTML help feature.
+# Since the tree basically has the same information as the tab index you
+# could consider to set DISABLE_INDEX to NO when enabling this option.
GENERATE_TREEVIEW = YES
-# By enabling USE_INLINE_TREES, doxygen will generate the Groups, Directories,
-# and Class Hierarchy pages using a tree view instead of an ordered list.
+# The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values
+# (range [0,1..20]) that doxygen will group on one line in the generated HTML
+# documentation. Note that a value of 0 will completely suppress the enum
+# values from appearing in the overview section.
-USE_INLINE_TREES = NO
+ENUM_VALUES_PER_LINE = 4
# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be
# used to set the initial width (in pixels) of the frame in which the tree
@@ -1086,6 +1184,32 @@
FORMULA_TRANSPARENT = YES
+# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax
+# (see http://www.mathjax.org) which uses client side Javascript for the
+# rendering instead of using prerendered bitmaps. Use this if you do not
+# have LaTeX installed or if you want to formulas look prettier in the HTML
+# output. When enabled you may also need to install MathJax separately and
+# configure the path to it using the MATHJAX_RELPATH option.
+
+USE_MATHJAX = NO
+
+# When MathJax is enabled you need to specify the location relative to the
+# HTML output directory using the MATHJAX_RELPATH option. The destination
+# directory should contain the MathJax.js script. For instance, if the mathjax
+# directory is located at the same level as the HTML output directory, then
+# MATHJAX_RELPATH should be ../mathjax. The default value points to
+# the MathJax Content Delivery Network so you can quickly see the result without
+# installing MathJax.
+# However, it is strongly recommended to install a local
+# copy of MathJax from http://www.mathjax.org before deployment.
+
+MATHJAX_RELPATH = http://cdn.mathjax.org/mathjax/latest
+
+# The MATHJAX_EXTENSIONS tag can be used to specify one or MathJax extension
+# names that should be enabled during MathJax rendering.
+
+MATHJAX_EXTENSIONS =
+
# When the SEARCHENGINE tag is enabled doxygen will generate a search box
# for the HTML output. The underlying search engine uses javascript
# and DHTML and should work on any modern browser. Note that when using
@@ -1101,7 +1225,7 @@
# using Javascript. Doxygen will generate the search PHP script and index
# file to put on the web server. The advantage of the server
# based approach is that it scales better to large projects and allows
-# full text search. The disadvances is that it is more difficult to setup
+# full text search. The disadvantages are that it is more difficult to setup
# and does not have live searching capabilities.
SERVER_BASED_SEARCH = NO
@@ -1142,7 +1266,7 @@
COMPACT_LATEX = NO
# The PAPER_TYPE tag can be used to set the paper type that is used
-# by the printer. Possible values are: a4, a4wide, letter, legal and
+# by the printer. Possible values are: a4, letter, legal and
# executive. If left blank a4wide will be used.
PAPER_TYPE = a4wide
@@ -1159,6 +1283,13 @@
LATEX_HEADER =
+# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for
+# the generated latex document. The footer should contain everything after
+# the last chapter. If it is left blank doxygen will generate a
+# standard footer. Notice: only use this tag if you know what you are doing!
+
+LATEX_FOOTER =
+
# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated
# is prepared for conversion to pdf (using ps2pdf). The pdf file will
# contain links (just like the HTML output) instead of page references
@@ -1192,6 +1323,12 @@
LATEX_SOURCE_CODE = NO
+# The LATEX_BIB_STYLE tag can be used to specify the style to use for the
+# bibliography, e.g. plainnat, or ieeetr. The default style is "plain". See
+# http://en.wikipedia.org/wiki/BibTeX for more info.
+
+LATEX_BIB_STYLE = plain
+
#---------------------------------------------------------------------------
# configuration options related to the RTF output
#---------------------------------------------------------------------------
@@ -1223,7 +1360,7 @@
RTF_HYPERLINKS = NO
-# Load stylesheet definitions from file. Syntax is similar to doxygen's
+# Load style sheet definitions from file. Syntax is similar to doxygen's
# config file, i.e. a series of assignments. You only have to provide
# replacements, missing definitions are set to their default value.
@@ -1368,7 +1505,7 @@
EXPAND_ONLY_PREDEF = NO
# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files
-# in the INCLUDE_PATH (see below) will be search if a #include is found.
+# pointed to by INCLUDE_PATH will be searched when a #include is found.
SEARCH_INCLUDES = YES
@@ -1376,8 +1513,6 @@
# contain include files that are not input files but should be processed by
# the preprocessor.
-# Work around a doxygen bug in finding build_tree/bindings/tcl/tclgen_s.h even
-# though the corresponding directory is recursively part of input.
INCLUDE_PATH = @CMAKE_BINARY_DIR@/bindings/tcl
# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
@@ -1400,15 +1535,15 @@
# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then
# this tag can be used to specify a list of macro names that should be expanded.
# The macro definition that is found in the sources will be used.
-# Use the PREDEFINED tag if you want to use a different macro definition.
+# Use the PREDEFINED tag if you want to use a different macro definition that
+# overrules the definition found in the source code.
EXPAND_AS_DEFINED =
# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then
-# doxygen's preprocessor will remove all function-like macros that are alone
-# on a line, have an all uppercase name, and do not end with a semicolon. Such
-# function macros are typically used for boiler-plate code, and will confuse
-# the parser if not removed.
+# doxygen's preprocessor will remove all references to function-like macros
+# that are alone on a line, have an all uppercase name, and do not end with a
+# semicolon, because these will confuse the parser if not removed.
SKIP_FUNCTION_MACROS = YES
@@ -1416,22 +1551,18 @@
# Configuration::additions related to external references
#---------------------------------------------------------------------------
-# The TAGFILES option can be used to specify one or more tagfiles.
-# Optionally an initial location of the external documentation
-# can be added for each tagfile. The format of a tag file without
-# this location is as follows:
+# The TAGFILES option can be used to specify one or more tagfiles. For each
+# tag file the location of the external documentation should be added. The
+# format of a tag file without this location is as follows:
#
# TAGFILES = file1 file2 ...
# Adding location for the tag files is done as follows:
#
# TAGFILES = file1=loc1 "file2 = loc2" ...
-# where "loc1" and "loc2" can be relative or absolute paths or
-# URLs. If a location is present for each tag, the installdox tool
-# does not have to be run to correct the links.
-# Note that each tag file must have a unique name
-# (where the name does NOT include the path)
-# If a tag file is not located in the directory in which doxygen
-# is run, you must also specify the path to the tagfile here.
+# where "loc1" and "loc2" can be relative or absolute paths
+# or URLs. Note that each tag file must have a unique name (where the name does
+# NOT include the path). If a tag file is not located in the directory in which
+# doxygen is run, you must also specify the path to the tagfile here.
TAGFILES =
@@ -1464,9 +1595,8 @@
# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will
# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base
# or super classes. Setting the tag to NO turns the diagrams off. Note that
-# this option is superseded by the HAVE_DOT option below. This is only a
-# fallback. It is recommended to install and use dot, since it yields more
-# powerful graphs.
+# this option also works with HAVE_DOT disabled, but it is recommended to
+# install and use dot, since it yields more powerful graphs.
CLASS_DIAGRAMS = YES
@@ -1500,14 +1630,12 @@
DOT_NUM_THREADS = 0
-# By default doxygen will write a font called FreeSans.ttf to the output
-# directory and reference it in all dot files that doxygen generates. This
-# font does not include all possible unicode characters however, so when you need
-# these (or just want a differently looking font) you can specify the font name
-# using DOT_FONTNAME. You need need to make sure dot is able to find the font,
-# which can be done by putting it in a standard location or by setting the
-# DOTFONTPATH environment variable or by setting DOT_FONTPATH to the directory
-# containing the font.
+# By default doxygen will use the Helvetica font for all dot files that
+# doxygen generates. When you want a differently looking font you can specify
+# the font name using DOT_FONTNAME. You need to make sure dot is able to find
+# the font, which can be done by putting it in a standard location or by setting
+# the DOTFONTPATH environment variable or by setting DOT_FONTPATH to the
+# directory containing the font.
DOT_FONTNAME = FreeSans
@@ -1516,17 +1644,16 @@
DOT_FONTSIZE = 10
-# By default doxygen will tell dot to use the output directory to look for the
-# FreeSans.ttf font (which doxygen will put there itself). If you specify a
-# different font using DOT_FONTNAME you can set the path where dot
-# can find it using this tag.
+# By default doxygen will tell dot to use the Helvetica font.
+# If you specify a different font using DOT_FONTNAME you can use DOT_FONTPATH to
+# set the path where dot can find it.
DOT_FONTPATH =
# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen
# will generate a graph for each documented class showing the direct and
# indirect inheritance relations. Setting this tag to YES will force the
-# the CLASS_DIAGRAMS tag to NO.
+# CLASS_DIAGRAMS tag to NO.
CLASS_GRAPH = YES
@@ -1548,6 +1675,15 @@
UML_LOOK = NO
+# If the UML_LOOK tag is enabled, the fields and methods are shown inside
+# the class node. If there are many fields or methods and many nodes the
+# graph may become too big to be useful. The UML_LIMIT_NUM_FIELDS
+# threshold limits the number of items for each type to make the size more
+# managable. Set this to 0 for no limit. Note that the threshold may be
+# exceeded by 50% before the limit is enforced.
+
+UML_LIMIT_NUM_FIELDS = 10
+
# If set to YES, the inheritance and collaboration graphs will show the
# relations between templates and their instances.
@@ -1584,11 +1720,11 @@
CALLER_GRAPH = NO
# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen
-# will graphical hierarchy of all classes instead of a textual one.
+# will generate a graphical hierarchy of all classes instead of a textual one.
GRAPHICAL_HIERARCHY = YES
-# If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES
+# If the DIRECTORY_GRAPH and HAVE_DOT tags are set to YES
# then doxygen will show the dependencies a directory has on other directories
# in a graphical way. The dependency relations are determined by the #include
# relations between the files in the directories.
@@ -1596,11 +1732,22 @@
DIRECTORY_GRAPH = YES
# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
-# generated by dot. Possible values are png, jpg, or gif
-# If left blank png will be used.
+# generated by dot. Possible values are svg, png, jpg, or gif.
+# If left blank png will be used. If you choose svg you need to set
+# HTML_FILE_EXTENSION to xhtml in order to make the SVG files
+# visible in IE 9+ (other browsers do not have this requirement).
DOT_IMAGE_FORMAT = png
+# If DOT_IMAGE_FORMAT is set to svg, then this option can be set to YES to
+# enable generation of interactive SVG images that allow zooming and panning.
+# Note that this requires a modern browser other than Internet Explorer.
+# Tested and working are Firefox, Chrome, Safari, and Opera. For IE 9+ you
+# need to set HTML_FILE_EXTENSION to xhtml in order to make the SVG files
+# visible. Older versions of IE do not have SVG support.
+
+INTERACTIVE_SVG = NO
+
# The tag DOT_PATH can be used to specify the path where the dot tool can be
# found. If left blank, it is assumed the dot tool can be found in the path.
@@ -1612,6 +1759,12 @@
DOTFILE_DIRS =
+# The MSCFILE_DIRS tag can be used to specify one or more directories that
+# contain msc files that are included in the documentation (see the
+# \mscfile command).
+
+MSCFILE_DIRS =
+
# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of
# nodes that will be shown in the graph. If the number of nodes in a graph
# becomes larger than this value, doxygen will truncate the graph, which is
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2013-08-09 16:48:35
|
Revision: 12476
http://sourceforge.net/p/plplot/code/12476
Author: airwin
Date: 2013-08-09 16:48:32 +0000 (Fri, 09 Aug 2013)
Log Message:
-----------
Style. This is actually a fairly intrusive change but running the
test_diff_psc target shows Tcl continues to give the same results as
previous.
Tested by Alan W. Irwin <ai...@us...>.
Modified Paths:
--------------
trunk/bindings/tcl/tclAPI.c
Modified: trunk/bindings/tcl/tclAPI.c
===================================================================
--- trunk/bindings/tcl/tclAPI.c 2013-08-09 16:21:45 UTC (rev 12475)
+++ trunk/bindings/tcl/tclAPI.c 2013-08-09 16:48:32 UTC (rev 12476)
@@ -4257,39 +4257,39 @@
static int
plcolorbarCmd( ClientData PL_UNUSED( clientData ), Tcl_Interp *interp,
- int argc, const char *argv[] )
+ int argc, const char *argv[] )
{
- PLFLT colorbar_width, colorbar_height;
- PLINT opt, position;
- PLFLT x, y, x_length, y_length;
- PLINT bg_color, bb_color, bb_style;
- PLFLT low_cap_color, high_cap_color;
- PLINT cont_color;
- PLFLT cont_width;
- PLINT n_label_opts;
- PLINT n_labels;
- PLINT *label_opts;
- char **labels;
- PLINT n_axis_opts;
- PLINT n_ticks;
- PLINT n_sub_ticks;
- PLINT n_axes;
- char **axis_opts;
- PLFLT *ticks;
- PLINT *sub_ticks;
- Tcl_Obj *list_vectors;
- int n_vectors;
- PLINT *vector_sizes;
- PLFLT **vector_values;
- int retcode;
- int i;
- int length;
- Tcl_Obj *vector;
+ PLFLT colorbar_width, colorbar_height;
+ PLINT opt, position;
+ PLFLT x, y, x_length, y_length;
+ PLINT bg_color, bb_color, bb_style;
+ PLFLT low_cap_color, high_cap_color;
+ PLINT cont_color;
+ PLFLT cont_width;
+ PLINT n_label_opts;
+ PLINT n_labels;
+ PLINT *label_opts;
+ char **labels;
+ PLINT n_axis_opts;
+ PLINT n_ticks;
+ PLINT n_sub_ticks;
+ PLINT n_axes;
+ char **axis_opts;
+ PLFLT *ticks;
+ PLINT *sub_ticks;
+ Tcl_Obj *list_vectors;
+ int n_vectors;
+ PLINT *vector_sizes;
+ PLFLT **vector_values;
+ int retcode;
+ int i;
+ int length;
+ Tcl_Obj *vector;
tclMatrix *vectorPtr;
- double value;
+ double value;
- Tcl_Obj *data[2];
+ Tcl_Obj *data[2];
if ( argc != 20 )
{
@@ -4311,7 +4311,7 @@
sscanf( argv[10], "%lg", &value ); low_cap_color = (PLFLT) value;
sscanf( argv[11], "%lg", &value ); high_cap_color = (PLFLT) value;
sscanf( argv[12], "%d", &cont_color );
- sscanf( argv[13], "%lg", &value ); cont_width = (PLFLT) value;
+ sscanf( argv[13], "%lg", &value ); cont_width = (PLFLT) value;
label_opts = argv_to_ints( interp, argv[14], &n_label_opts );
labels = argv_to_chars( interp, argv[15], &n_labels );
axis_opts = argv_to_chars( interp, argv[16], &n_axis_opts );
@@ -4343,8 +4343,8 @@
}
else
{
- vector_sizes = (int *) malloc( sizeof( int ) * (size_t) n_vectors );
- vector_values = (PLFLT **) malloc( sizeof( PLFLT * ) * (size_t) n_vectors );
+ vector_sizes = (int *) malloc( sizeof ( int ) * (size_t) n_vectors );
+ vector_values = (PLFLT **) malloc( sizeof ( PLFLT * ) * (size_t) n_vectors );
for ( i = 0; i < n_vectors; i++ )
{
Tcl_ListObjIndex( interp, list_vectors, i, &vector );
@@ -4361,36 +4361,36 @@
}
c_plcolorbar( &colorbar_width, &colorbar_height,
- opt, position, x, y,
- x_length, y_length,
- bg_color, bb_color, bb_style,
- low_cap_color, high_cap_color,
- cont_color, cont_width,
- n_labels, label_opts, (const char * const *)labels,
- n_axes, (const char * const *)axis_opts,
- ticks, sub_ticks,
- vector_sizes, (const PLFLT * const *)vector_values );
+ opt, position, x, y,
+ x_length, y_length,
+ bg_color, bb_color, bb_style,
+ low_cap_color, high_cap_color,
+ cont_color, cont_width,
+ n_labels, label_opts, (const char * const *) labels,
+ n_axes, (const char * const *) axis_opts,
+ ticks, sub_ticks,
+ vector_sizes, (const PLFLT * const *) vector_values );
if ( label_opts != NULL )
free( label_opts );
if ( labels != NULL )
{
- free( labels[0] ) ;
- free( labels ) ;
+ free( labels[0] );
+ free( labels );
}
if ( axis_opts != NULL )
{
- free( axis_opts[0] ) ;
- free( axis_opts ) ;
+ free( axis_opts[0] );
+ free( axis_opts );
}
if ( ticks != NULL )
- free( ticks ) ;
+ free( ticks );
if ( sub_ticks != NULL )
- free( sub_ticks ) ;
+ free( sub_ticks );
if ( vector_values != NULL )
{
- free( vector_sizes ) ;
- free( vector_values ) ;
+ free( vector_sizes );
+ free( vector_values );
}
Tcl_DecrRefCount( list_vectors );
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2013-08-09 16:21:54
|
Revision: 12475
http://sourceforge.net/p/plplot/code/12475
Author: airwin
Date: 2013-08-09 16:21:45 +0000 (Fri, 09 Aug 2013)
Log Message:
-----------
Use correct API for DrawPolygon. Thanks to Joost Kuckartz for
spotting this error, and he reports this fix solves an offset issue he
had with wxwidgets plots.
Modified Paths:
--------------
trunk/drivers/wxwidgets_dc.cpp
Modified: trunk/drivers/wxwidgets_dc.cpp
===================================================================
--- trunk/drivers/wxwidgets_dc.cpp 2013-08-04 18:13:16 UTC (rev 12474)
+++ trunk/drivers/wxwidgets_dc.cpp 2013-08-09 16:21:45 UTC (rev 12475)
@@ -165,6 +165,8 @@
void wxPLDevDC::FillPolygon( PLStream *pls )
{
wxPoint *points = new wxPoint[pls->dev_npts];
+ wxCoord xoffset = 0;
+ wxCoord yoffset = 0;
for ( int i = 0; i < pls->dev_npts; i++ )
{
@@ -176,11 +178,11 @@
if ( pls->dev_eofill )
{
- m_dc->DrawPolygon( pls->dev_npts, points, wxODDEVEN_RULE );
+ m_dc->DrawPolygon( pls->dev_npts, points, xoffset, yoffset, wxODDEVEN_RULE );
}
else
{
- m_dc->DrawPolygon( pls->dev_npts, points, wxWINDING_RULE );
+ m_dc->DrawPolygon( pls->dev_npts, points, xoffset, yoffset, wxWINDING_RULE );
}
delete[] points;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2013-08-04 18:13:20
|
Revision: 12474
http://sourceforge.net/p/plplot/code/12474
Author: airwin
Date: 2013-08-04 18:13:16 +0000 (Sun, 04 Aug 2013)
Log Message:
-----------
Implement changes to gtk-doc build configuration generation.
Use '--with-xml-catalog=${BP_CMAKE_INSTALL_PREFIX}/etc/xml/catalog' as
a configure option.
Add docbook-xml and docbook-xsl dependencies.
The updated gtk-doc/bp.cmake file that is generated by this change
to this patch file has already been committed.
Modified Paths:
--------------
trunk/cmake/build_projects/patch_gtk_packages.xml
Modified: trunk/cmake/build_projects/patch_gtk_packages.xml
===================================================================
--- trunk/cmake/build_projects/patch_gtk_packages.xml 2013-08-04 18:04:25 UTC (rev 12473)
+++ trunk/cmake/build_projects/patch_gtk_packages.xml 2013-08-04 18:13:16 UTC (rev 12474)
@@ -1,6 +1,21 @@
---- gtk_packages_3.9.4.xml_original 2013-07-30 14:52:57.038048491 -0700
-+++ gtk_packages_3.9.4.xml 2013-07-31 08:06:20.965414047 -0700
-@@ -925,7 +925,7 @@
+--- gtk_packages_3.9.4.xml_original 2013-08-04 10:48:34.157911200 -0700
++++ gtk_packages_3.9.4.xml 2013-08-04 10:59:20.797600533 -0700
+@@ -640,11 +640,13 @@
+ <autotools id="gnome-common">
+ <branch hash="sha256:2af2d97010d2a9aeb3b99dd2ce07d1ef023e15a27b412ffe4f067f016ff7117b" module="gnome-common/3.7/gnome-common-3.7.4.tar.xz" repo="http://download.gnome.org/sources/" size="151864" version="3.7.4"/>
+ </autotools>
+- <autotools id="gtk-doc">
++ <autotools autogenargs="--with-xml-catalog=${BP_CMAKE_INSTALL_PREFIX}/etc/xml/catalog" id="gtk-doc">
+ <branch hash="sha256:27df247fa828433a9390368e2088cc22f954f2ce1f255ddbd12ab6e027b12e68" module="gtk-doc/1.19/gtk-doc-1.19.tar.xz" repo="http://download.gnome.org/sources/" size="597880" version="1.19"/>
+ <dependencies>
+ <dep package="libxslt"/>
+ <dep package="yelp-tools"/>
++ <dep package="docbook-xml"/>
++ <dep package="docbook-xsl"/>
+ </dependencies>
+ </autotools>
+ <autotools id="iso-codes">
+@@ -925,7 +927,7 @@
</suggests>
</autotools>
<autotools autogenargs="" id="harfbuzz">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2013-08-04 18:04:26
|
Revision: 12473
http://sourceforge.net/p/plplot/code/12473
Author: airwin
Date: 2013-08-04 18:04:25 +0000 (Sun, 04 Aug 2013)
Log Message:
-----------
Shift from partially hand-crafted (minor edits after generation) to
completely generated. The only change between the two is
gtk-doc_dependencies_LIST is now alphabetized.
Modified Paths:
--------------
trunk/cmake/build_projects/gtk-doc/bp.cmake
Modified: trunk/cmake/build_projects/gtk-doc/bp.cmake
===================================================================
--- trunk/cmake/build_projects/gtk-doc/bp.cmake 2013-08-04 17:54:28 UTC (rev 12472)
+++ trunk/cmake/build_projects/gtk-doc/bp.cmake 2013-08-04 18:04:25 UTC (rev 12473)
@@ -41,7 +41,7 @@
# ignored.
set(BP_ignored_dependencies_LIST pkg-config;bison;flex;python2-devel;libXft ${extra_ignored_dependencies_list})
-set(gtk-doc_dependencies_LIST libxslt;yelp-tools;docbook-xml;docbook-xsl)
+set(gtk-doc_dependencies_LIST docbook-xml;docbook-xsl;libxslt;yelp-tools)
# Remove dependencies that should be ignored.
if(gtk-doc_dependencies_LIST)
list(REMOVE_ITEM gtk-doc_dependencies_LIST ${BP_ignored_dependencies_LIST})
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2013-08-04 17:54:30
|
Revision: 12472
http://sourceforge.net/p/plplot/code/12472
Author: airwin
Date: 2013-08-04 17:54:28 +0000 (Sun, 04 Aug 2013)
Log Message:
-----------
Insert boiler-plate warning into generated */bp.cmake files that those
files are generated.
Implement use of extra_ignored_dependencies_list (which allows
platforms to selectively ignore certain dependencies).
Modified Paths:
--------------
trunk/cmake/build_projects/gtk-doc/bp.cmake
Modified: trunk/cmake/build_projects/gtk-doc/bp.cmake
===================================================================
--- trunk/cmake/build_projects/gtk-doc/bp.cmake 2013-08-04 17:50:42 UTC (rev 12471)
+++ trunk/cmake/build_projects/gtk-doc/bp.cmake 2013-08-04 17:54:28 UTC (rev 12472)
@@ -1,4 +1,11 @@
# gtk-doc/bp.cmake
+# N.B. this file is generated so if you edit it you will lose all your
+# changes the next time it is generated (typically by running
+# either/both the update_added_packages.sh or update_pango_packages.sh
+# scripts). If those scripts do not provide good results, then
+# consider changing their source files (e.g., by editing the files
+# used in those scripts) or add a patch to be run by those scripts).
+
# This file should be included directly or indirectly from a top-level
# CMakeLists.txt file to configure the build of gtk-doc.
@@ -32,7 +39,7 @@
# List of dependencies (most of which are build tools) which should be
# ignored.
-set(BP_ignored_dependencies_LIST pkg-config;bison;flex;python2-devel;libXft)
+set(BP_ignored_dependencies_LIST pkg-config;bison;flex;python2-devel;libXft ${extra_ignored_dependencies_list})
set(gtk-doc_dependencies_LIST libxslt;yelp-tools;docbook-xml;docbook-xsl)
# Remove dependencies that should be ignored.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2013-08-04 17:50:45
|
Revision: 12471
http://sourceforge.net/p/plplot/code/12471
Author: airwin
Date: 2013-08-04 17:50:42 +0000 (Sun, 04 Aug 2013)
Log Message:
-----------
Insert boiler-plate warning into generated */bp.cmake files that those
files are generated.
Implement use of extra_ignored_dependencies_list (which allows
platforms to selectively ignore certain dependencies).
Modified Paths:
--------------
trunk/cmake/build_projects/template.bp.in
Modified: trunk/cmake/build_projects/template.bp.in
===================================================================
--- trunk/cmake/build_projects/template.bp.in 2013-08-04 17:50:07 UTC (rev 12470)
+++ trunk/cmake/build_projects/template.bp.in 2013-08-04 17:50:42 UTC (rev 12471)
@@ -1,4 +1,11 @@
# @package@/bp.cmake
+# N.B. this file is generated so if you edit it you will lose all your
+# changes the next time it is generated (typically by running
+# either/both the update_added_packages.sh or update_pango_packages.sh
+# scripts). If those scripts do not provide good results, then
+# consider changing their source files (e.g., by editing the files
+# used in those scripts) or add a patch to be run by those scripts).
+
# This file should be included directly or indirectly from a top-level
# CMakeLists.txt file to configure the build of @package@.
@@ -32,7 +39,7 @@
# List of dependencies (most of which are build tools) which should be
# ignored.
-set(BP_ignored_dependencies_LIST @ignored_dependencies_LIST@)
+set(BP_ignored_dependencies_LIST @ignored_dependencies_LIST@ ${extra_ignored_dependencies_list})
set(@package@_dependencies_LIST @dependencies@)
# Remove dependencies that should be ignored.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2013-08-04 17:50:10
|
Revision: 12470
http://sourceforge.net/p/plplot/code/12470
Author: airwin
Date: 2013-08-04 17:50:07 +0000 (Sun, 04 Aug 2013)
Log Message:
-----------
Insert boiler-plate warning into generated */bp.cmake files that those
files are generated.
Implement use of extra_ignored_dependencies_list (which allows
platforms to selectively ignore certain dependencies).
Modified Paths:
--------------
trunk/cmake/build_projects/cairo/bp.cmake
trunk/cmake/build_projects/fontconfig/bp.cmake
trunk/cmake/build_projects/glib/bp.cmake
trunk/cmake/build_projects/gobject-introspection/bp.cmake
trunk/cmake/build_projects/harfbuzz/bp.cmake
trunk/cmake/build_projects/itstool/bp.cmake
trunk/cmake/build_projects/pango/bp.cmake
trunk/cmake/build_projects/yelp-tools/bp.cmake
trunk/cmake/build_projects/yelp-xsl/bp.cmake
Modified: trunk/cmake/build_projects/cairo/bp.cmake
===================================================================
--- trunk/cmake/build_projects/cairo/bp.cmake 2013-08-04 17:41:48 UTC (rev 12469)
+++ trunk/cmake/build_projects/cairo/bp.cmake 2013-08-04 17:50:07 UTC (rev 12470)
@@ -1,4 +1,11 @@
# cairo/bp.cmake
+# N.B. this file is generated so if you edit it you will lose all your
+# changes the next time it is generated (typically by running
+# either/both the update_added_packages.sh or update_pango_packages.sh
+# scripts). If those scripts do not provide good results, then
+# consider changing their source files (e.g., by editing the files
+# used in those scripts) or add a patch to be run by those scripts).
+
# This file should be included directly or indirectly from a top-level
# CMakeLists.txt file to configure the build of cairo.
@@ -32,7 +39,7 @@
# List of dependencies (most of which are build tools) which should be
# ignored.
-set(BP_ignored_dependencies_LIST pkg-config;bison;flex;python2-devel;libXft)
+set(BP_ignored_dependencies_LIST pkg-config;bison;flex;python2-devel;libXft ${extra_ignored_dependencies_list})
set(cairo_dependencies_LIST fontconfig;gtk-doc;pixman;pkg-config)
# Remove dependencies that should be ignored.
Modified: trunk/cmake/build_projects/fontconfig/bp.cmake
===================================================================
--- trunk/cmake/build_projects/fontconfig/bp.cmake 2013-08-04 17:41:48 UTC (rev 12469)
+++ trunk/cmake/build_projects/fontconfig/bp.cmake 2013-08-04 17:50:07 UTC (rev 12470)
@@ -1,4 +1,11 @@
# fontconfig/bp.cmake
+# N.B. this file is generated so if you edit it you will lose all your
+# changes the next time it is generated (typically by running
+# either/both the update_added_packages.sh or update_pango_packages.sh
+# scripts). If those scripts do not provide good results, then
+# consider changing their source files (e.g., by editing the files
+# used in those scripts) or add a patch to be run by those scripts).
+
# This file should be included directly or indirectly from a top-level
# CMakeLists.txt file to configure the build of fontconfig.
@@ -32,7 +39,7 @@
# List of dependencies (most of which are build tools) which should be
# ignored.
-set(BP_ignored_dependencies_LIST pkg-config;bison;flex;python2-devel;libXft)
+set(BP_ignored_dependencies_LIST pkg-config;bison;flex;python2-devel;libXft ${extra_ignored_dependencies_list})
set(fontconfig_dependencies_LIST gperf)
# Remove dependencies that should be ignored.
Modified: trunk/cmake/build_projects/glib/bp.cmake
===================================================================
--- trunk/cmake/build_projects/glib/bp.cmake 2013-08-04 17:41:48 UTC (rev 12469)
+++ trunk/cmake/build_projects/glib/bp.cmake 2013-08-04 17:50:07 UTC (rev 12470)
@@ -1,4 +1,11 @@
# glib/bp.cmake
+# N.B. this file is generated so if you edit it you will lose all your
+# changes the next time it is generated (typically by running
+# either/both the update_added_packages.sh or update_pango_packages.sh
+# scripts). If those scripts do not provide good results, then
+# consider changing their source files (e.g., by editing the files
+# used in those scripts) or add a patch to be run by those scripts).
+
# This file should be included directly or indirectly from a top-level
# CMakeLists.txt file to configure the build of glib.
@@ -32,7 +39,7 @@
# List of dependencies (most of which are build tools) which should be
# ignored.
-set(BP_ignored_dependencies_LIST pkg-config;bison;flex;python2-devel;libXft)
+set(BP_ignored_dependencies_LIST pkg-config;bison;flex;python2-devel;libXft ${extra_ignored_dependencies_list})
set(glib_dependencies_LIST gtk-doc;libffi)
# Remove dependencies that should be ignored.
Modified: trunk/cmake/build_projects/gobject-introspection/bp.cmake
===================================================================
--- trunk/cmake/build_projects/gobject-introspection/bp.cmake 2013-08-04 17:41:48 UTC (rev 12469)
+++ trunk/cmake/build_projects/gobject-introspection/bp.cmake 2013-08-04 17:50:07 UTC (rev 12470)
@@ -1,4 +1,11 @@
# gobject-introspection/bp.cmake
+# N.B. this file is generated so if you edit it you will lose all your
+# changes the next time it is generated (typically by running
+# either/both the update_added_packages.sh or update_pango_packages.sh
+# scripts). If those scripts do not provide good results, then
+# consider changing their source files (e.g., by editing the files
+# used in those scripts) or add a patch to be run by those scripts).
+
# This file should be included directly or indirectly from a top-level
# CMakeLists.txt file to configure the build of gobject-introspection.
@@ -32,7 +39,7 @@
# List of dependencies (most of which are build tools) which should be
# ignored.
-set(BP_ignored_dependencies_LIST pkg-config;bison;flex;python2-devel;libXft)
+set(BP_ignored_dependencies_LIST pkg-config;bison;flex;python2-devel;libXft ${extra_ignored_dependencies_list})
set(gobject-introspection_dependencies_LIST bison;cairo;flex;glib;python2-devel)
# Remove dependencies that should be ignored.
Modified: trunk/cmake/build_projects/harfbuzz/bp.cmake
===================================================================
--- trunk/cmake/build_projects/harfbuzz/bp.cmake 2013-08-04 17:41:48 UTC (rev 12469)
+++ trunk/cmake/build_projects/harfbuzz/bp.cmake 2013-08-04 17:50:07 UTC (rev 12470)
@@ -1,4 +1,11 @@
# harfbuzz/bp.cmake
+# N.B. this file is generated so if you edit it you will lose all your
+# changes the next time it is generated (typically by running
+# either/both the update_added_packages.sh or update_pango_packages.sh
+# scripts). If those scripts do not provide good results, then
+# consider changing their source files (e.g., by editing the files
+# used in those scripts) or add a patch to be run by those scripts).
+
# This file should be included directly or indirectly from a top-level
# CMakeLists.txt file to configure the build of harfbuzz.
@@ -32,7 +39,7 @@
# List of dependencies (most of which are build tools) which should be
# ignored.
-set(BP_ignored_dependencies_LIST pkg-config;bison;flex;python2-devel;libXft)
+set(BP_ignored_dependencies_LIST pkg-config;bison;flex;python2-devel;libXft ${extra_ignored_dependencies_list})
set(harfbuzz_dependencies_LIST glib;ragel)
# Remove dependencies that should be ignored.
Modified: trunk/cmake/build_projects/itstool/bp.cmake
===================================================================
--- trunk/cmake/build_projects/itstool/bp.cmake 2013-08-04 17:41:48 UTC (rev 12469)
+++ trunk/cmake/build_projects/itstool/bp.cmake 2013-08-04 17:50:07 UTC (rev 12470)
@@ -1,4 +1,11 @@
# itstool/bp.cmake
+# N.B. this file is generated so if you edit it you will lose all your
+# changes the next time it is generated (typically by running
+# either/both the update_added_packages.sh or update_pango_packages.sh
+# scripts). If those scripts do not provide good results, then
+# consider changing their source files (e.g., by editing the files
+# used in those scripts) or add a patch to be run by those scripts).
+
# This file should be included directly or indirectly from a top-level
# CMakeLists.txt file to configure the build of itstool.
@@ -32,7 +39,7 @@
# List of dependencies (most of which are build tools) which should be
# ignored.
-set(BP_ignored_dependencies_LIST pkg-config;bison;flex;python2-devel;libXft)
+set(BP_ignored_dependencies_LIST pkg-config;bison;flex;python2-devel;libXft ${extra_ignored_dependencies_list})
set(itstool_dependencies_LIST )
# Remove dependencies that should be ignored.
Modified: trunk/cmake/build_projects/pango/bp.cmake
===================================================================
--- trunk/cmake/build_projects/pango/bp.cmake 2013-08-04 17:41:48 UTC (rev 12469)
+++ trunk/cmake/build_projects/pango/bp.cmake 2013-08-04 17:50:07 UTC (rev 12470)
@@ -1,4 +1,11 @@
# pango/bp.cmake
+# N.B. this file is generated so if you edit it you will lose all your
+# changes the next time it is generated (typically by running
+# either/both the update_added_packages.sh or update_pango_packages.sh
+# scripts). If those scripts do not provide good results, then
+# consider changing their source files (e.g., by editing the files
+# used in those scripts) or add a patch to be run by those scripts).
+
# This file should be included directly or indirectly from a top-level
# CMakeLists.txt file to configure the build of pango.
@@ -32,7 +39,7 @@
# List of dependencies (most of which are build tools) which should be
# ignored.
-set(BP_ignored_dependencies_LIST pkg-config;bison;flex;python2-devel;libXft)
+set(BP_ignored_dependencies_LIST pkg-config;bison;flex;python2-devel;libXft ${extra_ignored_dependencies_list})
set(pango_dependencies_LIST cairo;fontconfig;glib;gobject-introspection;gtk-doc;harfbuzz;libXft)
# Remove dependencies that should be ignored.
Modified: trunk/cmake/build_projects/yelp-tools/bp.cmake
===================================================================
--- trunk/cmake/build_projects/yelp-tools/bp.cmake 2013-08-04 17:41:48 UTC (rev 12469)
+++ trunk/cmake/build_projects/yelp-tools/bp.cmake 2013-08-04 17:50:07 UTC (rev 12470)
@@ -1,4 +1,11 @@
# yelp-tools/bp.cmake
+# N.B. this file is generated so if you edit it you will lose all your
+# changes the next time it is generated (typically by running
+# either/both the update_added_packages.sh or update_pango_packages.sh
+# scripts). If those scripts do not provide good results, then
+# consider changing their source files (e.g., by editing the files
+# used in those scripts) or add a patch to be run by those scripts).
+
# This file should be included directly or indirectly from a top-level
# CMakeLists.txt file to configure the build of yelp-tools.
@@ -32,7 +39,7 @@
# List of dependencies (most of which are build tools) which should be
# ignored.
-set(BP_ignored_dependencies_LIST pkg-config;bison;flex;python2-devel;libXft)
+set(BP_ignored_dependencies_LIST pkg-config;bison;flex;python2-devel;libXft ${extra_ignored_dependencies_list})
set(yelp-tools_dependencies_LIST intltool;itstool;libxml2;libxslt;yelp-xsl)
# Remove dependencies that should be ignored.
Modified: trunk/cmake/build_projects/yelp-xsl/bp.cmake
===================================================================
--- trunk/cmake/build_projects/yelp-xsl/bp.cmake 2013-08-04 17:41:48 UTC (rev 12469)
+++ trunk/cmake/build_projects/yelp-xsl/bp.cmake 2013-08-04 17:50:07 UTC (rev 12470)
@@ -1,4 +1,11 @@
# yelp-xsl/bp.cmake
+# N.B. this file is generated so if you edit it you will lose all your
+# changes the next time it is generated (typically by running
+# either/both the update_added_packages.sh or update_pango_packages.sh
+# scripts). If those scripts do not provide good results, then
+# consider changing their source files (e.g., by editing the files
+# used in those scripts) or add a patch to be run by those scripts).
+
# This file should be included directly or indirectly from a top-level
# CMakeLists.txt file to configure the build of yelp-xsl.
@@ -32,7 +39,7 @@
# List of dependencies (most of which are build tools) which should be
# ignored.
-set(BP_ignored_dependencies_LIST pkg-config;bison;flex;python2-devel;libXft)
+set(BP_ignored_dependencies_LIST pkg-config;bison;flex;python2-devel;libXft ${extra_ignored_dependencies_list})
set(yelp-xsl_dependencies_LIST intltool;itstool;libxml2;libxslt)
# Remove dependencies that should be ignored.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2013-08-04 17:41:53
|
Revision: 12469
http://sourceforge.net/p/plplot/code/12469
Author: airwin
Date: 2013-08-04 17:41:48 +0000 (Sun, 04 Aug 2013)
Log Message:
-----------
Insert boiler-plate warning into generated */bp.cmake files that those
files are generated.
Implement use of extra_ignored_dependencies_list (which allows
platforms to selectively ignore certain dependencies).
Modified Paths:
--------------
trunk/cmake/build_projects/gperf/bp.cmake
trunk/cmake/build_projects/intltool/bp.cmake
trunk/cmake/build_projects/libffi/bp.cmake
trunk/cmake/build_projects/libxml2/bp.cmake
trunk/cmake/build_projects/libxslt/bp.cmake
trunk/cmake/build_projects/pixman/bp.cmake
trunk/cmake/build_projects/ragel/bp.cmake
Modified: trunk/cmake/build_projects/gperf/bp.cmake
===================================================================
--- trunk/cmake/build_projects/gperf/bp.cmake 2013-08-03 18:30:14 UTC (rev 12468)
+++ trunk/cmake/build_projects/gperf/bp.cmake 2013-08-04 17:41:48 UTC (rev 12469)
@@ -1,4 +1,11 @@
# gperf/bp.cmake
+# N.B. this file is generated so if you edit it you will lose all your
+# changes the next time it is generated (typically by running
+# either/both the update_added_packages.sh or update_pango_packages.sh
+# scripts). If those scripts do not provide good results, then
+# consider changing their source files (e.g., by editing the files
+# used in those scripts) or add a patch to be run by those scripts).
+
# This file should be included directly or indirectly from a top-level
# CMakeLists.txt file to configure the build of gperf.
@@ -32,7 +39,7 @@
# List of dependencies (most of which are build tools) which should be
# ignored.
-set(BP_ignored_dependencies_LIST pkg-config;bison;flex;python2-devel;libXft)
+set(BP_ignored_dependencies_LIST pkg-config;bison;flex;python2-devel;libXft ${extra_ignored_dependencies_list})
set(gperf_dependencies_LIST )
# Remove dependencies that should be ignored.
Modified: trunk/cmake/build_projects/intltool/bp.cmake
===================================================================
--- trunk/cmake/build_projects/intltool/bp.cmake 2013-08-03 18:30:14 UTC (rev 12468)
+++ trunk/cmake/build_projects/intltool/bp.cmake 2013-08-04 17:41:48 UTC (rev 12469)
@@ -1,4 +1,11 @@
# intltool/bp.cmake
+# N.B. this file is generated so if you edit it you will lose all your
+# changes the next time it is generated (typically by running
+# either/both the update_added_packages.sh or update_pango_packages.sh
+# scripts). If those scripts do not provide good results, then
+# consider changing their source files (e.g., by editing the files
+# used in those scripts) or add a patch to be run by those scripts).
+
# This file should be included directly or indirectly from a top-level
# CMakeLists.txt file to configure the build of intltool.
@@ -32,7 +39,7 @@
# List of dependencies (most of which are build tools) which should be
# ignored.
-set(BP_ignored_dependencies_LIST pkg-config;bison;flex;python2-devel;libXft)
+set(BP_ignored_dependencies_LIST pkg-config;bison;flex;python2-devel;libXft ${extra_ignored_dependencies_list})
set(intltool_dependencies_LIST )
# Remove dependencies that should be ignored.
Modified: trunk/cmake/build_projects/libffi/bp.cmake
===================================================================
--- trunk/cmake/build_projects/libffi/bp.cmake 2013-08-03 18:30:14 UTC (rev 12468)
+++ trunk/cmake/build_projects/libffi/bp.cmake 2013-08-04 17:41:48 UTC (rev 12469)
@@ -1,4 +1,11 @@
# libffi/bp.cmake
+# N.B. this file is generated so if you edit it you will lose all your
+# changes the next time it is generated (typically by running
+# either/both the update_added_packages.sh or update_pango_packages.sh
+# scripts). If those scripts do not provide good results, then
+# consider changing their source files (e.g., by editing the files
+# used in those scripts) or add a patch to be run by those scripts).
+
# This file should be included directly or indirectly from a top-level
# CMakeLists.txt file to configure the build of libffi.
@@ -32,7 +39,7 @@
# List of dependencies (most of which are build tools) which should be
# ignored.
-set(BP_ignored_dependencies_LIST pkg-config;bison;flex;python2-devel;libXft)
+set(BP_ignored_dependencies_LIST pkg-config;bison;flex;python2-devel;libXft ${extra_ignored_dependencies_list})
set(libffi_dependencies_LIST )
# Remove dependencies that should be ignored.
Modified: trunk/cmake/build_projects/libxml2/bp.cmake
===================================================================
--- trunk/cmake/build_projects/libxml2/bp.cmake 2013-08-03 18:30:14 UTC (rev 12468)
+++ trunk/cmake/build_projects/libxml2/bp.cmake 2013-08-04 17:41:48 UTC (rev 12469)
@@ -1,4 +1,11 @@
# libxml2/bp.cmake
+# N.B. this file is generated so if you edit it you will lose all your
+# changes the next time it is generated (typically by running
+# either/both the update_added_packages.sh or update_pango_packages.sh
+# scripts). If those scripts do not provide good results, then
+# consider changing their source files (e.g., by editing the files
+# used in those scripts) or add a patch to be run by those scripts).
+
# This file should be included directly or indirectly from a top-level
# CMakeLists.txt file to configure the build of libxml2.
@@ -32,7 +39,7 @@
# List of dependencies (most of which are build tools) which should be
# ignored.
-set(BP_ignored_dependencies_LIST pkg-config;bison;flex;python2-devel;libXft)
+set(BP_ignored_dependencies_LIST pkg-config;bison;flex;python2-devel;libXft ${extra_ignored_dependencies_list})
set(libxml2_dependencies_LIST )
# Remove dependencies that should be ignored.
Modified: trunk/cmake/build_projects/libxslt/bp.cmake
===================================================================
--- trunk/cmake/build_projects/libxslt/bp.cmake 2013-08-03 18:30:14 UTC (rev 12468)
+++ trunk/cmake/build_projects/libxslt/bp.cmake 2013-08-04 17:41:48 UTC (rev 12469)
@@ -1,4 +1,11 @@
# libxslt/bp.cmake
+# N.B. this file is generated so if you edit it you will lose all your
+# changes the next time it is generated (typically by running
+# either/both the update_added_packages.sh or update_pango_packages.sh
+# scripts). If those scripts do not provide good results, then
+# consider changing their source files (e.g., by editing the files
+# used in those scripts) or add a patch to be run by those scripts).
+
# This file should be included directly or indirectly from a top-level
# CMakeLists.txt file to configure the build of libxslt.
@@ -32,7 +39,7 @@
# List of dependencies (most of which are build tools) which should be
# ignored.
-set(BP_ignored_dependencies_LIST pkg-config;bison;flex;python2-devel;libXft)
+set(BP_ignored_dependencies_LIST pkg-config;bison;flex;python2-devel;libXft ${extra_ignored_dependencies_list})
set(libxslt_dependencies_LIST libxml2)
# Remove dependencies that should be ignored.
Modified: trunk/cmake/build_projects/pixman/bp.cmake
===================================================================
--- trunk/cmake/build_projects/pixman/bp.cmake 2013-08-03 18:30:14 UTC (rev 12468)
+++ trunk/cmake/build_projects/pixman/bp.cmake 2013-08-04 17:41:48 UTC (rev 12469)
@@ -1,4 +1,11 @@
# pixman/bp.cmake
+# N.B. this file is generated so if you edit it you will lose all your
+# changes the next time it is generated (typically by running
+# either/both the update_added_packages.sh or update_pango_packages.sh
+# scripts). If those scripts do not provide good results, then
+# consider changing their source files (e.g., by editing the files
+# used in those scripts) or add a patch to be run by those scripts).
+
# This file should be included directly or indirectly from a top-level
# CMakeLists.txt file to configure the build of pixman.
@@ -32,7 +39,7 @@
# List of dependencies (most of which are build tools) which should be
# ignored.
-set(BP_ignored_dependencies_LIST pkg-config;bison;flex;python2-devel;libXft)
+set(BP_ignored_dependencies_LIST pkg-config;bison;flex;python2-devel;libXft ${extra_ignored_dependencies_list})
set(pixman_dependencies_LIST pkg-config)
# Remove dependencies that should be ignored.
Modified: trunk/cmake/build_projects/ragel/bp.cmake
===================================================================
--- trunk/cmake/build_projects/ragel/bp.cmake 2013-08-03 18:30:14 UTC (rev 12468)
+++ trunk/cmake/build_projects/ragel/bp.cmake 2013-08-04 17:41:48 UTC (rev 12469)
@@ -1,4 +1,11 @@
# ragel/bp.cmake
+# N.B. this file is generated so if you edit it you will lose all your
+# changes the next time it is generated (typically by running
+# either/both the update_added_packages.sh or update_pango_packages.sh
+# scripts). If those scripts do not provide good results, then
+# consider changing their source files (e.g., by editing the files
+# used in those scripts) or add a patch to be run by those scripts).
+
# This file should be included directly or indirectly from a top-level
# CMakeLists.txt file to configure the build of ragel.
@@ -32,7 +39,7 @@
# List of dependencies (most of which are build tools) which should be
# ignored.
-set(BP_ignored_dependencies_LIST pkg-config;bison;flex;python2-devel;libXft)
+set(BP_ignored_dependencies_LIST pkg-config;bison;flex;python2-devel;libXft ${extra_ignored_dependencies_list})
set(ragel_dependencies_LIST )
# Remove dependencies that should be ignored.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2013-08-03 18:30:17
|
Revision: 12468
http://sourceforge.net/p/plplot/code/12468
Author: airwin
Date: 2013-08-03 18:30:14 +0000 (Sat, 03 Aug 2013)
Log Message:
-----------
Save original version of gtk_packages<VERSION>.xml file to make
it more convenient to update the patch that is applied.
Modified Paths:
--------------
trunk/cmake/build_projects/update_pango_packages.sh
Modified: trunk/cmake/build_projects/update_pango_packages.sh
===================================================================
--- trunk/cmake/build_projects/update_pango_packages.sh 2013-08-03 17:40:53 UTC (rev 12467)
+++ trunk/cmake/build_projects/update_pango_packages.sh 2013-08-03 18:30:14 UTC (rev 12468)
@@ -12,8 +12,9 @@
cd ..
./gtk_xml_recursive_process.py \
$GTK_VERSION/gnome-apps-$GTK_VERSION.modules \
->|gtk_packages_$GTK_VERSION.xml
+>|gtk_packages_$GTK_VERSION.xml_original
rm -rf $GTK_VERSION
+cp gtk_packages_$GTK_VERSION.xml_original gtk_packages_$GTK_VERSION.xml
patch --no-backup-if-mismatch gtk_packages_$GTK_VERSION.xml patch_gtk_packages.xml
./gtk_transform.py pango 1 <gtk_packages_$GTK_VERSION.xml 1>| pango_packages.data
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2013-08-03 17:40:55
|
Revision: 12467
http://sourceforge.net/p/plplot/code/12467
Author: airwin
Date: 2013-08-03 17:40:53 +0000 (Sat, 03 Aug 2013)
Log Message:
-----------
Small simplification of CMake logic.
Modified Paths:
--------------
trunk/cmake/build_projects/CMakeLists.txt
Modified: trunk/cmake/build_projects/CMakeLists.txt
===================================================================
--- trunk/cmake/build_projects/CMakeLists.txt 2013-08-03 17:39:54 UTC (rev 12466)
+++ trunk/cmake/build_projects/CMakeLists.txt 2013-08-03 17:40:53 UTC (rev 12467)
@@ -166,17 +166,17 @@
determine_msys_path(MSYS_CMAKE_RC_COMPILER "${CMAKE_RC_COMPILER}")
list(APPEND BP_CMAKE_COMMAND -DCMAKE_RC_COMPILER:FILEPATH=${MSYS_CMAKE_RC_COMPILER})
endif(CMAKE_RC_COMPILER)
- # Propagate the install prefix to autotools-based builds
- set(BP_CONFIGURE_COMMAND configure --prefix=${BP_CMAKE_INSTALL_PREFIX})
else(MSYS_PLATFORM)
# Propagate the overall CMake generator and install prefix to all CMake-based
# software project builds.
set(BP_CMAKE_COMMAND ${CMAKE_COMMAND} "-G${CMAKE_GENERATOR}" -DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_INSTALL_PREFIX})
set(BP_CMAKE_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX})
- # Propagate the install prefix to autotools-based builds
- set(BP_CONFIGURE_COMMAND configure --prefix=${BP_CMAKE_INSTALL_PREFIX})
endif(MSYS_PLATFORM)
+# Propagate the install prefix to autotools-based builds
+set(BP_CONFIGURE_COMMAND configure --prefix=${BP_CMAKE_INSTALL_PREFIX})
+
+
if(CMAKE_VERBOSE_MAKEFILE)
# Not sure whether all contemplated back-ends support this or not, but
# most should.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2013-08-03 17:39:57
|
Revision: 12466
http://sourceforge.net/p/plplot/code/12466
Author: airwin
Date: 2013-08-03 17:39:54 +0000 (Sat, 03 Aug 2013)
Log Message:
-----------
Do not reuse PLPLOT_LOCAL_SOURCE_DIR in loop that configures both
plplot and plplot_lite. This fixes a bug where
z: was being prepended twice for the second time through the loop.
Modified Paths:
--------------
trunk/cmake/build_projects/plplot/bp.cmake
Modified: trunk/cmake/build_projects/plplot/bp.cmake
===================================================================
--- trunk/cmake/build_projects/plplot/bp.cmake 2013-08-03 17:35:12 UTC (rev 12465)
+++ trunk/cmake/build_projects/plplot/bp.cmake 2013-08-03 17:39:54 UTC (rev 12466)
@@ -100,7 +100,9 @@
# TEMPORARY (already in the _required_ native form for the cmake -E
# copy_directory command below except for the drive letter which is
# z: for this local result.)
- set(PLPLOT_LOCAL_SOURCE_DIR z:${PLPLOT_LOCAL_SOURCE_DIR})
+ set(MODIFIED_PLPLOT_LOCAL_SOURCE_DIR z:${PLPLOT_LOCAL_SOURCE_DIR})
+ else(MSYS_PLATFORM)
+ set(MODIFIED_PLPLOT_LOCAL_SOURCE_DIR ${PLPLOT_LOCAL_SOURCE_DIR})
endif(MSYS_PLATFORM)
message(STATUS "modified BP_PATH for ${BP_PACKAGE}${tag} = ${BP_PATH}")
@@ -110,7 +112,7 @@
build_${BP_PACKAGE}${tag}
DEPENDS "${${BP_PACKAGE}${tag}_dependencies_targets}"
#TEMPORARY
- DOWNLOAD_COMMAND ${CMAKE_COMMAND} -E copy_directory ${PLPLOT_LOCAL_SOURCE_DIR} ${EP_BASE}/Source/build_${BP_PACKAGE}${tag}
+ DOWNLOAD_COMMAND ${CMAKE_COMMAND} -E copy_directory ${MODIFIED_PLPLOT_LOCAL_SOURCE_DIR} ${EP_BASE}/Source/build_${BP_PACKAGE}${tag}
CONFIGURE_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${BP_CMAKE_COMMAND} -DBUILD_TEST=ON -DPLD_pdf=ON ${${BP_PACKAGE}${tag}_cmake_args} ${EP_BASE}/Source/build_${BP_PACKAGE}${tag}
BUILD_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${BP_PARALLEL_BUILD_COMMAND}
INSTALL_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${BP_PARALLEL_BUILD_COMMAND} install
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2013-08-03 17:35:15
|
Revision: 12465
http://sourceforge.net/p/plplot/code/12465
Author: airwin
Date: 2013-08-03 17:35:12 +0000 (Sat, 03 Aug 2013)
Log Message:
-----------
Sort out all generated catalog issues for the MSYS case.
This gives good results for build_gtk-doc on Linux, but
that build still fails for the MSYS case because of the
entity mangling issue for raw xmlcatalog on that platform
(see https://mail.gnome.org/archives/xml/2013-January/msg00009.html).
However, for the MSYS case have spot-checked a few of the generated
catalog results with the xmlcatalog_wrapper.sh script, and they
seem fine. Which seems to indicate that the catalogs generated
by the docbook-x?l packages are fine on MSYS.
Modified Paths:
--------------
trunk/cmake/build_projects/docbook-xml/CMakeLists.txt
trunk/cmake/build_projects/docbook-xsl/CMakeLists.txt
Modified: trunk/cmake/build_projects/docbook-xml/CMakeLists.txt
===================================================================
--- trunk/cmake/build_projects/docbook-xml/CMakeLists.txt 2013-08-03 17:29:37 UTC (rev 12464)
+++ trunk/cmake/build_projects/docbook-xml/CMakeLists.txt 2013-08-03 17:35:12 UTC (rev 12465)
@@ -23,6 +23,18 @@
cmake_minimum_required(VERSION 2.8.10.2 FATAL_ERROR)
+# CATALOG_CMAKE_INSTALL_PREFIX prepends a "/" to CMAKE_INSTALL_PREFIX if the
+# latter doesn't start with "/", (i.e, the drive letter
+# on Microsoft systems). This makes the URI file:/// form come out
+# right for catalog entries.
+if(CMAKE_INSTALL_PREFIX MATCHES "^[^/]")
+ set(CATALOG_CMAKE_INSTALL_PREFIX /${CMAKE_INSTALL_PREFIX})
+else(CMAKE_INSTALL_PREFIX MATCHES "^[^/]")
+ set(CATALOG_CMAKE_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX})
+endif(CMAKE_INSTALL_PREFIX MATCHES "^[^/]")
+message(STATUS "CMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}")
+message(STATUS "CATALOG_CMAKE_INSTALL_PREFIX=${CATALOG_CMAKE_INSTALL_PREFIX}")
+
# Define useful function.
find_program(XMLCATALOG_EXECUTABLE xmlcatalog)
function(install_xml_catalog arguments_LIST3 catalog)
@@ -105,24 +117,24 @@
set(commands
"public" "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"
-"public" "-//OASIS//DTD DocBook XML CALS Table Model V4.5//EN" "file://\${CMAKE_INSTALL_PREFIX}/share/xml/docbook/xml-dtd-4.5/calstblx.dtd"
-"public" "-//OASIS//DTD XML Exchange Table Model 19990315//EN" "file://\${CMAKE_INSTALL_PREFIX}/share/xml/docbook/xml-dtd-4.5/soextblx.dtd"
-"public" "-//OASIS//ELEMENTS DocBook XML Information Pool V4.5//EN" "file://\${CMAKE_INSTALL_PREFIX}/share/xml/docbook/xml-dtd-4.5/dbpoolx.mod"
-"public" "-//OASIS//ELEMENTS DocBook XML Document Hierarchy V4.5//EN" "file://\${CMAKE_INSTALL_PREFIX}/share/xml/docbook/xml-dtd-4.5/dbhierx.mod"
-"public" "-//OASIS//ELEMENTS DocBook XML HTML Tables V4.5//EN" "file://\${CMAKE_INSTALL_PREFIX}/share/xml/docbook/xml-dtd-4.5/htmltblx.mod"
-"public" "-//OASIS//ENTITIES DocBook XML Notations V4.5//EN" "file://\${CMAKE_INSTALL_PREFIX}/share/xml/docbook/xml-dtd-4.5/dbnotnx.mod"
-"public" "-//OASIS//ENTITIES DocBook XML Character Entities V4.5//EN" "file://\${CMAKE_INSTALL_PREFIX}/share/xml/docbook/xml-dtd-4.5/dbcentx.mod"
-"public" "-//OASIS//ENTITIES DocBook XML Additional General Entities V4.5//EN" "file://\${CMAKE_INSTALL_PREFIX}/share/xml/docbook/xml-dtd-4.5/dbgenent.mod"
-"rewriteSystem" "http://www.oasis-open.org/docbook/xml/4.5" "file://\${CMAKE_INSTALL_PREFIX}/share/xml/docbook/xml-dtd-4.5"
-"rewriteURI" "http://www.oasis-open.org/docbook/xml/4.5" "file://\${CMAKE_INSTALL_PREFIX}/share/xml/docbook/xml-dtd-4.5")
+"public" "-//OASIS//DTD DocBook XML CALS Table Model V4.5//EN" "file://${CATALOG_CMAKE_INSTALL_PREFIX}/share/xml/docbook/xml-dtd-4.5/calstblx.dtd"
+"public" "-//OASIS//DTD XML Exchange Table Model 19990315//EN" "file://${CATALOG_CMAKE_INSTALL_PREFIX}/share/xml/docbook/xml-dtd-4.5/soextblx.dtd"
+"public" "-//OASIS//ELEMENTS DocBook XML Information Pool V4.5//EN" "file://${CATALOG_CMAKE_INSTALL_PREFIX}/share/xml/docbook/xml-dtd-4.5/dbpoolx.mod"
+"public" "-//OASIS//ELEMENTS DocBook XML Document Hierarchy V4.5//EN" "file://${CATALOG_CMAKE_INSTALL_PREFIX}/share/xml/docbook/xml-dtd-4.5/dbhierx.mod"
+"public" "-//OASIS//ELEMENTS DocBook XML HTML Tables V4.5//EN" "file://${CATALOG_CMAKE_INSTALL_PREFIX}/share/xml/docbook/xml-dtd-4.5/htmltblx.mod"
+"public" "-//OASIS//ENTITIES DocBook XML Notations V4.5//EN" "file://${CATALOG_CMAKE_INSTALL_PREFIX}/share/xml/docbook/xml-dtd-4.5/dbnotnx.mod"
+"public" "-//OASIS//ENTITIES DocBook XML Character Entities V4.5//EN" "file://${CATALOG_CMAKE_INSTALL_PREFIX}/share/xml/docbook/xml-dtd-4.5/dbcentx.mod"
+"public" "-//OASIS//ENTITIES DocBook XML Additional General Entities V4.5//EN" "file://${CATALOG_CMAKE_INSTALL_PREFIX}/share/xml/docbook/xml-dtd-4.5/dbgenent.mod"
+"rewriteSystem" "http://www.oasis-open.org/docbook/xml/4.5" "file://${CATALOG_CMAKE_INSTALL_PREFIX}/share/xml/docbook/xml-dtd-4.5"
+"rewriteURI" "http://www.oasis-open.org/docbook/xml/4.5" "file://${CATALOG_CMAKE_INSTALL_PREFIX}/share/xml/docbook/xml-dtd-4.5")
install_xml_catalog(commands "docbook")
set(commands
-"delegatePublic" "-//OASIS//ENTITIES DocBook XML" "file://\${CMAKE_INSTALL_PREFIX}/etc/xml/docbook"
-"delegatePublic" "-//OASIS//DTD DocBook XML" "file://\${CMAKE_INSTALL_PREFIX}/etc/xml/docbook"
-"delegateSystem" "http://www.oasis-open.org/docbook/" "file://\${CMAKE_INSTALL_PREFIX}/etc/xml/docbook"
-"delegateURI" "http://www.oasis-open.org/docbook/" "file://\${CMAKE_INSTALL_PREFIX}/etc/xml/docbook"
+"delegatePublic" "-//OASIS//ENTITIES DocBook XML" "file://${CATALOG_CMAKE_INSTALL_PREFIX}/etc/xml/docbook"
+"delegatePublic" "-//OASIS//DTD DocBook XML" "file://${CATALOG_CMAKE_INSTALL_PREFIX}/etc/xml/docbook"
+"delegateSystem" "http://www.oasis-open.org/docbook/" "file://${CATALOG_CMAKE_INSTALL_PREFIX}/etc/xml/docbook"
+"delegateURI" "http://www.oasis-open.org/docbook/" "file://${CATALOG_CMAKE_INSTALL_PREFIX}/etc/xml/docbook"
)
install_xml_catalog(commands "catalog")
@@ -145,14 +157,14 @@
foreach(DTDVERSION ${previous_versions})
set(commands
"public" "-//OASIS//DTD DocBook XML V${DTDVERSION}//EN" "http://www.oasis-open.org/docbook/xml/${DTDVERSION}/docbookx.dtd"
- "rewriteSystem" "http://www.oasis-open.org/docbook/xml/${DTDVERSION}" "file://\${CMAKE_INSTALL_PREFIX}/share/xml/docbook/xml-dtd-4.5"
- "rewriteURI" "http://www.oasis-open.org/docbook/xml/${DTDVERSION}" "file://\${CMAKE_INSTALL_PREFIX}/share/xml/docbook/xml-dtd-4.5"
+ "rewriteSystem" "http://www.oasis-open.org/docbook/xml/${DTDVERSION}" "file://${CATALOG_CMAKE_INSTALL_PREFIX}/share/xml/docbook/xml-dtd-4.5"
+ "rewriteURI" "http://www.oasis-open.org/docbook/xml/${DTDVERSION}" "file://${CATALOG_CMAKE_INSTALL_PREFIX}/share/xml/docbook/xml-dtd-4.5"
)
install_xml_catalog(commands "docbook")
set(commands
- "delegateSystem" "http://www.oasis-open.org/docbook/xml/${DTDVERSION}/" "file://\${CMAKE_INSTALL_PREFIX}/etc/xml/docbook"
- "delegateURI" "http://www.oasis-open.org/docbook/xml/${DTDVERSION}/" "file://\${CMAKE_INSTALL_PREFIX}/etc/xml/docbook"
+ "delegateSystem" "http://www.oasis-open.org/docbook/xml/${DTDVERSION}/" "file://${CATALOG_CMAKE_INSTALL_PREFIX}/etc/xml/docbook"
+ "delegateURI" "http://www.oasis-open.org/docbook/xml/${DTDVERSION}/" "file://${CATALOG_CMAKE_INSTALL_PREFIX}/etc/xml/docbook"
)
install_xml_catalog(commands "catalog")
Modified: trunk/cmake/build_projects/docbook-xsl/CMakeLists.txt
===================================================================
--- trunk/cmake/build_projects/docbook-xsl/CMakeLists.txt 2013-08-03 17:29:37 UTC (rev 12464)
+++ trunk/cmake/build_projects/docbook-xsl/CMakeLists.txt 2013-08-03 17:35:12 UTC (rev 12465)
@@ -23,6 +23,18 @@
cmake_minimum_required(VERSION 2.8.10.2 FATAL_ERROR)
+# CATALOG_CMAKE_INSTALL_PREFIX prepends a "/" to CMAKE_INSTALL_PREFIX if the
+# latter doesn't start with "/", (i.e, the drive letter
+# on Microsoft systems). This makes the URI file:/// form come out
+# right for catalog entries.
+if(CMAKE_INSTALL_PREFIX MATCHES "^[^/]")
+ set(CATALOG_CMAKE_INSTALL_PREFIX /${CMAKE_INSTALL_PREFIX})
+else(CMAKE_INSTALL_PREFIX MATCHES "^[^/]")
+ set(CATALOG_CMAKE_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX})
+endif(CMAKE_INSTALL_PREFIX MATCHES "^[^/]")
+message(STATUS "CMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}")
+message(STATUS "CATALOG_CMAKE_INSTALL_PREFIX=${CATALOG_CMAKE_INSTALL_PREFIX}")
+
# Define useful function.
find_program(XMLCATALOG_EXECUTABLE xmlcatalog)
function(install_xml_catalog arguments_LIST3 catalog)
@@ -148,10 +160,10 @@
)
set(commands
- "rewriteSystem" "http://docbook.sourceforge.net/release/xsl/1.78.1" "\${CMAKE_INSTALL_PREFIX}/share/xml/docbook/xsl-stylesheets-1.78.1"
- "rewriteURI" "http://docbook.sourceforge.net/release/xsl/1.78.1" "\${CMAKE_INSTALL_PREFIX}/share/xml/docbook/xsl-stylesheets-1.78.1"
- "rewriteSystem" "http://docbook.sourceforge.net/release/xsl/current" "\${CMAKE_INSTALL_PREFIX}/share/xml/docbook/xsl-stylesheets-1.78.1"
- "rewriteURI" "http://docbook.sourceforge.net/release/xsl/current" "\${CMAKE_INSTALL_PREFIX}/share/xml/docbook/xsl-stylesheets-1.78.1"
+ "rewriteSystem" "http://docbook.sourceforge.net/release/xsl/1.78.1" "file://${CATALOG_CMAKE_INSTALL_PREFIX}/share/xml/docbook/xsl-stylesheets-1.78.1"
+ "rewriteURI" "http://docbook.sourceforge.net/release/xsl/1.78.1" "file://${CATALOG_CMAKE_INSTALL_PREFIX}/share/xml/docbook/xsl-stylesheets-1.78.1"
+ "rewriteSystem" "http://docbook.sourceforge.net/release/xsl/current" "file://${CATALOG_CMAKE_INSTALL_PREFIX}/share/xml/docbook/xsl-stylesheets-1.78.1"
+ "rewriteURI" "http://docbook.sourceforge.net/release/xsl/current" "file://${CATALOG_CMAKE_INSTALL_PREFIX}/share/xml/docbook/xsl-stylesheets-1.78.1"
)
install_xml_catalog(commands "catalog")
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
1 message has been excluded from this view by a project administrator.
