[Libreoffice-commits] .: i18npool/source

Caolán McNamara caolan at kemper.freedesktop.org
Fri Aug 19 07:44:43 PDT 2011


 i18npool/source/localedata/Makefile |   11 +++++++++++
 1 file changed, 11 insertions(+)

New commits:
commit 8fe21bbcaf1c496d2181c077548d619aa6f66ad6
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Aug 19 15:44:28 2011 +0100

    get localedata to build under windows, lib vs bin

diff --git a/i18npool/source/localedata/Makefile b/i18npool/source/localedata/Makefile
index fabf202..1b70c8d 100644
--- a/i18npool/source/localedata/Makefile
+++ b/i18npool/source/localedata/Makefile
@@ -37,13 +37,24 @@ localedata_%.cxx : localedata_%_invis.cxx
 	sed 's/\(^.*get[^;]*$$\)/SAL_DLLPUBLIC_EXPORT \1/' $< > $@
 
 localedata_%_invis.cxx : $(realpath $(SRC_ROOT)/i18npool/source/localedata/data)/%.xml saxparser.rdb
+ifeq ($(OS_FOR_BUILD),WNT)
+	$(gb_Helper_execute)saxparser $* `cygpath -w $<` $@ \
+		$(my_file)`cygpath -m $(WORKDIR)/CustomTarget/i18npool/source/localedata/saxparser.rdb` `cygpath -w $(OUTDIR)/bin/types.rdb` \
+		-env:OOO_INBUILD_SHAREDLIB_DIR=$(my_file)`cygpath -m $(OUTDIR)/bin`
+else
 	$(gb_Helper_execute)saxparser $* $< $@ \
 		$(my_file)$(WORKDIR)/CustomTarget/i18npool/source/localedata/saxparser.rdb $(OUTDIR)/bin/types.rdb \
 		-env:OOO_INBUILD_SHAREDLIB_DIR=$(my_file)$(OUTDIR)/lib
+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
 
 saxparser.input :
 	echo '<list><filename>$(my_components)</filename></list>' > $@


More information about the Libreoffice-commits mailing list