From: <ai...@us...> - 2009-09-02 18:18:40
|
Revision: 10366 http://plplot.svn.sourceforge.net/plplot/?rev=10366&view=rev Author: airwin Date: 2009-09-02 18:18:34 +0000 (Wed, 02 Sep 2009) Log Message: ----------- Improve onsgmls output. Modified Paths: -------------- trunk/cmake/modules/docbook.cmake Modified: trunk/cmake/modules/docbook.cmake =================================================================== --- trunk/cmake/modules/docbook.cmake 2009-09-02 16:54:52 UTC (rev 10365) +++ trunk/cmake/modules/docbook.cmake 2009-09-02 18:18:34 UTC (rev 10366) @@ -53,6 +53,12 @@ set(DOCBOOK_DTD_PUBID "-//OASIS//DTD DocBook XML V4.2//EN") find_program(ONSGMLS onsgmls) +if(ONSGMLS ) + message(STATUS "validate target will be available to check for syntax errors in the PLplot DocBook documentation using ${ONSGMLS}.") +else(ONSGMLS ) + message(STATUS "WARNING: validate target will not be available to check for syntax errors in the PLplot DocBook documentation because onsgmls was not found.") +endif(ONSGMLS ) + # Check for required programs and perl libraries. if(BUILD_DOC) # EC_PDFTEX needed to configure pdftex.map which is used in general for This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2009-09-22 01:29:54
|
Revision: 10453 http://plplot.svn.sourceforge.net/plplot/?rev=10453&view=rev Author: airwin Date: 2009-09-22 01:29:46 +0000 (Tue, 22 Sep 2009) Log Message: ----------- Replace "errors" with "issues" in normal output so that those using search tools like grep to find errors in the cmake output will not get fooled by this message. Modified Paths: -------------- trunk/cmake/modules/docbook.cmake Modified: trunk/cmake/modules/docbook.cmake =================================================================== --- trunk/cmake/modules/docbook.cmake 2009-09-22 00:40:50 UTC (rev 10452) +++ trunk/cmake/modules/docbook.cmake 2009-09-22 01:29:46 UTC (rev 10453) @@ -54,7 +54,7 @@ find_program(ONSGMLS onsgmls) if(ONSGMLS ) - message(STATUS "validate target will be available to check for syntax errors in the PLplot DocBook documentation using ${ONSGMLS}.") + message(STATUS "validate target will be available to check for syntax issues in the PLplot DocBook documentation using ${ONSGMLS}.") else(ONSGMLS ) message(STATUS "WARNING: validate target will not be available to check for syntax errors in the PLplot DocBook documentation because onsgmls was not found.") endif(ONSGMLS ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2010-01-08 02:40:25
|
Revision: 10747 http://plplot.svn.sourceforge.net/plplot/?rev=10747&view=rev Author: airwin Date: 2010-01-08 02:40:14 +0000 (Fri, 08 Jan 2010) Log Message: ----------- Expose XML_DECL in cmake to give path to xml.dcl This exposes XML_DECL to cmake as a user settable option. This allows "make validate" to be used on systems that have xml.dcl in locations other than "/usr/share/xml/declaration/xml.dcl". For example, on Macs that have installed OpenSP via MacPorts, the file will be in "/opt/local/share/OpenSP/xml.dcl". This also allows one to specify the docbook 4.2 catalog by prepending "-c /path/to/docbook-42.cat " to CML_DECL. It's a little bit of a cheat; the catalog probably get it's own cmake variable (or copy it into doc/docbook/src/catalog). Thanks to David MacMahon for this patch. Modified Paths: -------------- trunk/cmake/modules/docbook.cmake Modified: trunk/cmake/modules/docbook.cmake =================================================================== --- trunk/cmake/modules/docbook.cmake 2010-01-08 02:31:50 UTC (rev 10746) +++ trunk/cmake/modules/docbook.cmake 2010-01-08 02:40:14 UTC (rev 10747) @@ -49,7 +49,7 @@ set(PLPLOT_WEBSITE "plplot.sourceforge.net" CACHE STRING "PLplot web site") # Required for validation regardless of whether BUILD_DOC is set -set(XML_DECL /usr/share/xml/declaration/xml.dcl) +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.2//EN") find_program(ONSGMLS onsgmls) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2010-06-04 18:02:18
|
Revision: 11053 http://plplot.svn.sourceforge.net/plplot/?rev=11053&view=rev Author: airwin Date: 2010-06-04 18:02:11 +0000 (Fri, 04 Jun 2010) Log Message: ----------- Move from the dated DocBook 4.2 standard to DocBook 4.5. I double-checked that even Ubuntu Hardy has access to DocBook 4.5 so this change should be no problem for Hazen's Ubuntu Intrepid system. Modified Paths: -------------- trunk/cmake/modules/docbook.cmake Modified: trunk/cmake/modules/docbook.cmake =================================================================== --- trunk/cmake/modules/docbook.cmake 2010-06-04 01:07:14 UTC (rev 11052) +++ trunk/cmake/modules/docbook.cmake 2010-06-04 18:02:11 UTC (rev 11053) @@ -50,7 +50,7 @@ # 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.2//EN") +set(DOCBOOK_DTD_PUBID "-//OASIS//DTD DocBook XML V4.5//EN") find_program(ONSGMLS onsgmls) if(ONSGMLS ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2010-12-01 19:31:42
|
Revision: 11360 http://plplot.svn.sourceforge.net/plplot/?rev=11360&view=rev Author: airwin Date: 2010-12-01 19:31:36 +0000 (Wed, 01 Dec 2010) Log Message: ----------- Tweak message when onsgmls is not found. Modified Paths: -------------- trunk/cmake/modules/docbook.cmake Modified: trunk/cmake/modules/docbook.cmake =================================================================== --- trunk/cmake/modules/docbook.cmake 2010-12-01 18:47:35 UTC (rev 11359) +++ trunk/cmake/modules/docbook.cmake 2010-12-01 19:31:36 UTC (rev 11360) @@ -56,7 +56,7 @@ if(ONSGMLS ) message(STATUS "validate target will be available to check for syntax issues in the PLplot DocBook documentation using ${ONSGMLS}.") else(ONSGMLS ) - message(STATUS "WARNING: validate target will not be available to check for syntax errors in the PLplot DocBook documentation because onsgmls was not found.") + message(STATUS "WARNING: validate target will not be available to check for syntax issues in the PLplot DocBook documentation because onsgmls was not found.") endif(ONSGMLS ) # Check for required programs and perl libraries. 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-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-10-05 19:51:51
|
Revision: 12581 http://sourceforge.net/p/plplot/code/12581 Author: airwin Date: 2013-10-05 19:51:48 +0000 (Sat, 05 Oct 2013) Log Message: ----------- Make DOCBOOK_XML_BACKEND ON mandatory rather than an option. This change effectively disables the old SGML/DSSSL backend tools that were deprecated but still available for 5.9.10 and which were the default for releases prior to 5.9.10. Modified Paths: -------------- trunk/cmake/modules/docbook.cmake Modified: trunk/cmake/modules/docbook.cmake =================================================================== --- trunk/cmake/modules/docbook.cmake 2013-10-05 19:38:25 UTC (rev 12580) +++ trunk/cmake/modules/docbook.cmake 2013-10-05 19:51:48 UTC (rev 12581) @@ -68,8 +68,15 @@ # This option is used for the BUILD_DOC case below and elsewhere and also # for the PREBUILT_DOC case elsewhere (when stylesheet.css is configured). -option(DOCBOOK_XML_BACKEND "Use DocBook XML/XSLT backend tools to generate our documentation from DocBook source" ON) +# option(DOCBOOK_XML_BACKEND "Use DocBook XML/XSLT backend tools to generate our documentation from DocBook source" ON) +# N.B., DOCBOOK_XML_BACKEND ON is mandatory now rather than an option +# which effectively disables the old SGML/DSSSL backend tools that +# were deprecated but still available for 5.9.10 and which were the +# default for releases prior to 5.9.10. +set(DOCBOOK_XML_BACKEND ON CACHE BOOL "" FORCE) + + # Check for required programs and perl libraries. if(BUILD_DOC) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |