[Libreoffice-commits] core.git: sw/CppunitTest_sw_uiwriter2.mk sw/CppunitTest_sw_uiwriter3.mk sw/CppunitTest_sw_uiwriter.mk sw/Module_sw.mk sw/uiwriter_setup.mk
Xisco Fauli (via logerrit)
logerrit at kemper.freedesktop.org
Thu May 13 08:41:37 UTC 2021
sw/CppunitTest_sw_uiwriter.mk | 78 ---------------------------------
sw/CppunitTest_sw_uiwriter2.mk | 77 ---------------------------------
sw/CppunitTest_sw_uiwriter3.mk | 77 ---------------------------------
sw/Module_sw.mk | 1
sw/uiwriter_setup.mk | 95 +++++++++++++++++++++++++++++++++++++++++
5 files changed, 100 insertions(+), 228 deletions(-)
New commits:
commit bb4341d76974887d473fcee1e1b1d5a9ea8f5c26
Author: Xisco Fauli <xiscofauli at libreoffice.org>
AuthorDate: Thu May 13 09:11:56 2021 +0200
Commit: Xisco Fauli <xiscofauli at libreoffice.org>
CommitDate: Thu May 13 10:40:41 2021 +0200
sw_uiwriter: Use a template in makefiles to reduce duplicated code
Change-Id: I2aa29480766f943ad24d97635c50eb8b49ca8795
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115536
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofauli at libreoffice.org>
diff --git a/sw/CppunitTest_sw_uiwriter.mk b/sw/CppunitTest_sw_uiwriter.mk
index fce3367bd0e7..ed8fc7d29783 100644
--- a/sw/CppunitTest_sw_uiwriter.mk
+++ b/sw/CppunitTest_sw_uiwriter.mk
@@ -9,81 +9,7 @@
#
#*************************************************************************
-$(eval $(call gb_CppunitTest_CppunitTest,sw_uiwriter))
-
-$(eval $(call gb_CppunitTest_use_common_precompiled_header,sw_uiwriter))
-
-$(eval $(call gb_CppunitTest_add_exception_objects,sw_uiwriter, \
- sw/qa/extras/uiwriter/uiwriter \
-))
-
-# note: this links msword only for the reason to have an order dependency,
-# because "make sw.check" will not see the dependency through services.rdb
-$(eval $(call gb_CppunitTest_use_libraries,sw_uiwriter, \
- comphelper \
- cppu \
- cppuhelper \
- editeng \
- i18nlangtag \
- msword \
- sal \
- sfx \
- svl \
- svt \
- svxcore \
- sw \
- swqahelper \
- test \
- unotest \
- vcl \
- tl \
- utl \
- svx \
-))
-
-$(eval $(call gb_CppunitTest_use_externals,sw_uiwriter,\
- boost_headers \
- libxml2 \
-))
-
-$(eval $(call gb_CppunitTest_set_include,sw_uiwriter,\
- -I$(SRCDIR)/sw/inc \
- -I$(SRCDIR)/sw/source/core/inc \
- -I$(SRCDIR)/sw/source/uibase/inc \
- -I$(SRCDIR)/sw/source/filter/inc \
- -I$(SRCDIR)/sw/source/filter/html \
- -I$(SRCDIR)/sw/qa/inc \
- $$(INCLUDE) \
-))
-
-$(eval $(call gb_CppunitTest_use_api,sw_uiwriter,\
- udkapi \
- offapi \
- oovbaapi \
-))
-
-$(eval $(call gb_CppunitTest_use_ure,sw_uiwriter))
-$(eval $(call gb_CppunitTest_use_vcl,sw_uiwriter))
-
-$(eval $(call gb_CppunitTest_use_rdb,sw_uiwriter,services))
-
-$(eval $(call gb_CppunitTest_use_configuration,sw_uiwriter))
-
-$(eval $(call gb_CppunitTest_use_uiconfigs,sw_uiwriter, \
- modules/swriter \
- sfx \
- svt \
- svx \
-))
-
-$(eval $(call gb_CppunitTest_use_packages,sw_uiwriter, \
- oox_customshapes \
- sfx2_classification \
-))
-
-$(call gb_CppunitTest_get_target,sw_uiwriter): \
- $(call gb_Library_get_target,textconv_dict)
-
-$(eval $(call gb_CppunitTest_use_more_fonts,sw_uiwriter))
+# empty second argument (i.e. no 1)
+$(eval $(call sw_uiwriter_test,))
# vim: set noet sw=4 ts=4:
diff --git a/sw/CppunitTest_sw_uiwriter2.mk b/sw/CppunitTest_sw_uiwriter2.mk
index 898fd23645d4..b05c5ecd1855 100644
--- a/sw/CppunitTest_sw_uiwriter2.mk
+++ b/sw/CppunitTest_sw_uiwriter2.mk
@@ -9,81 +9,6 @@
#
#*************************************************************************
-$(eval $(call gb_CppunitTest_CppunitTest,sw_uiwriter2))
-
-$(eval $(call gb_CppunitTest_use_common_precompiled_header,sw_uiwriter2))
-
-$(eval $(call gb_CppunitTest_add_exception_objects,sw_uiwriter2, \
- sw/qa/extras/uiwriter/uiwriter2 \
-))
-
-# note: this links msword only for the reason to have an order dependency,
-# because "make sw.check" will not see the dependency through services.rdb
-$(eval $(call gb_CppunitTest_use_libraries,sw_uiwriter2, \
- comphelper \
- cppu \
- cppuhelper \
- editeng \
- i18nlangtag \
- msword \
- sal \
- sfx \
- svl \
- svt \
- svxcore \
- sw \
- swqahelper \
- test \
- unotest \
- vcl \
- tl \
- utl \
- svx \
-))
-
-$(eval $(call gb_CppunitTest_use_externals,sw_uiwriter2,\
- boost_headers \
- libxml2 \
-))
-
-$(eval $(call gb_CppunitTest_set_include,sw_uiwriter2,\
- -I$(SRCDIR)/sw/inc \
- -I$(SRCDIR)/sw/source/core/inc \
- -I$(SRCDIR)/sw/source/uibase/inc \
- -I$(SRCDIR)/sw/source/filter/inc \
- -I$(SRCDIR)/sw/source/filter/html \
- -I$(SRCDIR)/sw/qa/inc \
- $$(INCLUDE) \
-))
-
-$(eval $(call gb_CppunitTest_use_api,sw_uiwriter2,\
- udkapi \
- offapi \
- oovbaapi \
-))
-
-$(eval $(call gb_CppunitTest_use_ure,sw_uiwriter2))
-$(eval $(call gb_CppunitTest_use_vcl,sw_uiwriter2))
-
-$(eval $(call gb_CppunitTest_use_rdb,sw_uiwriter2,services))
-
-$(eval $(call gb_CppunitTest_use_configuration,sw_uiwriter2))
-
-$(eval $(call gb_CppunitTest_use_uiconfigs,sw_uiwriter2, \
- modules/swriter \
- sfx \
- svt \
- svx \
-))
-
-$(eval $(call gb_CppunitTest_use_packages,sw_uiwriter2, \
- oox_customshapes \
- sfx2_classification \
-))
-
-$(call gb_CppunitTest_get_target,sw_uiwriter2): \
- $(call gb_Library_get_target,textconv_dict)
-
-$(eval $(call gb_CppunitTest_use_more_fonts,sw_uiwriter2))
+$(eval $(call sw_uiwriter_test,2))
# vim: set noet sw=4 ts=4:
diff --git a/sw/CppunitTest_sw_uiwriter3.mk b/sw/CppunitTest_sw_uiwriter3.mk
index 4bea79b99da6..70c6cab223e3 100644
--- a/sw/CppunitTest_sw_uiwriter3.mk
+++ b/sw/CppunitTest_sw_uiwriter3.mk
@@ -9,81 +9,6 @@
#
#*************************************************************************
-$(eval $(call gb_CppunitTest_CppunitTest,sw_uiwriter3))
-
-$(eval $(call gb_CppunitTest_use_common_precompiled_header,sw_uiwriter3))
-
-$(eval $(call gb_CppunitTest_add_exception_objects,sw_uiwriter3, \
- sw/qa/extras/uiwriter/uiwriter3 \
-))
-
-# note: this links msword only for the reason to have an order dependency,
-# because "make sw.check" will not see the dependency through services.rdb
-$(eval $(call gb_CppunitTest_use_libraries,sw_uiwriter3, \
- comphelper \
- cppu \
- cppuhelper \
- editeng \
- i18nlangtag \
- msword \
- sal \
- sfx \
- svl \
- svt \
- svxcore \
- sw \
- swqahelper \
- test \
- unotest \
- vcl \
- tl \
- utl \
- svx \
-))
-
-$(eval $(call gb_CppunitTest_use_externals,sw_uiwriter3,\
- boost_headers \
- libxml2 \
-))
-
-$(eval $(call gb_CppunitTest_set_include,sw_uiwriter3,\
- -I$(SRCDIR)/sw/inc \
- -I$(SRCDIR)/sw/source/core/inc \
- -I$(SRCDIR)/sw/source/uibase/inc \
- -I$(SRCDIR)/sw/source/filter/inc \
- -I$(SRCDIR)/sw/source/filter/html \
- -I$(SRCDIR)/sw/qa/inc \
- $$(INCLUDE) \
-))
-
-$(eval $(call gb_CppunitTest_use_api,sw_uiwriter3,\
- udkapi \
- offapi \
- oovbaapi \
-))
-
-$(eval $(call gb_CppunitTest_use_ure,sw_uiwriter3))
-$(eval $(call gb_CppunitTest_use_vcl,sw_uiwriter3))
-
-$(eval $(call gb_CppunitTest_use_rdb,sw_uiwriter3,services))
-
-$(eval $(call gb_CppunitTest_use_configuration,sw_uiwriter3))
-
-$(eval $(call gb_CppunitTest_use_uiconfigs,sw_uiwriter3, \
- modules/swriter \
- sfx \
- svt \
- svx \
-))
-
-$(eval $(call gb_CppunitTest_use_packages,sw_uiwriter3, \
- oox_customshapes \
- sfx2_classification \
-))
-
-$(call gb_CppunitTest_get_target,sw_uiwriter3): \
- $(call gb_Library_get_target,textconv_dict)
-
-$(eval $(call gb_CppunitTest_use_more_fonts,sw_uiwriter3))
+$(eval $(call sw_uiwriter_test,3))
# vim: set noet sw=4 ts=4:
diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk
index dc976c4eb7b5..cdd515a693b1 100644
--- a/sw/Module_sw.mk
+++ b/sw/Module_sw.mk
@@ -18,6 +18,7 @@
#
include $(SRCDIR)/sw/ooxmlexport_setup.mk
+include $(SRCDIR)/sw/uiwriter_setup.mk
$(eval $(call gb_Module_Module,sw))
diff --git a/sw/uiwriter_setup.mk b/sw/uiwriter_setup.mk
new file mode 100644
index 000000000000..ce7544772447
--- /dev/null
+++ b/sw/uiwriter_setup.mk
@@ -0,0 +1,95 @@
+# -*- 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/.
+#
+#*************************************************************************
+
+define sw_uiwriter_libraries
+ comphelper \
+ cppu \
+ cppuhelper \
+ editeng \
+ i18nlangtag \
+ msword \
+ sal \
+ sfx \
+ svl \
+ svt \
+ svxcore \
+ sw \
+ swqahelper \
+ test \
+ unotest \
+ vcl \
+ tl \
+ utl \
+ svx
+endef
+
+# template for uiwriter tests (there are several so that they can be run in parallel)
+define sw_uiwriter_test
+
+$(eval $(call gb_CppunitTest_CppunitTest,sw_uiwriter$(1)))
+
+$(eval $(call gb_CppunitTest_use_common_precompiled_header,sw_uiwriter$(1)))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,sw_uiwriter$(1), \
+ sw/qa/extras/uiwriter/uiwriter$(1) \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,sw_uiwriter$(1), \
+ $(sw_uiwriter_libraries) \
+))
+
+$(eval $(call gb_CppunitTest_use_externals,sw_uiwriter$(1),\
+ boost_headers \
+ libxml2 \
+))
+
+$(eval $(call gb_CppunitTest_set_include,sw_uiwriter$(1),\
+ -I$(SRCDIR)/sw/inc \
+ -I$(SRCDIR)/sw/source/core/inc \
+ -I$(SRCDIR)/sw/source/uibase/inc \
+ -I$(SRCDIR)/sw/source/filter/inc \
+ -I$(SRCDIR)/sw/source/filter/html \
+ -I$(SRCDIR)/sw/qa/inc \
+ $$(INCLUDE) \
+))
+
+$(eval $(call gb_CppunitTest_use_api,sw_uiwriter$(1),\
+ udkapi \
+ offapi \
+ oovbaapi \
+))
+
+$(eval $(call gb_CppunitTest_use_ure,sw_uiwriter$(1)))
+$(eval $(call gb_CppunitTest_use_vcl,sw_uiwriter$(1)))
+
+$(eval $(call gb_CppunitTest_use_rdb,sw_uiwriter$(1),services))
+
+$(eval $(call gb_CppunitTest_use_configuration,sw_uiwriter$(1)))
+
+$(eval $(call gb_CppunitTest_use_uiconfigs,sw_uiwriter$(1),\
+ modules/swriter \
+ sfx \
+ svt \
+ svx \
+))
+
+$(eval $(call gb_CppunitTest_use_packages,sw_uiwriter$(1),\
+ oox_customshapes \
+ sfx2_classification \
+))
+
+$(call gb_CppunitTest_get_target,sw_uiwriter$(1)) : $(call gb_Library_get_target,textconv_dict)
+
+$(eval $(call gb_CppunitTest_use_more_fonts,sw_uiwriter$(1)))
+
+endef
+
+# vim: set noet sw=4 ts=4:
More information about the Libreoffice-commits
mailing list