[PATCH] Set a relative XSLT path for Windows builds
Dirk Hohndel
dirk at hohndel.org
Fri Feb 22 11:03:34 PST 2013
This is going into the right direction but it still doesn't work as
intended. I've instrumented the code to raise errors that I can see
(stderr goes nowhere by default) and it still doesn't find the files;
which explains all the bug reports that we are getting that import fails
for people - but due to our promiscous parser it doesn't completely
fail, it's just very incomplete
/D
"Lubomir I. Ivanov" <neolit123 at gmail.com> writes:
> From: "Lubomir I. Ivanov" <neolit123 at gmail.com>
>
> We need to override the XSLT path when building for Windows.
> "/usr/share/subsurface/xslt" doesn't make much sense unless
> one has some sort of a MSYS type enviroment set.
>
> The XSLT path in the installer is ./xslt, so this has to be
> the path passed via XSLT=-DXSLT='"$(XSLTDIR)"'
>
> Fixes a bug on Windows where files that require XSLT conversation
> were not processed correctly.
>
> Reported-by: Rainer Mohr <mail at divelogs.de>
> Signed-off-by: Lubomir I. Ivanov <neolit123 at gmail.com>
> ---
> Makefile | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/Makefile b/Makefile
> index 91bdbcc..953cd63 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -44,6 +44,7 @@ PRODVERSION_STRING := $(shell $(GET_VERSION) win $(VERSION_STRING) || \
> #
> ifeq ($(CC), i686-w64-mingw32-gcc)
> # ok, we are cross building for Windows
> + XSLTDIR = ./xslt/
> LIBDIVECOMPUTERINCLUDES = $(shell $(PKGCONFIG) --cflags libdivecomputer)
> LIBDIVECOMPUTERARCHIVE = $(shell $(PKGCONFIG) --libs libdivecomputer)
> RESFILE = packaging/windows/subsurface.res
> --
> 1.7.11.msysgit.0
>
> _______________________________________________
> subsurface mailing list
> subsurface at hohndel.org
> http://lists.hohndel.org/cgi-bin/mailman/listinfo/subsurface
More information about the subsurface
mailing list