Hi,
On Thu, Aug 01, 2019 at 07:13:58AM +0000, Stephan Bergmann (via logerrit) wrote:
> sysui/CustomTarget_share.mk | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> New commits:
> commit 4b4c7e76e6c2ea0d47a42a5107352d3ad7341fbf
> Author: Stephan Bergmann <[email protected]>
> AuthorDate: Wed Jul 31 21:56:18 2019 +0200
> Commit: Noel Grandin <[email protected]>
> CommitDate: Thu Aug 1 09:13:22 2019 +0200
>
> Only build LOKDocView-0.1.gir when necessary
>
> Prior to 634844354ee6ed884128086a80c3ee32c889d8c9 "sysui: fix rpm errors
> in
> freedesktop-menus (4.14.1)" it had been build as part of
> sysui/desktop/share/create_tree.sh, which is presumably only called when
> building for deb or rpm PKGFORMAT. Building it now in more cases started
> to
Uhm, no
$ git grep create_tree.sh
bin/distro-install-desktop-integration: # do not overwrite
$BINDIR/libreoffice symlink created by create_tree.sh
bin/distro-install-desktop-integration:cp -a
"${SRCDIR?}"/sysui/desktop/share/create_tree.sh "$sysui_temp"
bin/distro-install-desktop-integration: bash ./create_tree.sh
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
bin/distro-install-desktop-integration:# put the stuff installed by
create_tree.sh into the right file lists
sysui/CustomTarget_deb.mk:$(deb_WORKDIR)/%/DEBIAN/control:
$(deb_SRCDIR)/control $(call
gb_CustomTarget_get_workdir,sysui/share)/%/create_tree.sh
sysui/CustomTarget_deb.mk: ./create_tree.sh
sysui/CustomTarget_rpm.mk: $(call
gb_CustomTarget_get_workdir,sysui/share)/$(1)/create_tree.sh \
sysui/CustomTarget_share.mk: $(product)/create_tree.sh \
sysui/CustomTarget_share.mk:$(share_WORKDIR)/%/create_tree.sh:
$(share_SRCDIR)/share/create_tree.sh \
sysui/desktop/freedesktop/freedesktop-menus.spec:./create_tree.sh
This means that packaging without deb/rpm PKGFORMAT and plain "make install"
now doesn't build it....
Reverted it locally for me...
Regards,
Rene
_______________________________________________
LibreOffice mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/libreoffice
