Attachment 95942 Details for Bug 75860 – Make documentation generating MSYS/MSYS2-compatible

[patch] Make documentation generating MSYS/MSYS2-compatible

0003-Make-documentation-generating-MSYS-MSYS2-compatible.patch (text/plain), 1.86 KB, created by LRN on 2014-03-17 15:09:45 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: LRN

Created: 2014-03-17 15:09:45 UTC

Size: 1.86 KB

patch

obsolete

>From 126310f017fcce99da96c84b7f5753539cd6528c Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?=D0=A0=D1=83=D1=81=D0=BB=D0=B0=D0=BD=20=D0=98=D0=B6=D0=B1?=
> =?UTF-8?q?=D1=83=D0=BB=D0=B0=D1=82=D0=BE=D0=B2?= <lrn1986@gmail.com>
>Date: Thu, 6 Mar 2014 23:17:13 +0000
>Subject: [PATCH 3/9] Make documentation generating MSYS/MSYS2-compatible
>
>xmlto is a shell script, it needs to be fed MSYSsy filenames.
>This patch adds a cygpath invocation for filename conversion (autotools do
>that automatically, for CMake you have to spell it out). Cygwpath is available
>in MSYS2 (and Cygwin, obviously).
>When cygpath is not available, use MSYS-specific pwd extension to get W32 path.
>---
> cmake/doc/CMakeLists.txt | 15 +++++++++++++++
> 1 file changed, 15 insertions(+)
>
>diff --git a/cmake/doc/CMakeLists.txt b/cmake/doc/CMakeLists.txt
>index 7fdfc21..807af60 100644
>--- a/cmake/doc/CMakeLists.txt
>+++ b/cmake/doc/CMakeLists.txt
>@@ -20,6 +20,8 @@ find_program(MEINPROC4_EXECUTABLE meinproc4)
> 
> find_program(XMLTO_EXECUTABLE xmlto)
> 
>+find_program(CYGPATH_EXECUTABLE cygpath)
>+
> if (MEINPROC4_EXECUTABLE OR XMLTO_EXECUTABLE)
>   OPTION(DBUS_ENABLE_XML_DOCS "build XML  documentation (requires xmlto or meinproc4)" ON)
>   ADD_CUSTOM_TARGET(xmldoc ALL)
>@@ -71,6 +73,19 @@ macro (DOCBOOK _sources _format)
> 		)
> 	  endif ()
> 	  if (XMLTO_EXECUTABLE)
>+		    if (MSYS)
>+			if (CYGPATH_EXECUTABLE)
>+			    execute_process(
>+				COMMAND cygpath ${_infile}
>+				OUTPUT_VARIABLE _infile)
>+			else ()
>+			    execute_process(COMMAND dirname ${_infile}  OUTPUT_VARIABLE _path)
>+			    string(STRIP ${_path} _path)
>+			    execute_process(COMMAND sh -c "cd ${_path}; pwd -W" OUTPUT_VARIABLE _path)
>+			    string(STRIP ${_path} _path)
>+			    set(_infile "${_path}/${_name}")
>+			endif(CYGPATH_EXECUTABLE)
>+		    endif (MSYS)
> 		    ADD_CUSTOM_COMMAND(
> 			OUTPUT ${_outfile}
> 			COMMAND ${XMLTO_EXECUTABLE} -vv ${_format} ${_infile}
>-- 
>1.8.4
>

Actions: View | Splinter Review

Attachments on bug 75860: 95269 | 95942

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.