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

Make gb_Extension_use_default_description/license explicit

Browse Source 
...as a prerequisite for gbuild'ifying desktop/test/deployment/passive/, which
builds a test extension that does not match those default description/license
settings.

Change-Id: I200ff0ceb9750ed4b1c187305f10469f789d29cb
This commit is contained in:
Stephan Bergmann
2013-03-07 11:01:55 +01:00
parent 393ca6dde9
commit 12f9287bca
7 changed files with 26 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mysqlc/Extension_mysql-connector-ooo.mk
View File

@@ -9,6 +9,9 @@
$(eval $(call gb_Extension_Extension,mysql-connector-ooo,mysqlc/source))
$(eval $(call gb_Extension_use_default_description,mysql-connector-ooo))
$(eval $(call gb_Extension_use_default_license,mysql-connector-ooo))
$(eval $(call gb_Extension_add_library,mysql-connector-ooo,mysqlc))
$(eval $(call gb_Extension_add_file,mysql-connector-ooo,components.rdb,$(call gb_Rdb_get_target,mysqlc)))

3
nlpsolver/Extension_nlpsolver.mk
View File

@@ -30,6 +30,9 @@
$(eval $(call gb_Extension_Extension,nlpsolver,nlpsolver/src/com/sun/star/comp/Calc/NLPSolver))
$(eval $(call gb_Extension_use_default_description,nlpsolver))
$(eval $(call gb_Extension_use_default_license,nlpsolver))
$(eval $(call gb_Extension_add_file,nlpsolver,components.rdb,$(SRCDIR)/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/components.rdb))
$(eval $(call gb_Extension_add_file,nlpsolver,nlpsolver.jar,$(OUTDIR)/bin/nlpsolver.jar))
$(eval $(call gb_Extension_add_file,nlpsolver,EvolutionarySolver.jar,$(OUTDIR)/bin/EvolutionarySolver.jar))

3
reportbuilder/Extension_reportbuilder.mk
View File

@@ -27,6 +27,9 @@
$(eval $(call gb_Extension_Extension,report-builder,reportbuilder/util))
$(eval $(call gb_Extension_use_default_description,report-builder))
$(eval $(call gb_Extension_use_default_license,report-builder))
$(eval $(call gb_Extension_add_files,report-builder,,\
$(call gb_Jar_get_outdir_target,reportbuilderwizard) \
$(call gb_Jar_get_outdir_target,sun-report-builder) \

3
sdext/Extension_minimizer.mk
View File

@@ -27,6 +27,9 @@
$(eval $(call gb_Extension_Extension,presentation-minimizer,sdext/source/minimizer))
$(eval $(call gb_Extension_use_default_description,presentation-minimizer))
$(eval $(call gb_Extension_use_default_license,presentation-minimizer))
$(eval $(call gb_Extension_add_libraries,presentation-minimizer,\
SunPresentationMinimizer \
))

12
solenv/gbuild/Extension.mk
View File

@@ -29,8 +29,6 @@
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))
@@ -123,6 +121,16 @@ $(call gb_ExtensionTarget_add_helptreefile,$(1),$(2),$(3),$(4),$(5))
endef
define gb_Extension_use_default_description
$(call gb_ExtensionTarget_use_default_description,$(1))
endef
define gb_Extension_use_default_license
$(call gb_ExtensionTarget_use_default_license,$(1))
endef
define gb_Extension_use_unpacked
$(call gb_ExtensionTarget_use_unpacked,$(1),$(2))

2
solenv/gbuild/ExtensionTarget.mk
View File

@@ -160,7 +160,7 @@ 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_add_file,$(1),description-en-US.txt,$$(LOCATION)/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_TRANS_LANGS),description-$(lang).txt)

3
swext/Extension_wiki-publisher.mk
View File

@@ -30,6 +30,9 @@
$(eval $(call gb_Extension_Extension,wiki-publisher,swext/mediawiki/src))
$(eval $(call gb_Extension_use_default_description,wiki-publisher))
$(eval $(call gb_Extension_use_default_license,wiki-publisher))
ifneq ($(SYSTEM_APACHE_COMMONS),YES)
$(eval $(call gb_Extension_add_file,wiki-publisher,commons-codec-1.3.jar,$(OUTDIR)/bin/commons-codec-1.3.jar))
$(eval $(call gb_Extension_add_file,wiki-publisher,commons-httpclient-3.1.jar,$(OUTDIR)/bin/commons-httpclient-3.1.jar))