diff options
| author | David Tardon <dtardon@redhat.com> | 2012-02-19 13:39:39 +0100 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2012-03-06 10:23:26 +0100 |
| commit | 81d7b8f821b90b6c3983106ef365c73ede20698b (patch) | |
| tree | f5b9f3bdcb7b6942341a370cfabaec8ffec00a60 /solenv | |
| parent | support adding more than 1 file at once (diff) | |
| download | core-81d7b8f821b90b6c3983106ef365c73ede20698b.tar.gz core-81d7b8f821b90b6c3983106ef365c73ede20698b.zip | |
allow using manifest in different location
This is necessary for C++ extensions (at least for those from sdext
module), because the manifest needs preprocessing (the extension's name
is platform-dependent etc.)
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/Extension.mk | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/solenv/gbuild/Extension.mk b/solenv/gbuild/Extension.mk index d3ac634d848a..ddf520ceed07 100644 --- a/solenv/gbuild/Extension.mk +++ b/solenv/gbuild/Extension.mk @@ -91,7 +91,7 @@ $(call gb_Extension_get_target,%) : \ $(call gb_Helper_abbreviate_dirs_native,\ 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 $(MANIFEST) $(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 \ @@ -109,6 +109,8 @@ $(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)) : MANIFEST := $(SRCDIR)/$(2)/manifest.xml +$(call gb_Extension_get_target,$(1)) : $$(MANIFEST) $(call gb_Extension_get_target,$(1)) : PRJNAME := $(firstword $(subst /, ,$(2))) $(call gb_Extension_get_workdir,$(1))/description.xml : $(SRCDIR)/$(2)/description.xml ifneq ($(strip $(gb_WITH_LANG)),) @@ -122,6 +124,12 @@ $(call gb_Extension_get_outdir_target,$(1)) : $(call gb_Extension_get_target,$(1 endef +# Set custom manifest +define gb_Extension_set_manifest +$(call gb_Extension_get_target,$(1)) : MANIFEST := $(2) + +endef + # adding a file creates a dependency to it # file is copied to $(WORKDIR) define gb_Extension_add_file |