[Libreoffice-commits] .: Branch 'feature/killsdf' - solenv/gbuild

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Mon Sep 24 09:05:54 PDT 2012 

 solenv/gbuild/AllLangResTarget.mk    |   29 +++++++++++-------------
 solenv/gbuild/Configuration.mk       |   17 +++++++-------
 solenv/gbuild/ExtensionTarget.mk     |   41 +++++++++++++++++++----------------
 solenv/gbuild/InstallModuleTarget.mk |   14 ++++++-----
 4 files changed, 53 insertions(+), 48 deletions(-)

New commits:
commit 822ac662c758916af546a293a408ee6fbb9cfe7e
Author: Zolnai Tamás <zolnaitamas2000 at gmail.com>
Date:   Mon Sep 24 01:07:22 2012 +0200

    Correct dependancies in makefiles
    
    Change-Id: I6345144f1b5a998a4a8fd70b51c9a40342a69582
    Reviewed-on: https://gerrit.libreoffice.org/693
    Tested-by: Andras Timar <atimar at suse.com>
    Reviewed-by: Andras Timar <atimar at suse.com>

diff --git a/solenv/gbuild/AllLangResTarget.mk b/solenv/gbuild/AllLangResTarget.mk
index f03a410..24f9c67 100644
--- a/solenv/gbuild/AllLangResTarget.mk
+++ b/solenv/gbuild/AllLangResTarget.mk
@@ -51,32 +51,26 @@ gb_SrsPartMergeTarget_TRANSEXTARGET := $(call gb_Executable_get_target_for_build
 gb_SrsPartMergeTarget_TRANSEXCOMMAND := \
 	$(gb_Helper_set_ld_path) $(gb_SrsPartMergeTarget_TRANSEXTARGET)
 
-
-define gb_GetPoFiles
-echo $(foreach lang,$(filter-out en-US,$(gb_WITH_LANG)), $(gb_POLOCATION)/$(lang)/$(1)) > $(2)
-endef
-
 define gb_SrsPartMergeTarget__command
 $(call gb_Output_announce,$(3),$(true),srs,1)
-POFILES=`$(gb_MKTEMP)` && \
-$(call gb_GetPoFiles,$(PO),$${POFILES}) && \
+MERGEINPUT=`$(gb_MKTEMP)` && \
+echo $(POFILES) > $${MERGEINPUT} && \
 $(call gb_Helper_abbreviate_dirs,\
 	mkdir -p $(dir $(1)) && \
 	$(gb_SrsPartMergeTarget_TRANSEXCOMMAND) \
 		-p $(firstword $(subst /, ,$(2))) \
 		-i $(3) \
 		-o $(1) \
-		-m $${POFILES} \
+		-m $${MERGEINPUT} \
 		-l all) && \
-rm -rf $${POFILES}
+rm -rf $${MERGEINPUT}
 
 endef
 
 $(call gb_SrsPartMergeTarget_get_target,%) : $(SRCDIR)/% $(gb_Helper_MISCDUMMY)  $(gb_SrsPartMergeTarget_TRANSEXTARGET)
-	$(if $(strip $(foreach lang,$(filter-out en-US,$(gb_WITH_LANG)),$(if $(wildcard $(gb_POLOCATION)/$(lang)/$(PO)),,x))),\
-		mkdir -p $(dir $@) && cp $< $@,\
-		$(call gb_SrsPartMergeTarget__command,$@,$*,$<))
-
+	$(if $(filter $(words $(POFILES)),$(words $(wildcard $(POFILES)))),\
+		$(call gb_SrsPartMergeTarget__command,$@,$*,$<),\
+		mkdir -p $(dir $@) && cp $< $@)
 
 # SrsPartTarget class
 
@@ -120,7 +114,8 @@ $(call gb_SrsPartTarget_get_target,$(1)) : MERGEDFILE :=
 else
 $(call gb_SrsPartTarget_get_target,$(1)) : MERGEDFILE := $(call gb_SrsPartMergeTarget_get_target,$(1))
 $(call gb_SrsPartTarget_get_target,$(1)) : $(call gb_SrsPartMergeTarget_get_target,$(1))
-$(call gb_SrsPartMergeTarget_get_target,$(1)) : PO := $(patsubst %/,%,$(dir $(1))).po
+$(call gb_SrsPartMergeTarget_get_target,$(1)) : \
+	POFILES := $(foreach lang,$(filter-out en-US,$(gb_WITH_LANG)),$(gb_POLOCATION)/$(lang)/$(patsubst %/,%,$(dir $(1))).po)
 endif
 
 endef
@@ -133,8 +128,10 @@ $(call gb_SrsTemplatePartTarget_get_target,$(1)) : $(call gb_SrsPartMergeTarget_
 	    mkdir -p $$(dir $$@) && \
 	    cp $$< $$@)
 ifneq ($(strip $(WITH_LANG)),)
-$(call gb_SrsPartMergeTarget_get_target,$(1)) : PO := $(patsubst %/,%,$(dir $(1))).po
-$(call gb_SrsPartMergeTarget_get_target,$(1)) : $$(PO)
+$(call gb_SrsPartMergeTarget_get_target,$(1)) : \
+	POFILES := $(foreach lang,$(filter-out en-US,$(gb_WITH_LANG)),$(gb_POLOCATION)/$(lang)/$(patsubst %/,%,$(dir $(1))).po)
+$(call gb_SrsPartMergeTarget_get_target,$(1)) : \
+	$(wildcard $(foreach lang,$(filter-out en-US,$(gb_WITH_LANG)),$(gb_POLOCATION)/$(lang)/$(patsubst %/,%,$(dir $(1))).po))
 endif
 
 endef
diff --git a/solenv/gbuild/Configuration.mk b/solenv/gbuild/Configuration.mk
index 2ae4275..240c4ab 100644
--- a/solenv/gbuild/Configuration.mk
+++ b/solenv/gbuild/Configuration.mk
@@ -249,24 +249,24 @@ gb_XcuMergeTarget_CFGEXCOMMAND := $(gb_Helper_set_ld_path) $(gb_XcuMergeTarget_C
 # PRJNAME is computed from the stem (parameter $(2))
 define gb_XcuMergeTarget__command
 $(call gb_Output_announce,$(2),$(true),XCU,5)
-POFILES=`$(gb_MKTEMP)` && \
-$(call gb_GetPoFiles,$(PO),$${POFILES}) && \
+MERGEINPUT=`$(gb_MKTEMP)` && \
+echo $(POFILES) > $${MERGEINPUT} && \
 $(call gb_Helper_abbreviate_dirs,\
 	mkdir -p $(dir $(1)) && \
 	$(gb_XcuMergeTarget_CFGEXCOMMAND) \
 		-p $(firstword $(subst /, ,$(2))) \
 		-i $(call gb_Helper_symlinked_native,$(3)) \
 		-o $(1) \
-		-m $${POFILES} \
+		-m $${MERGEINPUT} \
 		-l all) && \
-rm -rf $${POFILES}
+rm -rf $${MERGEINPUT}
 
 endef
 
 $(call gb_XcuMergeTarget_get_target,%) : $(gb_XcuMergeTarget_CFGEXTARGET)
-	$(if $(strip $(foreach lang,$(filter-out en-US,$(gb_WITH_LANG)),$(if $(wildcard $(gb_POLOCATION)/$(lang)/$(PO)),,x))),\
-		mkdir -p $(dir $@) && cp $(filter %.xcu,$^) $@,\
-		$(call gb_XcuMergeTarget__command,$@,$*,$(filter %.xcu,$^)))
+	$(if $(filter $(words $(POFILES)),$(words $(wildcard $(POFILES)))),\
+		$(call gb_XcuMergeTarget__command,$@,$*,$(filter %.xcu,$^)),\
+		mkdir -p $(dir $@) && cp $(filter %.xcu,$^) $@)
 
 $(call gb_XcuMergeTarget_get_clean_target,%) :
 	$(call gb_Output_announce,$*,$(false),XCU,5)
@@ -278,7 +278,8 @@ define gb_XcuMergeTarget_XcuMergeTarget
 $(call gb_XcuMergeTarget_get_target,$(1)) : \
 	$(call gb_Configuration__get_source,$(2),$(3)/$(4)) \
 	$(wildcard $(foreach lang,$(filter-out en-US,$(gb_WITH_LANG)),$(gb_POLOCATION)/$(lang)/$(patsubst %/,%,$(dir $(1))).po))
-$(call gb_XcuMergeTarget_get_target,$(1)) : PO := $(patsubst %/,%,$(dir $(1))).po
+$(call gb_XcuMergeTarget_get_target,$(1)) : \
+	POFILES := $(foreach lang,$(filter-out en-US,$(gb_WITH_LANG)),$(gb_POLOCATION)/$(lang)/$(patsubst %/,%,$(dir $(1))).po)
 endef
 
 
diff --git a/solenv/gbuild/ExtensionTarget.mk b/solenv/gbuild/ExtensionTarget.mk
index 4e9e6df..e7eac81 100644
--- a/solenv/gbuild/ExtensionTarget.mk
+++ b/solenv/gbuild/ExtensionTarget.mk
@@ -72,17 +72,17 @@ $(call gb_ExtensionTarget_get_workdir,%)/description.xml :
 else
 $(call gb_ExtensionTarget_get_workdir,%)/description.xml : $(gb_ExtensionTarget_XRMEXTARGET)
 	$(call gb_Output_announce,$*/description.xml,$(true),XRM,3)
-	POFILES=`$(gb_MKTEMP)` && \
-	$(call gb_GetPoFiles,$(PO),$${POFILES}) && \
+	MERGEINPUT=`$(gb_MKTEMP)` && \
+	echo $(POFILES) > $${MERGEINPUT} && \
 	$(call gb_Helper_abbreviate_dirs,\
 		mkdir -p $(call gb_ExtensionTarget_get_workdir,$*) && \
 		$(gb_ExtensionTarget_XRMEXCOMMAND) \
 			-p $(PRJNAME) \
 			-i $(call gb_Helper_symlinked_native,$(filter %.xml,$^)) \
 			-o $@ \
-			-m $${POFILES} \
+			-m $${MERGEINPUT} \
 			-l all) && \
-	rm -rf $${POFILES}
+	rm -rf $${MERGEINPUT}
 
 endif
 
@@ -116,8 +116,10 @@ $(call gb_ExtensionTarget_get_target,$(1)) : PLATFORM :=
 $(call gb_ExtensionTarget_get_target,$(1)) : PRJNAME := $(firstword $(subst /, ,$(2)))
 $(call gb_ExtensionTarget_get_workdir,$(1))/description.xml : $(SRCDIR)/$(2)/description.xml
 ifneq ($(strip $(gb_WITH_LANG)),)
-$(call gb_ExtensionTarget_get_target,$(1)) : PO := $(2).po
-$(call gb_ExtensionTarget_get_workdir,$(1))/description.xml : $$(PO)
+$(call gb_ExtensionTarget_get_target,$(1)) : \
+	POFILES := $(foreach lang,$(gb_ExtensionTarget_LANGS),$(gb_POLOCATION)/$(lang)/$(2).po)
+$(call gb_ExtensionTarget_get_workdir,$(1))/description.xml : \
+	$(foreach lang,$(gb_ExtensionTarget_LANGS),$(gb_POLOCATION)/$(lang)/$(2).po)
 endif
 
 endef
@@ -201,19 +203,21 @@ define gb_ExtensionTarget_localize_properties
 $(call gb_ExtensionTarget_get_target,$(1)) : FILES += $(2)
 ifneq ($(strip $(gb_WITH_LANG)),)
 $(call gb_ExtensionTarget_get_target,$(1)) : FILES += $(foreach lang,$(subst -,_,$(gb_ExtensionTarget_LANGS)),$(subst en_US,$(lang),$(2)))
-$(call gb_ExtensionTarget_get_rootdir,$(1))/$(2) : PO := $(patsubst /%/,%,$(subst $(SRCDIR),,$(dir $(3)))).po
-$(call gb_ExtensionTarget_get_rootdir,$(1))/$(2) : $$(PO)
+$(call gb_ExtensionTarget_get_rootdir,$(1))/$(2) : \
+	POFILES := $(foreach lang,$(gb_ExtensionTarget_LANGS),$(gb_POLOCATION)/$(lang)/$(patsubst /%/,%,$(subst $(SRCDIR),,$(dir $(3)))).po)
+$(call gb_ExtensionTarget_get_rootdir,$(1))/$(2) : \
+	$(foreach lang,$(gb_ExtensionTarget_LANGS),$(gb_POLOCATION)/$(lang)/$(patsubst /%/,%,$(subst $(SRCDIR),,$(dir $(3)))).po)
 endif
 $(call gb_ExtensionTarget_get_target,$(1)) : $(call gb_ExtensionTarget_get_rootdir,$(1))/$(2)
 $(call gb_ExtensionTarget_get_rootdir,$(1))/$(2) : $(3) \
 		$(gb_ExtensionTarget_PROPMERGETARGET)
 	$$(call gb_Output_announce,$(2),$(true),PRP,3)
-	POFILES=`$(gb_MKTEMP)` && \
-	$(call gb_GetPoFiles,$$(PO),$$$${POFILES}) && \
+	MERGEINPUT=`$(gb_MKTEMP)` && \
+	echo $$(POFILES) > $$$${MERGEINPUT} && \
 	mkdir -p $$(dir $$@) && \
 	cp -f $$< $$@ \
-	$(if $(strip $(gb_WITH_LANG)),&& $(gb_ExtensionTarget_PROPMERGECOMMAND) -i $$@ -m $$$${POFILES}) && \
-	rm -rf $$$${POFILES}
+	$(if $(strip $(gb_WITH_LANG)),&& $(gb_ExtensionTarget_PROPMERGECOMMAND) -i $$@ -m $$$${MERGEINPUT}) && \
+	rm -rf $$$${MERGEINPUT}
 
 endef
 
@@ -229,16 +233,17 @@ endef
 define gb_ExtensionTarget_localize_help_onelang
 $(call gb_ExtensionTarget_get_target,$(1)) : $(call gb_ExtensionTarget_get_rootdir,$(1))/$(2)
 $(call gb_ExtensionTarget_get_rootdir,$(1))/$(2) : \
-	PO := $(patsubst /%/,%,$(subst $(SRCDIR),,$(subst $(WORKDIR)/CustomTarget,,$(dir $(3))))).po
-$(call gb_ExtensionTarget_get_rootdir,$(1))/$(2) : $$(PO)
+	POFILE := $(gb_POLOCATION)/$(4)/$(patsubst /%/,%,$(subst $(SRCDIR),,$(subst $(WORKDIR)/CustomTarget,,$(dir $(3))))).po
+$(call gb_ExtensionTarget_get_rootdir,$(1))/$(2) : \
+	$(gb_POLOCATION)/$(4)/$(patsubst /%/,%,$(subst $(SRCDIR),,$(subst $(WORKDIR)/CustomTarget,,$(dir $(3))))).po
 $(call gb_ExtensionTarget_get_rootdir,$(1))/$(2) : $(gb_ExtensionTarget_HELPEXTARGET)
 $(call gb_ExtensionTarget_get_rootdir,$(1))/$(2) : $(3)
 	$$(call gb_Output_announce,$(2),$(true),XHP,3)
-	POFILES=`$(gb_MKTEMP)` && \
-	echo $(gb_POLOCATION)/$(4)/$$(PO) > $$$${POFILES} && \
+	MERGEINPUT=`$(gb_MKTEMP)` && \
+	echo $$(POFILE) > $$$${MERGEINPUT} && \
 	mkdir -p $$(dir $$@) && \
-	$(gb_ExtensionTarget_HELPEXCOMMAND) -i $$< -o $$@ -l $(4) -m $$$${POFILES} && \
-	rm -rf $$$${POFILES}
+	$(gb_ExtensionTarget_HELPEXCOMMAND) -i $$< -o $$@ -l $(4) -m $$$${MERGEINPUT} && \
+	rm -rf $$$${MERGEINPUT}
 
 endef
 
diff --git a/solenv/gbuild/InstallModuleTarget.mk b/solenv/gbuild/InstallModuleTarget.mk
index 1de6c83..fbbe48e 100644
--- a/solenv/gbuild/InstallModuleTarget.mk
+++ b/solenv/gbuild/InstallModuleTarget.mk
@@ -113,11 +113,11 @@ gb_ScpMergeTarget_get_source = $(SRCDIR)/$(1).ulf
 
 define gb_ScpMergeTarget__command
 $(call gb_Output_announce,$(2),$(true),SUM,1)
-POFILES=`$(gb_MKTEMP)` && \
-$(call gb_GetPoFiles,$(SCP_PO),$${POFILES}) && \
+MERGEINPUT=`$(gb_MKTEMP)` && \
+echo $(SCP_POFILES) > $${MERGEINPUT} && \
 $(call gb_Helper_abbreviate_dirs,\
-	$(gb_ScpMergeTarget_COMMAND) -p scp2 -i $(3) -o $(1) -m $${POFILES} -l all ) && \
-rm -rf $${POFILES}
+	$(gb_ScpMergeTarget_COMMAND) -p scp2 -i $(3) -o $(1) -m $${MERGEINPUT} -l all ) && \
+rm -rf $${MERGEINPUT}
 
 endef
 
@@ -136,8 +136,10 @@ $(call gb_ScpMergeTarget_get_clean_target,%) :
 define gb_ScpMergeTarget_ScpMergeTarget
 $(call gb_ScpMergeTarget_get_target,$(1)) : $(call gb_ScpMergeTarget_get_source,$(1))
 $(call gb_ScpMergeTarget_get_target,$(1)) :| $(dir $(call gb_ScpMergeTarget_get_target,$(1))).dir
-$(call gb_ScpMergeTarget_get_target,$(1)) : SCP_PO := $(patsubst %/,%,$(dir $(1))).po
-$(call gb_ScpMergeTarget_get_target,$(1)) : $$(SCP_PO)
+$(call gb_ScpMergeTarget_get_target,$(1)) : \
+	SCP_POFILES := $(foreach lang,$(filter-out en-US,$(gb_WITH_LANG)),$(gb_POLOCATION)/$(lang)/$(patsubst %/,%,$(dir $(1))).po)
+$(call gb_ScpMergeTarget_get_target,$(1)) : \
+	$(foreach lang,$(filter-out en-US,$(gb_WITH_LANG)),$(gb_POLOCATION)/$(lang)/$(patsubst %/,%,$(dir $(1))).po)
 
 endef

More information about the Libreoffice-commits mailing list