strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Let flatpak-builder build .Debug extension

Browse source 
Includes a revert of 58891d589b "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@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
This commit is contained in:
Stephan Bergmann 2018-01-08 10:40:32 +01:00
parent 8ac48304da
commit 0ba869fc5c
4 changed files with 8 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
Makefile.in
View file

@ -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)\
@ -390,18 +390,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 $@

1
distro-configs/LibreOfficeFlatpak.conf
View file

@ -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

2
solenv/bin/assemble-flatpak.sh
View file

@ -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

2
solenv/flatpak-manifest.in
View file

@ -534,7 +534,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'"
]
}