diff options
| author | Michael Stahl <mstahl@redhat.com> | 2012-10-23 18:58:35 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-10-23 19:42:37 +0200 |
| commit | 10f4e767f004dc464a244618fc611bc700c6cb74 (patch) | |
| tree | 03be657648a43f21acd9170ddf1fbfff739fbaf4 | |
| parent | 76146f2f8d537c1942aa3a3288893363cadb1390 (diff) | |
gbuild: let ExtensionTarget expect manifest below META-INF
Change-Id: Ia07d3fd856578ab6976c02f8a0ec96273db19a2c
| -rw-r--r-- | ct2n/UnpackedTarball_ct2n.mk | 7 | ||||
| -rw-r--r-- | nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/META-INF/manifest.xml (renamed from nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/manifest.xml) | 0 | ||||
| -rw-r--r-- | reportbuilder/util/META-INF/manifest.xml (renamed from reportbuilder/util/manifest.xml) | 0 | ||||
| -rw-r--r-- | scripting/source/pyprov/META-INF/manifest.xml (renamed from scripting/source/pyprov/manifest.xml) | 0 | ||||
| -rw-r--r-- | sdext/source/minimizer/META-INF/manifest.xml (renamed from sdext/source/minimizer/manifest.xml) | 0 | ||||
| -rw-r--r-- | sdext/source/pdfimport/META-INF/manifest.xml (renamed from sdext/source/pdfimport/manifest.xml) | 0 | ||||
| -rw-r--r-- | sdext/source/presenter/META-INF/manifest.xml (renamed from sdext/source/presenter/manifest.xml) | 0 | ||||
| -rw-r--r-- | solenv/gbuild/ExtensionTarget.mk | 4 | ||||
| -rw-r--r-- | swext/mediawiki/src/META-INF/manifest.xml (renamed from swext/mediawiki/src/manifest.xml) | 0 |
9 files changed, 2 insertions, 9 deletions
diff --git a/ct2n/UnpackedTarball_ct2n.mk b/ct2n/UnpackedTarball_ct2n.mk index 633436caa0bc..f30704668a24 100644 --- a/ct2n/UnpackedTarball_ct2n.mk +++ b/ct2n/UnpackedTarball_ct2n.mk @@ -16,13 +16,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,ConvertTextToNumber,\ ct2n/ConvertTextToNumber-1.3.2-no-visible-by-default.patch \ )) -# adjustments for using Extension class -# 1. manifest.xml is expected in root directory -$(eval $(call gb_UnpackedTarball_set_post_action,ConvertTextToNumber,\ - mv $(call gb_UnpackedTarball_get_dir,ConvertTextToNumber)/META-INF/manifest.xml \ - $(call gb_UnpackedTarball_get_dir,ConvertTextToNumber) \ -)) - $(eval $(call gb_UnpackedTarball_mark_output_file,ConvertTextToNumber,description.xml)) # vim: set noet sw=4 ts=4: diff --git a/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/manifest.xml b/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/META-INF/manifest.xml index 0867cdd961e4..0867cdd961e4 100644 --- a/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/manifest.xml +++ b/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/META-INF/manifest.xml diff --git a/reportbuilder/util/manifest.xml b/reportbuilder/util/META-INF/manifest.xml index ee6b809722fe..ee6b809722fe 100644 --- a/reportbuilder/util/manifest.xml +++ b/reportbuilder/util/META-INF/manifest.xml diff --git a/scripting/source/pyprov/manifest.xml b/scripting/source/pyprov/META-INF/manifest.xml index 7a8f084277a6..7a8f084277a6 100644 --- a/scripting/source/pyprov/manifest.xml +++ b/scripting/source/pyprov/META-INF/manifest.xml diff --git a/sdext/source/minimizer/manifest.xml b/sdext/source/minimizer/META-INF/manifest.xml index a70fe27e848c..a70fe27e848c 100644 --- a/sdext/source/minimizer/manifest.xml +++ b/sdext/source/minimizer/META-INF/manifest.xml diff --git a/sdext/source/pdfimport/manifest.xml b/sdext/source/pdfimport/META-INF/manifest.xml index 2c23a785a584..2c23a785a584 100644 --- a/sdext/source/pdfimport/manifest.xml +++ b/sdext/source/pdfimport/META-INF/manifest.xml diff --git a/sdext/source/presenter/manifest.xml b/sdext/source/presenter/META-INF/manifest.xml index a25f22fdf81a..a25f22fdf81a 100644 --- a/sdext/source/presenter/manifest.xml +++ b/sdext/source/presenter/META-INF/manifest.xml diff --git a/solenv/gbuild/ExtensionTarget.mk b/solenv/gbuild/ExtensionTarget.mk index 286e9d79b025..f9c1ec3a25da 100644 --- a/solenv/gbuild/ExtensionTarget.mk +++ b/solenv/gbuild/ExtensionTarget.mk @@ -118,7 +118,7 @@ $(call gb_ExtensionTarget_get_target,%) : \ mkdir -p $(call gb_ExtensionTarget_get_rootdir,$*)/META-INF \ $(if $(LICENSE),$(call gb_ExtensionTarget_get_rootdir,$*)/registration) && \ $(call gb_ExtensionTarget__subst_platform,$(call gb_ExtensionTarget_get_workdir,$*)/description.xml,$(call gb_ExtensionTarget_get_rootdir,$*)/description.xml) && \ - $(call gb_ExtensionTarget__subst_platform,$(LOCATION)/manifest.xml,$(call gb_ExtensionTarget_get_rootdir,$*)/META-INF/manifest.xml) && \ + $(call gb_ExtensionTarget__subst_platform,$(LOCATION)/META-INF/manifest.xml,$(call gb_ExtensionTarget_get_rootdir,$*)/META-INF/manifest.xml) && \ $(if $(LICENSE),cp -f $(LICENSE) $(call gb_ExtensionTarget_get_rootdir,$*)/registration &&) \ $(if $(and $(gb_ExtensionTarget_TRANS_LANGS),$(DESCRIPTION)),cp $(foreach lang,$(gb_ExtensionTarget_TRANS_LANGS),$(call gb_ExtensionTarget_get_workdir,$*)/description-$(lang).txt) $(call gb_ExtensionTarget_get_rootdir,$*) &&) \ cd $(call gb_ExtensionTarget_get_rootdir,$*) && \ @@ -138,7 +138,7 @@ $(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_workdir,$(1))/description.xml : \ - $(SRCDIR)/$(2)/description.xml + $(2)/description.xml $(call gb_ExtensionTarget_get_workdir,$(1))/description.xml :| \ $(call gb_ExtensionTarget__get_preparation_target,$(1)) diff --git a/swext/mediawiki/src/manifest.xml b/swext/mediawiki/src/META-INF/manifest.xml index ab4d1054c32f..ab4d1054c32f 100644 --- a/swext/mediawiki/src/manifest.xml +++ b/swext/mediawiki/src/META-INF/manifest.xml |