From 4d2a8d50ecb2fdf282bbaf3b5f3509e72ca604fc Mon Sep 17 00:00:00 2001 From: Xisco Fauli Date: Thu, 3 Jun 2021 11:48:41 +0200 Subject: [PATCH] sw_ww8export: use a template for makefiles in order to remove duplicates code Change-Id: Ie107d953d2e7ab4624edccd58fd8637349b9e098 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116649 Tested-by: Jenkins Reviewed-by: Xisco Fauli --- sw/CppunitTest_sw_ww8export.mk | 55 +--------------------- sw/CppunitTest_sw_ww8export2.mk | 57 +---------------------- sw/CppunitTest_sw_ww8export3.mk | 60 +----------------------- sw/Module_sw.mk | 1 + sw/ww8export_setup.mk | 81 +++++++++++++++++++++++++++++++++ 5 files changed, 86 insertions(+), 168 deletions(-) create mode 100644 sw/ww8export_setup.mk diff --git a/sw/CppunitTest_sw_ww8export.mk b/sw/CppunitTest_sw_ww8export.mk index e338a15f1947..81e8eac2273d 100644 --- a/sw/CppunitTest_sw_ww8export.mk +++ b/sw/CppunitTest_sw_ww8export.mk @@ -9,58 +9,7 @@ # #************************************************************************* -$(eval $(call gb_CppunitTest_CppunitTest,sw_ww8export)) - -$(eval $(call gb_CppunitTest_use_common_precompiled_header,sw_ww8export)) - -$(eval $(call gb_CppunitTest_add_exception_objects,sw_ww8export, \ - sw/qa/extras/ww8export/ww8export \ -)) - -$(eval $(call gb_CppunitTest_use_libraries,sw_ww8export, \ - comphelper \ - cppu \ - cppuhelper \ - editeng \ - emboleobj \ - sal \ - test \ - unotest \ - utl \ - sfx \ - svl \ - sw \ - swqahelper \ - tl \ - vcl \ -)) - -$(eval $(call gb_CppunitTest_use_externals,sw_ww8export,\ - boost_headers \ - libxml2 \ -)) - -$(eval $(call gb_CppunitTest_set_include,sw_ww8export,\ - -I$(SRCDIR)/sw/inc \ - -I$(SRCDIR)/sw/source/core/inc \ - -I$(SRCDIR)/sw/source/uibase/inc \ - -I$(SRCDIR)/sw/qa/inc \ - $$(INCLUDE) \ -)) - -$(eval $(call gb_CppunitTest_use_api,sw_ww8export,\ - udkapi \ - offapi \ - oovbaapi \ -)) - -$(eval $(call gb_CppunitTest_use_ure,sw_ww8export)) -$(eval $(call gb_CppunitTest_use_vcl,sw_ww8export)) - -$(eval $(call gb_CppunitTest_use_rdb,sw_ww8export,services)) - -$(eval $(call gb_CppunitTest_use_configuration,sw_ww8export)) - -$(eval $(call gb_CppunitTest_use_more_fonts,sw_ww8export)) +# empty second argument (i.e. no 1) +$(eval $(call sw_ww8export_test,)) # vim: set noet sw=4 ts=4: diff --git a/sw/CppunitTest_sw_ww8export2.mk b/sw/CppunitTest_sw_ww8export2.mk index 0011658418f9..b2b4d6a5c14b 100644 --- a/sw/CppunitTest_sw_ww8export2.mk +++ b/sw/CppunitTest_sw_ww8export2.mk @@ -9,61 +9,6 @@ # #************************************************************************* -$(eval $(call gb_CppunitTest_CppunitTest,sw_ww8export2)) - -$(eval $(call gb_CppunitTest_use_common_precompiled_header,sw_ww8export2)) - -$(eval $(call gb_CppunitTest_add_exception_objects,sw_ww8export2, \ - sw/qa/extras/ww8export/ww8export2 \ -)) - -$(eval $(call gb_CppunitTest_use_libraries,sw_ww8export2, \ - comphelper \ - cppu \ - cppuhelper \ - editeng \ - emboleobj \ - sal \ - sfx \ - test \ - unotest \ - utl \ - sw \ - swqahelper \ - tl \ - svxcore \ -)) - -$(eval $(call gb_CppunitTest_use_externals,sw_ww8export2,\ - boost_headers \ - libxml2 \ -)) - -$(eval $(call gb_CppunitTest_set_include,sw_ww8export2,\ - -I$(SRCDIR)/sw/inc \ - -I$(SRCDIR)/sw/source/core/inc \ - -I$(SRCDIR)/sw/qa/inc \ - $$(INCLUDE) \ -)) - -$(eval $(call gb_CppunitTest_use_api,sw_ww8export2,\ - udkapi \ - offapi \ - oovbaapi \ -)) - -$(eval $(call gb_CppunitTest_use_ure,sw_ww8export2)) -$(eval $(call gb_CppunitTest_use_vcl,sw_ww8export2)) - -$(eval $(call gb_CppunitTest_use_rdb,sw_ww8export2,services)) - -$(eval $(call gb_CppunitTest_use_configuration,sw_ww8export2)) - -ifeq ($(OS),WNT) -# gpgme-w32spawn.exe is needed in workdir/LinkTarget/Executable -$(eval $(call gb_CppunitTest_use_packages,sw_ww8export2,\ - $(call gb_Helper_optional,GPGMEPP,gpgmepp)\ -)) -endif +$(eval $(call sw_ww8export_test,2)) # vim: set noet sw=4 ts=4: diff --git a/sw/CppunitTest_sw_ww8export3.mk b/sw/CppunitTest_sw_ww8export3.mk index 6eeb48f3ed3b..d725463968a7 100644 --- a/sw/CppunitTest_sw_ww8export3.mk +++ b/sw/CppunitTest_sw_ww8export3.mk @@ -9,64 +9,6 @@ # #************************************************************************* -$(eval $(call gb_CppunitTest_CppunitTest,sw_ww8export3)) - -$(eval $(call gb_CppunitTest_use_common_precompiled_header,sw_ww8export3)) - -$(eval $(call gb_CppunitTest_add_exception_objects,sw_ww8export3, \ - sw/qa/extras/ww8export/ww8export3 \ -)) - -$(eval $(call gb_CppunitTest_use_libraries,sw_ww8export3, \ - comphelper \ - cppu \ - cppuhelper \ - editeng \ - emboleobj \ - sal \ - sfx \ - test \ - unotest \ - utl \ - sw \ - swqahelper \ - tl \ -)) - -$(eval $(call gb_CppunitTest_use_externals,sw_ww8export3,\ - boost_headers \ - libxml2 \ -)) - -$(eval $(call gb_CppunitTest_set_include,sw_ww8export3,\ - -I$(SRCDIR)/sw/inc \ - -I$(SRCDIR)/sw/source/core/inc \ - -I$(SRCDIR)/sw/qa/inc \ - $$(INCLUDE) \ -)) - -$(eval $(call gb_CppunitTest_use_api,sw_ww8export3,\ - udkapi \ - offapi \ - oovbaapi \ -)) - -$(eval $(call gb_CppunitTest_use_ure,sw_ww8export3)) -$(eval $(call gb_CppunitTest_use_vcl,sw_ww8export3)) - -$(eval $(call gb_CppunitTest_use_rdb,sw_ww8export3,services)) - -ifeq ($(OS),WNT) -# gpgme-w32spawn.exe is needed in workdir/LinkTarget/Executable -$(eval $(call gb_CppunitTest_use_packages,sw_ww8export3,\ - $(call gb_Helper_optional,GPGMEPP,gpgmepp)\ -)) -endif - -$(eval $(call gb_CppunitTest_use_configuration,sw_ww8export3)) - -$(eval $(call gb_CppunitTest_use_packages,sw_ww8export3,\ - oox_customshapes \ -)) +$(eval $(call sw_ww8export_test,3)) # vim: set noet sw=4 ts=4: diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk index 5a955659d661..d195e7439c32 100644 --- a/sw/Module_sw.mk +++ b/sw/Module_sw.mk @@ -20,6 +20,7 @@ include $(SRCDIR)/sw/layoutwriter_setup.mk include $(SRCDIR)/sw/ooxmlexport_setup.mk include $(SRCDIR)/sw/uiwriter_setup.mk +include $(SRCDIR)/sw/ww8export_setup.mk $(eval $(call gb_Module_Module,sw)) diff --git a/sw/ww8export_setup.mk b/sw/ww8export_setup.mk new file mode 100644 index 000000000000..f2fdd0a5aa9c --- /dev/null +++ b/sw/ww8export_setup.mk @@ -0,0 +1,81 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +#************************************************************************* +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# +#************************************************************************* + +# template for ww8export tests +define sw_ww8export_test + +$(eval $(call gb_CppunitTest_CppunitTest,sw_ww8export$(1))) + +$(eval $(call gb_CppunitTest_use_common_precompiled_header,sw_ww8export$(1))) + +$(eval $(call gb_CppunitTest_add_exception_objects,sw_ww8export$(1), \ + sw/qa/extras/ww8export/ww8export$(1) \ +)) + +$(eval $(call gb_CppunitTest_use_libraries,sw_ww8export$(1), \ + comphelper \ + cppu \ + cppuhelper \ + editeng \ + emboleobj \ + sal \ + sfx \ + test \ + unotest \ + utl \ + svl \ + svxcore \ + sw \ + swqahelper \ + tl \ + vcl \ +)) + +$(eval $(call gb_CppunitTest_use_externals,sw_ww8export$(1),\ + boost_headers \ + libxml2 \ +)) + +$(eval $(call gb_CppunitTest_set_include,sw_ww8export$(1),\ + -I$(SRCDIR)/sw/inc \ + -I$(SRCDIR)/sw/source/core/inc \ + -I$(SRCDIR)/sw/source/uibase/inc \ + -I$(SRCDIR)/sw/qa/inc \ + $$(INCLUDE) \ +)) + +$(eval $(call gb_CppunitTest_use_api,sw_ww8export$(1),\ + udkapi \ + offapi \ + oovbaapi \ +)) + +$(eval $(call gb_CppunitTest_use_ure,sw_ww8export$(1))) +$(eval $(call gb_CppunitTest_use_vcl,sw_ww8export$(1))) + +$(eval $(call gb_CppunitTest_use_rdb,sw_ww8export$(1),services)) + +ifeq ($(OS),WNT) +# gpgme-w32spawn.exe is needed in workdir/LinkTarget/Executable +$(eval $(call gb_CppunitTest_use_packages,sw_ww8export$(1),\ + $(call gb_Helper_optional,GPGMEPP,gpgmepp)\ +)) +endif + +$(eval $(call gb_CppunitTest_use_configuration,sw_ww8export$(1))) + +$(eval $(call gb_CppunitTest_use_packages,sw_ww8export$(1),\ + oox_customshapes \ +)) + +endef + +# vim: set noet sw=4 ts=4: