From 06293b051c9eb418ce0f5a6ee2f7dabafd78f98c Mon Sep 17 00:00:00 2001 From: David Tardon Date: Fri, 11 Oct 2013 09:33:21 +0200 Subject: do not copy testing extensions to instdir Change-Id: Ibd2f18a8998b3e182d8d5b8af9c9f74a8ac00744 --- solenv/gbuild/Extension.mk | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) (limited to 'solenv') diff --git a/solenv/gbuild/Extension.mk b/solenv/gbuild/Extension.mk index 847705518524..42da3635c3a1 100644 --- a/solenv/gbuild/Extension.mk +++ b/solenv/gbuild/Extension.mk @@ -114,7 +114,7 @@ $(call gb_Extension_get_target,%) : \ # add deliverable # add dependency for outdir target to workdir target (pattern rule for delivery is in Package.mk) # -# gb_Extension_Extension extension srcdir +# gb_Extension_Extension extension srcdir nodeliver define gb_Extension_Extension $(call gb_Extension_get_target,$(1)) : DESCRIPTION := $(call gb_Extension_get_target,$(1)) : FILES := META-INF description.xml @@ -127,11 +127,7 @@ $(call gb_Extension_get_workdir,$(1))/description.xml :| \ $(call gb_Extension__get_preparation_target,$(1)) $(call gb_Extension__get_final_target,$(1)) : $(call gb_Extension_get_target,$(1)) -$(call gb_GeneratedPackage_GeneratedPackage,Extension/$(1),$(dir $(call gb_Extension_get_rootdir,$(1)))) -$(call gb_GeneratedPackage_add_dir,Extension/$(1),$(INSTROOT)/share/extensions/$(1),$(notdir $(call gb_Extension_get_rootdir,$(1)))) - -$(call gb_GeneratedPackage_get_target,Extension/$(1)) : $(call gb_Extension_get_target,$(1)) -$(call gb_Extension__get_final_target,$(1)) : $(call gb_GeneratedPackage_get_target,Extension/$(1)) +$(if $(filter nodeliver,$(3)),,$(call gb_Extension__Extension_deliver,$(1),Extension/$(1))) ifneq ($(strip $(gb_WITH_LANG)),) $(call gb_Extension_get_target,$(1)) : \ @@ -149,6 +145,18 @@ $(call gb_Helper_make_userfriendly_targets,$(1),Extension,$(call gb_Extension__g endef +# Ensure delivery of the extension to instdir. +# +# gb_Extension__Extension_deliver extension package-name +define gb_Extension__Extension_deliver +$(call gb_GeneratedPackage_GeneratedPackage,$(2),$(dir $(call gb_Extension_get_rootdir,$(1)))) +$(call gb_GeneratedPackage_add_dir,$(2),$(INSTROOT)/share/extensions/$(1),$(notdir $(call gb_Extension_get_rootdir,$(1)))) + +$(call gb_GeneratedPackage_get_target,$(2)) : $(call gb_Extension_get_target,$(1)) +$(call gb_Extension__get_final_target,$(1)) : $(call gb_GeneratedPackage_get_target,$(2)) + +endef + # adding a file creates a dependency to it # file is copied to $(WORKDIR) define gb_Extension_add_file -- cgit ht LibreOffice 核心代码仓库文档基金会
summaryrefslogtreecommitdiff
path: root/unoidl
td>
AgeCommit message (Expand)Author
2014-11-05coverity#1103678 Unchecked dynamic_castCaolán McNamara
2014-10-24coverity#1242422 Unchecked dynamic_castCaolán McNamara
2014-07-10cosmetic 'en-passant'....Norbert Thiebaud
2014-07-10coverity#1224979 Missing break in switchCaolán McNamara
2014-07-10coverity#1224980 Missing break in switchCaolán McNamara
2014-07-07fix build error 'strlen' is not a member of 'std' locallyDouglas Mencken
2014-06-27tweak assert so comment appears in abort messageCaolán McNamara
2014-05-23Remove circular references between unoidl::Manager and its providersStephan Bergmann
2014-05-23Combine unoidl::loadProvider and unoidl::Manager::addProviderStephan Bergmann
2014-04-29coverity#1210179 Uninitialized pointer fieldCaolán McNamara
2014-04-11unoidl-check: Also check for invalid UNOIDL identifiersStephan Bergmann
2014-03-26First batch of adding SAL_OVERRRIDE to overriding function declarationsStephan Bergmann
2014-03-18Find places where OUString and OString are passed by value.Noel Grandin
2014-02-24Yet another one undefined comparison of 'const' and a 'non-const' iteratorsDouglas Mencken
2014-02-18tests belong to check targetBjoern Michaelsen
2014-01-08OK to add optional bases to published old-style servicesStephan Bergmann
2013-12-20typo fixesAndras Timar
2013-11-27Silence false "may be used uninitialized" warningsStephan Bergmann
2013-11-26Fix unoidl sourceprovider old-style service duplicate member checksStephan Bergmann
2013-11-26Remove outdated TODO (@deprecated annotation are handled fine)Stephan Bergmann
2013-11-26Duplicate base checking code already covers check for opt base != XInterfaceStephan Bergmann
2013-11-25Fix unoidl sourceprovider interface base and member checksStephan Bergmann
2013-11-22Fix unoidl sourceprovider polystruct argument checksStephan Bergmann
2013-11-22Fix unoidl sourceprovider typedef checkStephan Bergmann
2013-11-22Fix unoidl sourceprovider recursive struct/exception member checkStephan Bergmann
2013-11-22Fix unoidl sourceprovider "published" checksStephan Bergmann
2013-11-05fixincludeguards.sh: uno*Thomas Arnhold
2013-10-24fdo#67725 unoidl::AggregatingCursor must wrap modules for aggregation, tooStephan Bergmann
2013-10-15Allow starts-/endsWith* to also return the rest of the matched stringStephan Bergmann
2013-10-10Silence some false Covertiy scan warnings about uninitialized membersStephan Bergmann
2013-10-10Make changes of interface method parameter names a hard failureStephan Bergmann
2013-09-20keep C++03 compilers happyStephan Bergmann
2013-09-20Reject "too similar" service constructorsStephan Bergmann
2013-09-20Certain UNOIDL typedefs are forbidden for historic reasonsStephan Bergmann
2013-09-19Directly build UNOIDL .rdb files from .idl filesStephan Bergmann
2013-09-19Update unoidl/READMEStephan Bergmann
Noel Grandin