[libreoffice] 01/03: enable running make uicheck

[Rene Engelhard]

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 1f5341dcb2b997d65c190baed2e4e4794fb617f7
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Sat Jun 3 15:54:43 2017 +0200

    enable running make uicheck
---
 changelog |  3 ++-
 rules     | 20 +++++++++++++++++---
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/changelog b/changelog
index fd5adde..6378e6f 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-libreoffice (1:5.4.0~beta2~git20170529-1) UNRELEASED; urgency=medium
+libreoffice (1:5.4.0~beta2~git20170603-1) UNRELEASED; urgency=medium
 
   * New upstream snapshot
     - is now able to do "insert->image, choose pdf". Not insert->docunent
@@ -31,6 +31,7 @@ libreoffice (1:5.4.0~beta2~git20170529-1) UNRELEASED; urgency=medium
       /usr/lib/libreoffice/share/xdg/*.desktop (except qstart.desktop) to
       them instead. Fixes e.g. appstream-generator for our appstream data
       (which cannot handle the symlinks...)
+    - enable running make uicheck
 
  -- Rene Engelhard <rene at debian.org>  Sat, 27 May 2017 10:52:43 +0200
 
diff --git a/rules b/rules
index b25c1fb..a26e8cd 100755
--- a/rules
+++ b/rules
@@ -115,7 +115,6 @@ BUILD_DEPS=\
 
 BUILD_DEPS_INDEP += rdfind, symlinks
 
-CHECKTARGET:=check
 # These are components which can be built from internal copies, or used from the
 # distribution. See configure --help for valid values (--with-system-<value>).
 SYSTEM_STUFF = dicts
@@ -265,6 +264,7 @@ ifeq "$(ENABLE_JAVA)" "y"
   ifeq "$(JDK)" "default"
     ifeq "$(shell LANG=C /usr/lib/jvm/default-java/bin/java -version 2>&1 | tail -n 1 | awk '{ print $$1 }')" "OpenJDK"
         RUN_MAKE_CHECK=y
+        RUN_MAKE_UICHECK=y
         ifeq "$(DEB_HOST_ARCH)" "i386"
 	  ENABLE_JUNIT4=y
         endif
@@ -276,6 +276,7 @@ ifeq "$(ENABLE_JAVA)" "y"
   else
     ifeq "$(JDK)" "openjdk"
         RUN_MAKE_CHECK=y
+        RUN_MAKE_UICHECK=y
         ifeq "$(DEB_HOST_ARCH)" "i386"
 	  ENABLE_JUNIT4=y
         endif
@@ -285,6 +286,7 @@ ifeq "$(ENABLE_JAVA)" "y"
         ENABLE_EXPORT_VALIDATION_TESTS=n
     else
       RUN_MAKE_CHECK=n
+      RUN_MAKE_UICHECK=n
       ENABLE_JUNIT4=n
       RUN_PYTESTS=n
       ENABLE_EXPORT_VALIDATION_TESTS=n
@@ -315,12 +317,14 @@ ifeq "$(ENABLE_JAVA)" "y"
   endif
 else
   RUN_MAKE_CHECK=n
+  RUN_MAKE_UICHECK=n
   ENABLE_JUNIT4=n
   ENABLE_EXPORT_VALIDATION_TESTS=n
   BUILD_TEST_PACKAGE=n
 endif
 else
   RUN_MAKE_CHECK=n
+  RUN_MAKE_UICHECK=n
   ENABLE_JUNIT4=n
   ENABLE_EXPORT_VALIDATION_TESTS=n
   BUILD_TEST_PACKAGE=n
@@ -2025,9 +2029,19 @@ endif
 		export SAL_USE_VCLPLUGIN="svp"; \
 		unset DISPLAY; \
 		if [ -x /usr/bin/gdb ]; then ulimit -c unlimited; fi && \
-		$(MAKE) -k $(CHECKTARGET) || PARALLELISM=1 $(MAKE) $(CHECKTARGET) && \
+		$(MAKE) -k check || PARALLELISM=1 $(MAKE) check && \
 	rm -rf $$t
-
+  ifeq "$(RUN_MAKE_UICHECK)" "y"
+	$(IGNORE_MAKE_CHECK_FAILURES)t=`mktemp -q -d`; \
+	cd $(SOURCE_TREE) && \
+		export PATH=$(BUILD_PATH); \
+		export TMPDIR=$$t; \
+		export HOME=$$t; \
+		export SAL_USE_VCLPLUGIN="gen"; \
+		if [ -x /usr/bin/gdb ]; then ulimit -c unlimited; fi && \
+		$(MAKE) -k uicheck || PARALLELISM=1 $(MAKE) uicheck && \
+	rm -rf $$t
+  endif
 ifneq (,$(findstring $(DEB_HOST_ARCH),$(OOO_NO_BASE_ARCHS)))
 	patch -p1 -R < $(CURDIR)/debian/patches/disable-db-tests.diff
 endif

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git