officecfg/Configuration_officecfg.mk | 99 ----------------------------------- officecfg/CustomTarget_registry.mk | 13 +++- officecfg/Module_officecfg.mk | 2 officecfg/Package_cppheader.mk | 4 - officecfg/qa/cppheader.cxx | 99 ----------------------------------- officecfg/registry/files.mk | 2 6 files changed, 16 insertions(+), 203 deletions(-)
New commits: commit 37b1ea0611abb41e5e7510ef579090496a38f29d Author: Michael Stahl <[email protected]> Date: Wed Sep 19 14:06:40 2012 +0200 officecfg: define list of schema files only once in files.mk Change-Id: I1155cbee1e1cf28fdda5635d7151b28159befc15 diff --git a/officecfg/Configuration_officecfg.mk b/officecfg/Configuration_officecfg.mk index 682a3e2..503a0a4 100644 --- a/officecfg/Configuration_officecfg.mk +++ b/officecfg/Configuration_officecfg.mk @@ -19,104 +19,7 @@ $(eval $(call gb_Configuration_Configuration,registry)) $(eval $(call gb_Configuration_add_schemas,registry,officecfg/registry/schema,\ - org/openoffice/LDAP.xcs \ - org/openoffice/Inet.xcs \ - org/openoffice/Setup.xcs \ - org/openoffice/System.xcs \ - org/openoffice/UserProfile.xcs \ - org/openoffice/VCL.xcs \ - org/openoffice/FirstStartWizard.xcs \ - org/openoffice/Interaction.xcs \ - org/openoffice/Office/Accelerators.xcs \ - org/openoffice/Office/Addons.xcs \ - org/openoffice/Office/Calc.xcs \ - org/openoffice/Office/CalcAddIns.xcs \ - org/openoffice/Office/Canvas.xcs \ - org/openoffice/Office/Chart.xcs \ - org/openoffice/Office/Commands.xcs \ - org/openoffice/Office/Common.xcs \ - org/openoffice/Office/Compatibility.xcs \ - org/openoffice/Office/DataAccess.xcs \ - org/openoffice/Office/Draw.xcs \ - org/openoffice/Office/Events.xcs \ - org/openoffice/Office/Embedding.xcs \ - org/openoffice/Office/ExtensionManager.xcs \ - org/openoffice/Office/Impress.xcs \ - org/openoffice/Office/Java.xcs \ - org/openoffice/Office/Jobs.xcs \ - org/openoffice/Office/Labels.xcs \ - org/openoffice/Office/Linguistic.xcs \ - org/openoffice/Office/Logging.xcs \ - org/openoffice/Office/Math.xcs \ - org/openoffice/Office/OptionsDialog.xcs \ - org/openoffice/Office/ProtocolHandler.xcs \ - org/openoffice/Office/SFX.xcs \ - org/openoffice/Office/Substitution.xcs \ - org/openoffice/Office/TableWizard.xcs \ - org/openoffice/Office/UI.xcs \ - org/openoffice/Office/Views.xcs \ - org/openoffice/Office/Writer.xcs \ - org/openoffice/Office/WriterWeb.xcs \ - org/openoffice/Office/Scripting.xcs \ - org/openoffice/Office/Security.xcs \ - org/openoffice/Office/WebWizard.xcs \ - org/openoffice/Office/Recovery.xcs \ - org/openoffice/Office/FormWizard.xcs \ - org/openoffice/Office/ExtendedColorScheme.xcs \ - org/openoffice/Office/TypeDetection.xcs \ - org/openoffice/Office/TabBrowse.xcs \ - org/openoffice/Office/Paths.xcs \ - org/openoffice/Office/Histories.xcs \ - org/openoffice/Office/UI/Controller.xcs \ - org/openoffice/Office/UI/Factories.xcs \ - org/openoffice/Office/UI/Commands.xcs \ - org/openoffice/Office/UI/BasicIDECommands.xcs \ - org/openoffice/Office/UI/BibliographyCommands.xcs \ - org/openoffice/Office/UI/CalcCommands.xcs \ - org/openoffice/Office/UI/ChartCommands.xcs \ - org/openoffice/Office/UI/DbuCommands.xcs \ - org/openoffice/Office/UI/BaseWindowState.xcs \ - org/openoffice/Office/UI/WriterFormWindowState.xcs \ - org/openoffice/Office/UI/WriterReportWindowState.xcs \ - org/openoffice/Office/UI/DbBrowserWindowState.xcs \ - org/openoffice/Office/UI/DbTableDataWindowState.xcs \ - org/openoffice/Office/UI/DrawImpressCommands.xcs \ - org/openoffice/Office/UI/GenericCommands.xcs \ - org/openoffice/Office/UI/MathCommands.xcs \ - org/openoffice/Office/UI/StartModuleCommands.xcs \ - org/openoffice/Office/UI/WriterCommands.xcs \ - org/openoffice/Office/UI/WindowState.xcs \ - org/openoffice/Office/UI/BasicIDEWindowState.xcs \ - org/openoffice/Office/UI/BibliographyWindowState.xcs \ - org/openoffice/Office/UI/CalcWindowState.xcs \ - org/openoffice/Office/UI/ChartWindowState.xcs \ - org/openoffice/Office/UI/DbQueryWindowState.xcs \ - org/openoffice/Office/UI/DbRelationWindowState.xcs \ - org/openoffice/Office/UI/DbTableWindowState.xcs \ - org/openoffice/Office/UI/DrawWindowState.xcs \ - org/openoffice/Office/UI/ImpressWindowState.xcs \ - org/openoffice/Office/UI/MathWindowState.xcs \ - org/openoffice/Office/UI/StartModuleWindowState.xcs \ - org/openoffice/Office/UI/WriterWindowState.xcs \ - org/openoffice/Office/UI/XFormsWindowState.xcs \ - org/openoffice/Office/UI/WriterGlobalWindowState.xcs \ - org/openoffice/Office/UI/WriterWebWindowState.xcs \ - org/openoffice/Office/UI/Effects.xcs \ - org/openoffice/Office/UI/Category.xcs \ - org/openoffice/Office/UI/GenericCategories.xcs \ - org/openoffice/Office/UI/GlobalSettings.xcs \ - org/openoffice/Office/UI/WindowContentFactories.xcs \ - org/openoffice/Office/DataAccess/Drivers.xcs \ - org/openoffice/Office/OOoImprovement/Settings.xcs \ - org/openoffice/TypeDetection/Types.xcs \ - org/openoffice/TypeDetection/Filter.xcs \ - org/openoffice/TypeDetection/GraphicFilter.xcs \ - org/openoffice/TypeDetection/Misc.xcs \ - org/openoffice/TypeDetection/UISort.xcs \ - org/openoffice/ucb/Configuration.xcs \ - org/openoffice/ucb/Hierarchy.xcs \ - org/openoffice/ucb/InteractionHandler.xcs \ - org/openoffice/ucb/Store.xcs \ + $(addprefix org/openoffice/,$(addsuffix .xcs,$(officecfg_XCSFILES))) \ )) $(eval $(call gb_Configuration_add_datas,registry,officecfg/registry/data,\ diff --git a/officecfg/CustomTarget_registry.mk b/officecfg/CustomTarget_registry.mk index fac8aee..32e6190 100644 --- a/officecfg/CustomTarget_registry.mk +++ b/officecfg/CustomTarget_registry.mk @@ -26,12 +26,10 @@ ## instead of those above. ## -include $(SRCDIR)/officecfg/registry/files.mk - $(eval $(call gb_CustomTarget_CustomTarget,officecfg/registry)) $(call gb_CustomTarget_get_target,officecfg/registry) : \ - $(foreach i,officecfg_qa_allheaders $(officecfg_FILES),\ + $(foreach i,officecfg_qa_allheaders $(officecfg_XCSFILES),\ $(call gb_CustomTarget_get_workdir,officecfg/registry)/$(i).hxx) # auto generated header file for unit test qa/cppheader.cxx @@ -39,7 +37,7 @@ $(call gb_CustomTarget_get_workdir,officecfg/registry)/officecfg_qa_allheaders.h $(SRCDIR)/officecfg/registry/files.mk $(call gb_Output_announce,officecfg_qa_allheaders.hxx,$(true),CAT,1) rm -f $@ \ - $(foreach file,$(officecfg_FILES),\ + $(foreach file,$(officecfg_XCSFILES),\ && echo "#include <officecfg/$(file).hxx>" >> $@) define officecfg_TARGET diff --git a/officecfg/Module_officecfg.mk b/officecfg/Module_officecfg.mk index ca4209c..ef46599 100644 --- a/officecfg/Module_officecfg.mk +++ b/officecfg/Module_officecfg.mk @@ -18,6 +18,8 @@ $(eval $(call gb_Module_Module,officecfg)) +include $(SRCDIR)/officecfg/registry/files.mk + $(eval $(call gb_Module_add_targets,officecfg,\ CustomTarget_registry \ Package_cppheader \ diff --git a/officecfg/Package_cppheader.mk b/officecfg/Package_cppheader.mk index 3e4a572..0f14f81 100644 --- a/officecfg/Package_cppheader.mk +++ b/officecfg/Package_cppheader.mk @@ -26,9 +26,7 @@ ## instead of those above. ## -include $(SRCDIR)/officecfg/registry/files.mk - $(eval $(call gb_Package_Package,officecfg_cppheader,$(WORKDIR)/CustomTarget/officecfg/registry)) -$(eval $(foreach i,officecfg_qa_allheaders $(officecfg_FILES),$(call \ +$(eval $(foreach i,officecfg_qa_allheaders $(officecfg_XCSFILES),$(call \ gb_Package_add_file,officecfg_cppheader,inc/officecfg/$(i).hxx,$(i).hxx))) diff --git a/officecfg/registry/files.mk b/officecfg/registry/files.mk index 4413da4..8501acb 100644 --- a/officecfg/registry/files.mk +++ b/officecfg/registry/files.mk @@ -1,4 +1,4 @@ -officecfg_FILES := \ +officecfg_XCSFILES := \ FirstStartWizard \ Inet \ Interaction \ commit c79be77c3506e2c6b28beffb744cd46ab49e19bc Author: Michael Stahl <[email protected]> Date: Wed Sep 19 13:50:29 2012 +0200 officecfg: replace hardcoded includes in unit test with generated header Change-Id: Id2c6758055ad9c12b23bbb9dc8c84f0c4b65b83d diff --git a/officecfg/CustomTarget_registry.mk b/officecfg/CustomTarget_registry.mk index 0f63c71..fac8aee 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 <officecfg/$(file).hxx>" >> $@) 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 fb344be..3e4a572 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 941d319..832c0ba 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 { _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
