[Libreoffice-commits] .: 4 commits - reportbuilder/util scripting/source solenv/gbuild swext/Extension_wiki-publisher.mk

Michael Stahl mst at kemper.freedesktop.org
Fri Nov 4 16:19:34 PDT 2011 

 reportbuilder/util/description-en-US.txt      |    2 -
 scripting/source/pyprov/description-en-US.txt |    1 
 solenv/gbuild/AllLangResTarget.mk             |    5 +-
 solenv/gbuild/Configuration.mk                |    2 -
 solenv/gbuild/Extension.mk                    |   46 +++++++++++++++++++++++---
 solenv/gbuild/SdiTarget.mk                    |    3 +
 solenv/gbuild/gbuild.mk                       |    2 -
 solenv/gbuild/platform/android.mk             |    3 -
 solenv/gbuild/platform/ios.mk                 |   16 ---------
 solenv/gbuild/platform/macosx.mk              |   16 ---------
 solenv/gbuild/platform/solaris.mk             |   16 ---------
 solenv/gbuild/platform/unxgcc.mk              |   16 ---------
 solenv/gbuild/platform/windows.mk             |   18 ----------
 solenv/gbuild/platform/winmingw.mk            |   15 --------
 swext/Extension_wiki-publisher.mk             |    1 
 15 files changed, 49 insertions(+), 113 deletions(-)

New commits:
commit 3fc888c2c518631d80d46e1d260378f810b3d7fe
Author: Michael Stahl <mstahl at redhat.com>
Date:   Fri Nov 4 23:14:46 2011 +0100

    gbuild: clean up pointless proliferation of PRECOMMANDs, all alike

diff --git a/solenv/gbuild/AllLangResTarget.mk b/solenv/gbuild/AllLangResTarget.mk
index 5e0f89a..ba714df 100644
--- a/solenv/gbuild/AllLangResTarget.mk
+++ b/solenv/gbuild/AllLangResTarget.mk
@@ -48,9 +48,8 @@
 # SrsPartMergeTarget class
 
 gb_SrsPartMergeTarget_TRANSEXTARGET := $(call gb_Executable_get_target_for_build,transex3)
-# gb_SrsPartMergeTarget_TRANSEXPRECOMMAND is set by the platforms
-
-gb_SrsPartMergeTarget_TRANSEXCOMMAND := $(gb_SrsPartMergeTarget_TRANSEXPRECOMMAND) $(gb_SrsPartMergeTarget_TRANSEXTARGET)
+gb_SrsPartMergeTarget_TRANSEXCOMMAND := \
+	$(gb_Helper_set_ld_path) $(gb_SrsPartMergeTarget_TRANSEXTARGET)
 gb_SrsPartMergeTarget_SDFLOCATION := $(SRCDIR)/translations/$(INPATH)/misc/sdf/
 
 define gb_SrsPartMergeTarget__command
diff --git a/solenv/gbuild/Configuration.mk b/solenv/gbuild/Configuration.mk
index 21497f5..c08719d 100644
--- a/solenv/gbuild/Configuration.mk
+++ b/solenv/gbuild/Configuration.mk
@@ -223,7 +223,7 @@ $(call gb_XcuLangpackTarget_get_outdir_target,%) :
 
 gb_XcuMergeTarget_CFGEXTARGET := $(call gb_Executable_get_target,cfgex)
 gb_XcuMergeTarget_CFGEXCOMMAND := \
-	$(gb_CFGEXPRECOMMAND) $(gb_XcuMergeTarget_CFGEXTARGET)
+	$(gb_Helper_set_ld_path) $(gb_XcuMergeTarget_CFGEXTARGET)
 gb_XcuMergeTarget_SDFLOCATION := $(SRCDIR)/translations/$(INPATH)/misc/sdf/
 
 # PRJNAME is computed from the stem (parameter $(2))
diff --git a/solenv/gbuild/Extension.mk b/solenv/gbuild/Extension.mk
index aecae5e..5b9267f 100644
--- a/solenv/gbuild/Extension.mk
+++ b/solenv/gbuild/Extension.mk
@@ -35,7 +35,7 @@ gb_Extension_LICENSEFILE := LICENSE
 endif
 gb_Extension_XRMEXTARGET := $(call gb_Executable_get_target,xrmex)
 gb_Extension_XRMEXCOMMAND := \
-	$(gb_XRMEXPRECOMMAND) $(gb_Extension_XRMEXTARGET)
+	$(gb_Helper_set_ld_path) $(gb_Extension_XRMEXTARGET)
 gb_Extension_SDFLOCATION := $(SRCDIR)/translations/$(INPATH)/misc/sdf/
 # does not contain en-US because it is special cased in gb_Extension_Extension
 gb_Extension_LANGS := $(filter-out en-US,$(gb_WITH_LANG))
diff --git a/solenv/gbuild/SdiTarget.mk b/solenv/gbuild/SdiTarget.mk
index f8d7b4c..d1fa175 100644
--- a/solenv/gbuild/SdiTarget.mk
+++ b/solenv/gbuild/SdiTarget.mk
@@ -33,7 +33,8 @@
 # SdiTarget class
 
 gb_SdiTarget_SVIDLTARGET := $(call gb_Executable_get_target_for_build,svidl)
-gb_SdiTarget_SVIDLCOMMAND := $(gb_SdiTarget_SVIDLPRECOMMAND) $(gb_SdiTarget_SVIDLTARGET)
+gb_SdiTarget_SVIDLCOMMAND := \
+	$(gb_Helper_set_ld_path) $(gb_SdiTarget_SVIDLTARGET)
 
 $(call gb_SdiTarget_get_target,%) : $(SRCDIR)/%.sdi | $(gb_SdiTarget_SVIDLTARGET)
 	$(call gb_Output_announce,$*,$(true),SDI,1)
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index 4be10a4..9a47723 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -352,7 +352,7 @@ gb_XSLTPROCTARGET :=
 gb_XSLTPROC := xsltproc
 else
 gb_XSLTPROCTARGET := $(call gb_Executable_get_target_for_build,xsltproc)
-gb_XSLTPROC := $(gb_XSLTPROCPRECOMMAND) $(gb_XSLTPROCTARGET)
+gb_XSLTPROC := $(gb_Helper_set_ld_path) $(gb_XSLTPROCTARGET)
 endif
 
 ifeq ($(SYSTEM_PYTHON),YES)
diff --git a/solenv/gbuild/platform/android.mk b/solenv/gbuild/platform/android.mk
index 8bf5acc..03f85ec 100644
--- a/solenv/gbuild/platform/android.mk
+++ b/solenv/gbuild/platform/android.mk
@@ -60,10 +60,4 @@ gb_UnoApiTarget_CPPUMAKERCOMMAND := $(gb_Helper_set_ld_path) SOLARBINDIR=$(OUTDI
 gb_UnoApiTarget_REGVIEWTARGET := $(OUTDIR_FOR_BUILD)/bin/regview
 gb_UnoApiTarget_REGVIEWCOMMAND := $(gb_Helper_set_ld_path) SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(gb_UnoApiTarget_REGVIEWTARGET)
 
-# Configuration
-gb_CFGEXPRECOMMAND := $(gb_Helper_set_ld_path)
-
-# Extension
-gb_XRMEXPRECOMMAND := $(gb_Helper_set_ld_path)
-
 # vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/ios.mk b/solenv/gbuild/platform/ios.mk
index 4cfe2d7..2f954c1 100644
--- a/solenv/gbuild/platform/ios.mk
+++ b/solenv/gbuild/platform/ios.mk
@@ -401,14 +401,6 @@ $(call gb_JunitTest_get_target,$(1)) : DEFS := \
 
 endef
 
-# SdiTarget class
-
-gb_SdiTarget_SVIDLPRECOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR_FOR_BUILD)/lib
-
-# SrsPartMergeTarget
-
-gb_SrsPartMergeTarget_TRANSEXPRECOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR_FOR_BUILD)/lib
-
 # SrsPartTarget class
 
 gb_SrsPartTarget_RSCTARGET := $(OUTDIR_FOR_BUILD)/bin/rsc
@@ -425,11 +417,6 @@ $(call gb_Helper_abbreviate_dirs,\
 		-o $(call gb_SrsPartTarget_get_dep_target,$(1)))
 endef
 
-
-# ComponentTarget
-
-gb_XSLTPROCPRECOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR_FOR_BUILD)/lib
-
 # UnoApiTarget
 
 gb_UnoApiTarget_IDLCTARGET := $(OUTDIR_FOR_BUILD)/bin/idlc
@@ -443,13 +430,7 @@ gb_UnoApiTarget_CPPUMAKERCOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR_FOR_BUILD)/lib SO
 gb_UnoApiTarget_REGVIEWTARGET := $(OUTDIR_FOR_BUILD)/bin/regview
 gb_UnoApiTarget_REGVIEWCOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR_FOR_BUILD)/lib SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(gb_UnoApiTarget_REGVIEWTARGET)
 
-# Configuration
-gb_CFGEXPRECOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR_FOR_BUILD)/lib
-
 # Python
 gb_PYTHON_PRECOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR_FOR_BUILD)/lib
 
-# Extension
-gb_XRMEXPRECOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR_FOR_BUILD)/lib
-
 # vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index 8fdaab1..616550b 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -494,14 +494,6 @@ $(call gb_JunitTest_get_target,$(1)) : DEFS := \
 
 endef
 
-# SdiTarget class
-
-gb_SdiTarget_SVIDLPRECOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR)/lib
-
-# SrsPartMergeTarget
-
-gb_SrsPartMergeTarget_TRANSEXPRECOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR)/lib
-
 # SrsPartTarget class
 
 gb_SrsPartTarget_RSCTARGET := $(OUTDIR)/bin/rsc
@@ -518,11 +510,6 @@ $(call gb_Helper_abbreviate_dirs,\
 		-o $(call gb_SrsPartTarget_get_dep_target,$(1)))
 endef
 
-
-# ComponentTarget
-
-gb_XSLTPROCPRECOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR)/lib
-
 # UnoApiTarget
 
 gb_UnoApiTarget_IDLCTARGET := $(OUTDIR)/bin/idlc
@@ -536,13 +523,7 @@ gb_UnoApiTarget_CPPUMAKERCOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=
 gb_UnoApiTarget_REGVIEWTARGET := $(OUTDIR)/bin/regview
 gb_UnoApiTarget_REGVIEWCOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGVIEWTARGET)
 
-# Configuration
-gb_CFGEXPRECOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR)/lib
-
 # Python
 gb_PYTHON_PRECOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR)/lib
 
-# Extension
-gb_XRMEXPRECOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR)/lib
-
 # vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk
index ffd74b0..8d0dcd2 100644
--- a/solenv/gbuild/platform/solaris.mk
+++ b/solenv/gbuild/platform/solaris.mk
@@ -362,14 +362,6 @@ $(call gb_JunitTest_get_target,$(1)) : DEFS := \
 
 endef
 
-# SdiTarget class
-
-gb_SdiTarget_SVIDLPRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib
-
-# SrsPartMergeTarget
-
-gb_SrsPartMergeTarget_TRANSEXPRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib
-
 # SrsPartTarget class
 
 gb_SrsPartTarget_RSCTARGET := $(OUTDIR)/bin/rsc
@@ -393,11 +385,6 @@ $(call gb_Helper_abbreviate_dirs_native,\
 	> $(call gb_SrsPartTarget_get_dep_target,$(1)))
 endef
 
-
-# ComponentTarget
-
-gb_XSLTPROCPRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib
-
 # UnoApiTarget
 
 gb_UnoApiTarget_IDLCTARGET := $(OUTDIR)/bin/idlc
@@ -411,13 +398,7 @@ gb_UnoApiTarget_CPPUMAKERCOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(
 gb_UnoApiTarget_REGVIEWTARGET := $(OUTDIR)/bin/regview
 gb_UnoApiTarget_REGVIEWCOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGVIEWTARGET)
 
-# Configuration
-gb_CFGEXPRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib
-
 # Python
 gb_PYTHON_PRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib PYTHONHOME=$(OUTDIR)/lib/python PYTHONPATH=$(OUTDIR)/lib/python:$(OUTDIR)/lib/python/lib-dynload
 
-# Extension
-gb_XRMEXPRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib
-
 # vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index 612041e..0cf5991 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -493,14 +493,6 @@ $(call gb_JunitTest_get_target,$(1)) : DEFS := \
 
 endef
 
-# SdiTarget class
-
-gb_SdiTarget_SVIDLPRECOMMAND := $(gb_Helper_set_ld_path)
-
-# SrsPartMergeTarget
-
-gb_SrsPartMergeTarget_TRANSEXPRECOMMAND := $(gb_Helper_set_ld_path)
-
 # SrsPartTarget class
 
 gb_SrsPartTarget_RSCTARGET := $(OUTDIR_FOR_BUILD)/bin/rsc
@@ -517,11 +509,6 @@ $(call gb_Helper_abbreviate_dirs,\
 		-o $(call gb_SrsPartTarget_get_dep_target,$(1)))
 endef
 
-
-# ComponentTarget
-
-gb_XSLTPROCPRECOMMAND := $(gb_Helper_set_ld_path)
-
 # UnoApiTarget
 
 gb_UnoApiTarget_IDLCTARGET := $(OUTDIR)/bin/idlc
@@ -535,13 +522,7 @@ gb_UnoApiTarget_CPPUMAKERCOMMAND := $(gb_Helper_set_ld_path) SOLARBINDIR=$(OUTDI
 gb_UnoApiTarget_REGVIEWTARGET := $(OUTDIR)/bin/regview
 gb_UnoApiTarget_REGVIEWCOMMAND := $(gb_Helper_set_ld_path) SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGVIEWTARGET)
 
-# Configuration
-gb_CFGEXPRECOMMAND := $(gb_Helper_set_ld_path)
-
 # Python
 gb_PYTHON_PRECOMMAND := $(gb_Helper_set_ld_path) PYTHONHOME=$(OUTDIR)/lib/python PYTHONPATH=$(OUTDIR)/lib/python:$(OUTDIR)/lib/python/lib-dynload
 
-# Extension
-gb_XRMEXPRECOMMAND := $(gb_Helper_set_ld_path)
-
 # vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk
index 484a1d6..c7e825b 100644
--- a/solenv/gbuild/platform/windows.mk
+++ b/solenv/gbuild/platform/windows.mk
@@ -688,16 +688,6 @@ $(call gb_JunitTest_get_target,$(1)) : DEFS := \
 endef
 
 
-# SdiTarget class
-
-# svidl.exe is in ${OUTDIR}/bin itself, so nothing special needed to have it find
-# DLLs in the same directory
-gb_SdiTarget_SVIDLPRECOMMAND :=
-
-# SrsPartMergeTarget
-# Ditto for transex3
-gb_SrsPartMergeTarget_TRANSEXPRECOMMAND :=
-
 # SrsPartTarget class
 
 gb_SrsPartTarget_RSCTARGET := $(OUTDIR)/bin/rsc.exe
@@ -763,11 +753,6 @@ else
 gb_WinResTarget__command_dep =
 endif
 
-# ComponentTarget
-
-# See comment for svidl.exe
-gb_XSLTPROCPRECOMMAND :=
-
 # UnoApiTarget
 
 gb_UnoApiTarget_IDLCTARGET := $(OUTDIR)/bin/idlc.exe
@@ -781,13 +766,7 @@ gb_UnoApiTarget_CPPUMAKERCOMMAND := SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_
 gb_UnoApiTarget_REGVIEWTARGET := $(OUTDIR)/bin/regview.exe
 gb_UnoApiTarget_REGVIEWCOMMAND := SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGVIEWTARGET)
 
-# Configuration
-gb_CFGEXPRECOMMAND :=  PATH="$${PATH}:$(OUTDIR)/bin"
-
 # Python
 gb_PYTHON_PRECOMMAND :=  PATH="$${PATH}:$(OUTDIR)/bin" PYTHONHOME="$(OUTDIR)/lib/python" PYTHONPATH="$(OUTDIR)/lib/python;$(OUTDIR)/lib/python/lib-dynload"
 
-# Extension
-gb_XRMEXPRECOMMAND :=  PATH="$${PATH}:$(OUTDIR)/bin"
-
 # vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/winmingw.mk b/solenv/gbuild/platform/winmingw.mk
index 643ef45..ea3ae75 100644
--- a/solenv/gbuild/platform/winmingw.mk
+++ b/solenv/gbuild/platform/winmingw.mk
@@ -596,14 +596,6 @@ $(call gb_LinkTarget_set_auxtargets,$(2),\
 
 endef
 
-# SdiTarget class
-
-gb_SdiTarget_SVIDLPRECOMMAND := $(gb_Helper_set_ld_path)
-
-# SrsPartMergeTarget
-
-gb_SrsPartMergeTarget_TRANSEXPRECOMMAND := $(gb_Helper_set_ld_path)
-
 # SrsPartTarget class
 
 gb_SrsPartTarget_RSCTARGET := $(OUTDIR_FOR_BUILD)/bin/rsc
@@ -669,10 +661,6 @@ else
 gb_WinResTarget__command_dep =
 endif
 
-# ComponentTarget
-
-gb_XSLTPROCPRECOMMAND := $(gb_Helper_set_ld_path)
-
 # UnoApiTarget
 
 gb_UnoApiTarget_IDLCTARGET := $(OUTDIR_FOR_BUILD)/bin/idlc
@@ -686,13 +674,7 @@ gb_UnoApiTarget_CPPUMAKERCOMMAND := $(gb_Helper_set_ld_path) SOLARBINDIR=$(OUTDI
 gb_UnoApiTarget_REGVIEWTARGET := $(OUTDIR_FOR_BUILD)/bin/regview
 gb_UnoApiTarget_REGVIEWCOMMAND := $(gb_Helper_set_ld_path) SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(gb_UnoApiTarget_REGVIEWTARGET)
 
-# Configuration
-gb_CFGEXPRECOMMAND :=  PATH="$${PATH}:$(OUTDIR)/bin"
-
 # Python
 gb_PYTHON_PRECOMMAND :=  PATH="$${PATH}:$(OUTDIR)/bin" PYTHONHOME="$(OUTDIR)/lib/python" PYTHONPATH="$(OUTDIR)/lib/python;$(OUTDIR)/lib/python/lib-dynload"
 
-# Extension
-gb_XRMEXPRECOMMAND :=  PATH="$${PATH}:$(OUTDIR)/bin"
-
 # vim: set noet sw=4:
commit fddb39b14df1e3dcb6e42c206547b095cc65853e
Author: Michael Stahl <mstahl at redhat.com>
Date:   Fri Nov 4 22:31:36 2011 +0100

    gbuild: add support for extension description l10n

diff --git a/solenv/gbuild/Extension.mk b/solenv/gbuild/Extension.mk
index 63627ec..aecae5e 100644
--- a/solenv/gbuild/Extension.mk
+++ b/solenv/gbuild/Extension.mk
@@ -33,6 +33,12 @@ gb_Extension_LICENSEFILE := license.txt
 else
 gb_Extension_LICENSEFILE := LICENSE
 endif
+gb_Extension_XRMEXTARGET := $(call gb_Executable_get_target,xrmex)
+gb_Extension_XRMEXCOMMAND := \
+	$(gb_XRMEXPRECOMMAND) $(gb_Extension_XRMEXTARGET)
+gb_Extension_SDFLOCATION := $(SRCDIR)/translations/$(INPATH)/misc/sdf/
+# does not contain en-US because it is special cased in gb_Extension_Extension
+gb_Extension_LANGS := $(filter-out en-US,$(gb_WITH_LANG))
 
 # remove extension directory in workdir and oxt file in workdir and outdir
 $(call gb_Extension_get_clean_target,%) :
@@ -42,18 +48,41 @@ $(call gb_Extension_get_clean_target,%) :
 		rm -f $(call gb_Extension_get_target,$*) && \
 		rm -f $(call gb_Extension_get_outdir_target,$*))
 
+ifeq ($(strip $(gb_WITH_LANG)),)
+$(call gb_Extension_get_workdir,%)/description.xml :
+	$(call gb_Output_announce,$*/description.xml,$(true),CPY,3)
+	$(call gb_Helper_abbreviate_dirs,\
+		mkdir -p $(call gb_Extension_get_workdir,$*) && \
+		cp -f $(LOCATION)/description.xml $@)
+else
+$(call gb_Extension_get_workdir,%)/description.xml : | \
+		$(gb_Extension_XRMEXTARGET)
+	$(call gb_Output_announce,$*/description.xml,$(true),XRM,3)
+	$(call gb_Helper_abbreviate_dirs_native,\
+		mkdir -p $(call gb_Extension_get_workdir,$*) && \
+		$(gb_Extension_XRMEXCOMMAND) \
+			-p $(PRJNAME) \
+			-i $(filter %.xml,$^) \
+			-o $@ \
+			-m $(SDF) \
+			-l all)
+endif
+
 # rule to create oxt package in workdir
 # --filesync makes sure that all files in the oxt package will be removed that no longer are in $(FILES)
-$(call gb_Extension_get_target,%) :
+$(call gb_Extension_get_target,%) : \
+		$(call gb_Extension_get_workdir,%)/description.xml
 	$(call gb_Output_announce,$*,$(true),OXT,3)
 	$(call gb_Helper_abbreviate_dirs_native,\
-		mkdir -p $(call gb_Extension_get_workdir,$*)/META-INF && \
-		mkdir -p $(call gb_Extension_get_workdir,$*)/registration && \
-		cp -f $(LOCATION)/description.xml $(call gb_Extension_get_workdir,$*) && \
+		mkdir -p $(call gb_Extension_get_workdir,$*)/META-INF \
+			$(call gb_Extension_get_workdir,$*)/registration && \
 		cp -f $(LOCATION)/manifest.xml $(call gb_Extension_get_workdir,$*)/META-INF && \
 		cp -f $(OUTDIR)/bin/osl/$(gb_Extension_LICENSEFILE) $(call gb_Extension_get_workdir,$*)/registration && \
 		cd $(call gb_Extension_get_workdir,$*) && \
-		$(gb_Extension_ZIPCOMMAND) -rX --filesync $(call gb_Extension_get_target,$*) $(FILES) )
+		$(gb_Extension_ZIPCOMMAND) -rX --filesync \
+			$(call gb_Extension_get_target,$*) \
+			$(FILES) \
+			$(foreach lang,$(gb_Extension_LANGS),description-$(lang).txt))
 
 # TODO: needs dependency on $(OUTDIR)/bin/osl/$(gb_Extension_LICENSEFILE) once readlicense_oo will be gbuildized
 # or just another simpler solution
@@ -65,6 +94,13 @@ $(call gb_Extension_get_target,%) :
 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_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))
 $(call gb_Extension_get_outdir_target,$(1)) : $(call gb_Extension_get_target,$(1))
diff --git a/solenv/gbuild/platform/android.mk b/solenv/gbuild/platform/android.mk
index a912c21..8bf5acc 100644
--- a/solenv/gbuild/platform/android.mk
+++ b/solenv/gbuild/platform/android.mk
@@ -63,4 +63,7 @@ gb_UnoApiTarget_REGVIEWCOMMAND := $(gb_Helper_set_ld_path) SOLARBINDIR=$(OUTDIR_
 # Configuration
 gb_CFGEXPRECOMMAND := $(gb_Helper_set_ld_path)
 
+# Extension
+gb_XRMEXPRECOMMAND := $(gb_Helper_set_ld_path)
+
 # vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/ios.mk b/solenv/gbuild/platform/ios.mk
index 8d3fec8..4cfe2d7 100644
--- a/solenv/gbuild/platform/ios.mk
+++ b/solenv/gbuild/platform/ios.mk
@@ -449,4 +449,7 @@ gb_CFGEXPRECOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR_FOR_BUILD)/lib
 # Python
 gb_PYTHON_PRECOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR_FOR_BUILD)/lib
 
+# Extension
+gb_XRMEXPRECOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR_FOR_BUILD)/lib
+
 # vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index 055073f..8fdaab1 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -542,4 +542,7 @@ gb_CFGEXPRECOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR)/lib
 # Python
 gb_PYTHON_PRECOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR)/lib
 
+# Extension
+gb_XRMEXPRECOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR)/lib
+
 # vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk
index 163a257..ffd74b0 100644
--- a/solenv/gbuild/platform/solaris.mk
+++ b/solenv/gbuild/platform/solaris.mk
@@ -417,4 +417,7 @@ gb_CFGEXPRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib
 # Python
 gb_PYTHON_PRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib PYTHONHOME=$(OUTDIR)/lib/python PYTHONPATH=$(OUTDIR)/lib/python:$(OUTDIR)/lib/python/lib-dynload
 
+# Extension
+gb_XRMEXPRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib
+
 # vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index d61c914..612041e 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -541,4 +541,7 @@ gb_CFGEXPRECOMMAND := $(gb_Helper_set_ld_path)
 # Python
 gb_PYTHON_PRECOMMAND := $(gb_Helper_set_ld_path) PYTHONHOME=$(OUTDIR)/lib/python PYTHONPATH=$(OUTDIR)/lib/python:$(OUTDIR)/lib/python/lib-dynload
 
+# Extension
+gb_XRMEXPRECOMMAND := $(gb_Helper_set_ld_path)
+
 # vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk
index 896eb0d..484a1d6 100644
--- a/solenv/gbuild/platform/windows.mk
+++ b/solenv/gbuild/platform/windows.mk
@@ -787,4 +787,7 @@ gb_CFGEXPRECOMMAND :=  PATH="$${PATH}:$(OUTDIR)/bin"
 # Python
 gb_PYTHON_PRECOMMAND :=  PATH="$${PATH}:$(OUTDIR)/bin" PYTHONHOME="$(OUTDIR)/lib/python" PYTHONPATH="$(OUTDIR)/lib/python;$(OUTDIR)/lib/python/lib-dynload"
 
+# Extension
+gb_XRMEXPRECOMMAND :=  PATH="$${PATH}:$(OUTDIR)/bin"
+
 # vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/winmingw.mk b/solenv/gbuild/platform/winmingw.mk
index a6618e3..643ef45 100644
--- a/solenv/gbuild/platform/winmingw.mk
+++ b/solenv/gbuild/platform/winmingw.mk
@@ -692,4 +692,7 @@ gb_CFGEXPRECOMMAND :=  PATH="$${PATH}:$(OUTDIR)/bin"
 # Python
 gb_PYTHON_PRECOMMAND :=  PATH="$${PATH}:$(OUTDIR)/bin" PYTHONHOME="$(OUTDIR)/lib/python" PYTHONPATH="$(OUTDIR)/lib/python;$(OUTDIR)/lib/python/lib-dynload"
 
+# Extension
+gb_XRMEXPRECOMMAND :=  PATH="$${PATH}:$(OUTDIR)/bin"
+
 # vim: set noet sw=4:
diff --git a/swext/Extension_wiki-publisher.mk b/swext/Extension_wiki-publisher.mk
index d4c64d5..05d5fd8 100644
--- a/swext/Extension_wiki-publisher.mk
+++ b/swext/Extension_wiki-publisher.mk
@@ -53,7 +53,6 @@ $(eval $(call gb_Extension_add_file,wiki-publisher,WikiEditor/script.xlb,$(WIKIS
 $(eval $(call gb_Extension_add_file,wiki-publisher,WikiEditor/dialog.xlb,$(WIKISRC)/dialogs/dialog.xlb))
 $(eval $(call gb_Extension_add_file,wiki-publisher,WikiEditor/SendToMediaWiki.xdl,$(WIKISRC)/dialogs/SendToMediaWiki.xdl))
 $(eval $(call gb_Extension_add_file,wiki-publisher,filter/odt2mediawiki.xsl,$(WIKISRC)/src/filter/odt2mediawiki.xsl))
-$(eval $(call gb_Extension_add_file,wiki-publisher,description-en-US.txt,$(WIKISRC)/src/description-en-US.txt))
 $(eval $(call gb_Extension_add_file,wiki-publisher,help/en-US/com.sun.wiki-publisher/wikisend.xhp,$(WIKISRC)/help/wikisend.xhp))
 $(eval $(call gb_Extension_add_file,wiki-publisher,help/en-US/com.sun.wiki-publisher/wikiformats.xhp,$(WIKISRC)/help/wikiformats.xhp))
 $(eval $(call gb_Extension_add_file,wiki-publisher,help/en-US/com.sun.wiki-publisher/wikiaccount.xhp,$(WIKISRC)/help/wikiaccount.xhp))
commit 4570fe5875d539aa92eee0e8f247862b7ad97636
Author: Michael Stahl <mstahl at redhat.com>
Date:   Fri Nov 4 22:30:35 2011 +0100

    ScriptProviderForPython: add some description

diff --git a/scripting/source/pyprov/description-en-US.txt b/scripting/source/pyprov/description-en-US.txt
new file mode 100644
index 0000000..b5d6321
--- /dev/null
+++ b/scripting/source/pyprov/description-en-US.txt
@@ -0,0 +1 @@
+A Script Provider for Python.
commit 1ca547d20882e9b3d3ba9a6c7ee0340a5b7009b0
Author: Michael Stahl <mstahl at redhat.com>
Date:   Fri Nov 4 17:50:43 2011 +0100

    reportbuilder: grammar considered neither stylish nor smart-looking

diff --git a/reportbuilder/util/description-en-US.txt b/reportbuilder/util/description-en-US.txt
index 21a1f1e..257af1d 100644
--- a/reportbuilder/util/description-en-US.txt
+++ b/reportbuilder/util/description-en-US.txt
@@ -1 +1 @@
-Create with the Report Builder stylish, smart-looking database reports. The flexible report editor can define group and page headers as well as group and page footers and even calculation fields are available to accomplish complex database reports.
+Use the Report Builder to create stylish, smart-looking database reports. The flexible report editor can define group and page headers as well as group and page footers. Additionally, calculation fields are available to accomplish complex database reports.

More information about the Libreoffice-commits mailing list