diff options
-rw-r--r-- | solenv/gbuild/Extension.mk | 46 | ||||
-rw-r--r-- | solenv/gbuild/platform/android.mk | 3 | ||||
-rw-r--r-- | solenv/gbuild/platform/ios.mk | 3 | ||||
-rw-r--r-- | solenv/gbuild/platform/macosx.mk | 3 | ||||
-rw-r--r-- | solenv/gbuild/platform/solaris.mk | 3 | ||||
-rw-r--r-- | solenv/gbuild/platform/unxgcc.mk | 3 | ||||
-rw-r--r-- | solenv/gbuild/platform/windows.mk | 3 | ||||
-rw-r--r-- | solenv/gbuild/platform/winmingw.mk | 3 | ||||
-rw-r--r-- | swext/Extension_wiki-publisher.mk | 1 |
9 files changed, 62 insertions, 6 deletions
diff --git a/solenv/gbuild/Extension.mk b/solenv/gbuild/Extension.mk index 63627ec6e96c..aecae5ef301a 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 a912c215eb87..8bf5acc16c09 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 8d3fec8b0d02..4cfe2d70a6be 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 055073f3aa4b..8fdaab17a027 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 163a25791e40..ffd74b07ef50 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 d61c914c6e2c..612041e41708 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 896eb0db8cd1..484a1d69949c 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 a6618e3ec838..643ef45f00ea 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 d4c64d505e98..05d5fd81d37a 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)) |