[libreoffice] 01/01: make cppunit build-dep optional and add <!nocheck> to the build-dep; run build-nocheck with --without-junit --without-cppunit
Rene Engelhard
rene at moszumanska.debian.org
Thu May 25 14:11:51 UTC 2017
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch debian-experimental-5.4
in repository libreoffice.
commit 93024caf70973faa339b77eeb656422c604b91dc
Author: Rene Engelhard <rene at debian.org>
Date: Thu May 25 16:05:28 2017 +0200
make cppunit build-dep optional and add <!nocheck> to the build-dep; run build-nocheck with --without-junit --without-cppunit
---
patches/cppunit-optional.diff | 180 ++++++++++++++++++++++++++++++
patches/disable-unused-test-programs.diff | 53 +++++++++
2 files changed, 233 insertions(+)
diff --git a/patches/cppunit-optional.diff b/patches/cppunit-optional.diff
new file mode 100644
index 0000000..e94d417
--- /dev/null
+++ b/patches/cppunit-optional.diff
@@ -0,0 +1,180 @@
+diff --git a/configure.ac b/configure.ac
+index c12fe95a561c..66d327ae8fb8 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -2047,6 +2047,11 @@ AC_ARG_WITH(bffvalidator,
+ See https://www.microsoft.com/en-us/download/details.aspx?id=26794]),
+ ,with_bffvalidator=no)
+
++libo_FUZZ_ARG_WITH(cppunit,
++ AS_HELP_STRING([--without-cppunit>],
++ [disable building(!) of cppunit stuff also built during make build]),
++,with_cppunit=yes)
++
+ libo_FUZZ_ARG_WITH(junit,
+ AS_HELP_STRING([--with-junit=<absolute path to JUnit 4 jar>],
+ [Specifies the JUnit 4 jar file to use for JUnit-based tests.
+@@ -7932,8 +7959,12 @@ dnl ===================================================================
+ dnl Check for system cppunit
+ dnl ===================================================================
+ if test "$cross_compiling" != "yes"; then
++ if test "$with_cppunit" != "no"; then
+ libo_CHECK_SYSTEM_MODULE([cppunit],[CPPUNIT],[cppunit >= 1.14.0])
++ ENABLE_CPPUNIT=TRUE
++ fi
+ fi
++AC_SUBST(ENABLE_CPPUNIT)
+
+ dnl ===================================================================
+ dnl Check whether freetype is available
+diff --git a/config_host.mk.in b/config_host.mk.in
+index 880895e3c00f..a3dab3e00979 100644
+--- a/config_host.mk.in
++++ b/config_host.mk.in
+@@ -114,6 +115,7 @@ export SYSTEM_COINMP=@SYSTEM_COINMP@
+ export COINMP_CFLAGS=@COINMP_CFLAGS@
+ export COINMP_LIBS=@COINMP_LIBS@
+ export ENABLE_COLLADA=@ENABLE_COLLADA@
++export ENABLE_CPPUNIT=@ENABLE_CPPUNIT@
+ export ENABLE_CRASHDUMP=@ENABLE_CRASHDUMP@
+ export ENABLE_CUPS=@ENABLE_CUPS@
+ export ENABLE_CURL=@ENABLE_CURL@
+diff --git a/sal/Module_sal.mk b/sal/Module_sal.mk
+index fe9523a7a6e2..719edf8c6252 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 \
+@@ -33,4 +32,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 373f40da36fd..c0401bef9c7a 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,11 +27,19 @@ $(eval $(call gb_Executable_use_libraries,pdf2xml,\
+ vcl \
+ comphelper \
+ cppu \
+- unotest \
+ cppuhelper \
+ sal \
+ ))
+
++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 7e8b6d5f11f6..a084e254bf70 100644
+--- a/smoketest/Module_smoketest.mk
++++ b/smoketest/Module_smoketest.mk
+@@ -12,6 +12,8 @@ $(eval $(call gb_Module_Module,smoketest))
+
+ ifeq ($(CROSS_COMPILING),)
+
++ifeq ($(ENABLE_CPPUNIT),TRUE)
++
+ $(eval $(call gb_Module_add_targets,smoketest,\
+ Library_smoketest \
+ Zip_smoketestdoc \
+@@ -42,6 +44,8 @@ endif
+
+ endif
+
++endif
++
+ ifneq ($(ENABLE_JAVA),)
+ $(eval $(call gb_Module_add_targets,smoketest,\
+ Jar_smoketest \
+diff --git a/test/Module_test.mk b/test/Module_test.mk
+index e1051f16b5a0..d1787cb5789b 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 \
+@@ -18,6 +19,7 @@ $(eval $(call gb_Module_add_targets,test,\
+ Library_vclbootstrapprotector \
+ Package_unittest \
+ ))
++endif
+
+ endif
+
+diff --git a/unotest/Module_unotest.mk b/unotest/Module_unotest.mk
+index a47ca5d4b694..e243e06309f5 100644
+--- a/unotest/Module_unotest.mk
++++ b/unotest/Module_unotest.mk
+@@ -11,12 +11,15 @@
+ $(eval $(call gb_Module_Module,unotest))
+
+ 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,\
+diff --git a/writerperfect/Module_writerperfect.mk b/writerperfect/Module_writerperfect.mk
+index 0b862086f5a9..4bbfacf564f8 100644
+--- a/writerperfect/Module_writerperfect.mk
++++ b/writerperfect/Module_writerperfect.mk
+@@ -43,7 +43,12 @@ $(eval $(call gb_Module_add_slowcheck_targets,writerperfect,\
+ CppunitTest_writerperfect_import \
+ CppunitTest_writerperfect_impress \
+ CppunitTest_writerperfect_writer \
++))
++
++ifeq ($(ENABLE_CPPUNIT),TRUE)
++$(eval $(call gb_Module_add_slowcheck_targets,writerperfect,\
+ Library_wpftqahelper \
+ ))
++endif
+
+ # vim: set noet sw=4 ts=4:
diff --git a/patches/disable-unused-test-programs.diff b/patches/disable-unused-test-programs.diff
new file mode 100644
index 0000000..d2abd1c
--- /dev/null
+++ b/patches/disable-unused-test-programs.diff
@@ -0,0 +1,53 @@
+diff --git a/vcl/Module_vcl.mk b/vcl/Module_vcl.mk
+index a5e4bf5d68d2..3e9e1bf9fe27 100644
+--- a/vcl/Module_vcl.mk
++++ b/vcl/Module_vcl.mk
+@@ -28,28 +28,9 @@ $(eval $(call gb_Module_add_targets,vcl,\
+ StaticLibrary_vclmain \
+ $(if $(ENABLE_MACOSX_SANDBOX),, \
+ $(if $(ENABLE_HEADLESS),, \
+- Executable_ui-previewer)) \
+- $(if $(filter LINUX MACOSX SOLARIS WNT %BSD,$(OS)), \
+- Executable_outdevgrind \
+- $(if $(ENABLE_HEADLESS),, \
+- Executable_vcldemo \
+- Executable_icontest \
+- Executable_visualbackendtest \
+- Executable_mtfdemo ))) \
++ Executable_ui-previewer))) \
+ ))
+
+-ifeq ($(CROSS_COMPILING)$(DISABLE_DYNLOADING),)
+-
+-$(eval $(call gb_Module_add_targets,vcl,\
+- $(if $(filter-out ANDROID IOS WNT,$(OS)), \
+- Executable_svdemo \
+- Executable_fftester \
+- Executable_svptest \
+- Executable_svpclient) \
+-))
+-
+-endif
+-
+ $(eval $(call gb_Module_add_l10n_targets,vcl,\
+ AllLangResTarget_vcl \
+ UIConfig_vcl \
+diff --git a/xmlsecurity/Module_xmlsecurity.mk b/xmlsecurity/Module_xmlsecurity.mk
+index d3fafeb7e4ec..87b8c067903e 100644
+--- a/xmlsecurity/Module_xmlsecurity.mk
++++ b/xmlsecurity/Module_xmlsecurity.mk
+@@ -45,14 +45,6 @@ $(eval $(call gb_Module_add_screenshot_targets,xmlsecurity,\
+ CppunitTest_xmlsecurity_dialogs_test \
+ ))
+
+-ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))
+-
+-$(eval $(call gb_Module_add_targets,xmlsecurity,\
+- Executable_pdfverify \
+-))
+-
+-endif
+-
+ endif
+
+ # vim: set noet sw=4 ts=4:
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
More information about the Pkg-openoffice-commits
mailing list