diff options
| author | Jay Berkenbilt <ejb@ql.org> | 2018-02-25 19:47:47 +0100 |
|---|---|---|
| committer | Jay Berkenbilt <ejb@ql.org> | 2018-02-25 19:50:22 +0100 |
| commit | 6edbf8fa72da98a4792a70660978e24023a490b2 (patch) | |
| tree | c65c31d587aca3aee573bd9aa742f2c2d4b8273f | |
| parent | 3618fdb13d0f808555c5d12838a1636a71bf1c3c (diff) | |
| download | qpdf-6edbf8fa72da98a4792a70660978e24023a490b2.tar.zst | |
Include AppImage update info
| -rw-r--r-- | README-maintainer | 3 | ||||
| -rw-r--r-- | appimage/Dockerfile | 2 | ||||
| -rwxr-xr-x | appimage/build-appimage | 7 |
3 files changed, 9 insertions, 3 deletions
diff --git a/README-maintainer b/README-maintainer index c79233ad..be408608 100644 --- a/README-maintainer +++ b/README-maintainer @@ -140,7 +140,8 @@ cp -rLp ~/.gnupg/. /tmp/build/.gnupg docker run --privileged -ti --rm -v /tmp/build:/tmp/build qpdfbuild https://github.com/jberkenbilt/qpdf -b work The AppImage in /tmp/build/qpdf/appimage/build should be called - qpdf-$version-x86_64.AppImage. Move it to the release archive area. + qpdf-$version-x86_64.AppImage. Move the AppImage and AppImage.zsync + files to the release archive area. * Create Windows binary releases. In Windows: * Extract the source distribution diff --git a/appimage/Dockerfile b/appimage/Dockerfile index 174cdc98..c87788b8 100644 --- a/appimage/Dockerfile +++ b/appimage/Dockerfile @@ -3,7 +3,7 @@ RUN apt-get update && \ apt-get -y install screen autoconf git \ build-essential zlib1g-dev libjpeg-dev \ docbook-xsl fop xsltproc \ - inkscape busybox wget fuse && \ + inkscape busybox-static wget fuse && \ apt-get clean && \ rm -rf /var/lib/apt/lists/* COPY entrypoint /entrypoint diff --git a/appimage/build-appimage b/appimage/build-appimage index 28f0710b..d292a0c0 100755 --- a/appimage/build-appimage +++ b/appimage/build-appimage @@ -182,8 +182,12 @@ fi MAJOR_QPDF_VERSION=$( ./appdir/usr/bin/qpdf --version | grep "qpdf version" | awk '{print $3}' ) if [ "$TRAVIS_JOB_NUMBER" != "" ]; then VERSION=${MAJOR_QPDF_VERSION}-continuous-${TRAVIS_JOB_NUMBER}-$(date "+%Y-%m-%d")-git.$(git rev-parse --short HEAD) + UPDATE_FLAG=-g + UPDATE_INFO= else VERSION=${MAJOR_QPDF_VERSION} + UPDATE_FLAG=-u + UPDATE_INFO="gh-releases-zsync|qpdf|qpdf|latest|qpdf-*x86_64.AppImage.zsync" fi # Remove the default AppRun/symlink and use our own custom AppRun script @@ -191,7 +195,8 @@ rm appdir/AppRun; cp $top/appimage/AppRun appdir; chmod a+x appdir/AppRun set +x # Finally, generate the AppImage: -PATH=./squashfs-root/usr/bin:$PATH ./squashfs-root/usr/bin/appimagetool $sign -g $appimagetool_param appdir qpdf-$VERSION-x86_64.AppImage +PATH=./squashfs-root/usr/bin:$PATH ./squashfs-root/usr/bin/appimagetool $sign $UPDATE_FLAG "$UPDATE_INFO" $appimagetool_param appdir qpdf-$VERSION-x86_64.AppImage + # Tell everyone where our result is stored: echo "" |