cppunit-optional

Gbp-Pq: Name cppunit-optional.diff

diff --git a/Repository.mk b/Repository.mk
index cbb6df60a9d0f5cb20b72644450b79380ee988cb..24e2a6e4edb289298e34e6c1174921a53d31dac0 100644 (file)
--- a/Repository.mk
+++ b/Repository.mk
@@ -878,8 +878,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, \
        $(if $(ENABLE_CLI),cli_basetypes_copy) \
        extras_wordbook \
        instsetoo_native_setup \

diff --git a/config_host.mk.in b/config_host.mk.in
index 7b1b669934df254e92d4d3c672a0cd697a214656..8f243c2b339ce6884d748babb2973dfcf8cf5a19 100644 (file)
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -168,6 +168,7 @@ export ENABLE_COINMP=@ENABLE_COINMP@
 SYSTEM_COINMP=@SYSTEM_COINMP@
 export COINMP_CFLAGS=@COINMP_CFLAGS@
 export COINMP_LIBS=@COINMP_LIBS@
+export ENABLE_CPPUNIT=@ENABLE_CPPUNIT@
 export ENABLE_ATSPI_TESTS=@ENABLE_ATSPI_TESTS@
 export ENABLE_CPDB=@ENABLE_CPDB@
 export ENABLE_CUPS=@ENABLE_CUPS@

diff --git a/configure.ac b/configure.ac
index 8ac13ef074c66e06e79190662cdeac3ba785c254..3cbf31f87cc23e44c6696ff161a294c89d102bea 100644 (file)
Binary files a/configure.ac and b/configure.ac differ

diff --git a/sal/Module_sal.mk b/sal/Module_sal.mk
index 854d46a8e6d48a0bdba195aac500151750ebcce1..08a317d292fa9b82b7ec161ef02887a0b2cbc855 100644 (file)
--- 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 EMSCRIPTEN), \
                Library_lo-bootstrap) \
        Library_sal \
@@ -39,4 +38,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 d98ee3ea2a34101eced23420b4ecfcf50bab3bbb..50ec34454ba3034d36dad770d8e2cc20052184c8 100644 (file)
--- 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) \
@@ -29,7 +29,6 @@ $(eval $(call gb_Executable_use_libraries,pdf2xml,\
     cppu \
     drawinglayercore \
     drawinglayer \
-    unotest \
     cppuhelper \
     sal \
     salhelper \
@@ -38,6 +37,15 @@ $(eval $(call gb_Executable_use_libraries,pdf2xml,\
     i18nutil \
 ))
 
+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 5d66a0daa1e4c0a306f62dd13f20263d104c9e3e..ed141379c0e3f3a815293d5a8d2fd03594068237 100644 (file)
--- a/smoketest/Module_smoketest.mk
+++ b/smoketest/Module_smoketest.mk
@@ -13,8 +13,12 @@ $(eval $(call gb_Module_Module,smoketest))
 ifeq ($(CROSS_COMPILING),)
 
 ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))
+ifeq ($(ENABLE_CPPUNIT),TRUE)
 $(eval $(call gb_Module_add_targets,smoketest,\
        Library_smoketest \
+))
+endif
+$(eval $(call gb_Module_add_targets,smoketest,\
        Zip_smoketestdoc \
 ))
 endif
@@ -28,6 +32,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,\
@@ -35,6 +40,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 99e7229051511d5717af5f65b0f9dad5fc851955..74f2a604a128477ba20f43fd83bbc3f440577cbd 100644 (file)
--- 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 \
@@ -23,6 +24,7 @@ $(eval $(call gb_Module_add_check_targets,test,\
     CppunitTest_test_a11y \
     CppunitTest_test_xpath \
 ))
+endif
 
 endif
 

diff --git a/testtools/Module_testtools.mk b/testtools/Module_testtools.mk
index 2ef90a01c0ecfc98f7cd122636af9f84d799f7d6..25ad6d55c25ca417bb3efacc785a4f9447de9b4f 100644 (file)
--- 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 \
@@ -43,4 +45,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 196d6cd1af7f72d6c6f11d3dcf833db1a67066fd..bd54227ca2a735d467c4d3d63815128b4ba447e1 100644 (file)
--- 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,\