[Libreoffice-commits] .: 2 commits - nlpsolver/Extension_nlpsolver.mk solenv/gbuild

[David Tardon]

 nlpsolver/Extension_nlpsolver.mk |   10 ++++++----
 solenv/gbuild/Extension.mk       |   14 ++++++++------
 2 files changed, 14 insertions(+), 10 deletions(-)

New commits:
commit 308b282a8e6a5e6b8bc60b16f7d293051d8ecb7f
Author: David Tardon <dtardon at redhat.com>
Date:   Wed Jan 4 08:39:47 2012 +0100

    do not break when building without langs

diff --git a/solenv/gbuild/Extension.mk b/solenv/gbuild/Extension.mk
index 94fdd2f..6c6cb5e 100644
--- a/solenv/gbuild/Extension.mk
+++ b/solenv/gbuild/Extension.mk
@@ -98,11 +98,11 @@ define gb_Extension_Extension
 $(call gb_Extension_get_target,$(1)) : FILES := META-INF description.xml registration
 $(call gb_Extension_get_target,$(1)) : LOCATION := $(SRCDIR)/$(2)
 $(call gb_Extension_get_target,$(1)) : PRJNAME := $(firstword $(subst /, ,$(2)))
-$(call gb_Extension_get_target,$(1)) : \
-	SDF := $(gb_Extension_SDFLOCATION)$(2)/localize.sdf
-$(call gb_Extension_get_workdir,$(1))/description.xml : \
-	$(SRCDIR)/$(2)/description.xml \
-	$(if $(gb_WITH_LANG),$(gb_Extension_SDFLOCATION)$(2)/localize.sdf)
+$(call gb_Extension_get_workdir,$(1))/description.xml : $(SRCDIR)/$(2)/description.xml
+ifneq ($(strip $(gb_WITH_LANG)),)
+$(call gb_Extension_get_target,$(1)) : SDF := $(gb_Extension_SDFLOCATION)$(2)/localize.sdf
+$(call gb_Extension_get_workdir,$(1))/description.xml : $$(SDF)
+endif
 $(call gb_Extension_add_file,$(1),description-en-US.txt,$(SRCDIR)/$(2)/description-en-US.txt)
 $(eval $(call gb_Module_register_target,$(call gb_Extension_get_outdir_target,$(1)),$(call gb_Extension_get_clean_target,$(1))))
 $(call gb_Deliver_add_deliverable,$(call gb_Extension_get_outdir_target,$(1)),$(call gb_Extension_get_target,$(1)),$(1))
@@ -124,14 +124,16 @@ endef
 # localize .properties file
 # source file is copied to $(WORKDIR)
 define gb_Extension_localize_properties
+ifneq ($(strip $(gb_WITH_LANG)),)
 $(call gb_Extension_get_target,$(1)) : FILES += $(2) $(foreach lang,$(subst -,_,$(gb_Extension_LANGS)),$(subst en_US,$(lang),$(2)))
 $(call gb_Extension_get_target,$(1)) : SDF2 := $(gb_Extension_SDFLOCATION)$(subst $(SRCDIR),,$(dir $(3)))localize.sdf
 $(call gb_Extension_get_target,$(1)) : $(call gb_Extension_get_workdir,$(1))/$(2)
 $(call gb_Extension_get_workdir,$(1))/$(2) : $(3)
-	$(call gb_Output_announce,$(2),$(true),PRP,3)
+	$$(call gb_Output_announce,$(2),$(true),PRP,3)
 	mkdir -p $$(dir $$@)
 	cp -f $$< $$@
 	$(gb_Extension_PROPMERGECOMMAND) -i $$@ -m $$(SDF2)
+endif
 
 endef
 #	$(call gb_Output_announce,$@,$(true),PRP,3)
commit 7283a51473e6587388a11bcb3f5ccaf7efe5f3f0
Author: David Tardon <dtardon at redhat.com>
Date:   Wed Jan 4 08:28:04 2012 +0100

    just list the files explicitly

diff --git a/nlpsolver/Extension_nlpsolver.mk b/nlpsolver/Extension_nlpsolver.mk
index 542892b..cfe27f6 100644
--- a/nlpsolver/Extension_nlpsolver.mk
+++ b/nlpsolver/Extension_nlpsolver.mk
@@ -33,10 +33,12 @@ $(eval $(call gb_Extension_add_file,nlpsolver,components.rdb,$(SRCDIR)/nlpsolver
 $(eval $(call gb_Extension_add_file,nlpsolver,nlpsolver.jar,$(OUTDIR)/bin/nlpsolver.jar))
 $(eval $(call gb_Extension_add_file,nlpsolver,EvolutionarySolver.jar,$(OUTDIR)/bin/EvolutionarySolver.jar))
 
-$(eval $(foreach trans, $(wildcard $(SRCDIR)/nlpsolver/src/locale/*en_US.default), \
-	$(eval $(call gb_Extension_add_file,nlpsolver,locale/$(notdir $(trans)),$(trans)))))
-$(eval $(foreach trans, $(wildcard $(SRCDIR)/nlpsolver/src/locale/*en_US.properties), \
-	$(eval $(call gb_Extension_localize_properties,nlpsolver,locale/$(notdir $(trans)),$(trans)))))
+$(eval $(call gb_Extension_add_file,nlpsolver,locale/NLPSolverCommon_en_US.default,$(SRCDIR)/nlpsolver/src/locale/NLPSolverCommon_en_US.default))
+$(eval $(call gb_Extension_add_file,nlpsolver,locale/NLPSolverStatusDialog_en_US.default,$(SRCDIR)/nlpsolver/src/locale/NLPSolverStatusDialog_en_US.default))
+
+$(eval $(call gb_Extension_localize_properties,nlpsolver,locale/NLPSolverCommon_en_US.properties,$(SRCDIR)/nlpsolver/src/locale/NLPSolverCommon_en_US.properties))
+$(eval $(call gb_Extension_localize_properties,nlpsolver,locale/NLPSolverStatusDialog_en_US.properties,$(SRCDIR)/nlpsolver/src/locale/NLPSolverStatusDialog_en_US.properties))
+
 $(eval $(call gb_Extension_add_file,nlpsolver,help/en/com.sun.star.comp.Calc.NLPSolver/Options.xhp, \
 	$(SRCDIR)/nlpsolver/help/en/com.sun.star.comp.Calc.NLPSolver/Options.xhp))
 $(eval $(call gb_Extension_add_file,nlpsolver,help/en/com.sun.star.comp.Calc.NLPSolver/Usage.xhp, \