[Libreoffice-commits] .: bridges/Module_bridges.mk Makefile.in solenv/gbuild

[Libreoffice Gerrit user]

 Makefile.in               |    2 +-
 bridges/Module_bridges.mk |    2 +-
 solenv/gbuild/Module.mk   |   17 +++++++++++++++--
 3 files changed, 17 insertions(+), 4 deletions(-)

New commits:
commit a5838b19bc774efd261c1d6c78a2b6eb62f1b502
Author: Matúš Kukan <matus.ku...@gmail.com>
Date:   Wed Jan 9 14:24:33 2013 +0100

    add rule for generating fresh pot (po template) files
    
    Moved from translations' custom makefile.
    
    Change-Id: Ife58bfa3ee607b06617d7db80408afb453b9a10c
    Reviewed-on: https://gerrit.libreoffice.org/1622
    Reviewed-by: Miklos Vajna <vmik...@suse.cz>
    Tested-by: Miklos Vajna <vmik...@suse.cz>

diff --git a/Makefile.in b/Makefile.in
index 9c12258..013548b 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -422,7 +422,7 @@ check: dev-install subsequentcheck
 subsequentcheck :| $(if $(filter-out 
subsequentcheck,$(MAKECMDGOALS)),dev-install)
        $(GNUMAKE) -j $(CHECK_PARALLELISM) $(GMAKE_OPTIONS) -f 
$(SRC_ROOT)/Makefile.post $@
 
-unitcheck slowcheck debugrun:
+unitcheck slowcheck debugrun translations:
        $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) -f 
$(SRC_ROOT)/Makefile.post $@
 
 endif # not clean or distclean
diff --git a/bridges/Module_bridges.mk b/bridges/Module_bridges.mk
index 118e82f..14a7255 100644
--- a/bridges/Module_bridges.mk
+++ b/bridges/Module_bridges.mk
@@ -96,7 +96,7 @@ $(eval $(call gb_Module_add_targets,bridges,\
        ) \
 ))
 
-ifneq (showmodules,$(MAKECMDGOALS))
+ifeq ($(gb_FULL_BUILD),$(true))
 ifeq ($(strip $(bridges_SELECTED_BRIDGE)),)
 $(call gb_Output_error,no bridge selected for build: bailing out)
 endif
diff --git a/solenv/gbuild/Module.mk b/solenv/gbuild/Module.mk
index fad1821..2863be8 100644
--- a/solenv/gbuild/Module.mk
+++ b/solenv/gbuild/Module.mk
@@ -89,7 +89,7 @@ $(call gb_Module_get_target,%) :
                mkdir -p $(dir $@) && \
                touch $@)
 
-.PHONY : build all clean unitcheck slowcheck subsequentcheck dev-install 
showmodules
+.PHONY : build all clean unitcheck slowcheck subsequentcheck dev-install 
showmodules translations
 .DEFAULT_GOAL := all
 
 ifeq ($(strip $(gb_PARTIALBUILD)),)
@@ -188,6 +188,17 @@ showmodules :
        $(info $(strip $(gb_Module_ALLMODULES)))
        @true 
 
+translations : $(WORKDIR)/pot.done
+
+$(WORKDIR)/pot.done : $(foreach exec,cfgex helpex localize transex3 \
+                                                                       propex 
uiex ulfex xrmex treex, \
+                                                       $(call 
gb_Executable_get_target_for_build,$(exec)))
+       $(call gb_Output_announce,$(subst .pot,,$(subst 
$(WORKDIR)/,,$@)),$(true),POT,1)
+       $(call gb_Helper_abbreviate_dirs,\
+               mkdir -p $(dir $@) && $(call gb_Helper_execute,localize) 
$(SRCDIR) $(dir $@)/pot \
+               && find $(dir $@)/pot -type f -printf "%P\n" | sed -e 
"s/\.pot/.po/" > $(dir $@)/LIST \
+               && touch $@)
+
 # enable if: no "-MODULE/" defined AND ["all" defined OR "MODULE/" defined]
 gb_Module__debug_enabled = \
  $(and $(if $(filter -$(1)/,$(ENABLE_DEBUGINFO_FOR)),,$(true)),\
@@ -227,7 +238,9 @@ endif
 
 endef
 
-ifneq (showmodules,$(MAKECMDGOALS))
+gb_FULL_BUILD := $(if $(filter showmodules 
translations,$(MAKECMDGOALS)),$(false),$(true))
+
+ifeq ($(gb_FULL_BUILD),$(true))
 define gb_Module_add_target
 $(call gb_Module__read_targetfile,$(1),$(2),target)
 

_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits