From c79be77c3506e2c6b28beffb744cd46ab49e19bc Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Wed, 19 Sep 2012 13:50:29 +0200 Subject: officecfg: replace hardcoded includes in unit test with generated header Change-Id: Id2c6758055ad9c12b23bbb9dc8c84f0c4b65b83d --- officecfg/CustomTarget_registry.mk | 11 ++++- officecfg/Package_cppheader.mk | 2 +- officecfg/qa/cppheader.cxx | 99 +------------------------------------- 3 files changed, 12 insertions(+), 100 deletions(-) diff --git a/officecfg/CustomTarget_registry.mk b/officecfg/CustomTarget_registry.mk index 0f63c711a2aa..fac8aee073ae 100644 --- a/officecfg/CustomTarget_registry.mk +++ b/officecfg/CustomTarget_registry.mk @@ -31,7 +31,16 @@ include $(SRCDIR)/officecfg/registry/files.mk $(eval $(call gb_CustomTarget_CustomTarget,officecfg/registry)) $(call gb_CustomTarget_get_target,officecfg/registry) : \ - $(foreach i,$(officecfg_FILES),$(call gb_CustomTarget_get_workdir,officecfg/registry)/$(i).hxx) + $(foreach i,officecfg_qa_allheaders $(officecfg_FILES),\ + $(call gb_CustomTarget_get_workdir,officecfg/registry)/$(i).hxx) + +# auto generated header file for unit test qa/cppheader.cxx +$(call gb_CustomTarget_get_workdir,officecfg/registry)/officecfg_qa_allheaders.hxx: \ + $(SRCDIR)/officecfg/registry/files.mk + $(call gb_Output_announce,officecfg_qa_allheaders.hxx,$(true),CAT,1) + rm -f $@ \ + $(foreach file,$(officecfg_FILES),\ + && echo "#include " >> $@) define officecfg_TARGET $(call gb_CustomTarget_get_workdir,officecfg/registry)/$(if $(1),$(1)/$(if $(2),$(2)/))%.hxx: \ diff --git a/officecfg/Package_cppheader.mk b/officecfg/Package_cppheader.mk index fb344bef77ff..3e4a5727cb90 100644 --- a/officecfg/Package_cppheader.mk +++ b/officecfg/Package_cppheader.mk @@ -30,5 +30,5 @@ include $(SRCDIR)/officecfg/registry/files.mk $(eval $(call gb_Package_Package,officecfg_cppheader,$(WORKDIR)/CustomTarget/officecfg/registry)) -$(eval $(foreach i,$(officecfg_FILES),$(call \ +$(eval $(foreach i,officecfg_qa_allheaders $(officecfg_FILES),$(call \ gb_Package_add_file,officecfg_cppheader,inc/officecfg/$(i).hxx,$(i).hxx))) diff --git a/officecfg/qa/cppheader.cxx b/officecfg/qa/cppheader.cxx index 941d3193c2d4..832c0ba476cf 100644 --- a/officecfg/qa/cppheader.cxx +++ b/officecfg/qa/cppheader.cxx @@ -35,104 +35,7 @@ // Just verify that all the generated headers can be included (i.e., that all // the identifiers are valid and do not clash: -#include "officecfg/FirstStartWizard.hxx" -#include "officecfg/Inet.hxx" -#include "officecfg/Interaction.hxx" -#include "officecfg/LDAP.hxx" -#include "officecfg/Office/Accelerators.hxx" -#include "officecfg/Office/Addons.hxx" -#include "officecfg/Office/Calc.hxx" -#include "officecfg/Office/CalcAddIns.hxx" -#include "officecfg/Office/Canvas.hxx" -#include "officecfg/Office/Chart.hxx" -#include "officecfg/Office/Commands.hxx" -#include "officecfg/Office/Common.hxx" -#include "officecfg/Office/Compatibility.hxx" -#include "officecfg/Office/DataAccess.hxx" -#include "officecfg/Office/DataAccess/Drivers.hxx" -#include "officecfg/Office/Draw.hxx" -#include "officecfg/Office/Embedding.hxx" -#include "officecfg/Office/Events.hxx" -#include "officecfg/Office/ExtendedColorScheme.hxx" -#include "officecfg/Office/ExtensionManager.hxx" -#include "officecfg/Office/FormWizard.hxx" -#include "officecfg/Office/Histories.hxx" -#include "officecfg/Office/Impress.hxx" -#include "officecfg/Office/Java.hxx" -#include "officecfg/Office/Jobs.hxx" -#include "officecfg/Office/Labels.hxx" -#include "officecfg/Office/Linguistic.hxx" -#include "officecfg/Office/Logging.hxx" -#include "officecfg/Office/Math.hxx" -#include "officecfg/Office/OOoImprovement/Settings.hxx" -#include "officecfg/Office/OptionsDialog.hxx" -#include "officecfg/Office/Paths.hxx" -#include "officecfg/Office/ProtocolHandler.hxx" -#include "officecfg/Office/Recovery.hxx" -#include "officecfg/Office/SFX.hxx" -#include "officecfg/Office/Scripting.hxx" -#include "officecfg/Office/Security.hxx" -#include "officecfg/Office/Substitution.hxx" -#include "officecfg/Office/TabBrowse.hxx" -#include "officecfg/Office/TableWizard.hxx" -#include "officecfg/Office/TypeDetection.hxx" -#include "officecfg/Office/UI.hxx" -#include "officecfg/Office/UI/BaseWindowState.hxx" -#include "officecfg/Office/UI/BasicIDECommands.hxx" -#include "officecfg/Office/UI/BasicIDEWindowState.hxx" -#include "officecfg/Office/UI/BibliographyCommands.hxx" -#include "officecfg/Office/UI/BibliographyWindowState.hxx" -#include "officecfg/Office/UI/CalcCommands.hxx" -#include "officecfg/Office/UI/CalcWindowState.hxx" -#include "officecfg/Office/UI/Category.hxx" -#include "officecfg/Office/UI/ChartCommands.hxx" -#include "officecfg/Office/UI/ChartWindowState.hxx" -#include "officecfg/Office/UI/Commands.hxx" -#include "officecfg/Office/UI/Controller.hxx" -#include "officecfg/Office/UI/DbBrowserWindowState.hxx" -#include "officecfg/Office/UI/DbQueryWindowState.hxx" -#include "officecfg/Office/UI/DbRelationWindowState.hxx" -#include "officecfg/Office/UI/DbTableDataWindowState.hxx" -#include "officecfg/Office/UI/DbTableWindowState.hxx" -#include "officecfg/Office/UI/DbuCommands.hxx" -#include "officecfg/Office/UI/DrawImpressCommands.hxx" -#include "officecfg/Office/UI/DrawWindowState.hxx" -#include "officecfg/Office/UI/Effects.hxx" -#include "officecfg/Office/UI/Factories.hxx" -#include "officecfg/Office/UI/GenericCategories.hxx" -#include "officecfg/Office/UI/GenericCommands.hxx" -#include "officecfg/Office/UI/GlobalSettings.hxx" -#include "officecfg/Office/UI/ImpressWindowState.hxx" -#include "officecfg/Office/UI/MathCommands.hxx" -#include "officecfg/Office/UI/MathWindowState.hxx" -#include "officecfg/Office/UI/StartModuleCommands.hxx" -#include "officecfg/Office/UI/StartModuleWindowState.hxx" -#include "officecfg/Office/UI/WindowContentFactories.hxx" -#include "officecfg/Office/UI/WindowState.hxx" -#include "officecfg/Office/UI/WriterCommands.hxx" -#include "officecfg/Office/UI/WriterFormWindowState.hxx" -#include "officecfg/Office/UI/WriterGlobalWindowState.hxx" -#include "officecfg/Office/UI/WriterReportWindowState.hxx" -#include "officecfg/Office/UI/WriterWebWindowState.hxx" -#include "officecfg/Office/UI/WriterWindowState.hxx" -#include "officecfg/Office/UI/XFormsWindowState.hxx" -#include "officecfg/Office/Views.hxx" -#include "officecfg/Office/WebWizard.hxx" -#include "officecfg/Office/Writer.hxx" -#include "officecfg/Office/WriterWeb.hxx" -#include "officecfg/Setup.hxx" -#include "officecfg/System.hxx" -#include "officecfg/TypeDetection/Filter.hxx" -#include "officecfg/TypeDetection/GraphicFilter.hxx" -#include "officecfg/TypeDetection/Misc.hxx" -#include "officecfg/TypeDetection/Types.hxx" -#include "officecfg/TypeDetection/UISort.hxx" -#include "officecfg/UserProfile.hxx" -#include "officecfg/VCL.hxx" -#include "officecfg/ucb/Configuration.hxx" -#include "officecfg/ucb/Hierarchy.hxx" -#include "officecfg/ucb/InteractionHandler.hxx" -#include "officecfg/ucb/Store.hxx" +#include "officecfg/officecfg_qa_allheaders.hxx" namespace { -- cgit