From 9d26047d8c844d1081029d7b2d0c1d40d450d6a8 Mon Sep 17 00:00:00 2001
From: Frank Halasz <frank@halasz.org>
Date: Wed, 2 Aug 2023 13:41:36 -0700
Subject: [PATCH] WIP fixing up scripts/release_medley.sh and syncing with
 buildLoadup.yml

---
 .gitignore                   |  4 ++
 scripts/release-make-tars.sh | 86 ++++++++++++++++++++++++++++++++++++
 scripts/release-medley.sh    | 49 +++++---------------
 3 files changed, 101 insertions(+), 38 deletions(-)
 create mode 100755 scripts/release-make-tars.sh

diff --git a/.gitignore b/.gitignore
index aeae2bea..223b84a6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,10 @@
 
 tmp/*
 
+# releases directory
+releases/*
+
+
 # all loadup files 
 
 loadups/exports.all
diff --git a/scripts/release-make-tars.sh b/scripts/release-make-tars.sh
new file mode 100755
index 00000000..f62d9236
--- /dev/null
+++ b/scripts/release-make-tars.sh
@@ -0,0 +1,86 @@
+#!/bin/sh
+
+######### Functions ########
+check_exists () {
+  f="$1"
+  if [ -e "${f}" ]
+  then
+    echo "${f}"
+  else
+    echo "Warning: $f does not exist. $(basename ${f}) will not be included in release tars" 1>&2
+    echo " "
+  fi
+}
+######## End Functions #######
+
+
+if [ ! -x run-medley ] ; then
+    echo run from MEDLEYDIR
+    exit 1
+fi
+export MEDLEYDIR=`pwd`
+
+if [ -z "$1" ] ; then
+    tag=medley-$(date +%y%m%d)-$(date +%s)
+else
+    tag="$1"
+fi
+short_tag="${tag#medley-}"
+
+dirname=$(basename "${MEDLEYDIR}")
+if [ "${dirname}" = "medley" ]
+then
+  name_xform=" "
+else
+  uname | grep -q -i Linux
+  if [ $? -eq 0 ]
+  then
+    name_xform="--xform s/^${dirname}/medley/"
+  else
+    name_xform="-s /^${dirname}/medley/"
+  fi
+fi
+
+cd ..
+release_dir="${dirname}"/releases/"${short_tag}"
+mkdir -p "${release_dir}"
+
+echo making releases/${short_tag}/$tag-loadups.tgz
+
+
+tar -c -z -f "${release_dir}"/$tag-loadups.tgz                  \
+    ${name_xform}                                               \
+    "${dirname}"/loadups/lisp.sysout                            \
+    "${dirname}"/loadups/full.sysout                            \
+    $(check_exists "${dirname}/loadups/apps.sysout")            \
+    "${dirname}"/loadups/*.dribble                              \
+    "${dirname}"/loadups/whereis.hash                           \
+    "${dirname}"/loadups/exports.all                            \
+    $(check_exists "${dirname}/loadups/fuller.database")        ;
+
+echo making releases/${short_tag}/$tag-runtime.tgz
+
+tar -c -z -f "${release_dir}"/$tag-runtime.tgz                  \
+    --exclude "*~" --exclude "*#*"                              \
+    --exclude exports.all                                       \
+    ${name_xform}                                               \
+    "${dirname}"/clos                                           \
+    "${dirname}"/docs/dinfo                                     \
+    "${dirname}"/docs/man-page/medley.1.gz                      \
+    "${dirname}"/doctools                                       \
+    "${dirname}"/greetfiles                                     \
+    "${dirname}"/rooms                                          \
+    "${dirname}"/medley                                         \
+    "${dirname}"/run-medley                                     \
+    "${dirname}"/scripts                                        \
+    "${dirname}"/fonts/displayfonts                             \
+    "${dirname}"/fonts/altofonts                                \
+    "${dirname}"/fonts/adobe                                    \
+    "${dirname}"/fonts/postscriptfonts                          \
+    "${dirname}"/fonts/ipfonts                                  \
+    "${dirname}"/library                                        \
+    "${dirname}"/lispusers                                      \
+    "${dirname}"/sources                                        \
+    "${dirname}"/internal                                       ;
+
+echo "Done with release tars"
diff --git a/scripts/release-medley.sh b/scripts/release-medley.sh
index a4fcf0df..3834d7e9 100755
--- a/scripts/release-medley.sh
+++ b/scripts/release-medley.sh
@@ -6,48 +6,21 @@ if [ ! -x run-medley ] ; then
     exit 1
 fi
 
-tag=$1
-
-if [ -z "$tag" ] ; then
-    tag=medley-`date +%y%m%d`
+if [ -z "$1" ] ; then
+    tag=medley-$(date +%y%m%d)-$(date +%s)
+else
+    tag="$1"
 fi
+short_tag="${tag#medley-}"
 
-cd ..
-
-echo making $tag-loadups.tgz
-
-tar cfz medley/tmp/$tag-loadups.tgz                       \
-    medley/loadups/lisp.sysout                            \
-    medley/loadups/full.sysout                            \
-    medley/loadups/fuller.database                        \
-    medley/loadups/*.dribble                              \
-    medley/loadups/whereis.hash                           \
-    medley/loadups//exports.all
-	
-echo making $tag-runtime.tgz
-
-tar cfz medley/tmp/$tag-runtime.tgz                       \
-    --exclude "*~" --exclude "*#*"                        \
-    medley/docs/dinfo                                     \
-    medley/doctools                                       \
-    medley/greetfiles                                     \
-    medley/rooms                                          \
-    medley/run-medley                                     \
-    medley/scripts                                        \
-    medley/fonts/displayfonts  medley/fonts/altofonts     \
-    medley/fonts/adobe                                    \
-    medley/fonts/postscriptfonts                          \
-    medley/library                                        \
-    medley/lispusers                                      \
-    medley/sources                                        \
-    medley/internal
-
-cd medley
+scripts/release-make-tars.sh "${tag}"
 
 echo making release
-sed s/'$tag'/$tag/g < release-notes.md > tmp/release-notes.md
-gh release create $tag -F tmp/release-notes.md -p -t $tag
+sed s/'$tag'/$tag/g < release-notes.md > releases/${short_tag}/release-notes.md
+gh release create $tag -F releases/${short_tag}/release-notes.md -p -t $tag
 
 echo uploading
-gh release upload $tag tmp/$tag-loadups.tgz tmp/$tag-runtime.tgz --clobber
+gh release upload $tag releases/${short_tag}/$tag-loadups.tgz releases/${short_tag}/$tag-runtime.tgz --clobber
+
+echo done