sc: split subsequent modules into smaller parts

Change-Id: Iee175a064714fa1c7b40c1c450c2fffb59f4fd7c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116625
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>

sc/CppunitTest_sc_subsequent_export-test.mk

@@ -0,0 +1,12 @@
+# -*- 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/.
+#
+
+$(eval $(call sc_subsequent_test,export-test))
+
+# vim: set noet sw=4 ts=4:

sc/CppunitTest_sc_subsequent_export-test2.mk

@@ -0,0 +1,12 @@
+# -*- 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/.
+#
+
+$(eval $(call sc_subsequent_test,export-test2))
+
+# vim: set noet sw=4 ts=4:

sc/CppunitTest_sc_subsequent_filters-test.mk

@@ -0,0 +1,12 @@
+# -*- 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/.
+#
+
+$(eval $(call sc_subsequent_test,filters-test))
+
+# vim: set noet sw=4 ts=4:

sc/CppunitTest_sc_subsequent_filters-test2.mk

@@ -0,0 +1,12 @@
+# -*- 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/.
+#
+
+$(eval $(call sc_subsequent_test,filters-test2))
+
+# vim: set noet sw=4 ts=4:

sc/CppunitTest_sc_subsequent_filters_test.mk

@@ -1,137 +0,0 @@
-# -*- 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/.
-#
-
-$(eval $(call gb_CppunitTest_CppunitTest,sc_subsequent_filters_test))
-
-$(eval $(call gb_CppunitTest_use_common_precompiled_header,sc_subsequent_filters_test))
-
-$(eval $(call gb_CppunitTest_add_exception_objects,sc_subsequent_filters_test, \
-    sc/qa/unit/subsequent_filters-test \
-))
-
-$(eval $(call gb_CppunitTest_use_externals,sc_subsequent_filters_test, \
-	boost_headers \
-	mdds_headers \
-	libxml2 \
-))
-
-$(eval $(call gb_CppunitTest_use_libraries,sc_subsequent_filters_test, \
-    basegfx \
-    comphelper \
-    cppu \
-    cppuhelper \
-    drawinglayer \
-    editeng \
-    for \
-    forui \
-    i18nlangtag \
-    msfilter \
-    oox \
-    sal \
-    salhelper \
-    sax \
-    sb \
-    sc \
-    scqahelper \
-    sfx \
-    sot \
-    subsequenttest \
-    svl \
-    svt \
-    svx \
-    svxcore \
-	test \
-    tk \
-    tl \
-    ucbhelper \
-	unotest \
-    utl \
-    vbahelper \
-    vcl \
-    xo \
-))
-
-$(eval $(call gb_CppunitTest_set_include,sc_subsequent_filters_test,\
-    -I$(SRCDIR)/sc/source/ui/inc \
-    -I$(SRCDIR)/sc/inc \
-	-I$(SRCDIR)/sc/source/filter/inc \
-    $$(INCLUDE) \
-))
-
-$(eval $(call gb_CppunitTest_use_api,sc_subsequent_filters_test,\
-	udkapi \
-	offapi \
-	oovbaapi \
-))
-
-$(eval $(call gb_CppunitTest_use_ure,sc_subsequent_filters_test))
-$(eval $(call gb_CppunitTest_use_vcl,sc_subsequent_filters_test))
-
-$(eval $(call gb_CppunitTest_use_components,sc_subsequent_filters_test,\
-	basic/util/sb \
-	basctl/util/basctl \
-    chart2/source/chartcore \
-    chart2/source/controller/chartcontroller \
-    comphelper/util/comphelp \
-    configmgr/source/configmgr \
-    dbaccess/util/dba \
-    embeddedobj/util/embobj \
-    emfio/emfio \
-    eventattacher/source/evtatt \
-    filter/source/config/cache/filterconfig1 \
-    forms/util/frm \
-    framework/util/fwk \
-    i18npool/source/search/i18nsearch \
-    i18npool/util/i18npool \
-    linguistic/source/lng \
-    oox/util/oox \
-    package/source/xstor/xstor \
-    package/util/package2 \
-    sax/source/expatwrap/expwrap \
-    scaddins/source/analysis/analysis \
-    scaddins/source/datefunc/date \
-    sc/util/sc \
-    sc/util/scfilt \
-    sc/util/vbaobj \
-    sfx2/util/sfx \
-    sot/util/sot \
-    svl/util/svl \
-    svl/source/fsstor/fsstorage \
-    svtools/util/svt \
-    toolkit/util/tk \
-    ucb/source/core/ucb1 \
-    ucb/source/ucp/file/ucpfile1 \
-    ucb/source/ucp/tdoc/ucptdoc1 \
-    unotools/util/utl \
-    unoxml/source/rdf/unordf \
-    unoxml/source/service/unoxml \
-    uui/util/uui \
-    vcl/vcl.common \
-    xmloff/util/xo \
-    xmlsecurity/util/xmlsecurity \
-))
-
-$(eval $(call gb_CppunitTest_use_components,sc_subsequent_filters_test,\
-    xmlsecurity/util/xsec_xmlsec \
-))
-
-$(eval $(call gb_CppunitTest_use_externals,sc_subsequent_filters_test,\
-	orcus \
-	orcus-parser \
-	boost_filesystem \
-	boost_system \
-	boost_iostreams \
-	zlib \
-))
-
-$(eval $(call gb_CppunitTest_use_configuration,sc_subsequent_filters_test))
-
-$(eval $(call gb_CppunitTest_use_more_fonts,sc_subsequent_filters_test))
-
-# vim: set noet sw=4 ts=4:

sc/Module_sc.mk

@@ -10,6 +10,7 @@
 
 include $(SRCDIR)/sc/common_unoapi_tests.mk
 include $(SRCDIR)/sc/ucalc_setup.mk
+include $(SRCDIR)/sc/subsequent_setup.mk
 
 $(eval $(call gb_Module_Module,sc))
 
@@ -75,8 +76,10 @@ $(eval $(call gb_Module_add_slowcheck_targets,sc, \
 	CppunitTest_sc_new_cond_format_api \
 	CppunitTest_sc_pdf_export \
 	CppunitTest_sc_pivottable_filters_test \
-	CppunitTest_sc_subsequent_filters_test \
+	CppunitTest_sc_subsequent_filters-test \
-	CppunitTest_sc_subsequent_export_test \
+	CppunitTest_sc_subsequent_filters-test2 \
+	CppunitTest_sc_subsequent_export-test \
+	CppunitTest_sc_subsequent_export-test2 \
 	CppunitTest_sc_uicalc \
 ))
 

sc/subsequent_setup.mk

@@ -7,21 +7,24 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_CppunitTest_CppunitTest,sc_subsequent_export_test))
+# template for subsequent tests
+define sc_subsequent_test
 
-$(eval $(call gb_CppunitTest_use_common_precompiled_header,sc_subsequent_export_test))
+$(eval $(call gb_CppunitTest_CppunitTest,sc_subsequent_$(1)))
 
-$(eval $(call gb_CppunitTest_add_exception_objects,sc_subsequent_export_test, \
+$(eval $(call gb_CppunitTest_use_common_precompiled_header,sc_subsequent_$(1)))
-    sc/qa/unit/subsequent_export-test \
+
+$(eval $(call gb_CppunitTest_add_exception_objects,sc_subsequent_$(1), \
+    sc/qa/unit/subsequent_$(1) \
 ))
 
-$(eval $(call gb_CppunitTest_use_externals,sc_subsequent_export_test, \
+$(eval $(call gb_CppunitTest_use_externals,sc_subsequent_$(1), \
 	boost_headers \
 	mdds_headers \
 	libxml2 \
 ))
 
-$(eval $(call gb_CppunitTest_use_libraries,sc_subsequent_export_test, \
+$(eval $(call gb_CppunitTest_use_libraries,sc_subsequent_$(1), \
     basegfx \
     comphelper \
     cppu \
@@ -54,22 +57,24 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_subsequent_export_test, \
     xo \
 ))
 
-$(eval $(call gb_CppunitTest_set_include,sc_subsequent_export_test,\
+$(eval $(call gb_CppunitTest_set_include,sc_subsequent_$(1),\
     -I$(SRCDIR)/sc/source/ui/inc \
     -I$(SRCDIR)/sc/inc \
     $$(INCLUDE) \
 ))
 
-$(eval $(call gb_CppunitTest_use_api,sc_subsequent_export_test,\
+$(eval $(call gb_CppunitTest_use_api,sc_subsequent_$(1),\
 	udkapi \
 	offapi \
 	oovbaapi \
 ))
 
-$(eval $(call gb_CppunitTest_use_ure,sc_subsequent_export_test))
+$(eval $(call gb_CppunitTest_use_ure,sc_subsequent_$(1)))
-$(eval $(call gb_CppunitTest_use_vcl,sc_subsequent_export_test))
+$(eval $(call gb_CppunitTest_use_vcl,sc_subsequent_$(1)))
 
-$(eval $(call gb_CppunitTest_use_components,sc_subsequent_export_test,\
+$(eval $(call gb_CppunitTest_use_components,sc_subsequent_$(1),\
+    basic/util/sb \
+    basctl/util/basctl \
     chart2/source/chartcore \
     chart2/source/controller/chartcontroller \
     comphelper/util/comphelp \
@@ -93,6 +98,7 @@ $(eval $(call gb_CppunitTest_use_components,sc_subsequent_export_test,\
     scaddins/source/datefunc/date \
     sc/util/sc \
     sc/util/scfilt \
+    sc/util/vbaobj \
     sfx2/util/sfx \
     sot/util/sot \
     svl/util/svl \
@@ -112,20 +118,22 @@ $(eval $(call gb_CppunitTest_use_components,sc_subsequent_export_test,\
     emfio/emfio \
 ))
 
-$(eval $(call gb_CppunitTest_use_components,sc_subsequent_export_test,\
+$(eval $(call gb_CppunitTest_use_components,sc_subsequent_$(1),\
     xmlsecurity/util/xsec_xmlsec \
 ))
 
-$(eval $(call gb_CppunitTest_use_custom_headers,sc_subsequent_export_test,\
+$(eval $(call gb_CppunitTest_use_custom_headers,sc_subsequent_$(1),\
 	officecfg/registry \
 ))
 
-$(eval $(call gb_CppunitTest_use_configuration,sc_subsequent_export_test))
+$(eval $(call gb_CppunitTest_use_configuration,sc_subsequent_$(1)))
 
-$(eval $(call gb_CppunitTest_use_packages,sc_subsequent_export_test, \
+$(eval $(call gb_CppunitTest_use_packages,sc_subsequent_$(1), \
     oox_generated \
 ))
 
-$(eval $(call gb_CppunitTest_use_more_fonts,sc_subsequent_export_test))
+$(eval $(call gb_CppunitTest_use_more_fonts,sc_subsequent_$(1)))
+
+endef
 
 # vim: set noet sw=4 ts=4: