From eb15d03b906cfc183d455f69922eab3a8e6d0006 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Wed, 12 Oct 2011 23:11:30 +0200 Subject: Configuration.mk: add nodeliver mode Add a special mode where a Configuration does not deliver to the solver, and use it in Configuration_mediawiki, preventing the files from officecfg being overwritten by files from swext. Should fix the annoying sc_test_filters failure and the smoketest as well if the mediawiki extension is enabled. --- swext/Configuration_mediawiki.mk | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'swext') diff --git a/swext/Configuration_mediawiki.mk b/swext/Configuration_mediawiki.mk index 9ece045fdddc..23d10e77dba3 100644 --- a/swext/Configuration_mediawiki.mk +++ b/swext/Configuration_mediawiki.mk @@ -27,14 +27,11 @@ # instead of those above. # -$(eval $(call gb_Configuration_Configuration,mediawiki,SRCDIR)) +$(eval $(call gb_Configuration_Configuration,mediawiki,SRCDIR,nodeliver)) $(eval $(call gb_Configuration_add_datas,mediawiki,swext/mediawiki/src/registry/data,\ - org/openoffice/Office/Addons.xcu \ - org/openoffice/Office/OptionsDialog.xcu \ org/openoffice/Office/ProtocolHandler.xcu \ org/openoffice/Office/Paths.xcu \ - org/openoffice/Office/Custom/WikiExtension.xcu \ org/openoffice/TypeDetection/Filter.xcu \ org/openoffice/TypeDetection/Types.xcu \ )) @@ -47,4 +44,4 @@ $(eval $(call gb_Configuration_add_localized_datas,mediawiki,swext/mediawiki/src $(eval $(call gb_Configuration_add_schemas,mediawiki,swext/mediawiki/src/registry/schema,\ org/openoffice/Office/Custom/WikiExtension.xcs \ -)) +)) -- cgit