[Libreoffice-commits] core.git: 2 commits - solenv/gbuild
David Tardon
dtardon at redhat.com
Wed May 15 08:09:56 PDT 2013
solenv/gbuild/Gallery.mk | 92 +++++++++++++++++++++++++++++------------------
1 file changed, 58 insertions(+), 34 deletions(-)
New commits:
commit 268a23d8c2d9881aa6d492b7609424b839c8704c
Author: David Tardon <dtardon at redhat.com>
Date: Wed May 15 16:56:31 2013 +0200
gbuild: use pattern rules for Gallery l10n files
Change-Id: I781d02805ee0d526638f556794b852c6277922dd
diff --git a/solenv/gbuild/Gallery.mk b/solenv/gbuild/Gallery.mk
index c9fdc3d..6e0284f 100644
--- a/solenv/gbuild/Gallery.mk
+++ b/solenv/gbuild/Gallery.mk
@@ -73,6 +73,24 @@ $(call gb_Helper_abbreviate_dirs,\
)
endef
+define gb_Gallery__command_ulf
+$(call gb_Output_announce,$(2),$(true),ULF,1)
+MERGEINPUT=`$(gb_MKTEMP)` && \
+echo $(foreach lang,$(gb_TRANS_LANGS),$(gb_POLOCATION)/$(lang)/$(patsubst %/,%,$(dir $(GALLERY_BASEDIR))).po) > $${MERGEINPUT} && \
+$(call gb_Helper_abbreviate_dirs,\
+ $(call gb_Executable_get_command,ulfex) -i $(GALLERY_ULFFILE) -o $(1) -m $${MERGEINPUT} -l all) && \
+rm -rf $${MERGEINPUT}
+endef
+
+define gb_Gallery__command_str
+$(call gb_Output_announce,$(2),$(true),STR,1)
+cp -f $(GALLERY_STRFILE) $@ && \
+$(PERL) $(gb_Gallery_TRANSLATE) \
+ --ext "str" --key "name" \
+ -d $(GALLERY_WORKDIR) \
+ $(GALLERY_ULFFILE)
+endef
+
gb_Gallery__get_final_target = $(WORKDIR)/Gallery/$(1).final
$(dir $(call gb_Gallery_get_target,$(1))).dir :
@@ -89,6 +107,18 @@ $(call gb_Gallery_get_target,%) : \
$(call gb_Gallery__get_final_target,%) :
touch $@
+ifneq ($(WITH_LANG),)
+$(call gb_Gallery_get_workdir,%).ulf : $(call gb_Executable_get_runtime_dependencies,ulfex)
+ $(call gb_Gallery__command_ulf,$@,$*)
+else
+$(call gb_Gallery_get_workdir,%).ulf :
+ $(call gb_Output_announce,$*,$(true),CPY,1)
+ cp $(GALLERY_ULFFILE) $@
+endif
+
+$(call gb_Gallery_get_workdir,%).str : $(gb_Gallery_TRANSLATE)
+ $(call gb_Gallery__command_str,$@,$*)
+
.PHONY : $(call gb_Gallery_get_clean_target,%)
$(call gb_Gallery_get_clean_target,%) :
$(call gb_Output_announce,$*,$(false),GAL,1)
@@ -125,6 +155,9 @@ endef
gb_Gallery_basedir = $(patsubst %/,%,$(dir $(SRCDIR)/$(1)))
+# TODO: we process the same ulf file for every gallery. That does not
+# make sense.
+#
# gb_Gallery__Gallery_impl gallery package basedir name
define gb_Gallery__Gallery_impl
$(call gb_Package_Package_internal,$(2),$(call gb_Gallery_get_workdir,$(1)))
@@ -138,6 +171,17 @@ $(call gb_Package_add_file,$(2),$(gb_Gallery_INSTDIR)/$(1).str,$(1).str)
$(call gb_Gallery_get_target,$(1)) : GALLERY_BASEDIR := $(call gb_Helper_make_url,$(call gb_Gallery_basedir,$(3)))
$(call gb_Gallery_get_target,$(1)) : GALLERY_FILES :=
$(call gb_Gallery_get_target,$(1)) : GALLERY_NAME := $(1)
+$(call gb_Gallery_get_workdir,$(1))/$(1).str : GALLERY_STRFILE := $(SRCDIR)/$(3)/$(1).str
+$(call gb_Gallery_get_workdir,$(1))/$(1).str : GALLERY_ULFFILE := $(call gb_Gallery_get_workdir,$(1))/$(1).ulf
+$(call gb_Gallery_get_workdir,$(1))/$(1).str : GALLERY_WORKDIR := $(call gb_Gallery_get_workdir,$(1))
+$(call gb_Gallery_get_workdir,$(1))/$(1).ulf : GALLERY_BASEDIR := $(3)
+$(call gb_Gallery_get_workdir,$(1))/$(1).ulf : GALLERY_ULFFILE := $(call gb_Gallery_basedir,$(3))/share/gallery_names.ulf
+
+$(call gb_Gallery_get_workdir,$(1))/$(1).ulf : \
+ $(call gb_Gallery_basedir,$(3))/share/gallery_names.ulf \
+ $(call gb_Gallery_get_target,$(1)) # that rule pre-cleans our output directory
+
+$(call gb_Gallery_get_workdir,$(1))/$(1).str : $(call gb_Gallery_get_workdir,$(1))/$(1).ulf
$(call gb_Gallery_get_workdir,$(1))/$(1).sdg \
$(call gb_Gallery_get_workdir,$(1))/$(1).sdv \
@@ -151,31 +195,6 @@ $(call gb_Gallery_get_target,$(1)) :| $(dir $(call gb_Gallery_get_target,$(1))).
$$(eval $$(call gb_Module_register_target,$(call gb_Gallery__get_final_target,$(1)),$(call gb_Gallery_get_clean_target,$(1))))
$(call gb_Helper_make_userfriendly_targets,$(1),Gallery,$(call gb_Gallery__get_final_target,$(1)))
-
-# this should probably be done with more general rules: but how ?
-ifneq ($(WITH_LANG),)
-$$(call gb_Gallery_get_workdir,$(1))/$(1).ulf : \
- $$(call gb_Gallery_basedir,$(3))/share/gallery_names.ulf | $$(call gb_Executable_get_runtime_dependencies,ulfex) \
- $(call gb_Gallery_get_target,$(1)) # that rule pre-cleans our output directory
- $$(call gb_Output_announce,$@,$(true),SUM,1)
- MERGEINPUT=`$(gb_MKTEMP)` && \
- echo $(foreach lang,$(gb_TRANS_LANGS),$(gb_POLOCATION)/$(lang)/$(patsubst %/,%,$(dir $(3))).po) > $$$${MERGEINPUT} && \
- $(call gb_Helper_abbreviate_dirs,\
- $$(call gb_Executable_get_command,ulfex) -i $$< -o $$@ -m $$$${MERGEINPUT} -l all ) && \
- rm -rf $$$${MERGEINPUT}
-else
-$$(call gb_Gallery_get_workdir,$(1))/$(1).ulf : $$(call gb_Gallery_basedir,$(3))/share/gallery_names.ulf
- cp $$< $$@
-endif
-
-$(call gb_Gallery_get_workdir,$(1))/$(1).str : $(gb_Gallery_TRANSLATE) \
- $$(call gb_Gallery_get_workdir,$(1))/$(1).ulf
- cp -f $(SRCDIR)/$(3)/$(1).str $(call gb_Gallery_get_workdir,$(1))/$(1).str && \
- $(PERL) $(gb_Gallery_TRANSLATE) \
- --ext "str" --key "name" \
- -d $$(call gb_Gallery_get_workdir,$(1))/ \
- $$(call gb_Gallery_get_workdir,$(1))/$(1).ulf
-
endef
# Add a file to the gallery.
commit 7fd93c32d7c0606594a35d7301e14711d4f517c0
Author: David Tardon <dtardon at redhat.com>
Date: Wed May 15 16:12:08 2013 +0200
gbuild: silence building of galleries
Change-Id: I17e6a3923f3ee6cec22760f8c9f9410bbe742a7f
diff --git a/solenv/gbuild/Gallery.mk b/solenv/gbuild/Gallery.mk
index ae62532..c9fdc3d 100644
--- a/solenv/gbuild/Gallery.mk
+++ b/solenv/gbuild/Gallery.mk
@@ -58,15 +58,19 @@ define gb_Gallery__command
$(call gb_Output_announce,$(2),$(true),GAL,1)
$(call gb_Helper_abbreviate_dirs,\
rm -f $(call gb_Gallery_get_workdir,$(2))/* && \
- SAL_USE_VCLPLUGIN=svp \
- $(call gb_Executable_get_command,$(gb_GENGAL),$(ICECREAM_RUN)) \
- $(call gb_Gallery__make_env_args) \
- --build-tree \
- --destdir $(GALLERY_BASEDIR) \
- --name "$(GALLERY_NAME)" \
- --path $(call gb_Gallery_get_workdir,$(2))) \
- $(GALLERY_FILES) && \
- touch $@
+ $(call gb_Helper_print_on_error,\
+ SAL_USE_VCLPLUGIN=svp \
+ $(call gb_Executable_get_command,$(gb_GENGAL),$(ICECREAM_RUN)) \
+ $(call gb_Gallery__make_env_args) \
+ --build-tree \
+ --destdir $(GALLERY_BASEDIR) \
+ --name "$(GALLERY_NAME)" \
+ --path $(call gb_Gallery_get_workdir,$(2)) \
+ $(GALLERY_FILES),\
+ $@.log \
+ ) && \
+ touch $@ \
+)
endef
gb_Gallery__get_final_target = $(WORKDIR)/Gallery/$(1).final
@@ -92,6 +96,7 @@ $(call gb_Gallery_get_clean_target,%) :
rm -rf \
$(call gb_Gallery__get_final_target,$*) \
$(call gb_Gallery_get_target,$*) \
+ $(call gb_Gallery_get_target,$*).log \
$(call gb_Gallery_get_workdir,$*) \
)
More information about the Libreoffice-commits
mailing list