doc: reorg part 8 - fix update*.sh scripts

documentation/update-opendylan.org.sh

@@ -13,9 +13,9 @@ dest_dir=/var/www/opendylan.org
 # dependencies, etc.
 git pull --rebase origin master
 
-${exe_dir}/update.sh "${dest_dir}"
+${exe_dir}/update.sh "${exe_dir}/source/package/index.rst" "${dest_dir}"
 
-echo "Done updating opendylan.org in ${dest_DIR}."
+echo "Done updating opendylan.org in ${dest_dir}."
 bzip2 $logfile
 # Keep 10 days of logs.
 find /var/log -name 'update-opendylan.org.*' -mtime +10 -print -exec rm {} \;

documentation/update.sh

@@ -1,4 +1,4 @@
-#!/bin/bash -xe
+#!/bin/bash
 
 # This script builds the opendylan.org website. It does a clean build of the
 # docs each time and copies files to ${dest_dir}, meaning that there could be
@@ -7,50 +7,58 @@
 # /var/www/opendylan.org/downloads is handled specially. New versions of Open
 # Dylan should be copied there by hand, or ... we could stop doing that.
 
-# Note the -e in the #! line above causes this script to abort on any command
-# failure.
+echo ""
 
-if [[ $# -ne 1 ]]; then
-    echo "Usage: `basename $0` dest_dir"
-    echo "  dest_dir:    Directory in which to place the built website documents."
-    echo "               Example: /var/www/opendylan.org"
+if [[ $# -ne 2 ]]; then
+    echo "Usage: `basename $0` index-file dest"
+    echo "  INDEX-FILE: Pathname to the documentation/source/package/index.rst file"
+    echo "    in the opendylan repository checkout.  This file will be modified to"
+    echo "    contain the package docs."
+    echo "  DEST: Directory into which the website content should be copied."
+    echo "    Example: /var/www/opendylan.org"
     exit 2
 fi
 
-# Get latest gendoc, DRM, DPG, etc, as specified in dylan-package.json.
-echo "Updating the Dylan workspace to get latest packages..."
-dylan update
-dylan build gendoc
+index_file="$1"
+dest_dir="$2"
 
-website_dir=$(realpath $(dirname "$0"))
+if [[ ! -r "${index_file}" ]]; then
+    echo "${index_file} doesn't exist; aborting."
+    exit 2
+fi
 
-dest_dir=$(realpath "$1")
 if [[ ! -d "$dest_dir" ]]; then
-    echo "dest_dir ${dest_dir} doesn't exist, aborting."
+    echo "${dest_dir} doesn't exist, aborting."
     exit 2
 fi
 
-gendoc_exe=${website_dir}/_build/bin/gendoc
+set -e   # die on any error
 
-# Packages are downloaded here.
-gendoc_work_dir=$(mktemp -d gendoc-XXXX)
+opendylan_dir=$(realpath "${index_file}/../../../..")
+gendoc_exe="${opendylan_dir}/_build/bin/gendoc"
 
-# Doc for each package is generated in
-# ${gendoc_output_dir}/package/<package-name>
-gendoc_output_dir=${website_dir}/source
-echo "Generating package docs in ${gendoc_output_dir}..."
+# Get latest gendoc, DRM, etc, as specified in dylan-package.json.
+echo "Updating the Dylan workspace to get latest package dependencies..."
+cd "${opendylan_dir}/documentation"
+dylan update
+dylan build gendoc
 
-rm -rf ${gendoc_output_dir}/package
-${gendoc_exe} -o ${gendoc_output_dir}
+# Doc for each package is generated in ${package_dir}/<package-name>
+package_dir=${opendylan_dir}/documentation/source/package
+echo "Generating package docs in ${package_dir}..."
 
-echo "Building website..."
-make html
-rsync -avz build/html/ ${dest_dir}
+for file in ${package_dir}/*; do
+    if [[ "$(basename "$file")" != "index.rst" ]]; then
+        echo "rm -rf ${file}"
+        rm -rf "$file"
+    fi
+done
+${gendoc_exe} ${index_file}
+
+echo "Building opendylan.org ..."
+make --directory ${opendylan_dir}/documentation html
+rsync -avz ${opendylan_dir}/documentation/_build/html/ ${dest_dir}
 
 echo "Updating DRM files..."
 mkdir -p ${dest_dir}/books/drm
-rsync -avz _packages/dylan-reference-manual/current/src/source/  ${dest_dir}/books/drm
-
-echo "Updating DPG files..."
-mkdir -p ${dest_dir}/books/dpg
-rsync -avz _packages/dylan-programming-book/current/src/source/  ${dest_dir}/books/dpg
+rsync -avz ${opendylan_dir}/_packages/dylan-reference-manual/current/src/source/  ${dest_dir}/books/drm