mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

do not copy testing extensions to instdir

Browse Source 
Change-Id: Ibd2f18a8998b3e182d8d5b8af9c9f74a8ac00744
This commit is contained in:
David Tardon
2013-10-11 09:33:21 +02:00
parent 2cddda124a
commit 06293b051c
3 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
desktop/Extension_test-passive.mk
View File

@@ -7,7 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/. # file, You can obtain one at http://mozilla.org/MPL/2.0/.
# #
$(eval $(call gb_Extension_Extension,test-passive,desktop/test/deployment/passive)) $(eval $(call gb_Extension_Extension,test-passive,desktop/test/deployment/passive,nodeliver))
$(eval $(call gb_Extension_add_file,test-passive,generic.components,$(call gb_Rdb_get_target,passive_generic))) $(eval $(call gb_Extension_add_file,test-passive,generic.components,$(call gb_Rdb_get_target,passive_generic)))

2
smoketest/Extension_TestExtension.mk
View File

@@ -7,7 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/. # file, You can obtain one at http://mozilla.org/MPL/2.0/.
# #
$(eval $(call gb_Extension_Extension,TestExtension,smoketest/com/sun/star/comp/smoketest)) $(eval $(call gb_Extension_Extension,TestExtension,smoketest/com/sun/star/comp/smoketest,nodeliver))
$(eval $(call gb_Extension_add_file,TestExtension,TestExtension.jar,$(call gb_Jar_get_outdir_target,TestExtension))) $(eval $(call gb_Extension_add_file,TestExtension,TestExtension.jar,$(call gb_Jar_get_outdir_target,TestExtension)))

20
solenv/gbuild/Extension.mk
View File

@@ -114,7 +114,7 @@ $(call gb_Extension_get_target,%) : \
# add deliverable # add deliverable
# add dependency for outdir target to workdir target (pattern rule for delivery is in Package.mk) # 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 define gb_Extension_Extension
$(call gb_Extension_get_target,$(1)) : DESCRIPTION := $(call gb_Extension_get_target,$(1)) : DESCRIPTION :=
$(call gb_Extension_get_target,$(1)) : FILES := META-INF description.xml $(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_preparation_target,$(1))
$(call gb_Extension__get_final_target,$(1)) : $(call gb_Extension_get_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)))) $(if $(filter nodeliver,$(3)),,$(call gb_Extension__Extension_deliver,$(1),Extension/$(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))
ifneq ($(strip $(gb_WITH_LANG)),) ifneq ($(strip $(gb_WITH_LANG)),)
$(call gb_Extension_get_target,$(1)) : \ $(call gb_Extension_get_target,$(1)) : \
@@ -149,6 +145,18 @@ $(call gb_Helper_make_userfriendly_targets,$(1),Extension,$(call gb_Extension__g
endef 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 # adding a file creates a dependency to it
# file is copied to $(WORKDIR) # file is copied to $(WORKDIR)
define gb_Extension_add_file define gb_Extension_add_file