From 4bd94c3474779b00d8e9e758aa320d4fb3987a75 Mon Sep 17 00:00:00 2001 From: Debian LibreOffice Maintainers Date: Sat, 16 Jul 2022 11:57:00 +0100 Subject: [PATCH] cppunit-optional Gbp-Pq: Name cppunit-optional.diff --- Repository.mk | 4 ++++ config_host.mk.in | 1 + configure.ac | Bin 529542 -> 529803 bytes sal/Module_sal.mk | 7 ++++++- sdext/Executable_pdf2xml.mk | 12 ++++++++++-- smoketest/Module_smoketest.mk | 6 ++++++ test/Module_test.mk | 2 ++ testtools/Module_testtools.mk | 4 ++++ unotest/Module_unotest.mk | 2 ++ 9 files changed, 35 insertions(+), 3 deletions(-) diff --git a/Repository.mk b/Repository.mk index 009c3bdff2d..a59497936bd 100644 --- a/Repository.mk +++ b/Repository.mk @@ -803,8 +803,12 @@ endif # 'test_unittest' is only package delivering to workdir. # Other packages could be potentially autoinstalled. +ifeq ($(ENABLE_CPPUNIT),TRUE) $(eval $(call gb_Helper_register_packages, \ test_unittest \ +)) +endif +$(eval $(call gb_Helper_register_packages, \ cli_basetypes_copy \ extras_wordbook \ instsetoo_native_setup \ diff --git a/config_host.mk.in b/config_host.mk.in index cf62cf84865..aae8a10fd63 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -151,6 +151,7 @@ export ENABLE_COINMP=@ENABLE_COINMP@ export SYSTEM_COINMP=@SYSTEM_COINMP@ export COINMP_CFLAGS=@COINMP_CFLAGS@ export COINMP_LIBS=@COINMP_LIBS@ +export ENABLE_CPPUNIT=@ENABLE_CPPUNIT@ export ENABLE_CUPS=@ENABLE_CUPS@ export ENABLE_CURL=@ENABLE_CURL@ export ENABLE_FUZZERS=@ENABLE_FUZZERS@ diff --git a/configure.ac b/configure.ac index 1b02496ee49220d9f9f3413c016f8d34c746701a..60ba67376058146518e1f7bfda6e6066943149f7 100644 GIT binary patch delta 254 zcmZo$snESzpX+U0SUS^41tPYm~6hx76DZ$b>y2WWX$mE&#U%<#D#$vf8&oifO!pCDb&>!% z%hk`($;UO`IUpd^&ojg}Bq-FCYx;dpb_sT<&~(KatfABY6tQu%zY$^uVm2UV-~L93 HV-_O-%Xm}N delta 80 zcmeBPtqgjp@uyY?hPM fg{BwGWaXY7w}zRc{i84|5VHX>`}U8*9J3e!!h9VA diff --git a/sal/Module_sal.mk b/sal/Module_sal.mk index 1a190037f05..1a65e9bf7f9 100644 --- a/sal/Module_sal.mk +++ b/sal/Module_sal.mk @@ -10,7 +10,6 @@ $(eval $(call gb_Module_Module,sal)) $(eval $(call gb_Module_add_targets,sal,\ - $(if $(CROSS_COMPILING),,$(if $(filter TRUE,$(DISABLE_DYNLOADING)),,Executable_cppunittester)) \ $(if $(filter $(OS),ANDROID), \ Library_lo-bootstrap) \ Library_sal \ @@ -37,4 +36,10 @@ $(eval $(call gb_Module_add_check_targets,sal,\ endif +ifeq ($(ENABLE_CPPUNIT),TRUE) +$(eval $(call gb_Module_add_check_targets,sal,\ + $(if $(CROSS_COMPILING),,$(if $(filter TRUE,$(DISABLE_DYNLOADING)),,Executable_cppunittester)) \ +)) +endif + # vim: set noet sw=4 ts=4: diff --git a/sdext/Executable_pdf2xml.mk b/sdext/Executable_pdf2xml.mk index b2439164a1e..2f919d0da27 100644 --- a/sdext/Executable_pdf2xml.mk +++ b/sdext/Executable_pdf2xml.mk @@ -13,10 +13,10 @@ $(eval $(call gb_Executable_use_sdk_api,pdf2xml)) $(eval $(call gb_Executable_use_externals,pdf2xml,\ boost_headers \ - cppunit \ zlib \ )) + $(eval $(call gb_Executable_set_include,pdf2xml,\ -I$(SRCDIR)/sdext/source/pdfimport/inc \ $$(INCLUDE) \ @@ -27,13 +27,21 @@ $(eval $(call gb_Executable_use_libraries,pdf2xml,\ vcl \ comphelper \ cppu \ - unotest \ cppuhelper \ sal \ tl \ xo \ )) +ifeq ($(ENABLE_CPPUNIT),TRUE) +$(eval $(call gb_Executable_use_externals,pdf2xml,\ + cppunit \ +)) +$(eval $(call gb_Executable_use_libraries,pdf2xml,\ + unotest \ +)) +endif + $(eval $(call gb_Executable_use_library_objects,pdf2xml,pdfimport)) $(eval $(call gb_Executable_add_exception_objects,pdf2xml,\ diff --git a/smoketest/Module_smoketest.mk b/smoketest/Module_smoketest.mk index 217dbfa6543..fa2d0d489bd 100644 --- a/smoketest/Module_smoketest.mk +++ b/smoketest/Module_smoketest.mk @@ -12,8 +12,12 @@ $(eval $(call gb_Module_Module,smoketest)) ifeq ($(CROSS_COMPILING),) +ifeq ($(ENABLE_CPPUNIT),TRUE) $(eval $(call gb_Module_add_targets,smoketest,\ Library_smoketest \ +)) +endif +$(eval $(call gb_Module_add_targets,smoketest,\ Zip_smoketestdoc \ )) @@ -26,6 +30,7 @@ $(eval $(call gb_Module_add_targets,smoketest,\ endif endif +ifeq ($(ENABLE_CPPUNIT),TRUE) ifneq (MACOSX/TRUE,$(OS)/$(ENABLE_MACOSX_SANDBOX)) ifneq ($(filter EXTENSIONS,$(BUILD_TYPE)),) $(eval $(call gb_Module_add_subsequentcheck_targets,smoketest,\ @@ -33,6 +38,7 @@ $(eval $(call gb_Module_add_subsequentcheck_targets,smoketest,\ )) endif endif +endif endif diff --git a/test/Module_test.mk b/test/Module_test.mk index 080cc855b28..8d47bbc6463 100644 --- a/test/Module_test.mk +++ b/test/Module_test.mk @@ -11,6 +11,7 @@ $(eval $(call gb_Module_Module,test)) ifneq (,$(filter DESKTOP,$(BUILD_TYPE))) +ifeq ($(ENABLE_CPPUNIT),TRUE) $(eval $(call gb_Module_add_targets,test,\ Library_test \ Library_test_setupvcl \ @@ -22,6 +23,7 @@ $(eval $(call gb_Module_add_targets,test,\ $(eval $(call gb_Module_add_check_targets,test,\ CppunitTest_test_xpath \ )) +endif endif diff --git a/testtools/Module_testtools.mk b/testtools/Module_testtools.mk index a1b84e175b3..08e4aad24c1 100644 --- a/testtools/Module_testtools.mk +++ b/testtools/Module_testtools.mk @@ -11,6 +11,8 @@ $(eval $(call gb_Module_Module,testtools)) ifeq ($(CROSS_COMPILING),) +ifeq ($(ENABLE_CPPUNIT),TRUE) + $(eval $(call gb_Module_add_targets,testtools,\ CustomTarget_bridgetest \ InternalUnoApi_bridgetest \ @@ -41,4 +43,6 @@ $(eval $(call gb_Module_add_check_targets,testtools,\ endif +endif + # vim:set noet sw=4 ts=4: diff --git a/unotest/Module_unotest.mk b/unotest/Module_unotest.mk index bdffe8e8ac1..acdd4da6c53 100644 --- a/unotest/Module_unotest.mk +++ b/unotest/Module_unotest.mk @@ -12,12 +12,14 @@ $(eval $(call gb_Module_Module,unotest)) ifeq ($(gb_Side),host) ifneq (,$(filter DESKTOP,$(BUILD_TYPE))) +ifeq ($(ENABLE_CPPUNIT),TRUE) $(eval $(call gb_Module_add_targets,unotest,\ Library_unobootstrapprotector \ Library_unoexceptionprotector \ Library_unotest \ )) endif +endif ifneq ($(ENABLE_JAVA),) $(eval $(call gb_Module_add_targets,unotest,\ -- 2.30.2