Attachment 95269 Details for Bug 75860 – Make documentation generating MSYS2-compatible

[patch] Make documentation generating MSYS2-compatible

0006-Make-documentation-generating-MSYS2-compatible.patch (text/plain), 1.22 KB, created by LRN on 2014-03-07 00:20:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: LRN

Created: 2014-03-07 00:20:03 UTC

Size: 1.22 KB

patch

obsolete

>From 08362a1d9a177e573f422e71b290f51198bef110 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 6/9] Make documentation generating 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). It may be absent in MSYS, but i don't care.
>
>https://bugs.freedesktop.org/show_bug.cgi?id=75860
>---
> cmake/doc/CMakeLists.txt | 6 ++++++
> 1 file changed, 6 insertions(+)
>
>diff --git a/cmake/doc/CMakeLists.txt b/cmake/doc/CMakeLists.txt
>index 7fdfc21..ad73c9c 100644
>--- a/cmake/doc/CMakeLists.txt
>+++ b/cmake/doc/CMakeLists.txt
>@@ -71,6 +71,12 @@ macro (DOCBOOK _sources _format)
> 		)
> 	  endif ()
> 	  if (XMLTO_EXECUTABLE)
>+		    if(MSYS)
>+		      execute_process(
>+			COMMAND cygpath ${_infile}
>+			OUTPUT_VARIABLE _infile
>+		      )
>+		    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.