solenv/gbuild/Extension.mk | 21 ++++++++++++++++++---
1 file changed, 18 insertions(+), 3 deletions(-)
New commits:
commit 7cebed268a11ae9193cd0d7323e32cd138c7ef9d
Author: Andras Timar <ati...@suse.com>
Date: Fri Jan 6 14:51:07 2012 +0100
gbuild: fix extension localization on Windows
diff --git a/solenv/gbuild/Extension.mk b/solenv/gbuild/Extension.mk
index 7f004f6..0f1e092 100644
--- a/solenv/gbuild/Extension.mk
+++ b/solenv/gbuild/Extension.mk
@@ -36,13 +36,13 @@ endif
gb_Extension_XRMEXTARGET := $(call gb_Executable_get_target,xrmex)
gb_Extension_XRMEXCOMMAND := \
$(gb_Helper_set_ld_path) $(gb_Extension_XRMEXTARGET)
-gb_Extension_PROPMERGETARGET := $(call gb_Executable_get_target,propmerge)
+gb_Extension_PROPMERGETARGET := $(OUTDIR)/bin/propmerge
gb_Extension_PROPMERGECOMMAND := \
$(PERL) $(gb_Extension_PROPMERGETARGET)
gb_Extension_HELPEXTARGET := $(call gb_Executable_get_target,helpex)
gb_Extension_HELPEXCOMMAND := \
$(gb_Helper_set_ld_path) $(gb_Extension_HELPEXTARGET)
-gb_Extension_SDFLOCATION := $(SRCDIR)/translations/$(INPATH)/misc/sdf/
+gb_Extension_SDFLOCATION := $(L10N_MODULE)/$(INPATH)/misc/sdf/
# does not contain en-US because it is special cased in gb_Extension_Extension
gb_Extension_LANGS := $(filter-out en-US,$(gb_WITH_LANG))
@@ -64,6 +64,16 @@ else
$(call gb_Extension_get_workdir,%)/description.xml : | \
$(gb_Extension_XRMEXTARGET)
$(call gb_Output_announce,$*/description.xml,$(true),XRM,3)
+ifeq ($(OS_FOR_BUILD),WNT)
+ $(call gb_Helper_abbreviate_dirs_native,\
+ mkdir -p $(call gb_Extension_get_workdir,$*) && \
+ $(gb_Extension_XRMEXCOMMAND) \
+ -p $(PRJNAME) \
+ -i $(shell cygpath -m $(filter %.xml,$^)) \
+ -o $(shell cygpath -m $@) \
+ -m $(SDF) \
+ -l all)
+else
$(call gb_Helper_abbreviate_dirs_native,\
mkdir -p $(call gb_Extension_get_workdir,$*) && \
$(gb_Extension_XRMEXCOMMAND) \
@@ -73,6 +83,7 @@ $(call gb_Extension_get_workdir,%)/description.xml : | \
-m $(SDF) \
-l all)
endif
+endif
# rule to create oxt package in workdir
# --filesync makes sure that all files in the oxt package will be removed that
no longer are in $(FILES)
@@ -148,7 +159,7 @@ endef
define gb_Extension_localize_help
ifneq ($(strip $(gb_WITH_LANG)),)
$(call gb_Extension_get_target,$(1)) : FILES += $(foreach
lang,$(gb_Extension_LANGS),$(subst lang,$(lang),$(2)))
-$(call gb_Extension_get_target,$(1)) : SDF3 := $(realpath
$(gb_Extension_SDFLOCATION)$(subst $(SRCDIR),,$(dir $(3)))localize.sdf)
+$(call gb_Extension_get_target,$(1)) : SDF3 :=
$(gb_Extension_SDFLOCATION)$(subst $(SRCDIR),,$(dir $(3)))localize.sdf
$(call gb_Extension_get_target,$(1)) : $$(SDF3)
$(foreach lang,$(gb_Extension_LANGS),$(call
gb_Extension_localize_help_onelang,$(1),$(subst
lang,$(lang),$(2)),$(3),$(lang)))
endif
@@ -160,7 +171,11 @@ $(call gb_Extension_get_target,$(1)) : $(call
gb_Extension_get_workdir,$(1))/$(2
$(call gb_Extension_get_workdir,$(1))/$(2) : $(3)
$(call gb_Output_announce,$(2),$(true),XHP,3)
mkdir -p $$(dir $$@)
+ifeq ($(OS_FOR_BUILD),WNT)
+ $(gb_Extension_HELPEXCOMMAND) -i $$(shell cygpath -m $$<) -o $$(shell
cygpath -m $$@) -l $(4) -m $$(SDF3)
+else
$(gb_Extension_HELPEXCOMMAND) -i $$< -o $$@ -l $(4) -m $$(SDF3)
+endif
endef
_______________________________________________
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
