nlpsolver/Extension_nlpsolver.mk | 18 ++++++++++++------ solenv/gbuild/Extension.mk | 36 +++++++++++++++++++++++++++++++----- swext/Extension_wiki-publisher.mk | 6 +++++- 3 files changed, 48 insertions(+), 12 deletions(-)
New commits: commit 5be4e4dc9d21d4b201a601e12b605eea007e1db0 Author: Andras Timar <ati...@suse.com> Date: Wed Jan 4 22:58:16 2012 +0100 build and pack MediaWiki extension's help localizations diff --git a/swext/Extension_wiki-publisher.mk b/swext/Extension_wiki-publisher.mk index 4db566d..1b6eb51 100644 --- a/swext/Extension_wiki-publisher.mk +++ b/swext/Extension_wiki-publisher.mk @@ -61,4 +61,8 @@ $(eval $(call gb_Extension_add_file,wiki-publisher,help/en-US/com.sun.wiki-publi $(eval $(call gb_Extension_add_file,wiki-publisher,help/en-US/com.sun.wiki-publisher/wikisettings.xhp,$(WIKISRC)/help/wikisettings.xhp)) $(eval $(call gb_Extension_add_file,wiki-publisher,license/THIRDPARTYLICENSEREADME.html,$(WIKISRC)/src/THIRDPARTYLICENSEREADME.html)) $(eval $(call gb_Extension_add_file,wiki-publisher,templates/MediaWiki/mediawiki.ott,$(WIKISRC)/src/filter/mediawiki.ott)) - +$(eval $(call gb_Extension_localize_help,wiki-publisher,help/lang/com.sun.wiki-publisher/wikisend.xhp,$(WIKISRC)/help/wikisend.xhp)) +$(eval $(call gb_Extension_localize_help,wiki-publisher,help/lang/com.sun.wiki-publisher/wikiformats.xhp,$(WIKISRC)/help/wikiformats.xhp)) +$(eval $(call gb_Extension_localize_help,wiki-publisher,help/lang/com.sun.wiki-publisher/wikiaccount.xhp,$(WIKISRC)/help/wikiaccount.xhp)) +$(eval $(call gb_Extension_localize_help,wiki-publisher,help/lang/com.sun.wiki-publisher/wiki.xhp,$(WIKISRC)/help/wiki.xhp)) +$(eval $(call gb_Extension_localize_help,wiki-publisher,help/lang/com.sun.wiki-publisher/wikisettings.xhp,$(WIKISRC)/help/wikisettings.xhp)) commit 8c7dadd0cbd6356b9728d0fa71c6ff4fea75804c Author: Andras Timar <ati...@suse.com> Date: Wed Jan 4 22:22:50 2012 +0100 build and pack NLPSolver help localizations diff --git a/nlpsolver/Extension_nlpsolver.mk b/nlpsolver/Extension_nlpsolver.mk index cfe27f6..b7de4b0 100644 --- a/nlpsolver/Extension_nlpsolver.mk +++ b/nlpsolver/Extension_nlpsolver.mk @@ -39,7 +39,11 @@ $(eval $(call gb_Extension_add_file,nlpsolver,locale/NLPSolverStatusDialog_en_US $(eval $(call gb_Extension_localize_properties,nlpsolver,locale/NLPSolverCommon_en_US.properties,$(SRCDIR)/nlpsolver/src/locale/NLPSolverCommon_en_US.properties)) $(eval $(call gb_Extension_localize_properties,nlpsolver,locale/NLPSolverStatusDialog_en_US.properties,$(SRCDIR)/nlpsolver/src/locale/NLPSolverStatusDialog_en_US.properties)) -$(eval $(call gb_Extension_add_file,nlpsolver,help/en/com.sun.star.comp.Calc.NLPSolver/Options.xhp, \ +$(eval $(call gb_Extension_add_file,nlpsolver,help/en-US/com.sun.star.comp.Calc.NLPSolver/Options.xhp, \ $(SRCDIR)/nlpsolver/help/en/com.sun.star.comp.Calc.NLPSolver/Options.xhp)) -$(eval $(call gb_Extension_add_file,nlpsolver,help/en/com.sun.star.comp.Calc.NLPSolver/Usage.xhp, \ +$(eval $(call gb_Extension_add_file,nlpsolver,help/en-US/com.sun.star.comp.Calc.NLPSolver/Usage.xhp, \ + $(SRCDIR)/nlpsolver/help/en/com.sun.star.comp.Calc.NLPSolver/Usage.xhp)) +$(eval $(call gb_Extension_localize_help,nlpsolver,help/lang/com.sun.star.comp.Calc.NLPSolver/Options.xhp, \ + $(SRCDIR)/nlpsolver/help/en/com.sun.star.comp.Calc.NLPSolver/Options.xhp)) +$(eval $(call gb_Extension_localize_help,nlpsolver,help/lang/com.sun.star.comp.Calc.NLPSolver/Usage.xhp, \ $(SRCDIR)/nlpsolver/help/en/com.sun.star.comp.Calc.NLPSolver/Usage.xhp)) commit a992230c142a09c2ba0536911a13ef6cf47d2c4c Author: David Tardon <dtar...@redhat.com> Date: Wed Jan 4 08:28:04 2012 +0100 just list the files explicitly diff --git a/nlpsolver/Extension_nlpsolver.mk b/nlpsolver/Extension_nlpsolver.mk index 542892b..cfe27f6 100644 --- a/nlpsolver/Extension_nlpsolver.mk +++ b/nlpsolver/Extension_nlpsolver.mk @@ -33,10 +33,12 @@ $(eval $(call gb_Extension_add_file,nlpsolver,components.rdb,$(SRCDIR)/nlpsolver $(eval $(call gb_Extension_add_file,nlpsolver,nlpsolver.jar,$(OUTDIR)/bin/nlpsolver.jar)) $(eval $(call gb_Extension_add_file,nlpsolver,EvolutionarySolver.jar,$(OUTDIR)/bin/EvolutionarySolver.jar)) -$(eval $(foreach trans, $(wildcard $(SRCDIR)/nlpsolver/src/locale/*en_US.default), \ - $(eval $(call gb_Extension_add_file,nlpsolver,locale/$(notdir $(trans)),$(trans))))) -$(eval $(foreach trans, $(wildcard $(SRCDIR)/nlpsolver/src/locale/*en_US.properties), \ - $(eval $(call gb_Extension_localize_properties,nlpsolver,locale/$(notdir $(trans)),$(trans))))) +$(eval $(call gb_Extension_add_file,nlpsolver,locale/NLPSolverCommon_en_US.default,$(SRCDIR)/nlpsolver/src/locale/NLPSolverCommon_en_US.default)) +$(eval $(call gb_Extension_add_file,nlpsolver,locale/NLPSolverStatusDialog_en_US.default,$(SRCDIR)/nlpsolver/src/locale/NLPSolverStatusDialog_en_US.default)) + +$(eval $(call gb_Extension_localize_properties,nlpsolver,locale/NLPSolverCommon_en_US.properties,$(SRCDIR)/nlpsolver/src/locale/NLPSolverCommon_en_US.properties)) +$(eval $(call gb_Extension_localize_properties,nlpsolver,locale/NLPSolverStatusDialog_en_US.properties,$(SRCDIR)/nlpsolver/src/locale/NLPSolverStatusDialog_en_US.properties)) + $(eval $(call gb_Extension_add_file,nlpsolver,help/en/com.sun.star.comp.Calc.NLPSolver/Options.xhp, \ $(SRCDIR)/nlpsolver/help/en/com.sun.star.comp.Calc.NLPSolver/Options.xhp)) $(eval $(call gb_Extension_add_file,nlpsolver,help/en/com.sun.star.comp.Calc.NLPSolver/Usage.xhp, \ commit 6488818ff383e66aa5d3ccca3ab65e2a469f1d71 Author: Andras Timar <ati...@suse.com> Date: Wed Jan 4 22:20:00 2012 +0100 extension help localizer help functions diff --git a/solenv/gbuild/Extension.mk b/solenv/gbuild/Extension.mk index 7d4bb34..6044f4f 100644 --- a/solenv/gbuild/Extension.mk +++ b/solenv/gbuild/Extension.mk @@ -39,6 +39,9 @@ gb_Extension_XRMEXCOMMAND := \ gb_Extension_PROPMERGETARGET := $(call gb_Executable_get_target,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/ # does not contain en-US because it is special cased in gb_Extension_Extension gb_Extension_LANGS := $(filter-out en-US,$(gb_WITH_LANG)) @@ -130,7 +133,7 @@ $(call gb_Extension_get_target,$(1)) : SDF2 := $(gb_Extension_SDFLOCATION)$(subs $(call gb_Extension_get_target,$(1)) : $$(SDF2) $(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),PRP,3) + $(call gb_Output_announce,$(2),$(true),PRP,3) mkdir -p $$(dir $$@) cp -f $$< $$@ $(gb_Extension_PROPMERGECOMMAND) -i $$@ -m $$(SDF2) @@ -138,4 +141,24 @@ endif endef +# localize extension help +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) +$(foreach lang,$(gb_Extension_LANGS),$(call gb_Extension_localize_help_onelang,$(1),$(subst lang,$(lang),$(2)),$(3),$(lang))) +endif + +endef + +define gb_Extension_localize_help_onelang +$(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 $$@) + $(gb_Extension_HELPEXCOMMAND) -i $$< -o $$@ -l $(4) -m $$(SDF3) + +endef + # vim: set noet sw=4 ts=4: commit 24d6f866709447d7a46c0ba5b464990b733c4756 Author: David Tardon <dtar...@redhat.com> Date: Wed Jan 4 08:49:22 2012 +0100 add dep on sdf file diff --git a/solenv/gbuild/Extension.mk b/solenv/gbuild/Extension.mk index 4c33463..7d4bb34 100644 --- a/solenv/gbuild/Extension.mk +++ b/solenv/gbuild/Extension.mk @@ -127,6 +127,7 @@ define gb_Extension_localize_properties ifneq ($(strip $(gb_WITH_LANG)),) $(call gb_Extension_get_target,$(1)) : FILES += $(2) $(foreach lang,$(subst -,_,$(gb_Extension_LANGS)),$(subst en_US,$(lang),$(2))) $(call gb_Extension_get_target,$(1)) : SDF2 := $(gb_Extension_SDFLOCATION)$(subst $(SRCDIR),,$(dir $(3)))localize.sdf +$(call gb_Extension_get_target,$(1)) : $$(SDF2) $(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),PRP,3) commit 1b31b92d816568d0debfdc3a1be9623bc040e5b7 Author: David Tardon <dtar...@redhat.com> Date: Wed Jan 4 08:39:47 2012 +0100 do not break when building without langs diff --git a/solenv/gbuild/Extension.mk b/solenv/gbuild/Extension.mk index ec357c6..4c33463 100644 --- a/solenv/gbuild/Extension.mk +++ b/solenv/gbuild/Extension.mk @@ -98,11 +98,11 @@ define gb_Extension_Extension $(call gb_Extension_get_target,$(1)) : FILES := META-INF description.xml registration $(call gb_Extension_get_target,$(1)) : LOCATION := $(SRCDIR)/$(2) $(call gb_Extension_get_target,$(1)) : PRJNAME := $(firstword $(subst /, ,$(2))) -$(call gb_Extension_get_target,$(1)) : \ - SDF := $(gb_Extension_SDFLOCATION)$(2)/localize.sdf -$(call gb_Extension_get_workdir,$(1))/description.xml : \ - $(SRCDIR)/$(2)/description.xml \ - $(if $(gb_WITH_LANG),$(gb_Extension_SDFLOCATION)$(2)/localize.sdf) +$(call gb_Extension_get_workdir,$(1))/description.xml : $(SRCDIR)/$(2)/description.xml +ifneq ($(strip $(gb_WITH_LANG)),) +$(call gb_Extension_get_target,$(1)) : SDF := $(gb_Extension_SDFLOCATION)$(2)/localize.sdf +$(call gb_Extension_get_workdir,$(1))/description.xml : $$(SDF) +endif $(call gb_Extension_add_file,$(1),description-en-US.txt,$(SRCDIR)/$(2)/description-en-US.txt) $(eval $(call gb_Module_register_target,$(call gb_Extension_get_outdir_target,$(1)),$(call gb_Extension_get_clean_target,$(1)))) $(call gb_Deliver_add_deliverable,$(call gb_Extension_get_outdir_target,$(1)),$(call gb_Extension_get_target,$(1)),$(1)) @@ -124,14 +124,16 @@ endef # localize .properties file # source file is copied to $(WORKDIR) define gb_Extension_localize_properties +ifneq ($(strip $(gb_WITH_LANG)),) $(call gb_Extension_get_target,$(1)) : FILES += $(2) $(foreach lang,$(subst -,_,$(gb_Extension_LANGS)),$(subst en_US,$(lang),$(2))) $(call gb_Extension_get_target,$(1)) : SDF2 := $(gb_Extension_SDFLOCATION)$(subst $(SRCDIR),,$(dir $(3)))localize.sdf $(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),PRP,3) + $$(call gb_Output_announce,$(2),$(true),PRP,3) mkdir -p $$(dir $$@) cp -f $$< $$@ $(gb_Extension_PROPMERGECOMMAND) -i $$@ -m $$(SDF2) +endif endef _______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits