cppunit-optional

Gbp-Pq: Name cppunit-optional.diff

diff --git a/Repository.mk b/Repository.mk
index fc8819193fa2384bd87d04c1aeabc3cb3380b11a..c8e668b7cbb9afae405ec5b06f728406f4db715d 100644 (file)
--- a/Repository.mk
+++ b/Repository.mk
@@ -861,8 +861,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 b2bfa83e676b502e05809abf6af455618b3e55d0..863fa263d6275a92686c93414198a789c2863a5c 100644 (file)
--- 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_DBGUTIL=@ENABLE_DBGUTIL@

diff --git a/configure.ac b/configure.ac
index c8608475c3a110623ff9c66a5a69f7ba173c02dc..2a2c85483785402eaba5be7f9b948fd9f9342276 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 e0448a5085bf87d9ec476d27aec63c8fac511b5d..2a89269622ebe25a0ad7a73f764e55f2e94db353 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), \
                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 b2439164a1ed1342e8849dea61fbaa4160783556..2f919d0da27fe8d9dfee29fcad6a3409bfcca7b2 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) \
@@ -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 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 080cc855b28cd74330f2a533669061ad947905f0..8d47bbc64638cbc8f1f0bf0941e6a4b2ec60f609 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 \
@@ -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 a1b84e175b30819e6dc993dca324b4bcd9fd3606..08e4aad24c1156947b7744fcc50f0315ea496481 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 \
@@ -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 bdffe8e8ac14ba654f45f5e9bd2676303221ba2e..acdd4da6c539fdb22beb1b33746bbe48e48f6353 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,\