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. |