[Libreoffice-commits] .: 2 commits - solenv/gbuild

[Libreoffice Gerrit user]

 solenv/gbuild/UI.mk |   22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

New commits:
commit 9c634c95e2939b1cdad5ea61e24cce58da3857b9
Author: David Tardon <dtardon at redhat.com>
Date:   Wed Jan 9 06:41:06 2013 +0100

    remove workdir too
    
    Change-Id: Ib6d1a21fcc2a4dd6dda1e46a99551b38b5035d1f

diff --git a/solenv/gbuild/UI.mk b/solenv/gbuild/UI.mk
index 6a6d397..2bd07ac 100644
--- a/solenv/gbuild/UI.mk
+++ b/solenv/gbuild/UI.mk
@@ -54,7 +54,7 @@ $(call gb_UILocalizeTarget_get_target,%) : $(gb_UILocalizeTarget_DEPS)
 $(call gb_UILocalizeTarget_get_clean_target,%) :
 	$(call gb_Output_announce,$*,$(false),UIX,1)
 	$(call gb_Helper_abbreviate_dirs,\
-		rm -f $(call gb_UILocalizeTarget_get_target,$*) \
+		rm -rf $(call gb_UILocalizeTarget_get_target,$*) $(call gb_UILocalizeTarget_get_workdir,$*) \
 	)
 
 # Produce translations for one .ui file
commit 2e8fb5803f2c9caed25e7a0a1c4cd1dba69f8cb0
Author: David Tardon <dtardon at redhat.com>
Date:   Wed Jan 9 06:39:52 2013 +0100

    create dummy translation files to avoid delivery failures
    
    Change-Id: Idf4a12987295e0454d0330d76f251e3dd00c8403

diff --git a/solenv/gbuild/UI.mk b/solenv/gbuild/UI.mk
index 6078df3..6a6d397 100644
--- a/solenv/gbuild/UI.mk
+++ b/solenv/gbuild/UI.mk
@@ -17,17 +17,14 @@ gb_UILocalizeTarget_DEPS := $(call gb_Executable_get_runtime_dependencies,uiex)
 gb_UILocalizeTarget_COMMAND := $(call gb_Executable_get_command,uiex)
 
 # If translatable strings from a .ui file are not merged into the
-# respective .po file yet, the produced translated files are empty (that
-# is, they only contain the root element), but qtz is not created at all
+# respective .po file yet, the produced translated files are empty,
 # which breaks delivery. This hack avoids the problem by creating a
 # dummy translation file.
-define gb_UILocalizeTarget__fix_missing_qtz
-$(if $(filter qtz,$(gb_WITH_LANG)),\
-	&& if [ ! -f $(1)/qtz.ui ]; then \
-		echo '<?xml version="1.0"?><t></t>' > $(1)/qtz.ui; \
-	fi \
-)
-endef
+$(call gb_UILocalizeTarget_get_workdir,%).ui :
+	$(if $(wildcard $@) \
+		,touch $@ \
+		,echo '<?xml version="1.0"?><t></t>' > $@ \
+	)
 
 define gb_UILocalizeTarget__command
 $(call gb_Output_announce,$(2),$(true),UIX,1)
@@ -39,7 +36,6 @@ $(call gb_Helper_abbreviate_dirs,\
 		-o $(call gb_UILocalizeTarget_get_workdir,$(2)) \
 		-l all \
 		-m $${MERGEINPUT} \
-	$(call gb_UILocalizeTarget__fix_missing_qtz,$(call gb_UILocalizeTarget_get_workdir,$(2))) \
 	&& touch $(1) \
 ) && \
 rm -rf $${MERGEINPUT}
@@ -65,7 +61,7 @@ $(call gb_UILocalizeTarget_get_clean_target,%) :
 #
 # gb_UILocalizeTarget_UILocalizeTarget target
 define gb_UILocalizeTarget_UILocalizeTarget
-$(call gb_UILocalizeTarget__UILocalizeTarget_impl,$(1),$(foreach lang,$(gb_TRANS_LANGS),$(gb_POLOCATION)/$(lang)/$(patsubst %/,%,$(dir $(1))).po))
+$(call gb_UILocalizeTarget__UILocalizeTarget_impl,$(1),$(wildcard $(foreach lang,$(gb_TRANS_LANGS),$(gb_POLOCATION)/$(lang)/$(patsubst %/,%,$(dir $(1))).po)))
 
 endef
 
@@ -80,8 +76,6 @@ $(call gb_UILocalizeTarget_get_target,$(1)) :| \
 	$(dir $(call gb_UILocalizeTarget_get_target,$(1))).dir \
 	$(call gb_UILocalizeTarget_get_workdir,$(1))/.dir
 
-$(2) :
-
 endef
 
 # class UI