diff options
| author | David Tardon <dtardon@redhat.com> | 2012-08-05 07:32:05 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2012-08-09 07:42:28 +0200 |
| commit | 3abc7880e0e09b1a74922067707b37ef45462479 (patch) | |
| tree | 612bbea4f2a04f841e74bc150ee77c804a1f3b00 | |
| parent | 9fbbcc122f5de6446d7500334f21445c30057bf6 (diff) | |
change handling of license file
This is a preparation for gbuildizing dictionaries, which does not
contain registration/LICENSE like regular extensions.
Change-Id: I9b186d101627872b522be0432f6daf21250eb497
| -rw-r--r-- | solenv/gbuild/Extension.mk | 1 | ||||
| -rw-r--r-- | solenv/gbuild/ExtensionTarget.mk | 22 |
2 files changed, 15 insertions, 8 deletions
diff --git a/solenv/gbuild/Extension.mk b/solenv/gbuild/Extension.mk index 4f71256108fc..18ff482b037f 100644 --- a/solenv/gbuild/Extension.mk +++ b/solenv/gbuild/Extension.mk @@ -29,6 +29,7 @@ define gb_Extension_Extension $(call gb_ExtensionTarget_ExtensionTarget,$(1),$(2)) +$(call gb_ExtensionTarget_use_default_license,$(1)) $(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 599fbb9e5121..c4ee6498a61f 100644 --- a/solenv/gbuild/ExtensionTarget.mk +++ b/solenv/gbuild/ExtensionTarget.mk @@ -29,9 +29,9 @@ gb_ExtensionTarget_ZIPCOMMAND := zip $(if $(findstring s,$(MAKEFLAGS)),-q) ifeq ($(GUI),WNT) -gb_ExtensionTarget_LICENSEFILE := license.txt +gb_ExtensionTarget_LICENSEFILE_DEFAULT := $(OUTDIR)/bin/osl/license.txt else -gb_ExtensionTarget_LICENSEFILE := LICENSE +gb_ExtensionTarget_LICENSEFILE_DEFAULT := $(OUTDIR)/bin/osl/LICENSE endif gb_ExtensionTarget_XRMEXTARGET := $(call gb_Executable_get_target_for_build,xrmex) gb_ExtensionTarget_XRMEXCOMMAND := \ @@ -91,25 +91,23 @@ $(call gb_ExtensionTarget_get_target,%) : \ $(call gb_Output_announce,$*,$(true),OXT,3) $(call gb_Helper_abbreviate_dirs,\ mkdir -p $(call gb_ExtensionTarget_get_rootdir,$*)/META-INF \ - $(call gb_ExtensionTarget_get_rootdir,$*)/registration && \ + $(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) && \ - cp -f $(OUTDIR)/bin/osl/$(gb_ExtensionTarget_LICENSEFILE) $(call gb_ExtensionTarget_get_rootdir,$*)/registration && \ + $(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,$*) &&) \ cd $(call gb_ExtensionTarget_get_rootdir,$*) && \ $(gb_ExtensionTarget_ZIPCOMMAND) -rX --filesync \ $(call gb_ExtensionTarget_get_target,$*) \ $(FILES)) -# TODO: needs dependency on $(OUTDIR)/bin/osl/$(gb_ExtensionTarget_LICENSEFILE) once readlicense_oo will be gbuildized -# or just another simpler solution - # set file list and location of manifest and description files # register target and clean 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)) : FILES := META-INF description.xml registration +$(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) $(call gb_ExtensionTarget_get_target,$(1)) : PLATFORM := $(call gb_ExtensionTarget_get_target,$(1)) : PRJNAME := $(firstword $(subst /, ,$(2))) @@ -131,6 +129,14 @@ $(call gb_ExtensionTarget_get_target,$(1)) : PLATFORM := $(2) endef +# Use the default license file +define gb_ExtensionTarget_use_default_license +$(call gb_ExtensionTarget_get_target,$(1)) : FILES += registration +$(call gb_ExtensionTarget_get_target,$(1)) : LICENSE := $(gb_ExtensionTarget_LICENSEFILE_DEFAULT) +$(call gb_ExtensionTarget_get_target,$(1)) : $(gb_ExtensionTarget_LICENSEFILE_DEFAULT) + +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 |