Date: prev next · Thread: first prev next last
2011 Archives by date, by thread · List index


Hi,

I'm sending a patch which could help to build i18npool in
libreoffice-3-5 (and master also) on Windows.
But I have no Windows build and can't test whether this is really the problem.

I plan to push this also with other patches to master probably
tomorrow but anyway there is no windows tinderbox for master now.

CCing Kendy because he fixed this problem once with
http://cgit.freedesktop.org/libreoffice/core/commit/?id=c7052a5d6242df174ba21134635ac3d18530bf34

HTH,

Matus
From aab13a6afec4187d8bce4b9152c1cca50f5f1b48 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mat=C3=BA=C5=A1=20Kukan?= <matus.kukan@gmail.com>
Date: Sat, 10 Dec 2011 19:14:00 +0100
Subject: [PATCH] simplify this, use gb_Helper_abbreviate_dirs_native instead of cygpath

---
 i18npool/source/localedata/Makefile |    9 ++-------
 1 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/i18npool/source/localedata/Makefile b/i18npool/source/localedata/Makefile
index da83ff4..d744384 100755
--- a/i18npool/source/localedata/Makefile
+++ b/i18npool/source/localedata/Makefile
@@ -48,13 +48,8 @@ localedata_%_invis.cxx : $(realpath $(SRC_ROOT)/i18npool/source/localedata/data)
 endif
 
 saxparser.rdb : saxparser.input
-ifeq ($(OS_FOR_BUILD),WNT)
-       $(gb_XSLTPROC) --nonet --stringparam prefix `cygpath -m $(OUTDIR)/xml/` -o $@ \
-               $(SOLARENV)/bin/packcomponents.xslt saxparser.input
-else
-       $(gb_XSLTPROC) --nonet --stringparam prefix $(OUTDIR)/xml/ -o $@ \
-               $(SOLARENV)/bin/packcomponents.xslt saxparser.input
-endif
+       $(call gb_Helper_abbreviate_dirs_native, $(gb_XSLTPROC) --nonet --stringparam prefix 
$(OUTDIR)/xml/ -o $@ \
+               $(SOLARENV)/bin/packcomponents.xslt saxparser.input)
 
 saxparser.input :
        echo '<list><filename>$(my_components)</filename></list>' > $@
-- 
1.7.1


Context


Privacy Policy | Impressum (Legal Info) | Copyright information: Unless otherwise specified, all text and images on this website are licensed under the Creative Commons Attribution-Share Alike 3.0 License. This does not include the source code of LibreOffice, which is licensed under the Mozilla Public License (MPLv2). "LibreOffice" and "The Document Foundation" are registered trademarks of their corresponding registered owners or are in actual use as trademarks in one or more countries. Their respective logos and icons are also subject to international copyright laws. Use thereof is explained in our trademark policy.