diff options
| author | David Tardon <dtardon@redhat.com> | 2012-08-05 15:41:59 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2012-08-09 07:42:29 +0200 |
| commit | 9b93a2d9db4c245dc96387c0d341652142bd5d44 (patch) | |
| tree | 13702e2a3f18f7aa517ce64b8c614301fd37f998 /solenv | |
| parent | 009d6c69eafea1d2bd21d15a3266aefd82e40d45 (diff) | |
change handling of description-LANG.txt
Change-Id: Iecd7760af418f6e9ff7c9502e27011ee03962705
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/Extension.mk | 1 | ||||
| -rw-r--r-- | solenv/gbuild/ExtensionTarget.mk | 15 |
2 files changed, 13 insertions, 3 deletions
diff --git a/solenv/gbuild/Extension.mk b/solenv/gbuild/Extension.mk index 18ff482b037f..e501e18ec84b 100644 --- a/solenv/gbuild/Extension.mk +++ b/solenv/gbuild/Extension.mk @@ -30,6 +30,7 @@ define gb_Extension_Extension $(call gb_ExtensionTarget_ExtensionTarget,$(1),$(2)) $(call gb_ExtensionTarget_use_default_license,$(1)) +$(call gb_ExtensionTarget_use_default_description,$(1),$(2)) $(call gb_Extension_get_target,$(1)) : $(call gb_ExtensionTarget_get_target,$(1)) $(call gb_Extension_get_clean_target,$(1)) : $(call gb_ExtensionTarget_get_clean_target,$(1)) diff --git a/solenv/gbuild/ExtensionTarget.mk b/solenv/gbuild/ExtensionTarget.mk index 428c2d4ce74c..2a434ef1c663 100644 --- a/solenv/gbuild/ExtensionTarget.mk +++ b/solenv/gbuild/ExtensionTarget.mk @@ -93,7 +93,7 @@ $(call gb_ExtensionTarget_get_target,%) : \ $(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) && \ $(if $(LICENSE),cp -f $(LICENSE) $(call gb_ExtensionTarget_get_rootdir,$*)/registration &&) \ - $(if $(gb_WITH_LANG),cp $(foreach lang,$(gb_ExtensionTarget_LANGS),$(call gb_ExtensionTarget_get_workdir,$*)/description-$(lang).txt) $(call gb_ExtensionTarget_get_rootdir,$*) &&) \ + $(if $(and $(gb_WITH_LANG),$(DESCRIPTION)),cp $(foreach lang,$(gb_ExtensionTarget_LANGS),$(call gb_ExtensionTarget_get_workdir,$*)/description-$(lang).txt) $(call gb_ExtensionTarget_get_rootdir,$*) &&) \ cd $(call gb_ExtensionTarget_get_rootdir,$*) && \ $(gb_ExtensionTarget_ZIPCOMMAND) -rX --filesync \ $(call gb_ExtensionTarget_get_target,$*) \ @@ -104,6 +104,7 @@ $(call gb_ExtensionTarget_get_target,%) : \ # add deliverable # add dependency for outdir target to workdir target (pattern rule for delivery is in Package.mk) define gb_ExtensionTarget_ExtensionTarget +$(call gb_ExtensionTarget_get_target,$(1)) : DESCRIPTION := $(call gb_ExtensionTarget_get_target,$(1)) : FILES := META-INF description.xml $(call gb_ExtensionTarget_get_target,$(1)) : LICENSE := $(call gb_ExtensionTarget_get_target,$(1)) : LOCATION := $(SRCDIR)/$(2) @@ -111,11 +112,9 @@ $(call gb_ExtensionTarget_get_target,$(1)) : PLATFORM := $(call gb_ExtensionTarget_get_target,$(1)) : PRJNAME := $(firstword $(subst /, ,$(2))) $(call gb_ExtensionTarget_get_workdir,$(1))/description.xml : $(SRCDIR)/$(2)/description.xml ifneq ($(strip $(gb_WITH_LANG)),) -$(call gb_ExtensionTarget_get_target,$(1)) : FILES += $(foreach lang,$(gb_ExtensionTarget_LANGS),description-$(lang).txt) $(call gb_ExtensionTarget_get_target,$(1)) : SDF := $(gb_SDFLOCATION)/$(2)/localize.sdf $(call gb_ExtensionTarget_get_workdir,$(1))/description.xml : $$(SDF) endif -$(call gb_ExtensionTarget_add_file,$(1),description-en-US.txt,$(SRCDIR)/$(2)/description-en-US.txt) endef @@ -135,6 +134,16 @@ $(call gb_ExtensionTarget_get_target,$(1)) : $(gb_ExtensionTarget_LICENSEFILE_DE endef +# Use the default description file +define gb_ExtensionTarget_use_default_description +$(call gb_ExtensionTarget_add_file,$(1),description-en-US.txt,$(SRCDIR)/$(2)/description-en-US.txt) +$(call gb_ExtensionTarget_get_target,$(1)) : DESCRIPTION := $(true) +ifneq ($(strip $(gb_WITH_LANG)),) +$(call gb_ExtensionTarget_get_target,$(1)) : FILES += $(foreach lang,$(gb_ExtensionTarget_LANGS),description-$(lang).txt) +endif + +endef + # adding a file creates a dependency to it # file is copied to $(WORKDIR) # $(3) is the target of the copied file, and $(4) can be used to override that |