From b152b3c9a9d095730c2f8aa7a7ce64e195327bce Mon Sep 17 00:00:00 2001 From: Jay Berkenbilt Date: Sat, 8 May 2021 09:12:16 -0400 Subject: [PATCH] Include manuals in windows distributions again (fixes #521) --- .github/workflows/main.yml | 1 + ChangeLog | 3 +++ build-scripts/build-windows | 4 +--- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3f86ef9..a6b5f25 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -69,6 +69,7 @@ jobs: uses: actions/download-artifact@v2 with: name: distfiles + path: . - name: 'Download external libs' uses: actions/download-artifact@v2 with: diff --git a/ChangeLog b/ChangeLog index 2c8499d..b4c0017 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2021-05-08 Jay Berkenbilt + * Fix problem that caused the generated manual from being included + in the Windows distributions. Fixes #521. + * Fix 11-year-old bug of leaving unreferenced objects in preserved object streams. Fixes #520. diff --git a/build-scripts/build-windows b/build-scripts/build-windows index f67b8f2..992c54a 100755 --- a/build-scripts/build-windows +++ b/build-scripts/build-windows @@ -20,9 +20,7 @@ if [[ $tool == mingw ]]; then elif [[ $tool == msvc ]]; then cl fi -if [ -f distfiles/distfiles.zip ]; then - unzip distfiles/distfiles.zip -fi +unzip distfiles.zip unzip qpdf-external-libs-bin.zip cwd=`pwd` PATH=$cwd/libqpdf/build:$PATH -- libgit2 0.21.4