[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - distro-configs/LibreOfficeFlatpak.conf Makefile.in solenv/bin solenv/flatpak-manifest.in

[Stephan Bergmann]

 Makefile.in                            |   17 +++++------------
 distro-configs/LibreOfficeFlatpak.conf |    1 +
 solenv/bin/assemble-flatpak.sh         |    2 +-
 solenv/flatpak-manifest.in             |    2 +-
 4 files changed, 8 insertions(+), 14 deletions(-)

New commits:
commit 8ebc1d2df3bb60ac79d963db384b528bb359264e
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Jan 8 10:40:32 2018 +0100

    Let flatpak-builder build .Debug extension
    
    Includes a revert of 58891d589bd8da700f135b098dd50833277c65dc "Add distro-pack-
    install-strip target to be used by dev-tools' flatpak/build.sh".
    
    Change-Id: Ie2ba18bc13471b46e8d5f41868bae5aee17ff25f
    Reviewed-on: https://gerrit.libreoffice.org/47599
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
    (cherry picked from commit 0ba869fc5c13a29599fda7eb976b2e7959706e04)
    Reviewed-on: https://gerrit.libreoffice.org/47618
    Reviewed-by: Michael Stahl <mstahl at redhat.com>

diff --git a/Makefile.in b/Makefile.in
index afaa9085cbad..768861f2bcf6 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -9,7 +9,7 @@
 
 gb_Top_MODULE_CHECK_TARGETS := slowcheck unitcheck subsequentcheck perfcheck uicheck screenshot
 
-.PHONY : all check-if-root bootstrap gbuild build build-non-l10n-only build-l10n-only check clean clean-build clean-host test-install distclean distro-pack-install distro-pack-install-strip docs download etags fetch get-submodules id install install-gdb-printers install-strip tags debugrun help showmodules translations packageinfo internal.clean $(gb_Top_MODULE_CHECK_TARGETS)
+.PHONY : all check-if-root bootstrap gbuild build build-non-l10n-only build-l10n-only check clean clean-build clean-host test-install distclean distro-pack-install docs download etags fetch get-submodules id install install-gdb-printers install-strip tags debugrun help showmodules translations packageinfo internal.clean $(gb_Top_MODULE_CHECK_TARGETS)
 
 MAKECMDGOALS?=all
 build_goal:=$(if $(filter build check,$(MAKECMDGOALS)),all)\
@@ -382,18 +382,11 @@ else
 	@exit 1
 endif
 
-define gb_Top_DistroPackInstall
-$(SRCDIR)/bin/distro-install-clean-up
-$(SRCDIR)/bin/distro-install-desktop-integration
-$(SRCDIR)/bin/distro-install-sdk
-$(SRCDIR)/bin/distro-install-file-lists
-endef
-
 distro-pack-install: install
-	$(gb_Top_DistroPackInstall)
-
-distro-pack-install-strip: install-strip
-	$(gb_Top_DistroPackInstall)
+	$(SRCDIR)/bin/distro-install-clean-up
+	$(SRCDIR)/bin/distro-install-desktop-integration
+	$(SRCDIR)/bin/distro-install-sdk
+	$(SRCDIR)/bin/distro-install-file-lists
 
 install-package-%:
 	$(MAKE) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.gbuild $@
diff --git a/distro-configs/LibreOfficeFlatpak.conf b/distro-configs/LibreOfficeFlatpak.conf
index bb6b12b567c4..60312c31c8f5 100644
--- a/distro-configs/LibreOfficeFlatpak.conf
+++ b/distro-configs/LibreOfficeFlatpak.conf
@@ -1,5 +1,6 @@
 --disable-odk
 --enable-release-build
+--enable-symbols
 --with-ant-home=/run/build/libreoffice/ant
 --with-extra-buildid=Flatpak version
 --with-jdk-home=/usr/lib/sdk/openjdk9/jvm/openjdk-9
diff --git a/solenv/bin/assemble-flatpak.sh b/solenv/bin/assemble-flatpak.sh
index e678b9894b86..3eade815b11b 100755
--- a/solenv/bin/assemble-flatpak.sh
+++ b/solenv/bin/assemble-flatpak.sh
@@ -8,7 +8,7 @@
 #
 
 # Assemble Flatpak app files and metadata under /app/, copying from the
-# installation tree generated by 'make distro-pack-install-strip' (at
+# installation tree generated by 'make distro-pack-install' (at
 # $PREFIXDIR):
 
 set -e
diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index eed6a529b18d..25c34377dd88 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -510,7 +510,7 @@
             "build-commands": [
                 "./autogen.sh --prefix=/run/build/libreoffice/inst --with-distro=LibreOfficeFlatpak",
                 "make",
-                "make distro-pack-install-strip",
+                "make distro-pack-install",
                 "make cmd cmd='$(SRCDIR)/solenv/bin/assemble-flatpak.sh'"
             ]
         }