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

[Libreoffice Gerrit user]

 dictionaries                     |    2 +-
 solenv/gbuild/Dictionary.mk      |    2 +-
 solenv/gbuild/Extension.mk       |    2 +-
 solenv/gbuild/ExtensionTarget.mk |    8 +++++---
 4 files changed, 8 insertions(+), 6 deletions(-)

New commits:
commit 057ac009a338b1cca29c926bc90f53066078fde2
Author: David Tardon <dtardon at redhat.com>
Date:   Wed Oct 24 09:46:26 2012 +0200

    make l10n of extensions work again
    
    Change-Id: I156f6bdf04d64abfdf482fd2bee13136528bff9b

diff --git a/solenv/gbuild/Dictionary.mk b/solenv/gbuild/Dictionary.mk
index be81ef5..9890748 100644
--- a/solenv/gbuild/Dictionary.mk
+++ b/solenv/gbuild/Dictionary.mk
@@ -62,7 +62,7 @@ gb_Dictionary_extensionname = Dictionary/$(1)
 #
 # gb_Dictionary_Dictionary dictionary srcdir
 define gb_Dictionary_Dictionary
-$(call gb_ExtensionTarget_ExtensionTarget,$(call gb_Dictionary_extensionname,$(1)),$(SRCDIR)/$(2))
+$(call gb_ExtensionTarget_ExtensionTarget,$(call gb_Dictionary_extensionname,$(1)),$(SRCDIR)/$(2),$(2))
 $(call gb_Dictionary_add_root_file,$(1),$(2)/$(gb_Dictionary_CONFIGURATION_FILE))
 
 $(call gb_Dictionary_get_target,$(1)) : $(call gb_ExtensionTarget_get_target,$(call gb_Dictionary_extensionname,$(1)))
diff --git a/solenv/gbuild/Extension.mk b/solenv/gbuild/Extension.mk
index d2f29fc..ddf328b 100644
--- a/solenv/gbuild/Extension.mk
+++ b/solenv/gbuild/Extension.mk
@@ -28,7 +28,7 @@
 # Extension class
 
 define gb_Extension_Extension
-$(call gb_ExtensionTarget_ExtensionTarget,$(1),$(if $(filter nodefaults,$(3)),$(2),$(SRCDIR)/$(2)))
+$(call gb_ExtensionTarget_ExtensionTarget,$(1),$(if $(filter nodefaults,$(3)),$(2),$(SRCDIR)/$(2)),$(if $(filter nodefaults,$(3)),,$(2)))
 $(if $(filter nodefaults,$(3)),,\
  $(call gb_ExtensionTarget_use_default_license,$(1)))
 $(if $(filter nodefaults,$(3)),,\
diff --git a/solenv/gbuild/ExtensionTarget.mk b/solenv/gbuild/ExtensionTarget.mk
index f9c1ec3..61d0cec 100644
--- a/solenv/gbuild/ExtensionTarget.mk
+++ b/solenv/gbuild/ExtensionTarget.mk
@@ -130,21 +130,23 @@ $(call gb_ExtensionTarget_get_target,%) : \
 # register target and clean target
 # add deliverable
 # add dependency for outdir target to workdir target (pattern rule for delivery is in Package.mk)
+#
+# gb_ExtensionTarget_ExtensionTarget extension srcdir l10n-srcdir?
 define gb_ExtensionTarget_ExtensionTarget
 $(call gb_ExtensionTarget_get_target,$(1)) : DESCRIPTION :=
 $(call gb_ExtensionTarget_get_target,$(1)) : FILES := META-INF description.xml
 $(call gb_ExtensionTarget_get_target,$(1)) : LICENSE :=
 $(call gb_ExtensionTarget_get_target,$(1)) : LOCATION := $(2)
 $(call gb_ExtensionTarget_get_target,$(1)) : PLATFORM := $(PLATFORMID)
-$(call gb_ExtensionTarget_get_target,$(1)) : PRJNAME := $(firstword $(subst /, ,$(2)))
+$(call gb_ExtensionTarget_get_target,$(1)) : PRJNAME := $(firstword $(subst /, ,$(3)))
 $(call gb_ExtensionTarget_get_workdir,$(1))/description.xml : \
 	$(2)/description.xml
 $(call gb_ExtensionTarget_get_workdir,$(1))/description.xml :| \
 	$(call gb_ExtensionTarget__get_preparation_target,$(1))
 
 ifneq ($(strip $(gb_WITH_LANG)),)
-$(call gb_ExtensionTarget_get_target,$(1)) : SDF := $(gb_SDFLOCATION)/$(2)/localize.sdf
-$(call gb_ExtensionTarget_get_workdir,$(1))/description.xml : $(gb_SDFLOCATION)/$(2)/localize.sdf
+$(if $(3),$(call gb_ExtensionTarget_get_target,$(1)) : SDF := $(gb_SDFLOCATION)/$(3)/localize.sdf)
+$(if $(3),$(call gb_ExtensionTarget_get_workdir,$(1))/description.xml : $(gb_SDFLOCATION)/$(3)/localize.sdf)
 endif
 
 $(foreach lang,$(gb_ExtensionTarget_ALL_LANGS), \
commit 7cba3141cde4e6fdfdd34a3389964fe125bca745
Author: David Tardon <dtardon at redhat.com>
Date:   Wed Oct 24 09:41:18 2012 +0200

    change dictionaries
    
    Change-Id: I5802a25ee5128ce956e99daec6173627923121ec

diff --git a/dictionaries b/dictionaries
index 53e9940..b5b5c88 160000
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit 53e9940d33caa1e8a00ddaadfb57e5d668d35378
+Subproject commit b5b5c88c12835a7043c09f0d5140ff1318e9671b