From 426b4ce8565e4f9143c122fd3afbcc22598fc6c4 Mon Sep 17 00:00:00 2001
From: Jay Berkenbilt <ejb@ql.org>
Date: Sat, 18 Dec 2021 11:19:20 -0500
Subject: Update documentation build/installation

---
 build-scripts/build-mac      |  3 ---
 build-scripts/build-windows  |  2 +-
 build-scripts/make-distfiles | 11 -----------
 build-scripts/prebuild       | 12 ++++++++++++
 4 files changed, 13 insertions(+), 15 deletions(-)
 delete mode 100755 build-scripts/make-distfiles
 create mode 100755 build-scripts/prebuild

(limited to 'build-scripts')

diff --git a/build-scripts/build-mac b/build-scripts/build-mac
index eb41f817..497ea569 100755
--- a/build-scripts/build-mac
+++ b/build-scripts/build-mac
@@ -8,9 +8,6 @@ cd jpeg-*
 make -k
 sudo make install
 cd ..
-if [ -f distfiles/distfiles.zip ]; then
-    unzip distfiles/distfiles.zip
-fi
 ./configure --enable-werror --enable-show-failed-test-output
 make -j$(nproc) -k
 make -k check
diff --git a/build-scripts/build-windows b/build-scripts/build-windows
index 992c54ae..81543668 100755
--- a/build-scripts/build-windows
+++ b/build-scripts/build-windows
@@ -20,7 +20,7 @@ if [[ $tool == mingw ]]; then
 elif [[ $tool == msvc ]]; then
     cl
 fi
-unzip distfiles.zip
+unzip doc.zip
 unzip qpdf-external-libs-bin.zip
 cwd=`pwd`
 PATH=$cwd/libqpdf/build:$PATH
diff --git a/build-scripts/make-distfiles b/build-scripts/make-distfiles
deleted file mode 100755
index f30f4595..00000000
--- a/build-scripts/make-distfiles
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-cd $(dirname $0)/..
-set -ex
-sudo apt-get update
-sudo apt-get -y install \
-   autoconf build-essential zlib1g-dev libjpeg-dev \
-   python3-pip texlive-latex-extra latexmk inkscape imagemagick
-pip3 install sphinx
-./configure --enable-doc-maintenance
-make -j$(nproc) distfiles.zip
-build-scripts/download-external-libs
diff --git a/build-scripts/prebuild b/build-scripts/prebuild
new file mode 100755
index 00000000..f8d1f61b
--- /dev/null
+++ b/build-scripts/prebuild
@@ -0,0 +1,12 @@
+#!/bin/bash
+cd $(dirname $0)/..
+set -ex
+sudo apt-get update
+sudo apt-get -y install \
+   autoconf build-essential zlib1g-dev libjpeg-dev \
+   python3-pip texlive-latex-extra latexmk inkscape imagemagick
+pip3 install sphinx
+./configure --enable-doc-maintenance
+make -j$(nproc) build_manual
+zip -r doc.zip doc/*html doc/*.pdf
+build-scripts/download-external-libs
-- 
cgit v1.2.3-54-g00ecf