[Libreoffice-commits] dev-tools.git: flatpak/build.sh

Stephan Bergmann sbergman at redhat.com
Tue Jul 4 15:15:17 UTC 2017 

 flatpak/build.sh |   96 +------------------------------------------------------
 1 file changed, 2 insertions(+), 94 deletions(-)

New commits:
commit 777b01d4d7ea0ca2a855e36e87d366b458b8bd56
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Jul 4 17:13:40 2017 +0200

    Break core solenv/bin/assemble-flatpak.sh out of flatpak/build.sh
    
    ,,,in preparation of moving to a flatpak-builder manifest.json approach
    
    (corresponding core commit is 19c13650c81ae7e0ad6cf0d7b8661f8440ee7892 "Break
    solenv/bin/assemble-flatpak.sh out of dev-tools flatpak/build.sh")

diff --git a/flatpak/build.sh b/flatpak/build.sh
index 5ff7b44..dc1fd8f 100755
--- a/flatpak/build.sh
+++ b/flatpak/build.sh
@@ -63,105 +63,13 @@ mkdir "${my_dir?}"/build
 flatpak build --build-dir="${my_dir?}"/build --share=network "${my_dir?}"/app \
  bash -c \
  '"${1?}"/lo/autogen.sh --prefix="${1?}"/inst --with-distro=LibreOfficeFlatpak \
-  && make && make distro-pack-install-strip' \
+  && make && make distro-pack-install-strip \
+  && make cmd cmd='\''$(SRCDIR)/solenv/bin/assemble-flatpak.sh'\' \
  bash "${my_dir?}"
 
 
 # 3  Assemble the app files and metadata:
 
-cp -r "${my_dir?}"/inst/lib/libreoffice "${my_dir?}"/app/files/
-## libreoffice-startcenter.desktop -> org.libreoffice.LibreOffice.desktop,
-## combining all libreoffice-*.desktop MimeType= lines:
-mkdir "${my_dir?}"/app/files/share
-mkdir "${my_dir?}"/app/files/share/applications
-my_mimetypes=$(awk -d 'BEGIN { FS="="; ORS=""; semi=0 }; \
- /^MimeType=/ && length($2) \
-  { if (semi) print ";"; print $2; semi = match($2, ";$") == 0 }' \
- "${my_dir?}"/inst/share/applications/libreoffice-*.desktop)
-sed -e 's,^Exec=libreoffice,Exec=/app/libreoffice/program/soffice,' \
- -e 's/^Icon=libreoffice-/Icon=org.libreoffice.LibreOffice-/' \
- -e 's|^MimeType=.*$|MimeType='"$my_mimetypes"'|' \
- "${my_dir?}"/inst/share/applications/libreoffice-startcenter.desktop \
- > "${my_dir?}"/app/files/share/applications/org.libreoffice.LibreOffice.desktop
-## icons/hicolor/*/apps/libreoffice-startcenter.* ->
-## icons/hicolor/*/apps/org.libreoffice.LibreOffice-startcenter.*:
-mkdir "${my_dir?}"/app/files/share/icons
-for i in "${my_dir?}"/inst/share/icons/hicolor/*/apps/libreoffice-startcenter.*
-do
- mkdir -p \
-  "$(dirname "${my_dir?}"/app/files/share/icons/hicolor/"${i#"${my_dir?}"/inst/share/icons/hicolor/}")"
- cp -a "$i" \
-  "$(dirname "${my_dir?}"/app/files/share/icons/hicolor/"${i#"${my_dir?}"/inst/share/icons/hicolor/}")"/org.libreoffice.LibreOffice-startcenter."${i##*/apps/libreoffice-startcenter.}"
-done
-## org.libreoffice.LibreOffice.appdata.xml is manually derived from the various
-## inst/share/appdata/libreoffice-*.appdata.xml (at least recent GNOME Software
-## doesn't show more than five screenshots anyway, so restrict to one each from
-## the five libreoffice-*.appdata.xml: Writer, Calc, Impress, Draw, Base):
-mkdir "${my_dir?}"/app/files/share/appdata
-cat <<\EOF > \
- "${my_dir?}"/app/files/share/appdata/org.libreoffice.LibreOffice.appdata.xml
-<?xml version="1.0" encoding="UTF-8"?>
-<component type="desktop">
- <id>org.libreoffice.LibreOffice.desktop</id>
- <metadata_license>CC0-1.0</metadata_license>
- <project_license>MPL-2.0</project_license>
- <name>LibreOffice</name>
- <summary>The LibreOffice productivity suite</summary>
- <description>
-  <p>LibreOffice is a powerful office suite.  Its clean interface and
-  feature-rich tools help you unleash your creativity and enhance your
-  productivity.  LibreOffice includes several applications that make it the most
-  powerful Free and Open Source office suite on the market: Writer (word
-  processing), Calc (spreadsheets), Impress (presentations), Draw (vector
-  graphics and flowcharts), Base (databases), and Math (formula editing).</p>
-  <p>LibreOffice supports opening and saving into a wide variety of formats, so
-  you can easily share documents with users of other popular office suites
-  without worrying about compatibility.</p>
- </description>
- <url type="homepage">http://www.libreoffice.org/discover/libreoffice/</url>
- <url type="bugtracker">https://bugs.documentfoundation.org/</url>
- <url type="donation">https://donate.libreoffice.org/</url>
- <url type="faq">https://wiki.documentfoundation.org/Faq</url>
- <url type="help">http://www.libreoffice.org/get-help/documentation/</url>
- <url type="translate">https://wiki.documentfoundation.org/Translating_LibreOffice</url>
- <screenshots>
-  <screenshot type="default">
-   <image>http://www.libreoffice.org/assets/Uploads/Discover/Screenshots/_resampled/ResizedImage400300-Writer-02-Table-of-Contents-Getting-Started-Guide-4-2.png</image>
-   <caption><!-- Describe this screenshot in less than ~10 words --></caption>
-  </screenshot>
-  <screenshot>
-   <image>http://www.libreoffice.org/assets/Uploads/Discover/Screenshots/_resampled/ResizedImage400300-Calc-02-exemple-ods.png</image>
-   <caption><!-- Describe this screenshot in less than ~10 words --></caption>
-  </screenshot>
-  <screenshot>
-   <image>http://www.libreoffice.org/assets/Uploads/Discover/Screenshots/_resampled/ResizedImage400300-Impress-01-Blank.png</image>
-   <caption><!-- Describe this screenshot in less than ~10 words --></caption>
-  </screenshot>
-  <screenshot>
-   <image>http://www.libreoffice.org/assets/Uploads/Discover/Screenshots/_resampled/ResizedImage400300-Draw-02-Tiger-fdo82219.png</image>
-   <caption><!-- Describe this screenshot in less than ~10 words --></caption>
-  </screenshot>
-  <screenshot>
-   <image>http://www.libreoffice.org/assets/Uploads/Screenshots/Base/Screenshot-78.png</image>
-   <caption><!-- Describe this screenshot in less than ~10 words --></caption>
-  </screenshot>
- </screenshots>
- <developer_name>The Document Foundation</developer_name>
- <update_contact>libreoffice_at_lists.freedesktop.org</update_contact>
- <kudos>
-  <kudo>HiDpiIcon</kudo>
-  <kudo>HighContrast</kudo>
-  <kudo>ModernToolkit</kudo>
-  <kudo>UserDocs</kudo>
- </kudos>
-</component>
-EOF
-## see <https://github.com/flatpak/flatpak/blob/master/app/
-## flatpak-builtins-build-finish.c> for further places where build-finish would
-## look for data:
-## cp ... "${my_dir?}"/app/files/share/dbus-1/services/
-## cp ... "${my_dir?}"/app/files/share/gnome-shell/search-providers/
-##
 ## see
 ## <https://github.com/flatpak/flatpak/blob/master/builder/builder-manifest.c>
 ## for the appstream-compose command line:

More information about the Libreoffice-commits mailing list