diff options
| -rw-r--r-- | mysqlc/Extension_mysql-connector-ooo.mk | 3 | ||||
| -rw-r--r-- | nlpsolver/Extension_nlpsolver.mk | 3 | ||||
| -rw-r--r-- | reportbuilder/Extension_reportbuilder.mk | 3 | ||||
| -rw-r--r-- | sdext/Extension_minimizer.mk | 3 | ||||
| -rw-r--r-- | solenv/gbuild/Extension.mk | 12 | ||||
| -rw-r--r-- | solenv/gbuild/ExtensionTarget.mk | 2 | ||||
| -rw-r--r-- | swext/Extension_wiki-publisher.mk | 3 |
7 files changed, 26 insertions, 3 deletions
diff --git a/mysqlc/Extension_mysql-connector-ooo.mk b/mysqlc/Extension_mysql-connector-ooo.mk index 67c7c8f745d7..26cb7c31fdb2 100644 --- a/mysqlc/Extension_mysql-connector-ooo.mk +++ b/mysqlc/Extension_mysql-connector-ooo.mk @@ -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))) diff --git a/nlpsolver/Extension_nlpsolver.mk b/nlpsolver/Extension_nlpsolver.mk index c71c7110aa33..4599fe57bba2 100644 --- a/nlpsolver/Extension_nlpsolver.mk +++ b/nlpsolver/Extension_nlpsolver.mk @@ -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)) diff --git a/reportbuilder/Extension_reportbuilder.mk b/reportbuilder/Extension_reportbuilder.mk index fd79c8783e6b..f42134f92996 100644 --- a/reportbuilder/Extension_reportbuilder.mk +++ b/reportbuilder/Extension_reportbuilder.mk @@ -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) \ diff --git a/sdext/Extension_minimizer.mk b/sdext/Extension_minimizer.mk index 08073a4bf274..7abe9000f1ed 100644 --- a/sdext/Extension_minimizer.mk +++ b/sdext/Extension_minimizer.mk @@ -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 \ )) diff --git a/solenv/gbuild/Extension.mk b/solenv/gbuild/Extension.mk index 8d0e3776dfd3..f9a3b80c55fe 100644 --- a/solenv/gbuild/Extension.mk +++ b/solenv/gbuild/Extension.mk @@ -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)) diff --git a/solenv/gbuild/ExtensionTarget.mk b/solenv/gbuild/ExtensionTarget.mk index e839f47c66dd..09ebb1899ed6 100644 --- a/solenv/gbuild/ExtensionTarget.mk +++ b/solenv/gbuild/ExtensionTarget.mk @@ -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) diff --git a/swext/Extension_wiki-publisher.mk b/swext/Extension_wiki-publisher.mk index 9491612a4b2c..4a1a112ba3c0 100644 --- a/swext/Extension_wiki-publisher.mk +++ b/swext/Extension_wiki-publisher.mk @@ -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)) |