Merge pull request #1342 from Interlisp/PDFSTREAM

Pdfstream

.github/workflows/Dockerfile_medley

@@ -7,7 +7,7 @@
 #
 # ******************************************************************************
 
-FROM ubuntu:22.10
+FROM ubuntu:22.04
 ARG TARGETPLATFORM
 
 #  Handle ARGs, ENV variables, and LABELs
@@ -31,6 +31,12 @@ ENV LANG=C.UTF-8
 # Copy over the release deb files
 ADD ./*.deb /tmp
 
+# Get tzdata setup ahead of time
+RUN apt-get update; \
+    ln -fs /usr/share/zoneinfo/America/Los_Angeles /etc/localtime; \
+    DEBIAN_FRONTEND=noninteractive apt-get install -y tzdata; \
+    dpkg-reconfigure --frontend noninteractive tzdata
+
 # Install Medley/Maiko and add tightvnc server and xclip to the image
 RUN apt-get update                                               \
     && apt-get install -y apt-utils                              \ 
@@ -51,8 +57,8 @@ RUN apt-get update                                               \
                echo "x86_64";                                    \
            fi                                                    \
           )                                                      \
-    && deb="medley-full-${MEDLEY_RELEASE#medley-}"               \
-    && deb=${deb}_${MAIKO_RELEASE#maiko-}-linux-${p}.deb         \
+    && deb="medley-full-linux-${p}-${MEDLEY_RELEASE#medley-}"    \
+    && deb=${deb}_${MAIKO_RELEASE#maiko-}.deb                    \
     && apt-get install -y /tmp/${deb}                            \
     && chown --recursive root:root /usr/local/interlisp          \
     && (if [ -n "$(which unminimize)" ]; then (yes | unminimize); fi)

.github/workflows/buildDocker.yml

@@ -20,7 +20,7 @@ name: 'Build/Push Docker Image'
 # Run this workflow on ...
 on:
   workflow_dispatch:
-    inputs: 
+    inputs:
       draft:
         description: "Mark this as a draft release"
         type: choice
@@ -33,7 +33,7 @@ on:
         options:
         - 'false'
         - 'true'
-  
+
   workflow_call:
     outputs:
       successful:
@@ -59,7 +59,7 @@ on:
 defaults:
   run:
     shell: bash
-    
+
 
 jobs:
 
@@ -86,7 +86,7 @@ jobs:
               echo "draft=${{ inputs.draft }}" >> $GITHUB_OUTPUT;
               echo "force=${{ inputs.force }}" >> $GITHUB_OUTPUT;
           fi
-        
+
 
 
 ######################################################################################
@@ -100,7 +100,7 @@ jobs:
     outputs:
       release_not_built: ${{ steps.check.outputs.release_not_built }}
 
-    steps: 
+    steps:
       # Checkout the actions for this repo owner
       - name: Checkout Actions
         uses: actions/checkout@v3
@@ -110,7 +110,7 @@ jobs:
       - run: mv ./Actions_${{ github.sha }}/actions ../actions && rm -rf ./Actions_${{ github.sha }}
 
       # Check if build already run for this commit
-      - name: Build already completed? 
+      - name: Build already completed?
         id: check
         continue-on-error: true
         uses: ./../actions/check-sentry-action
@@ -131,12 +131,12 @@ jobs:
     if: |
       needs.sentry.outputs.release_not_built == 'true'
       || needs.inputs.outputs.force == 'true'
-    
+
     steps:
       # Checkout latest commit
       - name: Checkout Medley
         uses: actions/checkout@v3
-  
+
       # Find latest release (draft or normal)
       # and download its assets
       - name: Download linux debs from latest (draft) release
@@ -160,7 +160,7 @@ jobs:
       - name: Get info about Miako and Medley releases
         id: release_info
         run: |
-          regex="^[^0-9]*\([^_]*\)_\([^-]*-[^-]*\)-\([^-]*\)-\([^.]*\).*\$"
+          regex="^medley-full-[^-]*-[^-]*-\([^_]*\)_\(.*\).deb\$"
           ls -1 release_debs | head -n 1 > debname.tmp
           medley_release="medley-$(sed -e "s/${regex}/\1/" debname.tmp)"
           maiko_release="maiko-$(sed -e "s/${regex}/\2/" debname.tmp)"
@@ -168,6 +168,8 @@ jobs:
           echo "MEDLEY_RELEASE=${medley_release}"     >> ${GITHUB_ENV}
           echo "MAIKO_RELEASE=${maiko_release}"       >> ${GITHUB_ENV}
 
+          # regex="^[^0-9]*\([^_]*\)_\([^-]*-[^-]*\)-\([^-]*\)-\([^.]*\).*\$"
+
       # Set repo env variables
       - name: Set repo/docker env variables
         id: repo_env
@@ -176,10 +178,10 @@ jobs:
           docker_namespace="$(echo "${{ github.repository_owner }}" | tr '[:upper:]' '[:lower:]')"
           docker_image="${docker_namespace}/${repo_name}"
           if [ "${{ needs.inputs.outputs.draft }}" = "false" ];
-          then 
+          then
               docker_tags="${docker_image}:latest,${docker_image}:${MEDLEY_RELEASE#*-}_${MAIKO_RELEASE#*-}"
               platforms="linux/amd64,linux/arm64"
-          else 
+          else
               docker_tags="${docker_image}:draft"
               platforms="linux/amd64"
           fi
@@ -242,7 +244,7 @@ jobs:
 
     needs: [inputs, sentry, build_and-push]
 
-    steps: 
+    steps:
       # Checkout the actions for this repo owner
       - name: Checkout Actions
         uses: actions/checkout@v3
@@ -257,10 +259,10 @@ jobs:
         uses: ./../actions/set-sentry-action
         with:
           tag: "docker"
-     
+
       - name: Output
         id: output
         run: |
           echo "build_successful='true'" >> ${GITHUB_OUTPUT}
-          
+
 ######################################################################################

.github/workflows/buildLoadup.yml

@@ -60,7 +60,7 @@ defaults:
 
 jobs:
 
-######################################################################################
+# JOB: inputs #######################################################################
 
   # Regularize the inputs so they can be referenced the same way whether they are
   # the result of a workflow_dispatch or a workflow_call
@@ -85,8 +85,7 @@ jobs:
           fi
 
 
-
-######################################################################################
+# JOB: sentry #######################################################################
 
   # Use sentry-action to determine if this release has already been built
   # based on the latest commit to the repo
@@ -114,11 +113,11 @@ jobs:
         with:
           tag: "loadup"
 
-######################################################################################
 
+# JOB: loadup #######################################################################
 
   #
-  # Do the loadup
+  # Do the loadup and push to release on github
   # 
 
   loadup:
@@ -130,6 +129,9 @@ jobs:
       medley_release_tag: ${{ steps.job_outputs.outputs.MEDLEY_RELEASE_TAG }}
       medley_short_release_tag: ${{ steps.job_outputs.outputs.MEDLEY_SHORT_RELEASE_TAG }}
       debs_filename_base: ${{ steps.debs.outputs.DEBS_FILENAME_BASE }}
+      maiko_release_tag: ${{ steps.job_outputs.outputs.MAIKO_RELEASE_TAG }}
+      artifacts_filename_template: ${{ steps.job_outputs.outputs.ARTIFACTS_FILENAME_TEMPLATE }}
+      release_url: ${{ steps.push.outputs.html_url }}
 
     needs: [inputs, sentry]
     if: |
@@ -154,24 +156,36 @@ jobs:
         id: tag
         uses: ./../actions/release-tag-action
 
-      # Get Maiko release information, retrieves the name of the latest
+      # Get Maiko release information, retrieves the name of the latest (draft)
       # release.  Used to download the correct Maiko release
-      - name: Get Maiko Release Information
+      # Find latest release (draft or normal)
+      - name: Get maiko release information
         id: maiko
-        uses: abatilo/release-info-action@v1.3.2
-        with:
-          owner: ${{ github.repository_owner }}
-          repo: maiko
-
+        run: |
+          tag=""
+          if [ "${{ needs.inputs.outputs.draft }}" = "true" ];
+          then
+            gh release list --repo ${{ github.repository_owner }}/maiko | grep Draft >/tmp/releases-$$
+            if [ $? -eq 0 ];
+            then
+              tag=$(head -n 1 /tmp/releases-$$ | awk '{ print $3 }')
+            fi
+          fi
+          if [ -z "${tag}" ];
+          then
+            tag=$(gh release list --repo ${{ github.repository_owner }}/maiko | grep Latest | head -n 1 | awk '{ print $3 }')
+          fi
+          echo "maiko_tag=${tag}" >> ${GITHUB_OUTPUT}
+        env:
+          GITHUB_TOKEN: ${{ secrets.MAIKO_TOKEN }}
       # Setup environment variables & establish job outputs
       - name: Setup Environment Variables
         run: |
           echo "build_time=$(date -u +'%Y-%m-%dT%H:%M:%SZ')" >> ${GITHUB_OUTPUT}
-          echo "TARBALL_DIR=installers/deb/tmp/tarballs" >>${GITHUB_ENV}
-          echo "DEBS_DIR=installers/deb/debs" >>${GITHUB_ENV}
-          echo "TARS_DIR=installers/deb/tars" >>${GITHUB_ENV}
+          echo "TARBALL_DIR=/tmp/tarballs" >>${GITHUB_ENV}
           echo "MEDLEY_RELEASE_TAG=${RELEASE_TAG}" >>${GITHUB_ENV}
-          echo "MAIKO_RELEASE_TAG=${{ steps.maiko.outputs.latest_tag }}" >>${GITHUB_ENV}
+          echo "MAIKO_RELEASE_TAG=${{ steps.maiko.outputs.maiko_tag }}" >>${GITHUB_ENV}
+          echo "ARTIFACTS_FILENAME_TEMPLATE=medley-full-@@PLATFORM@@-@@ARCH@@-@@MEDLEY.RELEASE@@_@@MAIKO.RELEASE@@" >>${GITHUB_ENV}
       - name: More Environment Variables
         run: |
           echo "MEDLEY_SHORT_RELEASE_TAG=${MEDLEY_RELEASE_TAG#medley-}" >>${GITHUB_ENV}
@@ -182,27 +196,26 @@ jobs:
       - name: Establish job outputs
         id: job_outputs
         run: |
-          echo "COMBINED_RELEASE_TAG=${COMBINED_RELEASE_TAG}" >> $GITHUB_OUTPUT;
-          echo "MEDLEY_RELEASE_TAG=${MEDLEY_RELEASE_TAG}" >> $GITHUB_OUTPUT;
-          echo "MEDLEY_SHORT_RELEASE_TAG=${MEDLEY_SHORT_RELEASE_TAG}" >> $GITHUB_OUTPUT;
+          echo "COMBINED_RELEASE_TAG=${COMBINED_RELEASE_TAG}" >> ${GITHUB_OUTPUT}
+          echo "MEDLEY_RELEASE_TAG=${MEDLEY_RELEASE_TAG}" >> ${GITHUB_OUTPUT}
+          echo "MEDLEY_SHORT_RELEASE_TAG=${MEDLEY_SHORT_RELEASE_TAG}" >> ${GITHUB_OUTPUT}
+          echo "MAIKO_RELEASE_TAG=${MAIKO_RELEASE_TAG}" >> $GITHUB_OUTPUT;
+          echo "ARTIFACTS_FILENAME_TEMPLATE=${ARTIFACTS_FILENAME_TEMPLATE}" >> ${GITHUB_OUTPUT}
 
       # Setup some needed dirs in workspace
       - name: Create work dirs
         run: mkdir -p ${TARBALL_DIR}
 
-      # Download Maiko Release Assets
+      # Download Maiko Release Assets and untar it
       - name: Download Release Assets
-        uses: robinraju/release-downloader@v1.6
-        with:
-          repository: ${{ github.repository_owner }}/maiko
-          token: ${{ secrets.GITHUB_TOKEN }}
-          latest: true
-          out-file-path: ${{ env.TARBALL_DIR }}
-          fileName: "${{ env.MAIKO_RELEASE_TAG }}-linux.*.tgz"
-
-      - name: Untar Maiko Release for use in loadup
         run: |
-          tar -xzf "${TARBALL_DIR}/${{ env.MAIKO_RELEASE_TAG }}-linux.x86_64.tgz"
+          gh release download ${MAIKO_RELEASE_TAG} \
+                              -D ${TARBALL_DIR}    \
+                              --repo ${{ github.repository_owner }}/maiko \
+                              -p '*.tgz'
+          tar -xzf "${TARBALL_DIR}/${MAIKO_RELEASE_TAG}-linux.x86_64.tgz"
+        env:
+          GITHUB_TOKEN: ${{ secrets.MAIKO_TOKEN }}
 
       # Checkout Notecards and tar it in the tarballsdir
       - name: Checkout Notecards
@@ -210,11 +223,11 @@ jobs:
         with:
           repository: ${{ github.repository_owner }}/notecards
           path: ./notecards
-      - run: mv ./notecards ../notecards
       - name: Tar notecards into tarball dir
         run: |
-          cd ..
-          tar cfz medley/${TARBALL_DIR}/notecards.tgz notecards
+          mv ./notecards ../notecards
+          cd ../notecards
+          git archive --format=tgz --output="${TARBALL_DIR}/notecards.tgz" --prefix=notecards/ main
 
       # Install vnc
       - name: Install vnc
@@ -224,55 +237,13 @@ jobs:
         run: |
           Xvnc -geometry 1280x720 :0 &
           export DISPLAY=":0"
-          PATH="$PWD/maiko:$PATH"
           scripts/loadup-all.sh -apps
+          scripts/loadup-db.sh
 
-      - name: Build loadups release tar
+      - name: Build release tars
         run: |
-          cd ..
-          mkdir -p medley/${TARBALL_DIR}
-          tar cfz medley/${TARBALL_DIR}/${MEDLEY_RELEASE_TAG}-loadups.tgz        \
-            medley/loadups/lisp.sysout               \
-            medley/loadups/full.sysout               \
-            medley/loadups/apps.sysout               \
-            medley/loadups/whereis.hash              \
-            medley/library/exports.all
-
-      - name: Build runtime release tar
-        run: |
-          cd ..
-          mkdir -p medley/${TARBALL_DIR}
-          tar cfz medley/${TARBALL_DIR}/${MEDLEY_RELEASE_TAG}-runtime.tgz          \
-                     --exclude "*~" --exclude "*#*"              \
-                     --exclude exports.all                       \
-                     medley/clos                                 \
-                     medley/docs/dinfo                           \
-                     medley/docs/man-page/medley.1.gz            \
-                     medley/doctools                             \
-                     medley/greetfiles                           \
-                     medley/rooms                                \
-                     medley/medley                               \
-                     medley/run-medley                           \
-                     medley/scripts                              \
-                     medley/fonts/displayfonts                   \
-                     medley/fonts/altofonts                      \
-                     medley/fonts/adobe                          \
-                     medley/fonts/postscriptfonts                \
-                     medley/fonts/ipfonts                        \
-                     medley/library                              \
-                     medley/lispusers                            \
-                     medley/sources                              \
-                     medley/internal
-
-
-      # Build the deb files as well as the tgz files
-      - name: Build .deb files for 3 architectures
-        id: debs
-        run: |
-          cd installers/deb
-          debs_filename_base=$(./build_deb.sh)
-          echo "DEBS_FILENAME_BASE=${debs_filename_base}" >> $GITHUB_ENV;
-          echo "DEBS_FILENAME_BASE=${debs_filename_base}" >> $GITHUB_OUTPUT;
+          scripts/release-make-tars.sh "${MEDLEY_RELEASE_TAG}"
+          mv releases/"${MEDLEY_SHORT_RELEASE_TAG}"/*.tgz "${TARBALL_DIR}"
 
       # Push the release up to github releases
       - name: Delete existing release with same tag (if any)
@@ -282,29 +253,37 @@ jobs:
         continue-on-error: true
 
       - name: Push the release
-        id: push_release
+        id: push
         uses: ncipollo/release-action@v1
         with:
           allowUpdates: true
           artifacts:
+            # ${{ env.TARBALL_DIR }}/notecards.tgz,
             ${{ env.TARBALL_DIR }}/${{ env.MEDLEY_RELEASE_TAG }}-loadups.tgz,
-            ${{ env.TARBALL_DIR }}/${{ env.MEDLEY_RELEASE_TAG }}-runtime.tgz,
-            ${{ env.DEBS_DIR }}/*.deb,
-            ${{ env.TARS_DIR }}/*.tgz
+            ${{ env.TARBALL_DIR }}/${{ env.MEDLEY_RELEASE_TAG }}-runtime.tgz
           tag: ${{ env.MEDLEY_RELEASE_TAG }}
           draft: ${{ needs.inputs.outputs.draft }}
           prerelease: false
           generateReleaseNotes: true
           token: ${{ secrets.GITHUB_TOKEN }}
 
+      # Save the tarball directory for subsequent jobs
+      - name: Save tarballs
+        uses: actions/upload-artifact@v3
+        with:
+          name: tarballs
+          path: ${{ env.TARBALL_DIR }}
+          if-no-files-found: error
+
+
+# JOB: linux_installer ##############################################################
 
   #
-  # Create the Windows installer, push it up to the release on github and
-  # update the downloads page on OIO
+  # Create the linux installers (.deb and .tgz) and push to release on github
   #
-  windows_installer:
+  linux_installer:
 
-    runs-on: windows-latest
+    runs-on: ubuntu-latest
 
     needs: [inputs, sentry, loadup]
     if: |
@@ -312,6 +291,157 @@ jobs:
       || needs.inputs.outputs.force == 'true'
 
     steps:
+
+      # Checkout latest commit
+      - name: Checkout Medley
+        uses: actions/checkout@v3
+
+      # Environment variables
+      - name: Environment variables
+        run: |
+          echo "DEBS_DIR=installers/deb/debs" >>${GITHUB_ENV}
+          echo "TARS_DIR=installers/deb/tars" >>${GITHUB_ENV}
+          echo "TARBALL_DIR=installers/deb/tmp/tarballs" >>${GITHUB_ENV}
+          echo "MEDLEY_RELEASE_TAG=${{ needs.loadup.outputs.medley_release_tag }}" \
+                >>${GITHUB_ENV}
+          echo "ARTIFACTS_FILENAME_TEMPLATE=${{ needs.loadup.outputs.artifacts_filename_template }}" >>${GITHUB_ENV}
+
+      # Create taball dir
+      - run: mkdir -p ${TARBALL_DIR}
+
+      #  Get the tarballs
+      - name: Get tarballs
+        uses: actions/download-artifact@v3
+        with:
+          name: tarballs
+          path: ${{ env.TARBALL_DIR }}
+
+      # Build the deb files as well as the tgz files
+      - name: Build .deb files for 3 architectures
+        id: debs
+        run: |
+          cd installers/deb
+          ./build_deb.sh
+
+      # Push the debs and tgz up to github releases
+      - name: Push the release
+        id: push_release
+        uses: ncipollo/release-action@v1
+        with:
+          allowUpdates: true
+          artifacts:
+            ${{ env.DEBS_DIR }}/*.deb,
+            ${{ env.TARS_DIR }}/*.tgz
+          tag: ${{ env.MEDLEY_RELEASE_TAG }}
+          token: ${{ secrets.GITHUB_TOKEN }}
+          omitBodyDuringUpdate: true
+          omitDraftDuringUpdate: true
+          omitNameDuringUpdate: true
+          omitPrereleaseDuringUpdate: true
+
+      - name: Rename medley tar for the x86_64 platform
+        run: |
+            cd ${{ env.TARS_DIR }}
+            mv  medley-full-linux-x86_64-*.tgz medley.tgz
+
+      - name: Save medley tar for use in cygwin installers
+        uses: actions/upload-artifact@v3
+        with:
+          name: medley-tar
+          path: |
+            ${{ env.TARS_DIR }}/medley.tgz
+
+
+# JOB: macos_installer ##############################################################
+
+  #
+  # Create the macos installers (.dmg and .zip) and push to release on github
+  #
+  macos_installer:
+
+    runs-on: macos-12
+
+    needs: [inputs, sentry, loadup]
+    if: |
+      needs.sentry.outputs.release_not_built == 'true'
+      || needs.inputs.outputs.force == 'true'
+#    if: false
+
+    defaults:
+      run:
+        shell: bash
+
+    steps:
+
+      # Checkout latest commit
+      - name: Checkout Medley
+        uses: actions/checkout@v3
+
+      # Environment variables
+      - name: Environment variables
+        run: |
+          MACOS_DIR=installers/macos
+          echo "MACOS_DIR=${MACOS_DIR}" >>${GITHUB_ENV}
+          echo "ARTIFACTS_DIR=${MACOS_DIR}/artifacts" >>${GITHUB_ENV}
+          echo "TARBALL_DIR=${MACOS_DIR}/tmp/tarballs" >>${GITHUB_ENV}
+          echo "MEDLEY_RELEASE_TAG=${{ needs.loadup.outputs.medley_release_tag }}" >>${GITHUB_ENV}
+          echo "ARTIFACTS_FILENAME_TEMPLATE=${{ needs.loadup.outputs.artifacts_filename_template }}" >>${GITHUB_ENV}
+
+      # Create tarball dir
+      - run: mkdir -p ${TARBALL_DIR}
+
+      #  Get the tarballs
+      - name: Get tarballs
+        uses: actions/download-artifact@v3
+        with:
+          name: tarballs
+          path: ${{ env.TARBALL_DIR }}
+
+      # Build the .dmg and .zip files
+      - name: Build .dmg & .zip files
+        id: dmg-zip
+        run: |
+          cd ${MACOS_DIR}
+          ./build_artifacts.sh
+
+      # Push the .dmg and .zip up to github releases
+      - name: Push the release
+        id: push_release
+        uses: ncipollo/release-action@v1
+        with:
+          allowUpdates: true
+          artifacts:
+            # 2023-07-20 not yet building dmg -- ${{ env.ARTIFACTS_DIR }}/*.dmg,
+            ${{ env.ARTIFACTS_DIR }}/*.zip
+          tag: ${{ env.MEDLEY_RELEASE_TAG }}
+          token: ${{ secrets.GITHUB_TOKEN }}
+          omitBodyDuringUpdate: true
+          omitDraftDuringUpdate: true
+          omitNameDuringUpdate: true
+          omitPrereleaseDuringUpdate: true
+
+
+
+# JOB: cygwin_installer #############################################################
+
+  #
+  # Create the Windows installer, push it up to the release on github and
+  # update the downloads page on OIO
+  #
+  cygwin_installer:
+
+    runs-on: windows-2022
+
+    needs: [inputs, sentry, loadup, linux_installer]
+    if: |
+      needs.sentry.outputs.release_not_built == 'true'
+      || needs.inputs.outputs.force == 'true'
+
+    outputs:
+      cygwin_installer: ${{ steps.compile_iss.outputs.CYGWIN_INSTALLER }}
+
+    steps:
+
       # Checkout latest commit
       - name: Checkout Medley
         uses: actions/checkout@v3
@@ -326,24 +456,59 @@ jobs:
           echo "MEDLEY_RELEASE_TAG=$mrt" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append
           $msrt="${{ needs.loadup.outputs.medley_short_release_tag }}"
           echo "MEDLEY_SHORT_RELEASE_TAG=$msrt" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append
+          $aft="${{ needs.loadup.outputs.artifacts_filename_template }}"
+          echo "ARTIFACTS_FILENAME_TEMPLATE=$aft" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append
           $debs="${{ needs.loadup.outputs.debs_filename_base }}"
           echo "DEBS_FILENAME_BASE=$debs" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append
 
-      # Download vnc viewer
-      - name: Download vncviewer
+      # Retrieve medley tars from artifact store
+      - name: Retrieve medley tar
+        uses: actions/download-artifact@v3
+        with:
+          name: medley-tar
+          path: installers/cygwin/
+
+      # Download maiko cygwin build
+      - name: Retrieve maiko cygwin build
+        shell: powershell
+        env:
+          GH_TOKEN: ${{ secrets.MAIKO_TOKEN }}
+        run: |
+          gh release download ${{ needs.loadup.outputs.maiko_release_tag }} --repo interlisp/maiko --pattern ${{ needs.loadup.outputs.maiko_release_tag }}-cygwin.x86_64.tgz --output installers\cygwin\maiko-cygwin.x86_64.tgz
+
+      # Download cygwin installer to be included by medley.iss
+      - name: Download cygwin installer
+        id: cygwin
         shell: powershell
         run: |
-          $url = "https://sourceforge.net/projects/tigervnc/files/stable/1.12.0/vncviewer64-1.12.0.exe"
-          $output = "installers\win\vncviewer64-1.12.0.exe"
-          (New-Object System.Net.WebClient).DownloadFile($url, $output)
+          wget https://cygwin.com/setup-x86_64.exe -OutFile installers\cygwin\setup-x86_64.exe
+
+      # Download vnc viewer
+      #- name: Download vncviewer
+      #  shell: powershell
+      #  run: |
+      #    $url = "https://sourceforge.net/projects/tigervnc/files/stable/1.12.0/vncviewer64-1.12.0.exe"
+      #    $output = "installers\win\vncviewer64-1.12.0.exe"
+      #    (New-Object System.Net.WebClient).DownloadFile($url, $output)
 
       # Run iscc.exe to compile the installer
-      - name: Compile medley.iss
+      #- name: Compile medley.iss
+      #  shell: powershell
+      #  run: |
+      #     iscc installers\win\medley.iss
+      #     $filename="medley-install_${env:COMBINED_RELEASE_TAG}_x64.exe"
+      #     echo "INSTALLER_FILENAME=$filename" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append
+
+      # Run iscc.exe to compile the installer
+      - name: Compile cygwin_medley.iss
+        id: compile_iss
         shell: powershell
         run: |
-           iscc installers\win\medley.iss
-           $filename="medley-install_${env:COMBINED_RELEASE_TAG}_x64.exe"
-           echo "INSTALLER_FILENAME=$filename" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append
+           $Env:CYGWIN_INSTALLER_BASE="medley-full-cygwin-x86_64-${env:COMBINED_RELEASE_TAG}"
+           $CYGWIN_INSTALLER="${Env:CYGWIN_INSTALLER_BASE}.exe"
+           echo "CYGWIN_INSTALLER=$CYGWIN_INSTALLER" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append
+           echo "CYGWIN_INSTALLER=$CYGWIN_INSTALLER" | Out-File -FilePath $Env:GITHUB_OUTPUT -Encoding utf8 -Append
+           iscc installers\cygwin\medley.iss
 
       # Upload windows installer to release
       - name: Upload windows installer to release
@@ -351,7 +516,7 @@ jobs:
         uses: ncipollo/release-action@v1
         with:
           allowUpdates: true
-          artifacts: installers/win/${{ env.INSTALLER_FILENAME }}
+          artifacts: installers/cygwin/${{ env.CYGWIN_INSTALLER }}
           tag: ${{ env.MEDLEY_RELEASE_TAG }}
           token: ${{ secrets.GITHUB_TOKEN }}
           omitBodyDuringUpdate: true
@@ -359,18 +524,65 @@ jobs:
           omitNameDuringUpdate: true
           omitPrereleaseDuringUpdate: true
 
-      # Install the OpenSSH Client
-      - name: Install the OpenSSH Client
-        shell: powershell
+
+# JOB: downloads_page ################################################################
+
+  #
+  # Update the downloads page on OIO
+  #
+
+  downloads_page:
+
+    runs-on: ubuntu-latest
+
+    needs: [inputs, sentry, loadup, linux_installer, macos_installer, cygwin_installer]
+    if: |
+      needs.sentry.outputs.release_not_built == 'true'
+      || needs.inputs.outputs.force == 'true'
+
+    steps:
+
+      # Environment variables
+      - name: Environment Varibales (from other jobs)
         run: |
-          Add-WindowsCapability -Online -Name OpenSSH.Client~~~~0.0.1.0
+          crt="${{ needs.loadup.outputs.combined_release_tag }}"
+          echo "COMBINED_RELEASE_TAG=${crt}" >>${GITHUB_ENV}
+          mrt="${{ needs.loadup.outputs.medley_release_tag }}"
+          echo "MEDLEY_RELEASE_TAG=${mrt}" >>${GITHUB_ENV}
+          msrt="${{ needs.loadup.outputs.medley_short_release_tag }}"
+          echo "MEDLEY_SHORT_RELEASE_TAG=${msrt}" >>${GITHUB_ENV}
+          cyginst="${{ needs.cygwin_installer.outputs.cygwin_installer }}"
+          echo "CYGWIN_INSTALLER=${cyginst}" >>${GITHUB_ENV}
+
+      # Checkout latest commit
+      - name: Checkout Medley
+        uses: actions/checkout@v3
+
+
+      # Upload a dummy file to release
+      # Needed since download url of the release changes on every update
+      # So this will be the final update before creating downloads page
+      # and we can use its url for the page
+      - run: echo "placeholder" >placeholder.txt
+      - name: Upload windows placeholder.txt to release
+        id: pushph
+        uses: ncipollo/release-action@v1
+        with:
+          allowUpdates: true
+          artifacts: placeholder.txt
+          tag: ${{ env.MEDLEY_RELEASE_TAG }}
+          token: ${{ secrets.GITHUB_TOKEN }}
+          omitBodyDuringUpdate: true
+          omitDraftDuringUpdate: true
+          omitNameDuringUpdate: true
+          omitPrereleaseDuringUpdate: true
 
       # Update the downloads page and the man page on OIO
       - name: Update the downloads page and the man page to the OIO static page host
         shell: bash
         run: |
             # Figure out filenames
-            download_url="${{ steps.push.outputs.html_url }}"
+            download_url="${{ steps.pushph.outputs.html_url }}"
             download_url="${download_url/\/tag\//\/download\/}"
             local_template="installers/downloads_page/medley_downloads.html"
             local_filename="medley_downloads.html"
@@ -388,9 +600,9 @@ jobs:
             # Fill in downloads page template
             sed \
                -e "s/@@@MEDLEY.SHORT.RELEASE.TAG@@@/${MEDLEY_SHORT_RELEASE_TAG}/g" \
+               -e "s/@@@COMBINED.RELEASE.TAG@@@/${COMBINED_RELEASE_TAG}/g" \
                -e "s~@@@DOWNLOAD_URL@@@~${download_url}~g" \
-               -e "s/@@@DEBS.FILENAME.BASE@@@/${DEBS_FILENAME_BASE}/g" \
-               -e "s/@@@WINDOWS.INSTALLER.FILENAME@@@/${INSTALLER_FILENAME}/g" \
+               -e "s~@@@CYGWIN.INSTALLER@@@~${CYGWIN_INSTALLER}~g" \
                < "${local_template}" > "${local_filename}"
             # Create sftp instruction file
             echo "-rm ${remote_filepath}.oldold" > batch
@@ -405,9 +617,15 @@ jobs:
         env:
             SSH_KEY: ${{ secrets.OIO_SSH_KEY }}
 
+      # Remove placeholder.txt
+      - name: Remove placeholder.txt
+        run: |
+          gh release delete-asset ${{ env.MEDLEY_RELEASE_TAG }} placeholder.txt --yes
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
 
-######################################################################################
+# JOB: complete #####################################################################
 
   # Use set-sentry-action to determine set the sentry that says this release has
   # been successfully built
@@ -419,9 +637,16 @@ jobs:
     outputs:
       build_successful: ${{ steps.output.outputs.build_successful }}
 
-    needs: [inputs, sentry, loadup, windows_installer]
+    needs: [inputs, sentry, loadup, downloads_page]
 
     steps:
+      # Delete the tarballs artifact
+      - name: Delete tarballs artifact
+        uses: geekyeggo/delete-artifact@v2
+        with:
+          name: tarballs
+          failOnError: false
+
       # Checkout the actions for this repo owner
       - name: Checkout Actions
         uses: actions/checkout@v3
@@ -443,21 +668,4 @@ jobs:
           echo "build_successful='true'" >> $GITHUB_OUTPUT
 
 ######################################################################################
-
-
-
-#      - name: Download the Windows installer created in windows job
-#        uses: actions/download-artifact@v3
-#        with:
-#           name: windows_installer
-#           path: installers/win
-
-#     - name: Rename the Windows installer w/ version tag
-#        run: |
-#          maiko_release_tag="${{ steps.maiko.outputs.latest_tag }}"
-#          combined_release_tag="${MEDLEY_RELEASE_TAG#medley-}_${maiko_release_tag#maiko-}"
-#          windows_installer_filename="medley_install_${combined_release_tag}_x64.exe"
-#          cd installers/win
-#          mv medley_install_vXXXVERSIONXXX_x64.exe "${windows_installer_filename}"  
-#          echo "WINDOWS_INSTALLER_FILENAME=${windows_installer_filename}" >>${GITHUB_ENV}
-
+######################################################################################

.github/workflows/buildReleaseInclDocker.yml

@@ -84,6 +84,7 @@ jobs:
             echo "force=false" >> $GITHUB_OUTPUT;
           fi
 
+
 ######################################################################################
 
 
@@ -94,8 +95,7 @@ jobs:
     with:
         draft: ${{ needs.inputs.outputs.draft }}
         force: ${{ needs.inputs.outputs.force }}
-    secrets:
-        OIO_SSH_KEY: ${{ secrets.OIO_SSH_KEY }}
+    secrets: inherit
 
 
 ######################################################################################
@@ -107,9 +107,7 @@ jobs:
     with:
         draft: ${{ needs.inputs.outputs.draft }}
         force: ${{ needs.inputs.outputs.force }}
-    secrets:
-        DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
-        DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
+    secrets: inherit
 
 ######################################################################################
 

.gitignore

@@ -2,15 +2,20 @@
 
 tmp/*
 
+# releases directory
+releases/*
+
+
 # all loadup files 
 
-library/exports.all
+loadups/exports.all
 library/RDSYS*
 loadups/lisp.sysout
 loadups/full.sysout
 loadups/*.dribble
 loadups/whereis.hash
 loadups/apps.sysout
+loadups/fuller.database
 
 # manual cross-reference files
 

greetfiles/APPS-INIT

@@ -1,12 +1,11 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
 
-
(FILECREATED "19-Jan-2023 12:44:20" {DSK}<home>frank>il>medley>gmedley>greetfiles>APPS-INIT.;9
 21022  
+
(FILECREATED "16-Jun-2023 17:20:09" {DSK}<home>frank>il>medley>gmedley>greetfiles>APPS-INIT.;11
 21130  
 
-      :CHANGES-TO (VARS APPS-INITCOMS)
-                  (FNS Apps.DoInit)
+      :CHANGES-TO (FNS Apps.DoInit)
 
-      :PREVIOUS-DATE "19-Jan-2023 11:57:40" {DSK}<home>frank>il>medley>gmedley>greetfiles>APPS-INIT.;8
-)
+      :PREVIOUS-DATE "19-Jan-2023 12:44:20" 
+{DSK}<home>frank>il>medley>gmedley>greetfiles>APPS-INIT.;10)
 
 
 (PRETTYCOMPRINT APPS-INITCOMS)
@@ -170,7 +169,11 @@
 
            (* ;; " create the Documentation and ROOMS, Notecards Activation Buttons, if needed")

 
-           (Apps.CreateButtons
 T])
+           (Apps.CreateButtons
 T)
+
+           (* ;; " Make sure Notecards doesn't try to load its HASH file in NC.PostGreet")

+
+           (SETTOPVAL '\NC.SourceAccessFlg NIL])
 
 (Apps.CreateButtons

   [LAMBDA (DoDocsToo)
                                      (* ; "Edited 13-Dec-2022 12:51 by frank")


@@ -373,8 +376,8 @@
 (BKSYSBUF " ")
 )
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (1146 20888 (Apps.InitNotecards 1156 . 5018) (Apps.DoInit 5020 . 8119) (
-Apps.CreateButtons 8121 . 16945) (Apps.CreateLabel 16947 . 17757) (Apps.ActivateCLOS 17759 . 19108) (
-Apps.ActivateRooms 19110 . 19961) (Apps.ShowDoc 19963 . 20112) (XCL-USER::EXEC_INTERLISP 20114 . 20886
+  (FILEMAP (NIL (1109 20996 (Apps.InitNotecards 1119 . 4981) (Apps.DoInit 4983 . 8227) (
+Apps.CreateButtons 8229 . 17053) (Apps.CreateLabel 17055 . 17865) (Apps.ActivateCLOS 17867 . 19216) (
+Apps.ActivateRooms 19218 . 20069) (Apps.ShowDoc 20071 . 20220) (XCL-USER::EXEC_INTERLISP 20222 . 20994
 )))))
 STOP

installers/cygwin/.gitignore

@@ -0,0 +1,6 @@
+medley*.exe
+medley*.tgz
+maiko*.tgz
+setup-x86_64.exe
+medley.bat
+

installers/cygwin/editpath/EditPath.iss

@@ -0,0 +1,165 @@
+; Copyright (C) 2021-2023 by Bill Stewart (bstewart at iname.com)
+;
+; This program is free software; you can redistribute it and/or modify it under
+; the terms of the GNU Lesser General Public License as published by the Free
+; Software Foundation; either version 3 of the License, or (at your option) any
+; later version.
+;
+; This program is distributed in the hope that it will be useful, but WITHOUT
+; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+; FOR A PARTICULAR PURPOSE. See the GNU General Lesser Public License for more
+; details.
+;
+; You should have received a copy of the GNU Lesser General Public License
+; along with this program. If not, see https://www.gnu.org/licenses/.
+
+; Sample Inno Setup (https://www.jrsoftware.org/isinfo.php) script
+; demonstrating use of PathMgr.dll.
+;
+; This script uses PathMgr.dll in the following ways:
+; * Copies PathMgr.dll to the target machine (required for uninstall)
+; * Defines a task in [Tasks] that should modify the Path
+; * Imports the AddDirToPath() DLL function at setup time
+; * Imports the RemoveDirFromPath() DLL function at uninstall time
+; * Stores task state as custom setting using RegisterPreviousData()
+; * Retrieves task state custom setting during setup and uninstall initialize
+; * At post install, adds app dir to Path if task selected
+; * At uninstall, removes dir from Path if custom setting present
+; * Unloads and deletes DLL and removes app dir at uninstall deinitialize
+
+#if Ver < EncodeVer(6,0,0,0)
+  #error This script requires Inno Setup 6 or later
+#endif
+
+[Setup]
+AppId={{A17D2D05-C729-4F2A-9CC7-E04906C5A842}
+AppName=EditPath
+AppVersion=4.0.4.0
+UsePreviousAppDir=false
+DefaultDirName={autopf}\EditPath
+Uninstallable=true
+OutputDir=.
+OutputBaseFilename=EditPath_Setup
+ArchitecturesInstallIn64BitMode=x64
+PrivilegesRequired=none
+PrivilegesRequiredOverridesAllowed=dialog
+
+[Files]
+; Install PathMgr.dll for use with both setup and uninstall; use
+; uninsneveruninstall flag because DeinitializeSetup() will delete after
+; unloading the DLL; install the 32-bit version of PathMgr.dll because both
+; setup and uninstall executables are 32-bit
+Source: "i386\PathMgr.dll";  DestDir: "{app}"; Flags: uninsneveruninstall
+
+; Other files to install on target system
+Source: "i386\EditPath.exe";   DestDir: "{app}"; Check: not Is64BitInstallMode()
+Source: "x86_64\EditPath.exe"; DestDir: "{app}"; Check: Is64BitInstallMode()
+Source: "EditPath.md";         DestDir: "{app}"
+
+[Tasks]
+Name: modifypath; Description: "&Add to Path"
+
+[Code]
+const
+  MODIFY_PATH_TASK_NAME = 'modifypath';  // Specify name of task
+
+var
+  PathIsModified: Boolean;          // Cache task selection from previous installs
+  ApplicationUninstalled: Boolean;  // Has application been uninstalled?
+
+// Import AddDirToPath() at setup time ('files:' prefix)
+function DLLAddDirToPath(DirName: string; PathType, AddType: DWORD): DWORD;
+  external 'AddDirToPath@files:PathMgr.dll stdcall setuponly';
+
+// Import RemoveDirFromPath() at uninstall time ('{app}\' prefix)
+function DLLRemoveDirFromPath(DirName: string; PathType: DWORD): DWORD;
+  external 'RemoveDirFromPath@{app}\PathMgr.dll stdcall uninstallonly';
+
+// Wrapper for AddDirToPath() DLL function
+function AddDirToPath(const DirName: string): DWORD;
+var
+  PathType, AddType: DWORD;
+begin
+  // PathType = 0 - use system Path
+  // PathType = 1 - use user Path
+  // AddType = 0 - add to end of Path
+  // AddType = 1 - add to beginning of Path
+  if IsAdminInstallMode() then
+    PathType := 0
+  else
+    PathType := 1;
+  AddType := 0;
+  result := DLLAddDirToPath(DirName, PathType, AddType);
+end;
+
+// Wrapper for RemoveDirFromPath() DLL function
+function RemoveDirFromPath(const DirName: string): DWORD;
+var
+  PathType: DWORD;
+begin
+  // PathType = 0 - use system Path
+  // PathType = 1 - use user Path
+  if IsAdminInstallMode() then
+    PathType := 0
+  else
+    PathType := 1;
+  result := DLLRemoveDirFromPath(DirName, PathType);
+end;
+
+procedure RegisterPreviousData(PreviousDataKey: Integer);
+begin
+  // Store previous or current task selection as custom user setting
+  if PathIsModified or WizardIsTaskSelected(MODIFY_PATH_TASK_NAME) then
+    SetPreviousData(PreviousDataKey, MODIFY_PATH_TASK_NAME, 'true');
+end;
+
+function InitializeSetup(): Boolean;
+begin
+  result := true;
+  // Was task selected during a previous install?
+  PathIsModified := GetPreviousData(MODIFY_PATH_TASK_NAME, '') = 'true';
+end;
+
+function InitializeUninstall(): Boolean;
+begin
+  result := true;
+  // Was task selected during a previous install?
+  PathIsModified := GetPreviousData(MODIFY_PATH_TASK_NAME, '') = 'true';
+  ApplicationUninstalled := false;
+end;
+
+procedure CurStepChanged(CurStep: TSetupStep);
+begin
+  if CurStep = ssPostInstall then
+  begin
+    // Add app directory to Path at post-install step if task selected
+    if PathIsModified or WizardIsTaskSelected(MODIFY_PATH_TASK_NAME) then
+      AddDirToPath(ExpandConstant('{app}'));
+  end;
+end;
+
+procedure CurUninstallStepChanged(CurUninstallStep: TUninstallStep);
+begin
+  if CurUninstallStep = usUninstall then
+  begin
+    // Remove app directory from path during uninstall if task was selected;
+    // use variable because we can't use WizardIsTaskSelected() at uninstall
+    if PathIsModified then
+      RemoveDirFromPath(ExpandConstant('{app}'));
+  end
+  else if CurUninstallStep = usPostUninstall then
+  begin
+    ApplicationUninstalled := true;
+  end;
+end;
+
+procedure DeinitializeUninstall();
+begin
+  if ApplicationUninstalled then
+  begin
+    // Unload and delete PathMgr.dll and remove app dir when uninstalling
+    UnloadDLL(ExpandConstant('{app}\PathMgr.dll'));
+    DeleteFile(ExpandConstant('{app}\PathMgr.dll'));
+    RemoveDir(ExpandConstant('{app}'));
+  end;
+end;

installers/cygwin/editpath/EditPath.md

@@ -0,0 +1,118 @@
+# EditPath
+
+EditPath is a Windows console (text-based, command-line) program for managing the system Path and user Path.
+
+# Author
+
+Bill Stewart - bstewart at iname dot com
+
+# License
+
+EditPath.exe is covered by the GNU Lesser Public License (LPGL). See the file `LICENSE` for details.
+
+# Download
+
+https://github.com/Bill-Stewart/PathMgr/releases/
+
+# Background
+
+The system Path is found in the following location in the Windows registry:
+
+Root: `HKEY_LOCAL_MACHINE`  
+Subkey: `SYSTEM\CurrentControlSet\Control\Session Manager\Environment`  
+Value name: `Path`
+
+The current user Path is found in the following location in the registry:
+
+Root: `HKEY_CURRENT_USER`  
+Subkey: `Environment`  
+Value name: `Path`
+
+In both cases, the `Path` value is (or should be) the registry type `REG_EXPAND_SZ`, which means that it is a string that can contain values surrounded by `%` characters that Windows will automatically expand to environment variable values. (For example, `%SystemRoot%` will be expanded to `C:\Windows` on most systems.)
+
+The `Path` value contains a `;`-delimited list of directory names that the system should search for executables, library files, scripts, etc. Windows appends the content of the current user Path to the system Path and expands the environment variable references. The resulting string is set as the `Path` environment variable for processes.
+
+EditPath provides a command-line interface for managing the `Path` value in the system location (in `HKEY_LOCAL_MACHINE`) and the current user location (in `HKEY_CURRENT_USER`).
+
+# Usage
+
+The following describes the command-line usage for the program. Parameters are case-sensitive.
+
+**EditPath** [_options_] _type_ _action_
+
+You must specify only one of the following _type_ parameters:
+
+| _type_       | Abbreviation | Description
+| -------      | ------------ | -----------
+| **--system** | **-s**       | Specifies the system Path
+| **--user**   | **-u**       | Specifies the user Path
+
+You must specify only one of the following _action_ parameters:
+
+| _action_                     | Abbreviation           | Description
+| --------                     | ------------           | -----------
+| **--list**                   | **-l**                 | Lists directories in Path
+| **--test "**_dirname_**"**   | **-t "**_dirname_**"** | Tests if directory exists in Path
+| **--add "**_dirname_**"**    | **-a "**_dirname_**"** | Adds directory to Path
+| **--remove "**_dirname_**"** | **-r "**_dirname_**"** | Removes directory from Path
+
+The following parameters are optional:
+
+| _options_       | Abbreviation | Description
+| ---------       | ------------ | -----------
+| **--quiet**     | **-q**       | Suppresses result messages
+| **--expand**    | **-x**       | Expands environment variables (**--list** only)
+| **--beginning** | **-b**       | Adds to beginning of Path (**--add** only)
+
+# Exit Codes
+
+The following table lists typical exit codes when not using **--test** (**-t**).
+
+| Exit Code | Description
+| --------- | -----------
+| 0         | No errors
+| 2         | The Path value is not present in the registry
+| 3         | The specified directory does not exist in the Path
+| 5         | Access is denied
+| 87        | Incorrect parameter(s)
+| 183       | The specified directory already exists in the Path
+
+The following table lists typical exit codes when using **--test** (**-t**).
+
+| Exit Code | Description
+| --------- | -----------
+| 1         | The specified directory exists in the unexpanded Path
+| 2         | The specified directory exists in the expanded Path
+| 3         | The specified directory does not exist in the Path
+
+# Remarks
+
+* Anything on the command line after **--test**, **--add**, or **--remove** is considered to be the argument for the parameter. To avoid ambiguity, specify the _action_ parameter last on the command line.
+
+* Uexpanded vs. expanded refers to whether the environment variable references (i.e., names between `%` characters) are expanded after retrieving the Path value from the registry. For example, `%SystemRoot%` is unexpanded but `C:\Windows` is expanded.
+
+* The **--add** (**-a**) parameter checks whether the specified directory exists in both the unexpanded and expanded copies of the Path before adding the directory. For example, if the environment variable `TESTAPP` is set to `C:\TestApp` and `%TESTAPP%` is in the Path, specifying `--add C:\TestApp` will return exit code 183 (i.e., the directory already exists in the Path) because `%TESTAPP%` expands to `C:\TestApp`.
+
+* The **--remove** (**-r**) parameter does not expand environment variable references. For example, if the environment variable `TESTAPP` is set to `C:\TestApp` and `%TESTAPP%` is in the Path, specifying `--remove "C:\TestApp"` will return exit code 3 (i.e., the directory does not exist in the Path) because **--remove** does not expand `%TESTAPP%` to `C:\TestApp`. For the command to succeed, you would have to specify `--remove "%TESTAPP%"` instead.
+
+* The program will exit with error code 87 if a parameter (or an argument to a parameter) is missing or not valid, if mutually exclusive parameters are specified, etc.
+
+* The program will exit with error code 5 if the current user does not have permission to update the Path value in the registry (for example, if you try to update the system Path using a standard user account or an unelevated administrator account).
+
+# Examples
+
+1.  `EditPath --expand --system --list`
+
+    This command outputs the directories in the system Path, with environment variables expanded. You can also write this command as `EditPath -x -s -l`.
+
+2.  `EditPath --user --add "%LOCALAPPDATA%\Programs\MyApp"`
+
+    Adds the specified directory name to the user Path.
+
+3.  `EditPath -s -r "C:\Program Files\MyApp\bin"`
+
+    Removes the specified directory from the system Path.
+
+4.  `EditPath -s --test "C:\Program Files (x86)\MyApp\bin"`
+
+    Returns an exit code of 3 if the specified directory is not in the system Path, 1 if the specified directory is in the unexpanded copy of the system Path, or 2 if the specified directory is in the expanded copy of the system Path.

installers/cygwin/editpath/README.TXT

@@ -0,0 +1,3 @@
+Editpath installed here is extracted from Release 1.04 from https://github.com/Bill-Stewart/PathMgr.
+
+

installers/cygwin/makeflix.iss

@@ -0,0 +1,128 @@
+; -- makeflix.iss --
+; fgh 2016-08-19
+
+#define x86_or_x64 "x86"
+#define version "1.0.1"
+
+#if x86_or_x64 == "x86" 
+#define exe_dir "Win32"
+#else
+#define exe_dir "x64"
+#endif
+
+[Setup]
+ArchitecturesAllowed={#x86_or_x64}
+AppName=Makeflix
+AppVersion={#version}
+AppPublisher=Lellan, Inc.
+AppPublisherURL=http://www.lellan.com/
+AppCopyright=Copyright (C) 2012-2017 Lellan, Inc.
+DefaultDirName={pf}\Lellan\Makeflix
+DefaultGroupName=Lellan
+UninstallDisplayIcon={app}\makeflix.exe
+Compression=lzma2
+SolidCompression=yes
+; "ArchitecturesInstallIn64BitMode=x64" requests that the install be
+; done in "64-bit mode" on x64, meaning it should use the native
+; 64-bit Program Files directory and the 64-bit view of the registry.
+ArchitecturesInstallIn64BitMode=x64
+; Source Dir is lellan/toolchain/makeflix/windows
+SourceDir="..\"
+OutputDir="deploy"
+OutputBaseFilename="makeflix_v{#version}_{#x86_or_x64}"
+SetupIconFile="..\images\Lellan_Logo_20130221.ico"
+LicenseFile="..\deploy\EULA.rtf"
+DisableWelcomePage=no
+
+[Files]
+Source: "makeflix\{#exe_dir}\Release\makeflix.exe"; DestDir: "{app}"; DestName: "makeflix.exe"; Flags: ignoreversion
+Source: "deploy\DLLs\{#x86_or_x64}\Qt5Core.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "deploy\DLLs\{#x86_or_x64}\Qt5Gui.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "deploy\DLLs\{#x86_or_x64}\Qt5Widgets.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "deploy\DLLs\{#x86_or_x64}\Qt5Network.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "deploy\DLLs\{#x86_or_x64}\platforms\qwindows.dll"; DestDir: "{app}\platforms"; Flags: ignoreversion
+Source: "deploy\gstreamer\{#x86_or_x64}\*"; DestDir: "{app}\gstreamer"; Flags: recursesubdirs ignoreversion
+Source: "deploy\vc_redist\vc_redist.{#x86_or_x64}.exe"; DestDir: "{tmp}"; Flags: deleteafterinstall 
+Source: "deploy\bonjour\Bonjour.{#x86_or_x64}.msi"; DestDir: "{tmp}" ; Flags: deleteafterinstall
+
+Source: "..\deploy\Makeflix_Open_Source_Libraries.pdf"; DestDir: "{app}"
+
+[Icons]
+Name: "{group}\Makeflix"; Filename: "{app}\makeflix.exe"
+Name: "{group}\Uninstall Makeflix"; Filename: "{uninstallexe}"
+
+
+[Run]
+#define VCmsg "Installing Microsoft Visual C++ Redistributable ..."
+Filename: "{tmp}\vc_redist{#x86_or_x64}.exe"; StatusMsg: "{#VCmsg}"; Check: not VCinstalled
+#define BonjourMsg "Installing Apple Bonjour support ..."
+Filename: "msiexec"; Parameters: "/i {tmp}\Bonjour.{#x86_or_x64}.msi"; StatusMsg: "{#BonjourMsg}"; Check: not BonjourInstalled
+
+[Registry]
+Root: HKLM; Subkey: "SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\makeflix.exe"; ValueType: string; ValueName: "(Default)"; ValueData: "{app}\makeflix.exe"; Flags: uninsdeletekey
+Root: HKLM; Subkey: "SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\makeflix.exe"; ValueType: string; ValueName: "Path"; ValueData: "{app}\gstreamer\bin"; Flags: uninsdeletekey
+
+[Code]
+function VCinstalled: Boolean;
+ // By Michael Weiner <mailto:spam@cogit.net>
+ // Function for Inno Setup Compiler
+ // 13 November 2015
+ // Modified by Frank G Halasz to handle WOW case
+ // 23 August 2016
+ // Returns True if Microsoft Visual C++ Redistributable is installed, otherwise False.
+ // The programmer may set the year of redistributable to find; see below.
+ var
+  names: TArrayOfString;
+  i: Integer;
+  dName, key, year, platfm: String;
+ begin
+  // Year of redistributable to find; leave null to find installation for any year.
+  year := '2015';
+  Result := False;
+  if Is64BitInstallMode then
+    begin
+      platfm := 'x64'; 
+      key := 'Software\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall';
+    end
+  else if not IsWin64 then
+    begin
+      platfm := 'x86';
+      key := 'Software\Microsoft\Windows\CurrentVersion\Uninstall';
+    end
+  else
+    begin
+      platfm := 'x86';
+      key := 'Software\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall';
+    end;
+  // Get an array of all of the uninstall subkey names.
+  if RegGetSubkeyNames(HKEY_LOCAL_MACHINE, key, names) then
+   // Uninstall subkey names were found.
+   begin
+    i := 0
+    while ((i < GetArrayLength(names)) and (Result = False)) do
+     // The loop will end as soon as one instance of a Visual C++ redistributable is found.
+     begin
+      // For each uninstall subkey, look for a DisplayName value.
+      // If not found, then the subkey name will be used instead.
+      if not RegQueryStringValue(HKEY_LOCAL_MACHINE, key + '\' + names[i], 'DisplayName', dName) then
+       dName := names[i];
+      // See if the value contains both of the strings below.
+      Result := (Pos(Trim('Visual C++ ' + year),dName) * Pos('Redistributable',dName) * Pos(platfm, dName) <> 0)
+      i := i + 1;
+     end;
+   end;
+ end;
+
+ function BonjourInstalled: Boolean;
+ // Returns True if Apple Bonjour is installed, otherwise False.
+ // Ignores date/version of Bonjour.
+ begin
+  Result := False;
+  // If this key exists, then
+  // bonjour services must already be installed
+  if RegKeyExists(HKEY_LOCAL_MACHINE, 'SYSTEM\CurrentControlSet\Services\Bonjour Service') then
+   // Uninstall subkey names were found.
+   begin
+     Result := True;
+   end;
+ end;

installers/cygwin/medley.iss

@@ -0,0 +1,85 @@
+;###############################################################################
+;#
+;#    medley.iss - Inno Setup compiler script for creating a Windows
+;#                 installer for cygwin and Medley on cygwin
+;#
+;#   2023-06-03 Frank Halasz
+;#
+;#   Copyright 2023 Interlisp.org
+;#
+;###############################################################################
+
+#define x86_or_x64 "x64"
+#if GetEnv('COMBINED_RELEASE_TAG') != ""
+#define VERSION=GetEnv('COMBINED_RELEASE_TAG')
+#else
+#define VERSION="local"
+#endif
+
+#if GetEnv('CYGWIN_INSTALLER_BASE') != ""
+#define OUTFILE=GetEnv('CYGWIN_INSTALLER_BASE')
+#else
+#define OUTFILE="medley-full-cygwin-x86_64-local"
+#endif
+
+[Setup]
+PrivilegesRequired=lowest
+ArchitecturesAllowed={#x86_or_x64}
+AppName=Medley
+AppVersion={#version}
+AppPublisher=Interlisp.org
+AppPublisherURL=https://interlisp.org/
+AppCopyright=Copyright (C) 2023 Interlisp.org
+DefaultDirName={%USERPROFILE}\il
+DefaultGroupName=Medley
+Compression=lzma2
+SolidCompression=yes
+; "ArchitecturesInstallIn64BitMode=x64" requests that the install be
+; done in "64-bit mode" on x64, meaning it should use the native
+; 64-bit Program Files directory and the 64-bit view of the registry.
+ArchitecturesInstallIn64BitMode=x64
+OutputDir="."
+OutputBaseFilename={#OUTFILE}
+SetupIconFile="Medley.ico"
+DisableWelcomePage=no
+MissingRunOnceIdsWarning=no
+DisableProgramGroupPage=yes
+WizardImageFile=medley_logo.bmp
+WizardSmallImageFile=medley_logo_small.bmp
+WizardImageStretch=no
+UninstallDisplayIcon="{app}\Medley.ico"
+UninstallFilesDir={app}\uninstall
+UsePreviousAppDir=no
+
+[Dirs]
+Name: "{app}\install"; Permissions: everyone-full
+Name: "{app}\uninstall"; Permissions: everyone-full
+Name: "{app}\cygwin"; Permissions: everyone-full
+
+[Files]
+Source: "setup-x86_64.exe"; DestDir: "{app}\cygwin"; DestName: "setup-x86_64.exe"; Flags: ignoreversion
+Source: "maiko-cygwin.x86_64.tgz"; DestDir: "{app}\install"; DestName: "maiko-cygwin.x86_64.tgz"; Flags: ignoreversion
+Source: "medley.tgz"; DestDir: "{app}\install"; DestName: "medley.tgz"; Flags: ignoreversion
+Source: "..\win\editpath\x86_64\EditPath.exe"; DestDir: "{app}\uninstall"; DestName: "EditPath.exe"; Flags: ignoreversion
+Source: "Medley.ico"; DestDir: "{app}"; DestName: "Medley.ico"; Flags: ignoreversion
+
+[Icons]
+Name: "{group}\Medley\Uninstall_Medley"; Filename: "{uninstallexe}"
+; Name: "{group}\Medley\Medley"; Filename: "powershell"; Parameters: "-NoExit -File {app}\medley.ps1 --help"; IconFilename: "{app}\Medley.ico"
+
+[Run]
+Filename: "{app}\cygwin\setup-x86_64.exe"; Parameters: "--quiet-mode --no-admin --wait --no-shortcuts --no-write-registry --verbose --root {app} --site http://www.gtlib.gatech.edu/pub/cygwin/ --only-site --local-package-dir {app}\cygwin --packages nano,xdg-utils"; StatusMsg: "Installing Cygwin ..."
+Filename: "{app}\bin\bash"; Parameters: "-login -c 'sed -i -e s/^none/#none/ /etc/fstab && echo none / cygdrive binary,posix=0,user 0 0 >>/etc/fstab'"; Flags: runhidden
+Filename: "tar"; Parameters: "-x -z -C {app} -f {app}\install\medley.tgz"; Flags: runhidden; StatusMsg: "Installing Medley ..."
+Filename: "powershell"; Parameters: "remove-item -force -recurse {app}\maiko"; Flags: runhidden; StatusMsg: "Installing Maiko ..."
+Filename: "tar"; Parameters: "-x -z -C {app} -f {app}\install\maiko-cygwin.x86_64.tgz"; Flags: runhidden; StatusMsg: "Installing Maiko ..."
+; Recreate medley symbolic links (lost in tars)
+Filename: "{app}\bin\bash"; Parameters: "-login -c 'cd /medley/scripts/medley && ln -s medley.command medley.sh && cd ../.. && ln -s /medley/scripts/medley/medley.sh medley'"; Flags: runhidden
+; Create medley.bat
+Filename: "powershell"; Parameters: "write-output \""{app}\bin\bash -login -c '/medley/scripts/medley/medley.sh %*'\""  | out-file medley.bat -Encoding ascii"; WorkingDir: "{app}"; Flags: runhidden; StatusMsg: "Creating medley.bat ..."
+Filename: "{app}\uninstall\EditPath.exe"; Parameters: "--user --add {app}"; Flags: runhidden; StatusMsg: "Adding to PATH ..."
+Filename: "powershell"; Parameters: "remove-item -recurse -force {app}\install"; Flags: runhidden; StatusMsg: "Cleaning up ..."
+
+[UninstallRun]
+Filename: "{app}\uninstall\EditPath.exe"; Parameters: "--user --remove {app}"; Flags: runhidden 
+

installers/deb/build_deb.sh

@@ -11,15 +11,6 @@
 ###############################################################################
 # set -x
 
-# mess with file desscriptors so we get only one line on stdout
-# so we can communicate only what we want back to any githib runner
-# stash fd 1 in fd 3
-exec 3>&1
-# make fd 1 (stdout) be the same as stdout
-# so none of the std output from this file will be captured by
-# $() but it will still be written out to the tty (via stderr)
-exec 1>&2
-
 tarball_dir=tmp/tarballs
 
 #  Make sure we are in the right directory
@@ -32,6 +23,13 @@ then
   exit 1
 fi
 
+# template for artifacts file names should be passed down in the ENV variable: ARTIFACTS_FILENAME_TEMPLATE
+if [ -z "${ARTIFACTS_FILENAME_TEMPLATE}" ];
+then
+  ARTIFACTS_FILENAME_TEMPLATE="medley-full-@@PLATFORM@@-@@ARCH@@-@@MEDLEY.RELEASE@@_@@MAIKO.RELEASE@@"
+fi
+
+
 
 #  If running as a github action or -t arg, then skip downloading the tarballs
 if ! [[ -n "${GITHUB_WORKSPACE}" || "$1" = "-t" ]];
@@ -69,7 +67,6 @@ fi
 pushd ${tarball_dir} >/dev/null 2>/dev/null
 medley_release=$(echo medley-*-loadups.tgz | sed "s/medley-\(.*\)-loadups.tgz/\1/")
 maiko_release=$(echo maiko-*-linux.x86_64.tgz | sed "s/maiko-\(.*\)-linux.x86_64.tgz/\1/")
-debs_filename_base="medley-full-${medley_release}_${maiko_release}"
 popd >/dev/null 2>/dev/null
 
 
@@ -136,7 +133,7 @@ do
     #
     #  Create tar file for this arch
     #
-    filename="${debs_filename_base}-${wslp}-${arch}"
+    filename="$(echo ${ARTIFACTS_FILENAME_TEMPLATE} | sed -e "s#@@PLATFORM@@#${wslp}#" -e "s#@@ARCH@@#${arch}#" -e "s#@@MEDLEY.RELEASE@@#${medley_release}#" -e "s#@@MAIKO.RELEASE@@#${maiko_release}#" )"
     mkdir -p tars
     echo "Creating tar file tars/${filename}.tgz"
     tar -C ${il_dir} -czf tars/${filename}.tgz .
@@ -151,8 +148,5 @@ do
   done
 done
 
-# send just one line back to github $() construct
-# do this by restoring fd 1 to what it was orginally
-exec 1>&3
-echo "${debs_filename_base}"
-
+################################################################################################################
+################################################################################################################

installers/downloads_page/medley_downloads.html

@@ -10,36 +10,46 @@
 <ul>
 <li><h4>Standard Linux</h4>
 
-<p><a href="@@@DOWNLOAD_URL@@@/@@@DEBS.FILENAME.BASE@@@-linux-x86_64.deb">Release @@@MEDLEY.SHORT.RELEASE.TAG@@@ for x86_64 machines</a></p>
+<p><a href="@@@DOWNLOAD_URL@@@/medley-full-linux-x86_64-@@@COMBINED.RELEASE.TAG@@@.deb">Release @@@MEDLEY.SHORT.RELEASE.TAG@@@ for x86_64 machines</a></p>
 
-<p><a href="@@@DOWNLOAD_URL@@@/@@@DEBS.FILENAME.BASE@@@-linux-aarch64.deb">Release @@@MEDLEY.SHORT.RELEASE.TAG@@@ for ARM64 machines</a></p>
+<p><a href="@@@DOWNLOAD_URL@@@/medley-full-linux-aarch64-@@@COMBINED.RELEASE.TAG@@@.deb">Release @@@MEDLEY.SHORT.RELEASE.TAG@@@ for ARM64 machines</a></p>
 
-<p><a href="@@@DOWNLOAD_URL@@@/@@@DEBS.FILENAME.BASE@@@-linux-armv7l.deb">Release @@@MEDLEY.SHORT.RELEASE.TAG@@@ for ARMv7 machines</a></p></li>
+<p><a href="@@@DOWNLOAD_URL@@@/medley-full-linux-armv7l-@@@COMBINED.RELEASE.TAG@@@.deb">Release @@@MEDLEY.SHORT.RELEASE.TAG@@@ for ARMv7 machines</a></p></li>
 <li><h4>Windows System for Linux</h4>
 
-<p><a href="@@@DOWNLOAD_URL@@@/@@@DEBS.FILENAME.BASE@@@-wsl-x86_64.deb">Release @@@MEDLEY.SHORT.RELEASE.TAG@@@ for x86.64 machines</a></p>
+<p><a href="@@@DOWNLOAD_URL@@@/medley-full-wsl-x86_64-@@@COMBINED.RELEASE.TAG@@@.deb">Release @@@MEDLEY.SHORT.RELEASE.TAG@@@ for x86.64 machines</a></p>
 
-<p><a href="@@@DOWNLOAD_URL@@@/@@@DEBS.FILENAME.BASE@@@-wsl-aarch64.deb">Release @@@MEDLEY.SHORT.RELEASE.TAG@@@ for ARM64 machines</a></p></li>
+<p><a href="@@@DOWNLOAD_URL@@@/medley-full-wsl-aarch64-@@@COMBINED.RELEASE.TAG@@@.deb">Release @@@MEDLEY.SHORT.RELEASE.TAG@@@ for ARM64 machines</a></p></li>
 </ul></li>
 <li><h3>Local Installations (for any Linux distro)</h3>
 
 <ul>
 <li><h4>Standard Linux</h4>
 
-<p><a href="@@@DOWNLOAD_URL@@@/@@@DEBS.FILENAME.BASE@@@-linux-x86_64.tgz">Release @@@MEDLEY.SHORT.RELEASE.TAG@@@ for x86_64 machines</a></p>
+<p><a href="@@@DOWNLOAD_URL@@@/medley-full-linux-x86_64-@@@COMBINED.RELEASE.TAG@@@.tgz">Release @@@MEDLEY.SHORT.RELEASE.TAG@@@ for x86_64 machines</a></p>
 
-<p><a href="@@@DOWNLOAD_URL@@@/@@@DEBS.FILENAME.BASE@@@-linux-aarch64.tgz">Release @@@MEDLEY.SHORT.RELEASE.TAG@@@ for ARM64 machines</a></p>
+<p><a href="@@@DOWNLOAD_URL@@@/medley-full-linux-aarch64-@@@COMBINED.RELEASE.TAG@@@.tgz">Release @@@MEDLEY.SHORT.RELEASE.TAG@@@ for ARM64 machines</a></p>
 
-<p><a href="@@@DOWNLOAD_URL@@@/@@@DEBS.FILENAME.BASE@@@-linux-armv7l.tgz">Release @@@MEDLEY.SHORT.RELEASE.TAG@@@ for ARMv7 machines</a></p></li>
+<p><a href="@@@DOWNLOAD_URL@@@/medley-full-linux-armv7l-@@@COMBINED.RELEASE.TAG@@@.tgz">Release @@@MEDLEY.SHORT.RELEASE.TAG@@@ for ARMv7 machines</a></p></li>
 <li><h4>Windows System for Linux</h4>
 
-<p><a href="@@@DOWNLOAD_URL@@@/@@@DEBS.FILENAME.BASE@@@-wsl-x86_64.tgz">Release @@@MEDLEY.SHORT.RELEASE.TAG@@@ for x86_64 machines</a></p>
+<p><a href="@@@DOWNLOAD_URL@@@/medley-full-wsl-x86_64-@@@COMBINED.RELEASE.TAG@@@.tgz">Release @@@MEDLEY.SHORT.RELEASE.TAG@@@ for x86_64 machines</a></p>
 
-<p><a href="@@@DOWNLOAD_URL@@@/@@@DEBS.FILENAME.BASE@@@-wsl-aarch64.tgz">Release @@@MEDLEY.SHORT.RELEASE.TAG@@@ for ARM64 machines</a></p></li>
+<p><a href="@@@DOWNLOAD_URL@@@/medley-full-wsl-aarch64-@@@COMBINED.RELEASE.TAG@@@.tgz">Release @@@MEDLEY.SHORT.RELEASE.TAG@@@ for ARM64 machines</a></p></li>
 </ul></li>
 </ul></li>
-<li><h2>WINDOWS 10/11 (Medley runs in a Docker container)</h2>
+<li><h2>WINDOWS 10/11 (Single install based on cygwin - Docker install deprecated)</h2>
 
-<p><a href="@@@DOWNLOAD_URL@@@/@@@WINDOWS.INSTALLER.FILENAME@@@">Release @@@MEDLEY.SHORT.RELEASE.TAG@@@ for Windows x64 machines</a></p></li>
+<p><a href="@@@DOWNLOAD_URL@@@/@@@CYGWIN.INSTALLER@@@">Release @@@MEDLEY.SHORT.RELEASE.TAG@@@ for Windows x64 machines</a></p></li>
+<li><h2>macOS 11 (Big Sur) and later - for both Intel and Apple Silicon</h2>
+
+<ul>
+<li><h3>DMG Installer</h3>
+
+<p>Not available</p></li>
+<li><h3>ZIP Installer</h3>
+
+<p><a href="@@@DOWNLOAD_URL@@@/medley-full-macos-universal-@@@COMBINED.RELEASE.TAG@@@.zip">Release @@@MEDLEY.SHORT.RELEASE.TAG@@@</a></p></li>
+</ul></li>
 </ul></li>
 </ul>

installers/downloads_page/medley_downloads.md

@@ -6,40 +6,44 @@
 
              * #### Standard Linux
 
-             [Release @@@MEDLEY.SHORT.RELEASE.TAG@@@ for x86\_64 machines](@@@DOWNLOAD_URL@@@/@@@DEBS.FILENAME.BASE@@@-linux-x86\_64.deb)
+             [Release @@@MEDLEY.SHORT.RELEASE.TAG@@@ for x86\_64 machines](@@@DOWNLOAD_URL@@@/medley-full-linux-x86\_64-@@@COMBINED.RELEASE.TAG@@@.deb)
 
-             [Release @@@MEDLEY.SHORT.RELEASE.TAG@@@ for ARM64 machines](@@@DOWNLOAD_URL@@@/@@@DEBS.FILENAME.BASE@@@-linux-aarch64.deb)
+             [Release @@@MEDLEY.SHORT.RELEASE.TAG@@@ for ARM64 machines](@@@DOWNLOAD_URL@@@/medley-full-linux-aarch64-@@@COMBINED.RELEASE.TAG@@@.deb)
 
-             [Release @@@MEDLEY.SHORT.RELEASE.TAG@@@ for ARMv7 machines](@@@DOWNLOAD_URL@@@/@@@DEBS.FILENAME.BASE@@@-linux-armv7l.deb)
+             [Release @@@MEDLEY.SHORT.RELEASE.TAG@@@ for ARMv7 machines](@@@DOWNLOAD_URL@@@/medley-full-linux-armv7l-@@@COMBINED.RELEASE.TAG@@@.deb)
 
              * #### Windows System for Linux
 
-             [Release @@@MEDLEY.SHORT.RELEASE.TAG@@@ for x86\.64 machines](@@@DOWNLOAD_URL@@@/@@@DEBS.FILENAME.BASE@@@-wsl-x86\_64.deb)
+             [Release @@@MEDLEY.SHORT.RELEASE.TAG@@@ for x86\.64 machines](@@@DOWNLOAD_URL@@@/medley-full-wsl-x86\_64-@@@COMBINED.RELEASE.TAG@@@.deb)
 
-             [Release @@@MEDLEY.SHORT.RELEASE.TAG@@@ for ARM64 machines](@@@DOWNLOAD_URL@@@/@@@DEBS.FILENAME.BASE@@@-wsl-aarch64.deb)
+             [Release @@@MEDLEY.SHORT.RELEASE.TAG@@@ for ARM64 machines](@@@DOWNLOAD_URL@@@/medley-full-wsl-aarch64-@@@COMBINED.RELEASE.TAG@@@.deb)
 
          *    ### Local Installations (for any Linux distro)
 
              * #### Standard Linux
 
-             [Release @@@MEDLEY.SHORT.RELEASE.TAG@@@ for x86\_64 machines](@@@DOWNLOAD_URL@@@/@@@DEBS.FILENAME.BASE@@@-linux-x86\_64.tgz)
+             [Release @@@MEDLEY.SHORT.RELEASE.TAG@@@ for x86\_64 machines](@@@DOWNLOAD_URL@@@/medley-full-linux-x86\_64-@@@COMBINED.RELEASE.TAG@@@.tgz)
 
-             [Release @@@MEDLEY.SHORT.RELEASE.TAG@@@ for ARM64 machines](@@@DOWNLOAD_URL@@@/@@@DEBS.FILENAME.BASE@@@-linux-aarch64.tgz)
+             [Release @@@MEDLEY.SHORT.RELEASE.TAG@@@ for ARM64 machines](@@@DOWNLOAD_URL@@@/medley-full-linux-aarch64-@@@COMBINED.RELEASE.TAG@@@.tgz)
 
-             [Release @@@MEDLEY.SHORT.RELEASE.TAG@@@ for ARMv7 machines](@@@DOWNLOAD_URL@@@/@@@DEBS.FILENAME.BASE@@@-linux-armv7l.tgz)
+             [Release @@@MEDLEY.SHORT.RELEASE.TAG@@@ for ARMv7 machines](@@@DOWNLOAD_URL@@@/medley-full-linux-armv7l-@@@COMBINED.RELEASE.TAG@@@.tgz)
 
              * #### Windows System for Linux
 
-             [Release @@@MEDLEY.SHORT.RELEASE.TAG@@@ for x86\_64 machines](@@@DOWNLOAD_URL@@@/@@@DEBS.FILENAME.BASE@@@-wsl-x86\_64.tgz)
+             [Release @@@MEDLEY.SHORT.RELEASE.TAG@@@ for x86\_64 machines](@@@DOWNLOAD_URL@@@/medley-full-wsl-x86\_64-@@@COMBINED.RELEASE.TAG@@@.tgz)
 
-             [Release @@@MEDLEY.SHORT.RELEASE.TAG@@@ for ARM64 machines](@@@DOWNLOAD_URL@@@/@@@DEBS.FILENAME.BASE@@@-wsl-aarch64.tgz)
+             [Release @@@MEDLEY.SHORT.RELEASE.TAG@@@ for ARM64 machines](@@@DOWNLOAD_URL@@@/medley-full-wsl-aarch64-@@@COMBINED.RELEASE.TAG@@@.tgz)
 
-     *    ## WINDOWS 10/11 (Medley runs in a Docker container)
-
-         [Release @@@MEDLEY.SHORT.RELEASE.TAG@@@ for Windows x64 machines](@@@DOWNLOAD_URL@@@/@@@WINDOWS.INSTALLER.FILENAME@@@)
+     *    ## WINDOWS 10/11 (Single install based on cygwin - Docker install deprecated)
 
+     [Release @@@MEDLEY.SHORT.RELEASE.TAG@@@ for Windows x64 machines](@@@DOWNLOAD_URL@@@/@@@CYGWIN.INSTALLER@@@)
 
+     *    ## macOS 11 (Big Sur) and later - for both Intel and Apple Silicon
 
+         *    ### DMG Installer
 
+              Not available
 
+         *    ### ZIP Installer
 
+              [Release @@@MEDLEY.SHORT.RELEASE.TAG@@@](@@@DOWNLOAD_URL@@@/medley-full-macos-universal-@@@COMBINED.RELEASE.TAG@@@.zip)

installers/macos/.gitignore

@@ -0,0 +1,7 @@
+tmp
+devtmp
+pkg/*.pkg
+artifacts
+
+
+

installers/macos/app/Info.plist

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+    <key>CFBundleDevelopmentRegion</key>
+    <string>English</string>
+    <key>CFBundleExecutable</key>
+    <string>medley/medley</string>
+    <key>CFBundleGetInfoString</key>
+    <string>Medley Interlisp, Copyright 2023 Interlisp.org</string>
+    <key>CFBundleIconFile</key>
+    <string>Medley.icns</string>
+    <key>CFBundleIdentifier</key>
+    <string>org.interlisp.Medley</string>
+    <key>CFBundleDocumentTypes</key>
+    <array>
+    </array>
+    <key>CFBundleInfoDictionaryVersion</key>
+    <string>3.51</string>
+    <key>CFBundlePackageType</key>
+    <string>APPL</string>
+    <key>CFBundleShortVersionString</key>
+    <string>--VERSION_TAG--</string>
+    <key>CFBundleSignature</key>
+    <string>Medley</string>
+    <key>CFBundleVersion</key>
+    <string>--VERSION_TAG--</string>
+    <key>NSHumanReadableCopyright</key>
+    <string>Copyright 2023 Interlisp.org</string>
+    <key>LSMinimumSystemVersion</key>
+    <string>11.0</string>
+</dict>
+</plist>

installers/macos/app/PkgInfo

@@ -0,0 +1 @@
+APPLMedley

installers/macos/build_app.sh

@@ -0,0 +1,170 @@
+#!/bin/bash
+###############################################################################
+#
+#    build_app.sh: build app bundle for installing Medley Interlisp on MacOS
+#
+#    2023-02-23 Frank Halasz
+#
+#    Copyright 2023 by Interlisp.org
+#
+###############################################################################
+
+APPNAME=Medley
+
+# 2023-07-19 Temorary selector to allow us to create .zip asset before app/dmg work is finished
+INCLUDE_APP="no"   # "yes" or "no"
+
+#  Make sure we are in the right directory
+if [ ! -f ./app/Info.plist ];
+then
+echo "Can't find ./app/Info.plist file."
+echo "Incorrect cwd?"
+echo "Should be in medley/installers/macos"
+echo "Exiting"
+exit 1
+fi
+
+# template for artifacts file names should be passed down in the ENV variable: ARTIFACTS_FILENAME_TEMPLATE
+if [ -z "${ARTIFACTS_FILENAME_TEMPLATE}" ];
+then
+  ARTIFACTS_FILENAME_TEMPLATE="medley-full-@@PLATFORM@@-@@ARCH@@-@@MEDLEY.RELEASE@@_@@MAIKO.RELEASE@@"
+fi
+
+#
+#  Setup directories
+#
+CWD=$(pwd)
+RESULTS_DIR=${CWD}/artifacts
+APPBUNDLE=${RESULTS_DIR}/${APPNAME}.app
+APPBUNDLECONTENTS=${APPBUNDLE}/Contents
+APPBUNDLEEXE=${APPBUNDLECONTENTS}/MacOS
+APPBUNDLERESOURCES=${APPBUNDLECONTENTS}/Resources
+APPBUNDLEICON=${APPBUNDLECONTENTS}/Resources
+tmp_dir=${CWD}/tmp
+tarball_dir=${tmp_dir}/tarballs
+
+#  If running as a github action or -t arg, then skip downloading the tarballs
+if ! [[ -n "${GITHUB_WORKSPACE}" || "$1" = "-t" ]];
+then
+  #  First, make sure gh is available and we are logged in to github
+  if [ -z "$(which gh)" ];
+  then
+    echo "Can't find gh"
+    echo "Exiting."
+    exit 2
+  fi
+  gh auth status 2>&1 | grep --quiet --no-messages "Logged in to github.com"
+  if [ $? -ne 0 ];
+  then
+    echo "Not logged into github."
+    echo "Exiting."
+    exit 3
+  fi
+  # then clear out the ./tmp directory
+  rm -rf ${tmp_dir}
+  mkdir -p ${tmp_dir}
+  # then download the maiko and medley tarballs
+  mkdir -p ${tarball_dir}
+  echo "Fetching maiko and medley release tarballs"
+  TAG=$(gh release list --repo interlisp/maiko | head -n 1 | awk "{print \$1 }")
+  gh release download ${TAG} \
+                      --repo interlisp/maiko \
+                      --dir ${tarball_dir} \
+                      --pattern "*darwin*.tgz"
+  TAG=$(gh release list --repo interlisp/medley | head -n 1 | awk "{print \$1 }")
+  gh release download ${TAG} \
+                      --repo interlisp/medley \
+                      --dir ${tarball_dir} \
+                      --pattern "*-loadups.tgz" \
+                      --pattern "*-runtime.tgz"
+  gh repo clone interlisp/notecards notecards -- --depth 1
+  (cd notecards; git archive --format=tgz --output=../notecards.tgz --prefix=notecards/ main)
+  mv notecards.tgz ${tarball_dir}
+  rm -rf notecards
+fi
+
+# Figure out release tags from tarball names
+pushd ${tarball_dir} >/dev/null 2>/dev/null
+medley_release=$(echo medley-*-loadups.tgz | sed "s/medley-\(.*\)-loadups.tgz/\1/")
+maiko_release=$(echo maiko-*-darwin.x86_64.tgz | sed "s/maiko-\(.*\)-darwin.x86_64.tgz/\1/")
+popd >/dev/null 2>/dev/null
+
+if [ "${INCLUDE_APP}" = "yes" ]; then
+	#
+	#  Create bundle dirs
+	#
+	rm -rf ${RESULTS_DIR}
+	mkdir -p ${RESULTS_DIR}
+	rm -rf ${APPBUNDLE}
+	mkdir -p ${APPBUNDLE}
+	mkdir ${APPBUNDLE}/Contents
+	mkdir ${APPBUNDLE}/Contents/MacOS
+	mkdir ${APPBUNDLE}/Contents/Resources
+	#
+	#  Create icons and put in bundle
+	#
+	iconset_dir=${tmp_dir}/${APPNAME}.iconset
+	rm -rf ${iconset_dir}
+	mkdir -p ${iconset_dir}
+	image_dir=${CWD}/images
+	sips -z 16 16     ${image_dir}/App_icon1024.png --out ${iconset_dir}/icon_16x16.png >/dev/null 2>&1
+	sips -z 32 32     ${image_dir}/App_icon1024.png --out ${iconset_dir}/icon_16x16@2x.png >/dev/null 2>&1
+	sips -z 32 32     ${image_dir}/App_icon1024.png --out ${iconset_dir}/icon_32x32.png >/dev/null 2>&1
+	sips -z 64 64     ${image_dir}/App_icon1024.png --out ${iconset_dir}/icon_32x32@2x.png >/dev/null 2>&1
+	sips -z 128 128   ${image_dir}/App_icon1024.png --out ${iconset_dir}/icon_128x128.png >/dev/null 2>&1
+	sips -z 256 256   ${image_dir}/App_icon1024.png --out ${iconset_dir}/icon_128x128@2x.png >/dev/null 2>&1
+	sips -z 256 256   ${image_dir}/App_icon1024.png --out ${iconset_dir}/icon_256x256.png >/dev/null 2>&1
+	sips -z 512 512   ${image_dir}/App_icon1024.png --out ${iconset_dir}/icon_256x256@2x.png >/dev/null 2>&1
+	sips -z 512 512   ${image_dir}/App_icon1024.png --out ${iconset_dir}/icon_512x512.png >/dev/null 2>&1
+	cp ${image_dir}/App_icon1024.png ${iconset_dir}/icon_512x512@2x.png
+	iconutil -c icns -o ${tmp_dir}/${APPNAME}.icns ${iconset_dir}
+	cp ${tmp_dir}/${APPNAME}.icns ${APPBUNDLEICON}/
+	rm -r ${iconset_dir}
+	rm ${tmp_dir}/${APPNAME}.icns
+	#
+	#  Update and copy in "control" files
+	#
+	sed -e "s/--VERSION_TAG--/${medley_release}.${maiko_release}.0/g" \
+	    < app/Info.plist \
+	    > ${APPBUNDLECONTENTS}/Info.plist
+	cp app/PkgInfo ${APPBUNDLECONTENTS}/
+fi #INCLUDE_APP
+
+#
+#  Untar the maiko and medley releases into the bundle
+#
+il_dir=${APPBUNDLE}/Contents/MacOS
+mkdir -p ${il_dir}
+tar -x -z -C ${il_dir} \
+          -f "${tarball_dir}/maiko-${maiko_release}-darwin.universal.tgz"
+tar -x -z -C ${il_dir} \
+          -f "${tarball_dir}/medley-${medley_release}-runtime.tgz"
+tar -x -z -C ${il_dir} \
+          -f "${tarball_dir}/medley-${medley_release}-loadups.tgz"
+tar -x -z -C ${il_dir} \
+          -f "${tarball_dir}/notecards.tgz"
+#
+#  Handle run_medley needing separate directories for each arch
+#
+pushd ${il_dir}/maiko >/dev/null 2>&1
+ln -s darwin.universal darwin.aarch64
+ln -s darwin.universal darwin.x86_64
+popd >/dev/null 2>&1
+#
+#  Add file icon to medley.command
+#
+if [ -z "$(which fileicon)" ];
+then
+  brew install fileicon
+fi
+fileicon set ${il_dir}/medley/scripts/medley/medley.command ${image_dir}/Command_icon128.png
+#
+#  Also create the zip file of il_dir for distribution
+#
+pushd ${il_dir} >/dev/null 2>&1
+filename="$(echo ${ARTIFACTS_FILENAME_TEMPLATE} | sed -e "s#@@PLATFORM@@#macos#" -e "s#@@ARCH@@#universal#" -e "s#@@MEDLEY.RELEASE@@#${medley_release}#" -e "s#@@MAIKO.RELEASE@@#${maiko_release}#" )"
+zip -r -6 -y -q  ${RESULTS_DIR}/${filename}.zip .
+popd >/dev/null 2>&1
+
+######################################################################################################
+######################################################################################################

installers/macos/build_artifacts.sh

@@ -0,0 +1,66 @@
+#!/bin/bash
+###############################################################################
+#
+#    build_artifacts.sh: build the artifacts for installing Medley Interlisp on
+#                  MacOS.  Basically just calls build_app.sh and build_dmg.sh.
+#                  based on Medley.app built by build_app.sh
+#
+#    2023-03-03 Frank Halasz
+#
+#    Copyright 2023 by Interlisp.org
+#
+###############################################################################
+
+#
+# Figure out what directory this script is being executed from
+#
+get_abs_filename() {
+  # $1 : relative filename
+  echo "$(cd "$(dirname "$1")" && pwd)/$(basename "$1")"
+}
+
+get_script_dir() {
+
+    # call this with ${BASH_SOURCE[0]:-$0} as its (only) parameter
+
+    # set -x
+
+    local SCRIPT_PATH="$( get_abs_filename "$1" )";
+
+    pushd . > '/dev/null';
+
+    while [ -h "$SCRIPT_PATH" ];
+    do
+        cd "$( dirname -- "$SCRIPT_PATH"; )";
+        SCRIPT_PATH="$( readlink -f -- "$SCRIPT_PATH"; )";
+    done
+
+    cd "$( dirname -- "$SCRIPT_PATH"; )" > '/dev/null';
+    SCRIPT_PATH="$( pwd; )";
+
+    popd  > '/dev/null';
+
+    # set +x
+
+    echo "${SCRIPT_PATH}"
+}
+
+SCRIPTDIR=$(get_script_dir "${BASH_SOURCE[0]:-$0}")
+
+#
+#  cd to the dir we are executing from and call
+#    build_app.sh and the build_dmg.sh
+#
+cd ${SCRIPTDIR}
+t=""
+c=""
+if [[ "$1" = "-t" || "$2" = "-t" ]]; then t="-t"; fi
+if [[ "$1" = "-c" || "$2" = "-c" ]]; then c="-c"; fi
+./build_app.sh "${t}" 2>&1
+# 2023-07-20 Not building dmg as yet, just using this to build zip file
+# while we finish work around dmg
+# ./build_dmg.sh "${c}"
+
+
+
+###############################################################################

installers/macos/build_dmg.sh

@@ -0,0 +1,185 @@
+#!/bin/bash
+###############################################################################
+#
+#    build_dmg.sh: build dmg for installing Medley Interlisp on MacOS
+#                  based on Medley.app built by build_app.sh
+#
+#    2023-03-03 Frank Halasz
+#
+#    Copyright 2023 by Interlisp.org
+#
+#    Based on code found at:
+#    http://stackoverflow.com/questions/96882/how-do-i-create-a-nice-looking-dmg-for-mac-os-x-using-command-line-tools
+#
+###############################################################################
+
+#set -o verbose #echo onset +o verbose #echo off
+
+# template for artifacts file names should be passed down in the ENV variable: ARTIFACTS_FILENAME_TEMPLATE
+if [ -z "${ARTIFACTS_FILENAME_TEMPLATE}" ];
+then
+  ARTIFACTS_FILENAME_TEMPLATE="medley-full-@@PLATFORM@@-@@ARCH@@-@@MEDLEY.RELEASE@@_@@MAIKO.RELEASE@@"
+fi
+
+#
+#  Set Parameters
+#
+APP_NAME="Medley.app"
+VOL_NAME="Medley_Install"
+BG_NAME=Install_Message.png
+WIN_WIDTH=700
+WIN_HEIGHT=850
+
+#
+#  Set pathnames
+#
+CWD=$(pwd)
+TMP_DIR=${CWD}/tmp
+RESULTS_DIR=${CWD}/artifacts
+APP_PATH=${RESULTS_DIR}/${APP_NAME}
+DMG_PATH=${RESULTS_DIR}/${VOL_NAME}
+SRC_DIR=${TMP_DIR}/dmg_src
+IMAGES_DIR=${CWD}/images
+SCRIPTS_DIR=${CWD}/scripts
+
+#
+#  Make sure we are in the right directory
+#
+if [ ! -e ${APP_PATH} ];
+then
+  echo "Can't find the app: ${APP_NAME}."
+  echo "Incorrect cwd?  Should be in medley/installers/macos."
+  echo "Or build_app.sh not yet run?"
+  echo "Exiting"
+  exit 1
+fi
+
+#
+#  Copy over files from build app etc to dmg proto-directory
+#
+if [ ! "$1" = "-c" ]
+then
+  #
+  #  Cleanup anything leftover from last run
+  #
+  rm -rf ${SRC_DIR}
+  mkdir -p ${SRC_DIR}
+
+  #
+  #  Assemble source directory for DMG
+  #
+  #ditto ${APP_PATH} ${SRC_DIR}/${APP_NAME}
+  mv ${APP_PATH} ${SRC_DIR}/${APP_NAME}
+  SetFile -a B ${SRC_DIR}/${APP_NAME}
+  ditto ${SCRIPTS_DIR}/medley_add2path ${SRC_DIR}/medley_add2path
+  ditto ${IMAGES_DIR}/${BG_NAME} ${SRC_DIR}/.background/${BG_NAME}
+fi
+
+#
+#  Create initial dmg image
+#
+if [ -e "/Volumes/${VOL_NAME}" ];
+then
+  hdiutil detach /Volumes/${VOL_NAME}
+fi
+rm -f ${DMG_PATH}.temp.dmg
+hdiutil create -srcfolder ${SRC_DIR} -volname ${VOL_NAME} -fs HFS+ \
+               -fsargs "-c c=64,a=16,e=16" -format UDRW ${DMG_PATH}.temp.dmg
+device=$(\
+          hdiutil attach -readwrite -noverify -noautoopen "${DMG_PATH}".temp.dmg \
+          | egrep '^/dev/' | sed 1q | awk '{print $1}' \
+        )
+
+#
+# cd to the new dmg
+#
+pushd /Volumes/${VOL_NAME} >/dev/null 2>&1
+
+#
+#  Add symbolic link for medley script and icon for addpath
+#
+ln -s Medley.app/Contents/MacOS/medley/scripts/medley/medley.command medley
+if [ -z "$(which fileicon)" ];
+then
+  brew install fileicon
+fi
+fileicon set medley_add2path ${IMAGES_DIR}/A2P_icon128.png
+
+#
+# Dress up the appearance using Applescript
+#
+ROW1=375
+ROW2=650
+COL1=139
+COL2=350
+COL3=561
+osascript <<EOT
+  tell application "Finder"
+    tell disk "${VOL_NAME}"
+      open
+      set current view of container window to icon view
+      set toolbar visible of container window to false
+      set statusbar visible of container window to false
+      set old_bounds to bounds of container window
+      set l to item 1 of old_bounds
+      set t to item 2 of old_bounds 
+      set r to l + ${WIN_WIDTH}
+      set b to t + ${WIN_HEIGHT} 
+      set the bounds of container window to {l, t, r, b}
+      set theViewOptions to the icon view options of container window
+      set arrangement of theViewOptions to snap to grid
+      set icon size of theViewOptions to 128
+      set background picture of theViewOptions to file ".background:${BG_NAME}"
+      set appHome to path to applications folder from system domain
+      make new alias file at container window to appHome with properties {name:"Applications"}
+      set appHome to path to applications folder from user domain
+      make new alias file at container window to appHome with properties {name:"My Applications"}
+      set appHome to path to home folder from user domain
+      make new alias file at container window to appHome with properties {name:"My Home Folder"}
+      delay 1
+      set position of item "${APP_NAME}" of container window to     {${COL1}, ${ROW1}}
+      set position of item "medley" of container window to          {${COL2}, ${ROW1}}
+      set position of item "medley_add2path" of container window to {${COL3}, ${ROW1}}
+      set position of item "Applications" of container window to    {${COL1}, ${ROW2}}
+      set position of item "My Applications" of container window to {${COL2}, ${ROW2}}
+      set position of item "My Home Folder" of container window to  {${COL3}, ${ROW2}}
+      close
+    end tell
+  end tell
+EOT
+
+#
+# Add icon to dmg
+#
+fileicon set /Volumes/${VOL_NAME} ${IMAGES_DIR}/Install_icon128.png
+
+#
+# return to original dir
+#
+popd >/dev/null 2>&1
+
+#
+#  Detach the tmp dmg and convert it to final (compressed, ro) dmg
+#
+hdiutil detach ${device}
+sync
+rm -f ${DMG_PATH}.dmg
+hdiutil convert "${DMG_PATH}".temp.dmg -format UDZO -imagekey zlib-level=6 -o ${DMG_PATH}.dmg
+rm -rf "${DMG_PATH}".temp.dmg
+
+#
+#  Extract version info from app Info.plist & rename dmg using version
+#
+sed_script='{/CFBundleVersion/!d;N;s/^.*<string>\(.*\)<\/string>/\1/;s/.0$//;s/\./_/;p;}'
+version=$(sed -ne "${sed_script}" ${SRC_DIR}/${APP_NAME}/Contents/Info.plist)
+DMG_NAME="$(echo ${ARTIFACTS_FILENAME_TEMPLATE} | sed -e 's#@@PLATFORM@@#macos#' -e 's#@@ARCH@@#$universal#' -e 's#@@MEDLEY.RELEASE@@_@@MAIKO.RELEASE@@#${version}#' )"
+mv ${DMG_PATH}.dmg ${RESULTS_DIR}/${DMG_NAME}.dmg
+
+#
+#  Done
+#
+echo "DMG build completed."
+
+###############################################################################
+###############################################################################
+

installers/macos/images/A2P_icon.svg

@@ -0,0 +1,209 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   preserveAspectRatio="xMidYMid meet"
+   width="2000"
+   height="2000"
+   viewBox="0 0 2000 2000"
+   version="1.1"
+   id="svg2704"
+   sodipodi:docname="A2P_icon.svg"
+   inkscape:version="1.2 (dc2aeda, 2022-05-15)"
+   inkscape:export-filename="A2P_icon128.png"
+   inkscape:export-xdpi="6.1440001"
+   inkscape:export-ydpi="6.1440001"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <g
+     id="g1126"
+     transform="translate(-23.756927,163.29152)">
+    <text
+       x="597.27948"
+       y="997.78094"
+       font-family="'Times New Roman', Times, serif"
+       font-weight="bold"
+       font-size="420px"
+       id="text2702"
+       style="font-weight:bold;font-size:420px;font-family:'Times New Roman', Times, serif"><tspan
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:420px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal"
+         id="tspan25093">Medley</tspan></text>
+    <use
+       xlink:href="#window-icon"
+       x="1066.795"
+       y="218.396"
+       width="372"
+       height="300"
+       id="use2674"
+       transform="translate(147.4565)" />
+    <use
+       xlink:href="#window-icon"
+       x="865.021"
+       y="89.851997"
+       width="372"
+       height="300"
+       id="use2676"
+       transform="translate(147.4565)" />
+    <use
+       xlink:href="#window-icon"
+       x="629.06"
+       y="50.366001"
+       width="372"
+       height="300"
+       id="use2678"
+       transform="translate(147.4565)" />
+    <use
+       xlink:href="#window-icon"
+       x="396.42899"
+       y="106.215"
+       width="372"
+       height="300"
+       id="use2680"
+       transform="translate(147.4565)" />
+    <use
+       xlink:href="#window-icon"
+       x="204.11301"
+       y="248.522"
+       width="372"
+       height="300"
+       id="use2682"
+       transform="translate(147.4565)" />
+    <use
+       xlink:href="#window-icon"
+       x="82.689003"
+       y="454.659"
+       width="372"
+       height="300"
+       id="use2684"
+       transform="translate(147.4565)" />
+    <use
+       xlink:href="#window-icon"
+       x="51.462002"
+       y="691.854"
+       width="372"
+       height="300"
+       id="use2686"
+       transform="translate(147.4565)" />
+    <use
+       xlink:href="#window-icon"
+       x="115.396"
+       y="922.39398"
+       width="372"
+       height="300"
+       id="use2688"
+       transform="translate(147.4565)" />
+    <use
+       xlink:href="#window-icon"
+       x="264.327"
+       y="1109.627"
+       width="372"
+       height="300"
+       id="use2690"
+       transform="translate(147.4565)" />
+    <use
+       xlink:href="#window-icon"
+       x="474.577"
+       y="1223.783"
+       width="372"
+       height="300"
+       id="use2692"
+       transform="translate(147.4565)" />
+    <text
+       xml:space="preserve"
+       style="font-style:italic;font-size:766.666px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Italic';fill:#000000;fill-opacity:0;stroke:#000000;stroke-width:7.8"
+       x="1003.8107"
+       y="1163.4888"
+       id="text288"><tspan
+         sodipodi:role="line"
+         id="tspan286"
+         x="1003.8107"
+         y="1163.4888" /></text>
+    <text
+       x="946.01031"
+       y="1500.8351"
+       font-family="'Times New Roman', Times, serif"
+       font-weight="bold"
+       font-size="420px"
+       id="text292"
+       style="font-weight:bold;font-size:420px;font-family:'Times New Roman', Times, serif"><tspan
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:233.333px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal"
+         id="tspan290">add2path</tspan></text>
+  </g>
+  <defs
+     id="defs2708">
+    <rect
+       x="1144.3981"
+       y="797.67157"
+       width="915.91937"
+       height="555.16339"
+       id="rect44588" />
+  </defs>
+  <sodipodi:namedview
+     id="namedview2706"
+     pagecolor="#f5e6c4"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="1"
+     inkscape:pagecheckerboard="0"
+     showgrid="false"
+     inkscape:zoom="0.49895222"
+     inkscape:cx="864.81227"
+     inkscape:cy="918.92566"
+     inkscape:window-width="1752"
+     inkscape:window-height="1205"
+     inkscape:window-x="1508"
+     inkscape:window-y="107"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg2704"
+     fit-margin-top="100"
+     fit-margin-left="100"
+     fit-margin-right="100"
+     fit-margin-bottom="100"
+     inkscape:showpageshadow="2"
+     inkscape:deskcolor="#d1d1d1" />
+  <symbol
+     id="window-icon"
+     viewBox="0 0 372 300"
+     transform="translate(-98.918502,49.633999)">
+    <rect
+       x="10"
+       y="10"
+       width="352"
+       height="280"
+       style="fill:#ffffff;stroke:#000000;stroke-width:20"
+       id="rect2665" />
+    <line
+       x1="10"
+       y1="30"
+       x2="362"
+       y2="30"
+       style="fill:#ffffff;stroke:#000000;stroke-width:20"
+       id="line2667" />
+  </symbol>
+  <circle
+     cx="551.08148"
+     cy="699.63397"
+     r="20"
+     style="display:none;fill:#ffffff;stroke:#ff0000;stroke-width:5"
+     id="circle2696" />
+  <circle
+     cx="551.08148"
+     cy="699.63397"
+     r="600"
+     style="display:none;fill:none;stroke:#0000ff;stroke-width:5"
+     id="circle2698" />
+  <rect
+     x="-98.918503"
+     y="49.633999"
+     width="2922"
+     height="1600"
+     style="display:none;fill:none;stroke:#00ff00;stroke-width:10"
+     id="rect2700" />
+  <text
+     xml:space="preserve"
+     id="text44586"
+     style="font-size:40px;line-height:1.25;font-family:'Times New Roman';-inkscape-font-specification:'Times New Roman, ';white-space:pre;shape-inside:url(#rect44588);display:inline"
+     transform="translate(-98.918502,49.633999)" />
+</svg>

installers/macos/images/App_icon.svg

@@ -0,0 +1,209 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   preserveAspectRatio="xMidYMid meet"
+   width="2000"
+   height="2000"
+   viewBox="0 0 2000 2000"
+   version="1.1"
+   id="svg2704"
+   sodipodi:docname="App_icon.svg"
+   inkscape:version="1.2 (dc2aeda, 2022-05-15)"
+   inkscape:export-filename="App_icon512.png"
+   inkscape:export-xdpi="24.576"
+   inkscape:export-ydpi="24.576"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <g
+     id="g1126"
+     transform="translate(-23.756927,163.29152)">
+    <text
+       x="597.27948"
+       y="997.78094"
+       font-family="'Times New Roman', Times, serif"
+       font-weight="bold"
+       font-size="420px"
+       id="text2702"
+       style="font-weight:bold;font-size:420px;font-family:'Times New Roman', Times, serif"><tspan
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:420px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal"
+         id="tspan25093">Medley</tspan></text>
+    <use
+       xlink:href="#window-icon"
+       x="1066.795"
+       y="218.396"
+       width="372"
+       height="300"
+       id="use2674"
+       transform="translate(147.4565)" />
+    <use
+       xlink:href="#window-icon"
+       x="865.021"
+       y="89.851997"
+       width="372"
+       height="300"
+       id="use2676"
+       transform="translate(147.4565)" />
+    <use
+       xlink:href="#window-icon"
+       x="629.06"
+       y="50.366001"
+       width="372"
+       height="300"
+       id="use2678"
+       transform="translate(147.4565)" />
+    <use
+       xlink:href="#window-icon"
+       x="396.42899"
+       y="106.215"
+       width="372"
+       height="300"
+       id="use2680"
+       transform="translate(147.4565)" />
+    <use
+       xlink:href="#window-icon"
+       x="204.11301"
+       y="248.522"
+       width="372"
+       height="300"
+       id="use2682"
+       transform="translate(147.4565)" />
+    <use
+       xlink:href="#window-icon"
+       x="82.689003"
+       y="454.659"
+       width="372"
+       height="300"
+       id="use2684"
+       transform="translate(147.4565)" />
+    <use
+       xlink:href="#window-icon"
+       x="51.462002"
+       y="691.854"
+       width="372"
+       height="300"
+       id="use2686"
+       transform="translate(147.4565)" />
+    <use
+       xlink:href="#window-icon"
+       x="115.396"
+       y="922.39398"
+       width="372"
+       height="300"
+       id="use2688"
+       transform="translate(147.4565)" />
+    <use
+       xlink:href="#window-icon"
+       x="264.327"
+       y="1109.627"
+       width="372"
+       height="300"
+       id="use2690"
+       transform="translate(147.4565)" />
+    <use
+       xlink:href="#window-icon"
+       x="474.577"
+       y="1223.783"
+       width="372"
+       height="300"
+       id="use2692"
+       transform="translate(147.4565)" />
+    <text
+       xml:space="preserve"
+       style="font-style:italic;font-size:766.666px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Italic';fill:#000000;fill-opacity:0;stroke:#000000;stroke-width:7.8"
+       x="1003.8107"
+       y="1163.4888"
+       id="text288"><tspan
+         sodipodi:role="line"
+         id="tspan286"
+         x="1003.8107"
+         y="1163.4888" /></text>
+    <text
+       x="1263.5646"
+       y="1466.0958"
+       font-family="'Times New Roman', Times, serif"
+       font-weight="bold"
+       font-size="420px"
+       id="text292"
+       style="font-weight:bold;font-size:420px;font-family:'Times New Roman', Times, serif"><tspan
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:233.333px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal"
+         id="tspan290">app</tspan></text>
+  </g>
+  <defs
+     id="defs2708">
+    <rect
+       x="1144.3981"
+       y="797.67157"
+       width="915.91937"
+       height="555.16339"
+       id="rect44588" />
+  </defs>
+  <sodipodi:namedview
+     id="namedview2706"
+     pagecolor="#f5eddc"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="1"
+     inkscape:pagecheckerboard="0"
+     showgrid="false"
+     inkscape:zoom="0.49895222"
+     inkscape:cx="760.59387"
+     inkscape:cy="1017.1315"
+     inkscape:window-width="2286"
+     inkscape:window-height="1205"
+     inkscape:window-x="45"
+     inkscape:window-y="53"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="g1126"
+     fit-margin-top="100"
+     fit-margin-left="100"
+     fit-margin-right="100"
+     fit-margin-bottom="100"
+     inkscape:showpageshadow="2"
+     inkscape:deskcolor="#d1d1d1" />
+  <symbol
+     id="window-icon"
+     viewBox="0 0 372 300"
+     transform="translate(-98.918502,49.633999)">
+    <rect
+       x="10"
+       y="10"
+       width="352"
+       height="280"
+       style="fill:#ffffff;stroke:#000000;stroke-width:20"
+       id="rect2665" />
+    <line
+       x1="10"
+       y1="30"
+       x2="362"
+       y2="30"
+       style="fill:#ffffff;stroke:#000000;stroke-width:20"
+       id="line2667" />
+  </symbol>
+  <circle
+     cx="551.08148"
+     cy="699.63397"
+     r="20"
+     style="display:none;fill:#ffffff;stroke:#ff0000;stroke-width:5"
+     id="circle2696" />
+  <circle
+     cx="551.08148"
+     cy="699.63397"
+     r="600"
+     style="display:none;fill:none;stroke:#0000ff;stroke-width:5"
+     id="circle2698" />
+  <rect
+     x="-98.918503"
+     y="49.633999"
+     width="2922"
+     height="1600"
+     style="display:none;fill:none;stroke:#00ff00;stroke-width:10"
+     id="rect2700" />
+  <text
+     xml:space="preserve"
+     id="text44586"
+     style="font-size:40px;line-height:1.25;font-family:'Times New Roman';-inkscape-font-specification:'Times New Roman, ';white-space:pre;shape-inside:url(#rect44588);display:inline"
+     transform="translate(-98.918502,49.633999)" />
+</svg>

installers/macos/images/Command_icon.svg

@@ -0,0 +1,209 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   preserveAspectRatio="xMidYMid meet"
+   width="2000"
+   height="2000"
+   viewBox="0 0 2000 2000"
+   version="1.1"
+   id="svg2704"
+   sodipodi:docname="Command_icon.svg"
+   inkscape:version="1.2 (dc2aeda, 2022-05-15)"
+   inkscape:export-filename="Command_icon256.png"
+   inkscape:export-xdpi="12.288"
+   inkscape:export-ydpi="12.288"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <g
+     id="g1126"
+     transform="translate(-23.756927,163.29152)">
+    <text
+       x="597.27948"
+       y="997.78094"
+       font-family="'Times New Roman', Times, serif"
+       font-weight="bold"
+       font-size="420px"
+       id="text2702"
+       style="font-weight:bold;font-size:420px;font-family:'Times New Roman', Times, serif"><tspan
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:420px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal"
+         id="tspan25093">Medley</tspan></text>
+    <use
+       xlink:href="#window-icon"
+       x="1066.795"
+       y="218.396"
+       width="372"
+       height="300"
+       id="use2674"
+       transform="translate(147.4565)" />
+    <use
+       xlink:href="#window-icon"
+       x="865.021"
+       y="89.851997"
+       width="372"
+       height="300"
+       id="use2676"
+       transform="translate(147.4565)" />
+    <use
+       xlink:href="#window-icon"
+       x="629.06"
+       y="50.366001"
+       width="372"
+       height="300"
+       id="use2678"
+       transform="translate(147.4565)" />
+    <use
+       xlink:href="#window-icon"
+       x="396.42899"
+       y="106.215"
+       width="372"
+       height="300"
+       id="use2680"
+       transform="translate(147.4565)" />
+    <use
+       xlink:href="#window-icon"
+       x="204.11301"
+       y="248.522"
+       width="372"
+       height="300"
+       id="use2682"
+       transform="translate(147.4565)" />
+    <use
+       xlink:href="#window-icon"
+       x="82.689003"
+       y="454.659"
+       width="372"
+       height="300"
+       id="use2684"
+       transform="translate(147.4565)" />
+    <use
+       xlink:href="#window-icon"
+       x="51.462002"
+       y="691.854"
+       width="372"
+       height="300"
+       id="use2686"
+       transform="translate(147.4565)" />
+    <use
+       xlink:href="#window-icon"
+       x="115.396"
+       y="922.39398"
+       width="372"
+       height="300"
+       id="use2688"
+       transform="translate(147.4565)" />
+    <use
+       xlink:href="#window-icon"
+       x="264.327"
+       y="1109.627"
+       width="372"
+       height="300"
+       id="use2690"
+       transform="translate(147.4565)" />
+    <use
+       xlink:href="#window-icon"
+       x="474.577"
+       y="1223.783"
+       width="372"
+       height="300"
+       id="use2692"
+       transform="translate(147.4565)" />
+    <text
+       xml:space="preserve"
+       style="font-style:italic;font-size:766.666px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Italic';fill:#000000;fill-opacity:0;stroke:#000000;stroke-width:7.8"
+       x="1003.8107"
+       y="1163.4888"
+       id="text288"><tspan
+         sodipodi:role="line"
+         id="tspan286"
+         x="1003.8107"
+         y="1163.4888" /></text>
+    <text
+       x="936.01031"
+       y="1500.8351"
+       font-family="'Times New Roman', Times, serif"
+       font-weight="bold"
+       font-size="420px"
+       id="text292"
+       style="font-weight:bold;font-size:420px;font-family:'Times New Roman', Times, serif"><tspan
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:233.333px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal"
+         id="tspan290">command</tspan></text>
+  </g>
+  <defs
+     id="defs2708">
+    <rect
+       x="1144.3981"
+       y="797.67157"
+       width="915.91937"
+       height="555.16339"
+       id="rect44588" />
+  </defs>
+  <sodipodi:namedview
+     id="namedview2706"
+     pagecolor="#f5ebd3"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="1"
+     inkscape:pagecheckerboard="0"
+     showgrid="false"
+     inkscape:zoom="0.49895222"
+     inkscape:cx="1195.5053"
+     inkscape:cy="916.92146"
+     inkscape:window-width="1752"
+     inkscape:window-height="1205"
+     inkscape:window-x="1099"
+     inkscape:window-y="119"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="g1126"
+     fit-margin-top="100"
+     fit-margin-left="100"
+     fit-margin-right="100"
+     fit-margin-bottom="100"
+     inkscape:showpageshadow="2"
+     inkscape:deskcolor="#d1d1d1" />
+  <symbol
+     id="window-icon"
+     viewBox="0 0 372 300"
+     transform="translate(-98.918502,49.633999)">
+    <rect
+       x="10"
+       y="10"
+       width="352"
+       height="280"
+       style="fill:#ffffff;stroke:#000000;stroke-width:20"
+       id="rect2665" />
+    <line
+       x1="10"
+       y1="30"
+       x2="362"
+       y2="30"
+       style="fill:#ffffff;stroke:#000000;stroke-width:20"
+       id="line2667" />
+  </symbol>
+  <circle
+     cx="551.08148"
+     cy="699.63397"
+     r="20"
+     style="display:none;fill:#ffffff;stroke:#ff0000;stroke-width:5"
+     id="circle2696" />
+  <circle
+     cx="551.08148"
+     cy="699.63397"
+     r="600"
+     style="display:none;fill:none;stroke:#0000ff;stroke-width:5"
+     id="circle2698" />
+  <rect
+     x="-98.918503"
+     y="49.633999"
+     width="2922"
+     height="1600"
+     style="display:none;fill:none;stroke:#00ff00;stroke-width:10"
+     id="rect2700" />
+  <text
+     xml:space="preserve"
+     id="text44586"
+     style="font-size:40px;line-height:1.25;font-family:'Times New Roman';-inkscape-font-specification:'Times New Roman, ';white-space:pre;shape-inside:url(#rect44588);display:inline"
+     transform="translate(-98.918502,49.633999)" />
+</svg>

installers/macos/images/Install_icon.svg

@@ -0,0 +1,209 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   preserveAspectRatio="xMidYMid meet"
+   width="2000"
+   height="2000"
+   viewBox="0 0 2000 2000"
+   version="1.1"
+   id="svg2704"
+   sodipodi:docname="Install_icon.svg"
+   inkscape:version="1.2 (dc2aeda, 2022-05-15)"
+   inkscape:export-filename="Install_icon256.png"
+   inkscape:export-xdpi="6.1440001"
+   inkscape:export-ydpi="6.1440001"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <g
+     id="g1126"
+     transform="translate(-23.756927,163.29152)">
+    <text
+       x="597.27948"
+       y="997.78094"
+       font-family="'Times New Roman', Times, serif"
+       font-weight="bold"
+       font-size="420px"
+       id="text2702"
+       style="font-weight:bold;font-size:420px;font-family:'Times New Roman', Times, serif"><tspan
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:420px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal"
+         id="tspan25093">Medley</tspan></text>
+    <use
+       xlink:href="#window-icon"
+       x="1066.795"
+       y="218.396"
+       width="372"
+       height="300"
+       id="use2674"
+       transform="translate(147.4565)" />
+    <use
+       xlink:href="#window-icon"
+       x="865.021"
+       y="89.851997"
+       width="372"
+       height="300"
+       id="use2676"
+       transform="translate(147.4565)" />
+    <use
+       xlink:href="#window-icon"
+       x="629.06"
+       y="50.366001"
+       width="372"
+       height="300"
+       id="use2678"
+       transform="translate(147.4565)" />
+    <use
+       xlink:href="#window-icon"
+       x="396.42899"
+       y="106.215"
+       width="372"
+       height="300"
+       id="use2680"
+       transform="translate(147.4565)" />
+    <use
+       xlink:href="#window-icon"
+       x="204.11301"
+       y="248.522"
+       width="372"
+       height="300"
+       id="use2682"
+       transform="translate(147.4565)" />
+    <use
+       xlink:href="#window-icon"
+       x="82.689003"
+       y="454.659"
+       width="372"
+       height="300"
+       id="use2684"
+       transform="translate(147.4565)" />
+    <use
+       xlink:href="#window-icon"
+       x="51.462002"
+       y="691.854"
+       width="372"
+       height="300"
+       id="use2686"
+       transform="translate(147.4565)" />
+    <use
+       xlink:href="#window-icon"
+       x="115.396"
+       y="922.39398"
+       width="372"
+       height="300"
+       id="use2688"
+       transform="translate(147.4565)" />
+    <use
+       xlink:href="#window-icon"
+       x="264.327"
+       y="1109.627"
+       width="372"
+       height="300"
+       id="use2690"
+       transform="translate(147.4565)" />
+    <use
+       xlink:href="#window-icon"
+       x="474.577"
+       y="1223.783"
+       width="372"
+       height="300"
+       id="use2692"
+       transform="translate(147.4565)" />
+    <text
+       xml:space="preserve"
+       style="font-style:italic;font-size:766.666px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Italic';fill:#000000;fill-opacity:0;stroke:#000000;stroke-width:7.8"
+       x="1003.8107"
+       y="1163.4888"
+       id="text288"><tspan
+         sodipodi:role="line"
+         id="tspan286"
+         x="1003.8107"
+         y="1163.4888" /></text>
+    <text
+       x="970.08179"
+       y="1540.9191"
+       font-family="'Times New Roman', Times, serif"
+       font-weight="bold"
+       font-size="420px"
+       id="text292"
+       style="font-weight:bold;font-size:366.667px;font-family:'Times New Roman', Times, serif"><tspan
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:366.667px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal"
+         id="tspan290">install</tspan></text>
+  </g>
+  <defs
+     id="defs2708">
+    <rect
+       x="1144.3981"
+       y="797.67157"
+       width="915.91937"
+       height="555.16339"
+       id="rect44588" />
+  </defs>
+  <sodipodi:namedview
+     id="namedview2706"
+     pagecolor="#f5ebd3"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="1"
+     inkscape:pagecheckerboard="0"
+     showgrid="false"
+     inkscape:zoom="0.49895222"
+     inkscape:cx="1199.5137"
+     inkscape:cy="920.92986"
+     inkscape:window-width="1752"
+     inkscape:window-height="1205"
+     inkscape:window-x="1099"
+     inkscape:window-y="63"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="g1126"
+     fit-margin-top="100"
+     fit-margin-left="100"
+     fit-margin-right="100"
+     fit-margin-bottom="100"
+     inkscape:showpageshadow="2"
+     inkscape:deskcolor="#d1d1d1" />
+  <symbol
+     id="window-icon"
+     viewBox="0 0 372 300"
+     transform="translate(-98.918502,49.633999)">
+    <rect
+       x="10"
+       y="10"
+       width="352"
+       height="280"
+       style="fill:#ffffff;stroke:#000000;stroke-width:20"
+       id="rect2665" />
+    <line
+       x1="10"
+       y1="30"
+       x2="362"
+       y2="30"
+       style="fill:#ffffff;stroke:#000000;stroke-width:20"
+       id="line2667" />
+  </symbol>
+  <circle
+     cx="551.08148"
+     cy="699.63397"
+     r="20"
+     style="display:none;fill:#ffffff;stroke:#ff0000;stroke-width:5"
+     id="circle2696" />
+  <circle
+     cx="551.08148"
+     cy="699.63397"
+     r="600"
+     style="display:none;fill:none;stroke:#0000ff;stroke-width:5"
+     id="circle2698" />
+  <rect
+     x="-98.918503"
+     y="49.633999"
+     width="2922"
+     height="1600"
+     style="display:none;fill:none;stroke:#00ff00;stroke-width:10"
+     id="rect2700" />
+  <text
+     xml:space="preserve"
+     id="text44586"
+     style="font-size:40px;line-height:1.25;font-family:'Times New Roman';-inkscape-font-specification:'Times New Roman, ';white-space:pre;shape-inside:url(#rect44588);display:inline"
+     transform="translate(-98.918502,49.633999)" />
+</svg>

installers/macos/images/MedleyIcon.svg

@@ -0,0 +1,199 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   preserveAspectRatio="xMidYMid meet"
+   width="2000"
+   height="2000"
+   viewBox="0 0 2000 2000"
+   version="1.1"
+   id="svg2704"
+   sodipodi:docname="MedleyIcon.svg"
+   inkscape:version="1.2 (dc2aeda, 2022-05-15)"
+   inkscape:export-filename="C:\Users\Frank\Dev\il\logos\MedleyIcon256.png"
+   inkscape:export-xdpi="12.287999"
+   inkscape:export-ydpi="12.287999"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <g
+     id="g1126"
+     transform="translate(-23.756927,163.29152)">
+    <text
+       x="597.27948"
+       y="997.78094"
+       font-family="'Times New Roman', Times, serif"
+       font-weight="bold"
+       font-size="420px"
+       id="text2702"
+       style="font-weight:bold;font-size:420px;font-family:'Times New Roman', Times, serif"><tspan
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:420px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal"
+         id="tspan25093">Medley</tspan></text>
+    <use
+       xlink:href="#window-icon"
+       x="1066.795"
+       y="218.396"
+       width="372"
+       height="300"
+       id="use2674"
+       transform="translate(147.4565)" />
+    <use
+       xlink:href="#window-icon"
+       x="865.021"
+       y="89.851997"
+       width="372"
+       height="300"
+       id="use2676"
+       transform="translate(147.4565)" />
+    <use
+       xlink:href="#window-icon"
+       x="629.06"
+       y="50.366001"
+       width="372"
+       height="300"
+       id="use2678"
+       transform="translate(147.4565)" />
+    <use
+       xlink:href="#window-icon"
+       x="396.42899"
+       y="106.215"
+       width="372"
+       height="300"
+       id="use2680"
+       transform="translate(147.4565)" />
+    <use
+       xlink:href="#window-icon"
+       x="204.11301"
+       y="248.522"
+       width="372"
+       height="300"
+       id="use2682"
+       transform="translate(147.4565)" />
+    <use
+       xlink:href="#window-icon"
+       x="82.689003"
+       y="454.659"
+       width="372"
+       height="300"
+       id="use2684"
+       transform="translate(147.4565)" />
+    <use
+       xlink:href="#window-icon"
+       x="51.462002"
+       y="691.854"
+       width="372"
+       height="300"
+       id="use2686"
+       transform="translate(147.4565)" />
+    <use
+       xlink:href="#window-icon"
+       x="115.396"
+       y="922.39398"
+       width="372"
+       height="300"
+       id="use2688"
+       transform="translate(147.4565)" />
+    <use
+       xlink:href="#window-icon"
+       x="264.327"
+       y="1109.627"
+       width="372"
+       height="300"
+       id="use2690"
+       transform="translate(147.4565)" />
+    <use
+       xlink:href="#window-icon"
+       x="474.577"
+       y="1223.783"
+       width="372"
+       height="300"
+       id="use2692"
+       transform="translate(147.4565)" />
+    <text
+       xml:space="preserve"
+       style="font-style:italic;font-size:766.666px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Italic';fill:#000000;fill-opacity:0;stroke:#000000;stroke-width:7.8"
+       x="1003.8107"
+       y="1163.4888"
+       id="text288"><tspan
+         sodipodi:role="line"
+         id="tspan286"
+         x="1003.8107"
+         y="1163.4888" /></text>
+  </g>
+  <defs
+     id="defs2708">
+    <rect
+       x="1144.3981"
+       y="797.67157"
+       width="915.91937"
+       height="555.16339"
+       id="rect44588" />
+  </defs>
+  <sodipodi:namedview
+     id="namedview2706"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="1"
+     inkscape:pagecheckerboard="0"
+     showgrid="false"
+     inkscape:zoom="0.49895222"
+     inkscape:cx="1302.7299"
+     inkscape:cy="918.92566"
+     inkscape:window-width="1752"
+     inkscape:window-height="1205"
+     inkscape:window-x="172"
+     inkscape:window-y="96"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="g1126"
+     fit-margin-top="100"
+     fit-margin-left="100"
+     fit-margin-right="100"
+     fit-margin-bottom="100"
+     inkscape:showpageshadow="2"
+     inkscape:deskcolor="#d1d1d1" />
+  <symbol
+     id="window-icon"
+     viewBox="0 0 372 300"
+     transform="translate(-98.918502,49.633999)">
+    <rect
+       x="10"
+       y="10"
+       width="352"
+       height="280"
+       style="fill:#ffffff;stroke:#000000;stroke-width:20"
+       id="rect2665" />
+    <line
+       x1="10"
+       y1="30"
+       x2="362"
+       y2="30"
+       style="fill:#ffffff;stroke:#000000;stroke-width:20"
+       id="line2667" />
+  </symbol>
+  <circle
+     cx="551.08148"
+     cy="699.63397"
+     r="20"
+     style="display:none;fill:#ffffff;stroke:#ff0000;stroke-width:5"
+     id="circle2696" />
+  <circle
+     cx="551.08148"
+     cy="699.63397"
+     r="600"
+     style="display:none;fill:none;stroke:#0000ff;stroke-width:5"
+     id="circle2698" />
+  <rect
+     x="-98.918503"
+     y="49.633999"
+     width="2922"
+     height="1600"
+     style="display:none;fill:none;stroke:#00ff00;stroke-width:10"
+     id="rect2700" />
+  <text
+     xml:space="preserve"
+     id="text44586"
+     style="font-size:40px;line-height:1.25;font-family:'Times New Roman';-inkscape-font-specification:'Times New Roman, ';white-space:pre;shape-inside:url(#rect44588)"
+     transform="translate(-98.918502,49.633999)" />
+</svg>

installers/macos/pkg/Distribution.xml

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<installer-gui-script minSpecVersion="1">
+    <pkg-ref id="org.interlisp.Medley"/>
+    <options customize="always" require-scripts="false" hostArchitectures="x86_64,arm64" />
+    <domains enable_anywhere="false" enable_currentUserHome="true" enable_localSystem="false" />
+    <choices-outline>
+        <line choice="default">
+            <line choice="org.interlisp.Medley" />
+        </line>
+        <line choice="Location" />
+    </choices-outline>
+    <choice id="default" visible="false" />
+    <choice id="org.interlisp.Medley"
+            description="D Install for all Users?" 
+            title="T Install for all users?"
+            customLocation="tests"
+    >
+        <pkg-ref id="org.interlisp.Medley"/>
+    </choice>
+    <choice id="Location" 
+            description="D Install for all Users?" 
+            title="T Install for all users?"
+            customLocation="tests"
+    >
+        <pkg-ref id="org.interlisp.Medley"/>
+    </choice>
+    <pkg-ref id="org.interlisp.Medley" version="01.01.01" onConclusion="none">Medley-base.pkg</pkg-ref>
+</installer-gui-script>
+

installers/macos/scripts/medley_add2path

@@ -0,0 +1,43 @@
+#!/bin/bash
+
+# functions to discover what directory this script is being executed from
+get_abs_filename() {
+  # $1 : relative filename
+  echo "$(cd "$(dirname "$1")" && pwd)/$(basename "$1")"
+}
+
+get_script_dir() {
+
+    # call this with ${BASH_SOURCE[0]:-$0} as its (only) parameter
+
+    # set -x
+
+    local SCRIPT_PATH="$( get_abs_filename "$1" )";
+
+    pushd . > '/dev/null';
+
+    while [ -h "$SCRIPT_PATH" ];
+    do
+        cd "$( dirname -- "$SCRIPT_PATH"; )";
+        SCRIPT_PATH="$( readlink -f -- "$SCRIPT_PATH"; )";
+    done
+
+    cd "$( dirname -- "$SCRIPT_PATH"; )" > '/dev/null';
+    SCRIPT_PATH="$( pwd; )";
+
+    popd  > '/dev/null';
+
+    # set +x
+
+    echo "${SCRIPT_PATH}"
+}
+
+SCRIPTDIR=$(get_script_dir "${BASH_SOURCE[0]:-$0}")
+
+touch ~/.profile
+cat >> ~/.profile <<EOF
+PATH=\${PATH}:${SCRIPTDIR}
+EOF
+rm ${SCRIPTDIR}/medley_add2path.command
+
+

installers/win/medley.iss

@@ -34,7 +34,7 @@ SolidCompression=yes
 ; 64-bit Program Files directory and the 64-bit view of the registry.
 ArchitecturesInstallIn64BitMode=x64
 OutputDir="."
-OutputBaseFilename="medley-install_{#version}_{#x86_or_x64}"
+OutputBaseFilename="medley-full-{#version}-windows-{#x86_or_x64}"
 SetupIconFile="Medley.ico"
 DisableWelcomePage=no
 MissingRunOnceIdsWarning=no

internal/MEDLEY-UTILS

@@ -1,12 +1,13 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "XCL" BASE 10)
 
-
(FILECREATED "23-May-2023 07:10:58" |{DSK}<home>larry>il>medley>internal>MEDLEY-UTILS.;12|
 10354  
+
(FILECREATED " 3-Aug-2023 18:40:12" |{DSK}<home>frank>il>medley>gmedley>internal>MEDLEY-UTILS.;6|
 10695  
 
-      :EDIT-BY "lmm"
+      :EDIT-BY "frank"
 
-      :CHANGES-TO (FNS GATHER-INFO)
+      :CHANGES-TO (FNS MAKE-FULLER-DB MAKE-EXPORTS-ALL MAKE-WHEREIS-HASH)
 
-      :PREVIOUS-DATE "22-May-2023 22:57:21" |{DSK}<home>larry>il>medley>internal>MEDLEY-UTILS.;11|)
+      :PREVIOUS-DATE " 1-Aug-2023 22:43:13" 
+|{DSK}<home>frank>il>medley>gmedley>internal>MEDLEY-UTILS.;5|)
 
 
 (PRETTYCOMPRINT MEDLEY-UTILSCOMS)
@@ -102,18 +103,19 @@
         (HELP))))
 
 (MAKE-FULLER-DB

-  (LAMBDA NIL
                                             (* \; "Edited 16-Jul-2022 22:07 by larry")


+  (LAMBDA (DRIBBLEFILE DBFILE SYSOUTFILE)
                 (* \; "Edited  3-Aug-2023 18:12 by frank")


+                                                          (* \; "Edited 16-Jul-2022 22:07 by larry")


                                                           (* \; "Edited 20-Jun-2022 17:23 by larry")

     (FILESLOAD (SOURCE)
            FILESETS)
-    (DRIBBLE (MEDLEYDIR "tmp" "fuller.dribble" T T))
+    (DRIBBLE (OR DRIBBLEFILE "fuller.dribble"))
     (DOFILESLOAD (SUBSET (APPEND OKSOURCES OKLIBRARY OKLISPUSERS OKINTERNAL)
                         'FINDFILE))
     (GATHER-INFO
 'ALL)
     (MASTERSCOPE '(WHO CALLS XYZZY))
-    (DUMPDATABASE NIL (MKATOM (MEDLEYDIR "tmp" "fuller.database" T T)))
+    (DUMPDATABASE NIL (MKATOM (OR DBFILE "fuller.database")))
     (DRIBBLE)
-    (MAKESYS (MEDLEYDIR "tmp" "fuller.sysout" T T)
+    (MAKESYS (OR SYSOUTFILE "fuller.sysout")
            "Welcome to Fuller sysout")))
 
 (MEDLEY-FIX-LINKS

@@ -146,7 +148,8 @@
 (DEFINEQ
 
 (MAKE-EXPORTS-ALL

-  (LAMBDA NIL
                                             (* \; "Edited  9-Mar-2021 16:11 by larry")

+  (LAMBDA (OUTFILE)
                                       (* \; "Edited  3-Aug-2023 18:34 by frank")


+                                                          (* \; "Edited  9-Mar-2021 16:11 by larry")

                                                              (* "Edited May 3, 2018 by Ron Kaplan--relative to MEDLEYDIR/lispcore/.  Don't know why it does the CORE/RENAME")

                                                              (* 
 
          "Edited Aug 17 94 by Sybalsky -- point it to /king/export/lispcore as the truth directory.")

@@ -156,24 +159,25 @@
 
                                                             "Edited September 29, 1986 by van Melle")

     (CNDIR (MEDLEYDIR "sources"))
     (LOAD 'FILESETS)
-    (GATHEREXPORTS EXPORTFILES (MEDLEYDIR "tmp" "exports.all" T))))
+    (GATHEREXPORTS EXPORTFILES (OR OUTFILE "exports.all"))))
 
 (MAKE-WHEREIS-HASH

-  (LAMBDA NIL
                                               (* \; "Edited 12-Mar-2022 12:46 by rmk")


+  (LAMBDA (DRIBBLEFILE TMPFILE WHEREISFILE)
               (* \; "Edited  3-Aug-2023 18:37 by frank")


+                                                            (* \; "Edited 12-Mar-2022 12:46 by rmk")


                                                           (* \; "Edited 24-Mar-2021 13:26 by larry")

     (LET ((FILING.ENUMERATION.DEPTH 2)
           HASHFILE)
-         (DRIBBLE (MEDLEYDIR "tmp" "whereis.dribble" T))
-         (SETQ HASHFILE (XCL::WHERE-IS-NOTICE (MEDLEYDIR "tmp" "whereis.hash-tmp" T)
+         (DRIBBLE (OR DRIBBLEFILE "whereis.dribble"))
+         (SETQ HASHFILE (XCL::WHERE-IS-NOTICE (OR TMPFILE "whereis.hash-tmp")
                                :FILES
                                (|for|
 X |in|
 MEDLEY-FIX-DIRS |collect|
 (CONCAT (MEDLEYDIR X)
                                                                               "*.;"))
                                :HASH-FILE-SIZE 60000 :NEW T))
-         (RENAMEFILE HASHFILE (MEDLEYDIR "tmp" "whereis.hash" T))
+         (RENAMEFILE HASHFILE (OR WHEREISFILE "whereis.hash"))
          (DRIBBLE))))
 )
 (DECLARE\: DONTCOPY
-  (FILEMAP (NIL (624 7499 (GATHER-INFO 634 . 6162) (MAKE-FULLER-DB 6164 . 6854) (MEDLEY-FIX-LINKS 6856
- . 7253) (MEDLEY-FIX-DATES 7255 . 7497)) (8538 10331 (MAKE-EXPORTS-ALL 8548 . 9507) (MAKE-WHEREIS-HASH
- 9509 . 10329)))))
+  (FILEMAP (NIL (679 7642 (GATHER-INFO 689 . 6217) (MAKE-FULLER-DB 6219 . 6997) (MEDLEY-FIX-LINKS 6999
+ . 7396) (MEDLEY-FIX-DATES 7398 . 7640)) (8681 10672 (MAKE-EXPORTS-ALL 8691 . 9752) (MAKE-WHEREIS-HASH
+ 9754 . 10670)))))
 STOP

internal/loadups/LOADUP-FULL

@@ -1,10 +1,10 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
 
-
(FILECREATED "18-Jan-2023 16:23:36" {DSK}<home>frank>il>medley>gmedley>sources>LOADUP-FULL.;2
 4636   
+
(FILECREATED "31-Jul-2023 18:28:53" {DSK}<home>frank>il>medley>gmedley>sources>LOADUP-FULL.;4
 4521   
 
       :CHANGES-TO (FNS LOADUP-FULL)
 
-      :PREVIOUS-DATE "12-Aug-2022 12:30:09" {DSK}<home>frank>il>medley>gmedley>sources>LOADUP-FULL.;1
+      :PREVIOUS-DATE "18-Jan-2023 16:23:36" {DSK}<home>frank>il>medley>gmedley>sources>LOADUP-FULL.;3
 )
 
 
@@ -39,7 +39,7 @@
                (PRINTOUT T "FULL fonts loaded" T])
 
 (LOADUP-FULL

-  [LAMBDA NIL
                                                (* ; "Edited 18-Jan-2023 16:22 by FGH")


+  [LAMBDA (DRIBBLEFILE)
                                      (* ; "Edited 18-Jan-2023 16:22 by FGH")


                                                              (* ; "Edited 12-Aug-2022 11:17 by lmm")


                                                              (* ; "Edited 14-Jul-2022 12:32 by rmk")


                                                              (* ; "Edited 12-Jul-2022 21:57 by rmk")


@@ -55,9 +55,7 @@
     (PROGN (SETQ MEDLEYDIR)
            (CNDIR (MEDLEYDIR)))
     (MEDLEY-INIT-VARS)
-    (SETQ MAKESYSFILENAME (MEDLEYDIR "tmp" "full.sysout" T))
-    (SETQ MAKESYSNAME :MEDLEY)
-    (DRIBBLE (MEDLEYDIR "tmp" "full.dribble" T))
+    (DRIBBLE DRIBBLEFILE)
 
     (* ;; "BKSYSBUF stops page holding ")

 
@@ -88,5 +86,5 @@
 
 (FIXMETA
)
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (467 4598 (LOADFULLFONTS 477 . 1918) (LOADUP-FULL 1920 . 4348) (FIXMETA 4350 . 4596)))))
+  (FILEMAP (NIL (467 4483 (LOADFULLFONTS 477 . 1918) (LOADUP-FULL 1920 . 4233) (FIXMETA 4235 . 4481)))))
 STOP

internal/loadups/LOADUP-LISP

@@ -1,12 +1,11 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "XCL" BASE 10)
 
-
(FILECREATED "27-Feb-2023 17:15:53" |{DSK}<home>larry>il>medley>sources>LOADUP-LISP.;2|
 5263   
-
-      :EDIT-BY "lmm"
+
(FILECREATED "31-Jul-2023 18:22:53" |{DSK}<home>frank>il>medley>gmedley>sources>LOADUP-LISP.;2|
 5235   
 
       :CHANGES-TO (FNS LOADUP-LISP)
 
-      :PREVIOUS-DATE "12-Aug-2022 12:29:57" |{DSK}<home>larry>il>medley>sources>LOADUP-LISP.;1|)
+      :PREVIOUS-DATE "27-Feb-2023 17:15:53" 
+|{DSK}<home>frank>il>medley>gmedley>sources>LOADUP-LISP.;1|)
 
 
 (PRETTYCOMPRINT LOADUP-LISPCOMS)
@@ -19,13 +18,13 @@
 (DEFINEQ
 
 (LOADUP-LISP

-  (LAMBDA NIL
                                               (* \; "Edited 26-Feb-2023 12:17 by lmm")


+  (LAMBDA (DRIBBLEFILE)
                                     (* \; "Edited 26-Feb-2023 12:17 by lmm")


                                                             (* \; "Edited 13-Jul-2022 14:09 by rmk")


                                                           (* \; "Edited  4-Mar-2022 19:13 by larry")


                                                            (* \; "Edited 29-Apr-2021 22:30 by rmk:")

     (SETQQ COMPILE.EXT LCOM)
     (MEDLEY-INIT-VARS)                                       (* \; "should be set earlier")

-    (DRIBBLE (MEDLEYDIR "tmp" "lisp.dribble" T))
+    (DRIBBLE DRIBBLEFILE)
     (FOR
 X IN
 BOOTLOADEDFILES DO
 (CL:UNLESS (MEMB X SYSFILES)
                                      (PRINTOUT T X " bootloaded" T)
                                      (SETQ SYSFILES (CONS X SYSFILES))))
@@ -124,5 +123,5 @@
 (GLOBALVARS MAKESYSFILENAME MEDLEY-INIT-VARS MEDLEYDIR SYSTEMINITVARS USERRECLST)
 )
 (DECLARE\: DONTCOPY
-  (FILEMAP (NIL (654 5057 (LOADUP-LISP 664 . 5055)))))
+  (FILEMAP (NIL (649 5029 (LOADUP-LISP 659 . 5027)))))
 STOP

internal/loadups/MAKEINIT

@@ -1,18 +1,13 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
 
-
(FILECREATED "11-Jul-2022 20:00:23" 
-{DSK}<users>kaplan>local>medley3.5>working-medley>sources>MAKEINIT.;3
 54607  
+
(FILECREATED " 7-Aug-2023 13:31:49" {DSK}<home>frank>il>medley>gmedley>internal>loadups>MAKEINIT.;4
 54490  
 
-      :CHANGES-TO (FNS I.FIXUPNUM I.FIXUPSYM)
+      :CHANGES-TO (FNS MAKEINITGREET)
 
-      :PREVIOUS-DATE "19-Jul-2021 23:50:29" 
-{DSK}<users>kaplan>local>medley3.5>working-medley>sources>MAKEINIT.;2)
+      :PREVIOUS-DATE " 3-Aug-2023 17:37:51" 
+{DSK}<home>frank>il>medley>gmedley>internal>loadups>MAKEINIT.;1)
 
 
-(* ; "
-Copyright (c) 1982-1988, 1990-1992, 1998, 2021 by Venue & Xerox Corporation.
-")
-
 (PRETTYCOMPRINT MAKEINITCOMS)
 
 (RPAQQ MAKEINITCOMS

@@ -83,7 +78,8 @@ Copyright (c) 1982-1988, 1990-1992, 1998, 2021 by Venue & Xerox Corporation.
 (DEFINEQ
 
 (MAKEINITGREET

-  [LAMBDA NIL
                                          (* ; "Edited 11-Mar-2021 22:14 by larry")


+  [LAMBDA (SYSOUTFILE DLINITFILE)
                          (* ; "Edited  3-Aug-2023 17:37 by frank")


+                                                           (* ; "Edited 11-Mar-2021 22:14 by larry")


                                                             (* ; "Edited  5-Dec-2017 15:26 by rmk:")

 
     (* ;; "")

@@ -93,12 +89,13 @@ Copyright (c) 1982-1988, 1990-1992, 1998, 2021 by Venue & Xerox Corporation.
     (* ;; "")

                                                              (* Versions are Lisp Microcode Bcpl)

     (MEDLEY-INIT-VARS)
-    (DORENAME 'I)
-    (DORENAME 'R)
-    (DLFIXINIT
 (MAKEINIT
 '(39424 5682 11008)
-                          (MEDLEYDIR "tmp" "init.sysout" T)
-                          NIL DIRECTORIES DISPLAYFONTDIRECTORIES)
-           (MEDLEYDIR "tmp" "init.dlinit" T])
+    (RESETLST
+        (RESETSAVE OK.TO.MODIFY.FNS T)
+        (DORENAME 'I)
+        (DORENAME 'R)
+        (DLFIXINIT
 (MAKEINIT
 '(39424 5682 11008)
+                          SYSOUTFILE NIL DIRECTORIES DISPLAYFONTDIRECTORIES)
+               DLINITFILE))])
 )
 
 (FILESLOAD (SOURCE)
@@ -1053,28 +1050,26 @@ DONTCOPY
 (GLOBALVARS DLPRIMARYMAP DLSECONDARYMAP DLLOCKBITS DLLASTDOMINOPAGE DLIFPAGE DLNEXTPM DLPAGEMAPFP 
        FPTOVP NEWFPFROMOLD VMEMFILE VMEMFILEX)
 )
-(PUTPROPS MAKEINIT COPYRIGHT ("Venue & Xerox Corporation" 1982 1983 1984 1985 1986 1987 1988 1990 1991
- 1992 1998 2021))
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (3971 4718 (MAKEINITGREET 3981 . 4716)) (4901 11286 (LOADMAKEINIT 4911 . 6114) (
-LOADMKIFILES 6116 . 6431) (RELOAD 6433 . 6916) (MAKEINIT 6918 . 10578) (MKI.START 10580 . 11284)) (
-11364 17082 (MKI.PASSFILE 11374 . 14984) (SCRATCHARRAY 14986 . 15635) (DOFORM 15637 . 16314) (
-CONSTFORMP 16316 . 16550) (NOTICECOMS 16552 . 16860) (EVALFORMAKEINIT 16862 . 17080)) (17083 19203 (
-I.ADDTOVAR 17093 . 17187) (I.DECLARE%: 17189 . 17465) (I.DEFINE-FILE-INFO 17467 . 17657) (
-I.FILECREATED 17659 . 18033) (I.PUTPROPS 18035 . 18148) (I.RPAQ 18150 . 18371) (I.RPAQQ 18373 . 18569)
- (I.RPAQ? 18571 . 18786) (I.SETTOPVAL 18788 . 19020) (I.NOUNDO 19022 . 19201)) (19839 26055 (
-I.ATOMNUMBER 19849 . 20340) (I.\ATOMCELL 20342 . 22095) (I.FIXUPNUM 22097 . 23022) (I.FIXUPPTR 23024
- . 23505) (I.FIXUPSYM 23507 . 24563) (I.WORDSPERNAMEENTRY 24565 . 25320) (I.SETSTKNTOFFSET 25322 . 
-26053)) (26087 27595 (MKI.ATOM 26097 . 26293) (MKI.IEEE 26295 . 27593)) (27692 28457 (MKI.DSET 27702
- . 27985) (MKI.ADDTO 27987 . 28172) (MKI.PUTPROP 28174 . 28455)) (28631 29183 (DUMPVP 28641 . 28738) (
-BOUTZEROS 28740 . 28819) (BIN16 28821 . 29002) (BOUT16 29004 . 29181)) (30074 52808 (DLFIXINIT 30084
- . 31059) (DLSORTSYSOUTPAGES 31061 . 36187) (DLNEXTFP 36189 . 36526) (DLLOCKEDPAGEP 36528 . 36742) (
-DLSETLOCKBIT 36744 . 37006) (DLCOPYPAGEMAP 37008 . 40059) (DLCOPYVMPAGE 40061 . 40451) (
-DLADDPAGEMAPENTRIES 40453 . 41268) (ASSIGNFILEPAGE 41270 . 42503) (ASSIGNFILEPAGERANGE 42505 . 42912) 
-(DLDUMPSYSOUT 42914 . 44666) (DLDUMPFPTOVP 44668 . 45707) (DLDUMPPAGEMAPS 45709 . 46409) (
-DLDUMPVMEMPAGES 46411 . 47067) (DLSETBOOTPTR 47069 . 47299) (DLDUMPARRAY 47301 . 47688) (
-DLMARKASDUMPED 47690 . 48143) (DLDUMPVMEMPAGE 48145 . 48833) (INSTALLDOMINO 48835 . 49482) (
-INSTALLDOMINO.DIRECT 49484 . 50636) (INSTALLNEWDOMINO 50638 . 52806)) (52830 54187 (DLPRINTFPTOVP 
-52840 . 53129) (PRINTPRIMARYMAP 53131 . 53845) (DLREADPAGEOFWORDS 53847 . 54014) (SETDIF 54016 . 54185
+  (FILEMAP (NIL (3862 4722 (MAKEINITGREET 3872 . 4720)) (4905 11290 (LOADMAKEINIT 4915 . 6118) (
+LOADMKIFILES 6120 . 6435) (RELOAD 6437 . 6920) (MAKEINIT 6922 . 10582) (MKI.START 10584 . 11288)) (
+11368 17086 (MKI.PASSFILE 11378 . 14988) (SCRATCHARRAY 14990 . 15639) (DOFORM 15641 . 16318) (
+CONSTFORMP 16320 . 16554) (NOTICECOMS 16556 . 16864) (EVALFORMAKEINIT 16866 . 17084)) (17087 19207 (
+I.ADDTOVAR 17097 . 17191) (I.DECLARE%: 17193 . 17469) (I.DEFINE-FILE-INFO 17471 . 17661) (
+I.FILECREATED 17663 . 18037) (I.PUTPROPS 18039 . 18152) (I.RPAQ 18154 . 18375) (I.RPAQQ 18377 . 18573)
+ (I.RPAQ? 18575 . 18790) (I.SETTOPVAL 18792 . 19024) (I.NOUNDO 19026 . 19205)) (19843 26059 (
+I.ATOMNUMBER 19853 . 20344) (I.\ATOMCELL 20346 . 22099) (I.FIXUPNUM 22101 . 23026) (I.FIXUPPTR 23028
+ . 23509) (I.FIXUPSYM 23511 . 24567) (I.WORDSPERNAMEENTRY 24569 . 25324) (I.SETSTKNTOFFSET 25326 . 
+26057)) (26091 27599 (MKI.ATOM 26101 . 26297) (MKI.IEEE 26299 . 27597)) (27696 28461 (MKI.DSET 27706
+ . 27989) (MKI.ADDTO 27991 . 28176) (MKI.PUTPROP 28178 . 28459)) (28635 29187 (DUMPVP 28645 . 28742) (
+BOUTZEROS 28744 . 28823) (BIN16 28825 . 29006) (BOUT16 29008 . 29185)) (30078 52812 (DLFIXINIT 30088
+ . 31063) (DLSORTSYSOUTPAGES 31065 . 36191) (DLNEXTFP 36193 . 36530) (DLLOCKEDPAGEP 36532 . 36746) (
+DLSETLOCKBIT 36748 . 37010) (DLCOPYPAGEMAP 37012 . 40063) (DLCOPYVMPAGE 40065 . 40455) (
+DLADDPAGEMAPENTRIES 40457 . 41272) (ASSIGNFILEPAGE 41274 . 42507) (ASSIGNFILEPAGERANGE 42509 . 42916) 
+(DLDUMPSYSOUT 42918 . 44670) (DLDUMPFPTOVP 44672 . 45711) (DLDUMPPAGEMAPS 45713 . 46413) (
+DLDUMPVMEMPAGES 46415 . 47071) (DLSETBOOTPTR 47073 . 47303) (DLDUMPARRAY 47305 . 47692) (
+DLMARKASDUMPED 47694 . 48147) (DLDUMPVMEMPAGE 48149 . 48837) (INSTALLDOMINO 48839 . 49486) (
+INSTALLDOMINO.DIRECT 49488 . 50640) (INSTALLNEWDOMINO 50642 . 52810)) (52834 54191 (DLPRINTFPTOVP 
+52844 . 53133) (PRINTPRIMARYMAP 53135 . 53849) (DLREADPAGEOFWORDS 53851 . 54018) (SETDIF 54020 . 54189
 )))))
 STOP

library/FILEBROWSER

@@ -1,24 +1,19 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "XCL" BASE 10)
 
-
(FILECREATED " 4-Aug-2022 09:32:02" |{DSK}<home>larry>medley>library>FILEBROWSER.;2|
 266567 
+
(FILECREATED "19-Jul-2023 09:30:47" |{WMEDLEY}<library>FILEBROWSER.;25|
 265978 
+
+      :EDIT-BY |rmk|
 
       :CHANGES-TO (VARS FILEBROWSERCOMS)
 
-      :PREVIOUS-DATE " 2-Dec-2021 19:33:12" |{DSK}<home>larry>medley>library>FILEBROWSER.;1|)
+      :PREVIOUS-DATE "18-Jul-2023 22:19:30" |{WMEDLEY}<library>FILEBROWSER.;24|)
 
 
-; Copyright (c) 1983-1991, 1993-1994, 1999-2001, 2021 by Venue & Xerox Corporation.
-
 (PRETTYCOMPRINT FILEBROWSERCOMS)
 
 (RPAQQ FILEBROWSERCOMS

-       ((COMS (DECLARE\: EVAL@COMPILE DONTCOPY (P (CL:UNLESS (GETP 'EXPORTS.ALL 'FILE)
-                                                      (TERPRI T)
-                                                      (PRIN1 
-                                                            "NOTE:  FILEBROWSER requires EXPORTS.ALL"
-                                                             T)
-                                                      (TERPRI T)
-                                                      (TERPRI T))))
+       ((COMS (DECLARE\: EVAL@COMPILE DONTCOPY (FILES (FROM LOADUPS)
+                                                      EXPORTS.ALL))
               (FILES ATTACHEDWINDOW ICONW TABLEBROWSER)
               (P 
                  (* |;;| "Set up for MODERNIZE windows, whether or not MODERNIZE is pre-loaded")

@@ -250,11 +245,8 @@ You specify how many versions to keep.")))
         ))
 (DECLARE\: EVAL@COMPILE DONTCOPY 
 
-(CL:UNLESS (GETP 'EXPORTS.ALL 'FILE)
-    (TERPRI T)
-    (PRIN1 "NOTE:  FILEBROWSER requires EXPORTS.ALL" T)
-    (TERPRI T)
-    (TERPRI T))
+(FILESLOAD (FROM
 LOADUPS)
+       EXPORTS.ALL)
 )
 
 (FILESLOAD ATTACHEDWINDOW ICONW TABLEBROWSER)
@@ -463,8 +455,7 @@ Your deletions are thus ignored.")))
 (* \; "Entries")

 
 
-(DEFCOMMAND "fb"
 (&REST PAT&PROPS)
-   (APPLY 'FB PAT&PROPS))
+(DEFCOMMAND "fb" (&REST PAT&PROPS) (APPLY 'FB PAT&PROPS))
 (DEFINEQ
 
 (FB

@@ -943,8 +934,9 @@ Your deletions are thus ignored.")))
          (AND OLDFONT (DSPFONT OLDFONT STREAM)))))
 
 (FB.COPYFN

-  (LAMBDA (TBROWSER ITEM)                                    (* |bvm:| "13-Oct-85 17:44")

-    (BKSYSBUF (|fetch|
 (FBFILEDATA FILENAME) |of|
 (|fetch|
 TIDATA |of|
 ITEM)))))
+  (LAMBDA (TBROWSER ITEM)
                                   (* \; "Edited 18-Jul-2023 22:19 by rmk")

+                                                             (* |bvm:| "13-Oct-85 17:44")

+    (COPYINSERT (|fetch|
 (FBFILEDATA FILENAME) |of|
 (|fetch|
 TIDATA |of|
 ITEM)))))
 )
 
 
@@ -4253,54 +4245,52 @@ then click Recompute"))))
 
 (ADDTOVAR LAMA
 FB.PROMPTW.FORMAT FB.PROMPTWPRINT)
 )
-(PUTPROPS FILEBROWSER COPYRIGHT ("Venue & Xerox Corporation" 1983 1984 1985 1986 1987 1988 1989 1990 
-1991 1993 1994 1999 2000 2001 2021))
 (DECLARE\: DONTCOPY
-  (FILEMAP (NIL (32375 55256 (FB 32385 . 33520) (FB.COPYBINARYCOMMAND 33522 . 33868) (FB.COPYTEXTCOMMAND
- 33870 . 34212) (FILEBROWSER 34214 . 47320) (FB.TABLEBROWSER 47322 . 47539) (FB.SELECTEDFILES 47541 . 
-48178) (FB.FETCHFILENAME 48180 . 48572) (FB.DIRECTORYP 48574 . 48968) (FB.PROMPTWPRINT 48970 . 50016) 
-(FB.PROMPTW.FORMAT 50018 . 50755) (FB.PROMPTFORINPUT 50757 . 53009) (FB.YES-OR-NO-P 53011 . 54045) (
-FB.ALLOW.ABORT 54047 . 54901) (\\FB.HARDCOPY.TOFILE.EXTENSION 54903 . 55254)) (55280 56233 (FB.STARTUP
- 55290 . 55805) (FB.MAKERIGIDWINDOW 55807 . 56231)) (56234 61606 (FB.PRINTFN 56244 . 61397) (FB.COPYFN
- 61399 . 61604)) (61656 67996 (FB.MENU.WHENSELECTEDFN 61666 . 62024) (FB.COMMANDSELECTEDFN 62026 . 
-63565) (FB.SUBITEMP 63567 . 64168) (FB.MAKE.BROWSER.BUSY 64170 . 64974) (FB.FINISH.COMMAND 64976 . 
-67007) (FB.HANDLE.ABORT.BUTTON 67009 . 67994)) (67997 73513 (FB.DELETECOMMAND 68007 . 68288) (
-FB.DELVERCOMMAND 68290 . 71483) (FB.IS.NOT.SUBDIRECTORY.ITEM 71485 . 71666) (FB.DELVER.FILES 71668 . 
-72757) (FB.DELETE.FILE 72759 . 73511)) (73514 74839 (FB.UNDELETECOMMAND 73524 . 73809) (
-FB.UNDELETEALLCOMMAND 73811 . 74090) (FB.UNDELETE.FILE 74092 . 74837)) (74840 99021 (FB.COPYCOMMAND 
-74850 . 75119) (FB.RENAMECOMMAND 75121 . 75396) (FB.COPY/RENAME.COMMAND 75398 . 76321) (
-FB.COPY/RENAME.ONE 76323 . 78645) (FB.COPY/RENAME.MANY 78647 . 84867) (FB.MERGE.DIRECTORIES 84869 . 
-85287) (FB.GREATEST.PREFIX 85289 . 86645) (FB.MAYBE.INSERT.FILE 86647 . 94087) (FB.GET.NEW.FILE.SPEC 
-94089 . 97920) (FB.CANONICAL.DIRECTORY 97922 . 99019)) (99022 106806 (FB.HARDCOPYCOMMAND 99032 . 
-100162) (FB.HARDCOPY.TOFILE 100164 . 106804)) (106807 117006 (FB.EDITCOMMAND 106817 . 107684) (
-FB.EDITCOMMAND.ONEFILE 107686 . 111090) (FB.EDITLISPFILE 111092 . 112197) (FB.BROWSECOMMAND 112199 . 
-117004)) (117007 128928 (FB.FASTSEECOMMAND 117017 . 120467) (FB.FASTSEE.ONEFILE 120469 . 123626) (
-FB.SEEFULLFN 123628 . 127759) (FB.SEEBUTTONFN 127761 . 128926)) (128929 130675 (FB.LOADCOMMAND 128939
- . 129446) (FB.COMPILECOMMAND 129448 . 129986) (FB.OPERATE.ON.FILES 129988 . 130673)) (130676 178861 (
-FB.UPDATECOMMAND 130686 . 130911) (FB.FIX-DIRECTORY-DATES 130913 . 131936) (FB.MAYBE.EXPUNGE 131938 . 
-132999) (FB.UPDATEBROWSERITEMS 133001 . 146216) (FB.DATE 146218 . 146859) (FB.ADJUST.DATE.WIDTH 146861
- . 149829) (FB.SET.BROWSER.TITLE 149831 . 150833) (FB.MAYBE.WIDEN.NAMES 150835 . 152954) (
-FB.SET.DEFAULT.NAME.WIDTH 152956 . 154320) (FB.CREATE.FILEBUCKET 154322 . 161542) (
-FB.CHECK.NAME.LENGTH 161544 . 163965) (FB.ADD.FILEGROUP 163967 . 165494) (FB.INSERT.DIRECTORY 165496
- . 165734) (FB.MAKE.SUBDIRECTORY.ITEM 165736 . 167145) (FB.ADD.FILE 167147 . 167760) (FB.INSERT.FILE 
-167762 . 171174) (FB.ANALYZE.PATTERN 171176 . 176440) (FB.CANONICALIZE.PATTERN 176442 . 177754) (
-FB.GETALLFILEINFO 177756 . 178859)) (178862 187021 (FB.SORT.VERSIONS 178872 . 181643) (
-FB.DECREASING.VERSION 181645 . 182314) (FB.INCREASING.VERSION 182316 . 182937) (
-FB.NAMES.DECREASING.VERSION 182939 . 183974) (FB.NAMES.INCREASING.VERSION 183976 . 184973) (
-FB.DECREASING.NUMERIC.ATTR 184975 . 185655) (FB.INCREASING.NUMERIC.ATTR 185657 . 186331) (
-FB.ALPHABETIC.ATTR 186333 . 187019)) (187022 196864 (FB.SORTCOMMAND 187032 . 193862) (
-FB.INSERT.SUBDIRECTORIES 193864 . 194661) (FB.GET.SORT.MENU 194663 . 196862)) (196865 213086 (
-FB.EXPUNGECOMMAND 196875 . 199460) (FB.NEWPATTERNCOMMAND 199462 . 199860) (FB.NEWINFOCOMMAND 199862 . 
-202694) (FB.DEPTHCOMMAND 202696 . 204471) (FB.SHAPECOMMAND 204473 . 207815) (FB.REMOVE.FILE 207817 . 
-209638) (FB.COUNT.FILE.CHANGE 209640 . 211085) (FB.SETNEWPATTERN 211087 . 212257) (FB.GET.NEWPATTERN 
-212259 . 212843) (FB.OPTIONSCOMMAND 212845 . 213084)) (213121 214174 (FB.GETWINDOW 213131 . 214172)) (
-214175 215187 (FB.INFOMENU.SHADEINITIALSELECTIONS 214185 . 214832) (FB.INFO.ITEM.NAMED 214834 . 215185
-)) (215188 224720 (FB.MAKECOUNTERWINDOW 215198 . 216726) (FB.COUNTERW.REDISPLAYFN 216728 . 217315) (
-FB.UPDATE.COUNTERS 217317 . 219389) (FB.DISPLAY.COUNTERS 219391 . 224451) (FB.COUNTER.STRING 224453 . 
-224718)) (224721 229430 (FB.MAKEHEADINGWINDOW 224731 . 226345) (FB.HEADINGW.REDISPLAYFN 226347 . 
-226613) (FB.HEADINGW.RESHAPEFN 226615 . 226991) (FB.HEADINGW.DISPLAY 226993 . 229428)) (229431 233614 
-(FB.ICONFN 229441 . 229788) (FB.INFOMENU.WHENSELECTEDFN 229790 . 230520) (FB.CLOSEFN 230522 . 231725) 
-(FB.EXPUNGE?.MENU 231727 . 232139) (FB.AFTERCLOSEFN 232141 . 232502) (FB.CLOSE&EXPUNGE 232504 . 233612
-)) (233615 245673 (FB.HARDCOPY.DIRECTORY 233625 . 243982) (FB.HARDCOPY.PRINT.TITLE 243984 . 244310) (
-FB.HARDCOPY.MAXWIDTH 244312 . 245671)))))
+  (FILEMAP (NIL (31814 54695 (FB 31824 . 32959) (FB.COPYBINARYCOMMAND 32961 . 33307) (FB.COPYTEXTCOMMAND
+ 33309 . 33651) (FILEBROWSER 33653 . 46759) (FB.TABLEBROWSER 46761 . 46978) (FB.SELECTEDFILES 46980 . 
+47617) (FB.FETCHFILENAME 47619 . 48011) (FB.DIRECTORYP 48013 . 48407) (FB.PROMPTWPRINT 48409 . 49455) 
+(FB.PROMPTW.FORMAT 49457 . 50194) (FB.PROMPTFORINPUT 50196 . 52448) (FB.YES-OR-NO-P 52450 . 53484) (
+FB.ALLOW.ABORT 53486 . 54340) (\\FB.HARDCOPY.TOFILE.EXTENSION 54342 . 54693)) (54719 55672 (FB.STARTUP
+ 54729 . 55244) (FB.MAKERIGIDWINDOW 55246 . 55670)) (55673 61156 (FB.PRINTFN 55683 . 60836) (FB.COPYFN
+ 60838 . 61154)) (61206 67546 (FB.MENU.WHENSELECTEDFN 61216 . 61574) (FB.COMMANDSELECTEDFN 61576 . 
+63115) (FB.SUBITEMP 63117 . 63718) (FB.MAKE.BROWSER.BUSY 63720 . 64524) (FB.FINISH.COMMAND 64526 . 
+66557) (FB.HANDLE.ABORT.BUTTON 66559 . 67544)) (67547 73063 (FB.DELETECOMMAND 67557 . 67838) (
+FB.DELVERCOMMAND 67840 . 71033) (FB.IS.NOT.SUBDIRECTORY.ITEM 71035 . 71216) (FB.DELVER.FILES 71218 . 
+72307) (FB.DELETE.FILE 72309 . 73061)) (73064 74389 (FB.UNDELETECOMMAND 73074 . 73359) (
+FB.UNDELETEALLCOMMAND 73361 . 73640) (FB.UNDELETE.FILE 73642 . 74387)) (74390 98571 (FB.COPYCOMMAND 
+74400 . 74669) (FB.RENAMECOMMAND 74671 . 74946) (FB.COPY/RENAME.COMMAND 74948 . 75871) (
+FB.COPY/RENAME.ONE 75873 . 78195) (FB.COPY/RENAME.MANY 78197 . 84417) (FB.MERGE.DIRECTORIES 84419 . 
+84837) (FB.GREATEST.PREFIX 84839 . 86195) (FB.MAYBE.INSERT.FILE 86197 . 93637) (FB.GET.NEW.FILE.SPEC 
+93639 . 97470) (FB.CANONICAL.DIRECTORY 97472 . 98569)) (98572 106356 (FB.HARDCOPYCOMMAND 98582 . 99712
+) (FB.HARDCOPY.TOFILE 99714 . 106354)) (106357 116556 (FB.EDITCOMMAND 106367 . 107234) (
+FB.EDITCOMMAND.ONEFILE 107236 . 110640) (FB.EDITLISPFILE 110642 . 111747) (FB.BROWSECOMMAND 111749 . 
+116554)) (116557 128478 (FB.FASTSEECOMMAND 116567 . 120017) (FB.FASTSEE.ONEFILE 120019 . 123176) (
+FB.SEEFULLFN 123178 . 127309) (FB.SEEBUTTONFN 127311 . 128476)) (128479 130225 (FB.LOADCOMMAND 128489
+ . 128996) (FB.COMPILECOMMAND 128998 . 129536) (FB.OPERATE.ON.FILES 129538 . 130223)) (130226 178411 (
+FB.UPDATECOMMAND 130236 . 130461) (FB.FIX-DIRECTORY-DATES 130463 . 131486) (FB.MAYBE.EXPUNGE 131488 . 
+132549) (FB.UPDATEBROWSERITEMS 132551 . 145766) (FB.DATE 145768 . 146409) (FB.ADJUST.DATE.WIDTH 146411
+ . 149379) (FB.SET.BROWSER.TITLE 149381 . 150383) (FB.MAYBE.WIDEN.NAMES 150385 . 152504) (
+FB.SET.DEFAULT.NAME.WIDTH 152506 . 153870) (FB.CREATE.FILEBUCKET 153872 . 161092) (
+FB.CHECK.NAME.LENGTH 161094 . 163515) (FB.ADD.FILEGROUP 163517 . 165044) (FB.INSERT.DIRECTORY 165046
+ . 165284) (FB.MAKE.SUBDIRECTORY.ITEM 165286 . 166695) (FB.ADD.FILE 166697 . 167310) (FB.INSERT.FILE 
+167312 . 170724) (FB.ANALYZE.PATTERN 170726 . 175990) (FB.CANONICALIZE.PATTERN 175992 . 177304) (
+FB.GETALLFILEINFO 177306 . 178409)) (178412 186571 (FB.SORT.VERSIONS 178422 . 181193) (
+FB.DECREASING.VERSION 181195 . 181864) (FB.INCREASING.VERSION 181866 . 182487) (
+FB.NAMES.DECREASING.VERSION 182489 . 183524) (FB.NAMES.INCREASING.VERSION 183526 . 184523) (
+FB.DECREASING.NUMERIC.ATTR 184525 . 185205) (FB.INCREASING.NUMERIC.ATTR 185207 . 185881) (
+FB.ALPHABETIC.ATTR 185883 . 186569)) (186572 196414 (FB.SORTCOMMAND 186582 . 193412) (
+FB.INSERT.SUBDIRECTORIES 193414 . 194211) (FB.GET.SORT.MENU 194213 . 196412)) (196415 212636 (
+FB.EXPUNGECOMMAND 196425 . 199010) (FB.NEWPATTERNCOMMAND 199012 . 199410) (FB.NEWINFOCOMMAND 199412 . 
+202244) (FB.DEPTHCOMMAND 202246 . 204021) (FB.SHAPECOMMAND 204023 . 207365) (FB.REMOVE.FILE 207367 . 
+209188) (FB.COUNT.FILE.CHANGE 209190 . 210635) (FB.SETNEWPATTERN 210637 . 211807) (FB.GET.NEWPATTERN 
+211809 . 212393) (FB.OPTIONSCOMMAND 212395 . 212634)) (212671 213724 (FB.GETWINDOW 212681 . 213722)) (
+213725 214737 (FB.INFOMENU.SHADEINITIALSELECTIONS 213735 . 214382) (FB.INFO.ITEM.NAMED 214384 . 214735
+)) (214738 224270 (FB.MAKECOUNTERWINDOW 214748 . 216276) (FB.COUNTERW.REDISPLAYFN 216278 . 216865) (
+FB.UPDATE.COUNTERS 216867 . 218939) (FB.DISPLAY.COUNTERS 218941 . 224001) (FB.COUNTER.STRING 224003 . 
+224268)) (224271 228980 (FB.MAKEHEADINGWINDOW 224281 . 225895) (FB.HEADINGW.REDISPLAYFN 225897 . 
+226163) (FB.HEADINGW.RESHAPEFN 226165 . 226541) (FB.HEADINGW.DISPLAY 226543 . 228978)) (228981 233164 
+(FB.ICONFN 228991 . 229338) (FB.INFOMENU.WHENSELECTEDFN 229340 . 230070) (FB.CLOSEFN 230072 . 231275) 
+(FB.EXPUNGE?.MENU 231277 . 231689) (FB.AFTERCLOSEFN 231691 . 232052) (FB.CLOSE&EXPUNGE 232054 . 233162
+)) (233165 245223 (FB.HARDCOPY.DIRECTORY 233175 . 243532) (FB.HARDCOPY.PRINT.TITLE 243534 . 243860) (
+FB.HARDCOPY.MAXWIDTH 243862 . 245221)))))
 STOP

library/PDFSTREAM

@@ -0,0 +1,276 @@
+(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
+
+
(FILECREATED " 1-Oct-2023 20:53:05" {WMEDLEY}<library>PDFSTREAM.;54
 13917  
+
+      :EDIT-BY rmk
+
+      :CHANGES-TO (FNS SEE-PDF)
+
+      :PREVIOUS-DATE " 1-Oct-2023 15:29:33" {WMEDLEY}<library>PDFSTREAM.;53)
+
+
+(PRETTYCOMPRINT PDFSTREAMCOMS)
+
+(RPAQQ PDFSTREAMCOMS

+       ((FILES (SYSLOAD)
+               POSTSCRIPTSTREAM)
+        [COMS                                                (* ; "Hook into hardcopy interface")

+              [ADDVARS [PRINTERTYPES ((PDF)
+                                      (CANPRINT (PDF))
+                                      (STATUS TRUE)
+                                      (PROPERTIES NILL)
+                                      (SEND POSTSCRIPTSEND)
+                                      (BITMAPSCALE POSTSCRIPT.BITMAPSCALE)
+                                      (BITMAPFILE (PDF.HARDCOPYW FILE BITMAP SCALEFACTOR REGION 
+                                                         ROTATION TITLE]
+                     [PRINTFILETYPES (PDF (TEST PDFFILEP)
+                                          (EXTENSION (PDF))
+                                          (CONVERSION (TEXT PDF.TEXT TEDIT PDF.TEDIT]
+                     (IMAGESTREAMTYPES (PDF (OPENSTREAM OPEN-PDF-STREAM)
+                                            (FONTCREATE POSTSCRIPT.FONTCREATE)
+                                            (FONTSAVAILABLE POSTSCRIPT.FONTSAVAILABLE)
+                                            (CREATECHARSET \CREATECHARSET.PSC]
+              (VARS (DEFAULTPRINTERTYPE 'PDF))
+              (FNS PDFFILEP PDF.HARDCOPYW PDF.TEXT PDF.TEDIT)
+              (P (FONTPROFILE.ADDDEVICE 'PDF 'POSTSCRIPT]
+        
+        (* ;; "")

+
+        
+        (* ;; "Implementation of PDF streams")

+
+        (INITVARS (PDFCONVERTER 'ps2pdf))
+                                                             (* ; "Mac with ghostscript?")

+        (ALISTS (PDF-CONVERTER-TEMPLATES ps2pdf pstopdf))
+        (GLOBALVARS PDFCONVERTER PDF-CONVERTER-TEMPLATES)
+        (FNS OPEN-PDF-STREAM CLOSE-PDF-STREAM PS-TO-PDF)
+        (FNS SEE-PDF)))
+
+(FILESLOAD (SYSLOAD)
+       POSTSCRIPTSTREAM)
+
+
+
+(* ; "Hook into hardcopy interface")

+
+
+(ADDTOVAR PRINTERTYPES
 ((PDF)
+                        (CANPRINT (PDF))
+                        (STATUS TRUE)
+                        (PROPERTIES NILL)
+                        (SEND POSTSCRIPTSEND)
+                        (BITMAPSCALE POSTSCRIPT.BITMAPSCALE)
+                        (BITMAPFILE (PDF.HARDCOPYW FILE BITMAP SCALEFACTOR REGION ROTATION TITLE))))
+
+(ADDTOVAR PRINTFILETYPES
 (PDF (TEST PDFFILEP)
+                              (EXTENSION (PDF))
+                              (CONVERSION (TEXT PDF.TEXT TEDIT PDF.TEDIT))))
+
+(ADDTOVAR IMAGESTREAMTYPES
 (PDF (OPENSTREAM OPEN-PDF-STREAM)
+                                (FONTCREATE POSTSCRIPT.FONTCREATE)
+                                (FONTSAVAILABLE POSTSCRIPT.FONTSAVAILABLE)
+                                (CREATECHARSET \CREATECHARSET.PSC)))
+
+(RPAQQ DEFAULTPRINTERTYPE
 PDF)
+(DEFINEQ
+
+(PDFFILEP

+  [LAMBDA (FILE)
                                             (* ; "Edited 23-Jun-2023 14:43 by rmk")


+                                                             (* ; "Edited  5-Mar-93 21:40 by rmk:")


+                                                             (* ; "Edited 14-Jan-93 10:56 by jds")

+    (OR (CL:MEMBER (UNPACKFILENAME.STRING FILE 'EXTENSION)
+               '("PDF")
+               :TEST
+               (FUNCTION STRING-EQUAL))
+        (CL:WHEN (STREAMP FILE)
+            (SETFILEPTR FILE 0)
+            (PROG1 (AND (EQ (BIN FILE)
+                            (CHARCODE %%))
+                        (EQ (BIN FILE)
+                            (CHARCODE P))
+                        (EQ (BIN FILE)
+                            (CHARCODE D))
+                        (EQ (BIN FILE)
+                            (CHARCODE F)))
+                   (SETFILEPTR FILE 0)))])
+
+(PDF.HARDCOPYW

+  [LAMBDA (PDFFILE BITMAP SCALEFACTOR REGION Landscape? TITLE)

+                                                             (* ; "Edited 24-Jul-2023 10:37 by rmk")


+                                                             (* ; "Edited 23-Jun-2023 13:28 by rmk")


+                                                             (* ; "Edited  6-Mar-2023 22:43 by rmk")

+    (LET ((PSTTMP (PACKFILENAME 'EXTENSION 'TMPPS 'BODY PDFFILE)))
+         (PS-TO-PDF
 (POSTSCRIPT.HARDCOPYW PSTTMP BITMAP SCALEFACTOR REGION Landscape? TITLE)
+                PDFFILE])
+
+(PDF.TEXT

+  [LAMBDA (FILE PDFFILE FONTS HEADING TABS)
                  (* ; "Edited  1-Oct-2023 15:24 by rmk")


+                                                             (* ; "Edited 23-Jun-2023 13:23 by rmk")


+                                                             (* ; "Edited  7-Mar-2023 08:39 by rmk")

+    (TEXTTOIMAGEFILE FILE PDFFILE 'PDF FONTS HEADING TABS `(REGION ,POSTSCRIPT.DEFAULT.PAGEREGION 
+                                                                  ROTATION ,(NOT (NOT 
+                                                                        POSTSCRIPT.TEXTFILE.LANDSCAPE
+                                                                                      ])
+
+(PDF.TEDIT

+  [LAMBDA (FILE PDFFILE)
                                     (* ; "Edited 23-Jun-2023 13:22 by rmk")


+                                                             (* ; "Edited  7-Mar-2023 08:39 by rmk")

+    (LET ((TSTREAM (OPENTEXTSTREAM FILE)))
+         (TEDIT.FORMAT.HARDCOPY FILE PDFFILE T NIL NIL NIL 'PDF)
+         (CLOSEF TSTREAM])
+)
+
+(FONTPROFILE.ADDDEVICE 'PDF 'POSTSCRIPT)
+
+
+
+(* ;; "")

+
+
+
+
+(* ;; "Implementation of PDF streams")

+
+
+(RPAQ? PDFCONVERTER
 'ps2pdf)
+
+
+
+(* ; "Mac with ghostscript?")

+
+
+(ADDTOVAR PDF-CONVERTER-TEMPLATES
 (ps2pdf " " PSFILE " " PDFFILE " 2> " ERRORFILE)
+                                  (pstopdf " " PSFILE " -o " PDFFILE " 2> " ERRORFILE))
+(DECLARE%: DOEVAL@COMPILE DONTCOPY
+
+(GLOBALVARS PDFCONVERTER PDF-CONVERTER-TEMPLATES)
+)
+(DEFINEQ
+
+(OPEN-PDF-STREAM

+  [LAMBDA (FILE OPTIONS)
                                     (* ; "Edited 23-Sep-2023 15:38 by rmk")


+                                                             (* ; "Edited 22-Sep-2023 11:04 by rmk")


+                                                             (* ; "Edited 24-Jun-2023 14:49 by rmk")

+
+    (* ;; "Open a temporary PS file, but set it up so that at closing it gets converted to PDF using an operating-system utility (if available), and then gets renamed to the original intended filename.")

+
+    (* ;; "We have to stash the original filename someplace.  We could put it in the tmp filename and then parse it out, but then we would have to worry about how unix filenames might parse against our {, },  etc.  ")

+
+    (* ;; 
+
    "Simplest thing for now is to just add an extra field at the end of the \POSTSCRIPTDATA record.")

+
+    (* ;; "")

+
+    (if
 [AND NIL (EQ 'LPT (FILENAMEFIELD FILE 'HOST]
+        then
 
+             (* ;; "If FILE is on the LPT device, we could just ssume that it can be printed directly, no point in converting.  But then we would alo have to lie and give it a PDF extension so it thinks that we are heading to a PDF printer.")

+
+             (OPENPOSTSCRIPTSTREAM FILE OPTIONS)
+      else
 (CL:UNLESS (OR (ASSOC (OR PDFCONVERTER (MKATOM (UNIX-GETENV "MEDLEY-PDFCONVERTER")))
+                                 PDF-CONVERTER-TEMPLATES))
+                  (ERROR "POSTSCRIPT-to-PDF converter is not specified"))
+           (SETQ FILE (OR (AND (NEQ FILE T)
+                               (OUTFILEP FILE))
+                          (ERROR "PDF target file not found" FILE)))
+           (LET ((PSSTREAM (OPENPOSTSCRIPTSTREAM (CONCAT "{UNIX}/tmp/medley-pdf-" (IDATE)
+                                                        "-"
+                                                        (RAND)
+                                                        ".ps")
+                                  OPTIONS)))
+                (STREAMPROP PSSTREAM 'AFTERCLOSE (CONS (FUNCTION CLOSE-PDF-STREAM)))
+                (STREAMPROP PSSTREAM 'PDFTARGETINFO FILE)
+                PSSTREAM])
+
+(CLOSE-PDF-STREAM

+  [LAMBDA (PSSTREAM)
                                         (* ; "Edited 22-Sep-2023 11:18 by rmk")


+                                                             (* ; "Edited 24-Jul-2023 10:37 by rmk")


+                                                             (* ; "Edited 17-Jul-2023 22:32 by rmk")


+                                                             (* ; "Edited 24-Jun-2023 13:57 by rmk")

+
+    (* ;; "PSSTREAM is a postscript (maybe in tmp) rendition of what is intended to end up as a pdf.  If we are going directly to a printer, we can probably just pass it along without worrying about conversion.  In fact, in that case we probably should not have bothered even setting up the PDF stream.")

+
+    (* ;; "But for a file we execute the PDFCONVERTER as a shell command to make a pdf, and then we rename it to the intended filename")

+
+    (STREAMPROP PSSTREAM 'AFTERCLOSE NIL)                    (* ; 
+
                                             "Maybe just remove  only CLOSE-PDF-STREAMfrom the list?")

+    (LET ((TARGETINFO (STREAMPROP PSSTREAM 'PDFTARGETINFO NIL)))
+         (CL:IF TARGETINFO
+             (RENAMEFILE (PS-TO-PDF
 PSSTREAM)
+                    TARGETINFO)
+             PSSTREAM)])
+
+(PS-TO-PDF

+  [LAMBDA (PSFILE PDFFILE DONTDELETE)
                        (* ; "Edited  1-Oct-2023 15:18 by rmk")


+                                                             (* ; "Edited 23-Sep-2023 22:54 by rmk")


+                                                             (* ; "Edited 23-Jul-2023 22:30 by rmk")


+                                                             (* ; "Edited 24-Jun-2023 15:01 by rmk")


+                                                             (* ; "Edited 16-Jul-2022 13:06 by rmk")


+                                                             (* ; "Edited  8-Jul-2022 10:20 by rmk")


+                                                             (* ; "Edited  7-May-2022 22:40 by rmk")


+                                                            (* ; "Edited  7-Oct-2021 11:15 by rmk:")

+
+    (* ;; "PSFILE is the name of a closed PS file on a DSK/UNIX device.  This function uses the PDFCONVERTER utility to convert that to a parallel pdf file, which is then renamed to PDFFILE.  ")

+
+    (* ;; "DONTDELETE is just for debugging, keeps the /tmp/ files")

+
+    (SETQ PSFILE (FULLNAME (TRUEFILENAME PSFILE)))
+    (CL:UNLESS (INFILEP PSFILE)
+           (ERROR "NO PS FILE TO CONVERT"))
+    (SETQ PDFFILE (if
 PDFFILE
+                      then
 (TRUEFILENAME PDFFILE)
+                    else
 (PACKFILENAME 'EXTENSION 'pdf 'BODY PSFILE)))
+    (LET ((ERRORFILE (PACKFILENAME 'EXTENSION 'error 'BODY PSFILE))
+          COMPLETIONCODE)
+
+         (* ;; "PROCESS-COMMAND is currently from GITFNS.  Not sure whether ShellCommand in UNIXUTILS is appropriate.")

+
+         (* ;; 
+
     "We have to map the filenames down to Unix conventions:  (not pseudohost or host, slashes, etc.")

+
+         [SETQ COMPLETIONCODE (PROCESS-COMMAND (CONCATLIST (SUBLIS
+                                                            `((PSFILE \, (SLASHIT (TRUEFILENAME
+                                                                                   PSFILE)
+                                                                                NIL T))
+                                                              (PDFFILE \, (SLASHIT (TRUEFILENAME
+                                                                                    PDFFILE)
+                                                                                 NIL T))
+                                                              (ERRORFILE \, (SLASHIT (TRUEFILENAME
+                                                                                      ERRORFILE)
+                                                                                   NIL T)))
+                                                            (ASSOC (OR PDFCONVERTER
+                                                                       (MKATOM (UNIX-GETENV 
+                                                                                "MEDLEY-PDFCONVERTER"
+                                                                                      )))
+                                                                   PDF-CONVERTER-TEMPLATES]
+
+         (* ;; "Now use Medley names")

+
+         (CLOSEF? PSFILE)
+         (CL:UNLESS DONTDELETE (DELFILE PSFILE))
+         (CLOSEF? ERRORFILE)
+         (CL:WHEN (INFILEP ERRORFILE)
+             (CL:WHEN (IGREATERP (PROG1 (GETFILEINFO ERRORFILE 'LENGTH)
+                                     (CL:UNLESS DONTDELETE (DELFILE ERRORFILE)))
+                             0)
+                    (ERROR "Cannot create PDF file for " PDFFILE)))
+         (CL:WHEN (IGREATERP COMPLETIONCODE 0)
+                (ERROR "Cannot create PDF file for " PDFFILE))
+         PDFFILE])
+)
+(DEFINEQ
+
+(SEE-PDF

+  [LAMBDA (PDFFILE)
                                          (* ; "Edited  1-Oct-2023 20:47 by rmk")


+                                                             (* ; "Edited 26-Sep-2023 16:52 by rmk")

+
+    (* ;; "Good for Mac, not sure about Windows etc.")

+
+    (ShellCommand (CONCAT "open -a Preview " (UNIX-FILE-NAME (PACKFILENAME 'BODY PDFFILE 'EXTENSION
+                                                                    'PDF)
+                                                    'INPUT])
+)
+(DECLARE%: DONTCOPY
+  (FILEMAP (NIL (3078 5692 (PDFFILEP 3088 . 4002) (PDF.HARDCOPYW 4004 . 4602) (PDF.TEXT 4604 . 5321) (
+PDF.TEDIT 5323 . 5690)) (6136 13355 (OPEN-PDF-STREAM 6146 . 8324) (CLOSE-PDF-STREAM 8326 . 9613) (
+PS-TO-PDF 9615 . 13353)) (13356 13894 (SEE-PDF 13366 . 13892)))))
+STOP

library/SPY

@@ -1,18 +1,15 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
 
-
(FILECREATED " 4-Jan-2022 14:09:48" {DSK}<Users>kaplan>Local>medley3.5>my-medley>library>SPY.;2
 63314  
+
(FILECREATED "28-Jul-2023 20:13:45" {DSK}<home>larry>il>medley>library>SPY.;4
 64149  
+
+      :EDIT-BY "lmm"
 
       :CHANGES-TO (VARS SPYCOMS)
-                  (FNS SPY.MAKE.TREE)
+                  (FNS \SPY.INTERRUPT SPY.BUFFER.ENTRY SPY.ADD.ENTRY)
 
-      :PREVIOUS-DATE "29-Apr-94 14:13:52" {DSK}<Users>kaplan>Local>medley3.5>my-medley>library>SPY.;1
-)
+      :PREVIOUS-DATE " 4-Jan-2022 14:09:48" {DSK}<home>larry>il>medley>library>SPY.;1)
 
 
-(* ; "
-Copyright (c) 1984-1985, 1987-1988, 1990-1991, 1993-1994 by Venue & Xerox Corporation.
-")
-
 (PRETTYCOMPRINT SPYCOMS)
 
 (RPAQQ SPYCOMS

@@ -33,12 +30,13 @@ Copyright (c) 1984-1985, 1987-1988, 1990-1991, 1993-1994 by Venue & Xerox Corpor
              SPY.UPDATE.TITLE SPY.DELETE SPY.DRAWBOX SPY.BUFFER.ENTRY SPY.BUTTON SPY.END.ENTRY 
              SPY.START SPY.INIT \SPY.INTERRUPT SPY.DUMP.BUFFER SPY.START.ENTRY SPY.ADD.ENTRY 
              SPY.ORIGINAL SPY.OVERFLOW SPY.MERGE.CALLEES SPY.PRINT)
-        (COMS (INITVARS (SPY.BUTTON))
+        (COMS (INITVARS (\BACKGROUND)
+                     (SPY.BUTTON))
               (VARS SPY.OPEN SPY.CLOSED))
-        (VARIABLES SPY.POINTERS)
         (GLOBALVARS SPY.OVERFLOWED \PERIODIC.INTERRUPT SPY.TREE SPY.BUFFER.SIZE SPY.NEXT 
                SPY.BUFFER.THRESHOLD SPY.BUFFER SPY.FREQUENCY SPY.SHOW.THRESHOLD SPY.MAXLINES SPY.FONT
                )
+        (SPECVARS \BACKGROUND)
         (MACROS WITH-SPY WITH.SPY)
         (DECLARE%: DONTCOPY (RECORDS SPYRECORD SPYDATA))
         (INITRECORDS SPYRECORD)
@@ -836,8 +834,11 @@ Copyright (c) 1984-1985, 1987-1988, 1990-1991, 1993-1994 by Venue & Xerox Corpor
 )
 
 (SPY.BUFFER.ENTRY

-(LAMBDA (N) (* ; "Edited  9-Sep-87 18:27 by Masinter") (COND (SPY.POINTERS (AND (ILEQ (SETQ N (LLSH N 1)) SPY.BUFFER.SIZE) (\GETBASEPTR SPY.BUFFER N))) ((ILEQ N SPY.BUFFER.SIZE) (\VAG2 0 (\GETBASE SPY.BUFFER N)))))
-)
+  [LAMBDA (N)
                                                (* ; "Edited 28-Jul-2023 08:16 by lmm")


+                                                          (* ; "Edited  9-Sep-87 18:27 by Masinter")

+    (AND (ILEQ (SETQ N (LLSH N 1))
+               SPY.BUFFER.SIZE)
+         (\GETBASEPTR SPY.BUFFER N])
 
 (SPY.BUTTON

 (LAMBDA (POS) (* gbn " 2-Jun-85 13:12") (PROG ((REG (if POS then (CREATEREGION (fetch XCOORD of POS) (fetch YCOORD of POS) (WIDTHIFWINDOW (BITMAPWIDTH SPY.CLOSED)) (HEIGHTIFWINDOW (BITMAPHEIGHT SPY.CLOSED))) else (GETBOXREGION (WIDTHIFWINDOW (BITMAPWIDTH SPY.CLOSED)) (HEIGHTIFWINDOW (BITMAPHEIGHT SPY.CLOSED)) NIL NIL NIL "Specify region for window %"Spy Control%"")))) (BITBLT SPY.CLOSED NIL NIL (SETQ SPY.BUTTON (CREATEW REG NIL NIL T))) (WINDOWPROP SPY.BUTTON (QUOTE BUTTONEVENTFN) (FUNCTION (LAMBDA (W) (AND (LASTMOUSESTATE UP) (SPY.TOGGLE)))))))
@@ -855,8 +856,34 @@ Copyright (c) 1984-1985, 1987-1988, 1990-1991, 1993-1994 by Venue & Xerox Corpor
 )
 
 (\SPY.INTERRUPT

-(LAMBDA NIL (* ; "Edited  9-Sep-87 18:32 by Masinter") (SETQ \PERIODIC.INTERRUPT) (* ; "turn off sampling while gathering sample") (PROG ((FRAME (fetch (FX CLINK) (\MYALINK)))) (COND ((IGEQ (if SPY.POINTERS then (LLSH SPY.NEXT 1) else SPY.NEXT) SPY.BUFFER.THRESHOLD) (COND (\INTERRUPTABLE (SPY.DUMP.BUFFER)) (T (* ; "this sample might overflow;  just don't do it") (RETURN))))) (SPY.START.ENTRY) SAMPLELOOP (SPY.ADD.ENTRY (fetch (FX FRAMENAME) FRAME)) (COND ((NOT (fetch (FX INVALIDP) (SETQ FRAME (fetch (FX CLINK) FRAME)))) (GO SAMPLELOOP)) (T (SPY.END.ENTRY)))) (SETQ \PERIODIC.INTERRUPT (QUOTE \SPY.INTERRUPT)))
-)
+  [LAMBDA NIL
                                                (* ; "Edited 28-Jul-2023 08:59 by lmm")


+                                                          (* ; "Edited  9-Sep-87 18:32 by Masinter")

+    (DECLARE
 (SPECVARS \BACKGROUND))
+    [PROG [(FRAME (fetch
 (FX CLINK)
+                         (\MYALINK]
+          (IF
 \BACKGROUND
+              THEN
 (RETURN))
+          (SETQ \PERIODIC.INTERRUPT)                         (* ; 
+
                                                           "turn off sampling while gathering sample")

+          [COND
+             ((IGEQ (LLSH SPY.NEXT 1)
+                    SPY.BUFFER.THRESHOLD)
+              (COND
+                 (\INTERRUPTABLE (SPY.DUMP.BUFFER
))
+                 (T                                          (* ; 
+
                                                      "this sample might overflow;  just don't do it")

+                    (RETURN]
+          (SPY.START.ENTRY
)
+      SAMPLELOOP
+          (SPY.ADD.ENTRY
 (fetch
 (FX FRAMENAME)
+                                FRAME))
+          (COND
+             ([NOT (fetch
 (FX INVALIDP)
+                          (SETQ FRAME (fetch
 (FX CLINK)
+                                             FRAME]
+              (GO SAMPLELOOP))
+             (T (SPY.END.ENTRY
]
+    (SETQ \PERIODIC.INTERRUPT '\SPY.INTERRUPT])
 
 (SPY.DUMP.BUFFER

   [LAMBDA NIL
                                         (* ; "Edited 28-Apr-94 14:00 by sybalsky")

@@ -885,8 +912,15 @@ Copyright (c) 1984-1985, 1987-1988, 1990-1991, 1993-1994 by Venue & Xerox Corpor
 )
 
 (SPY.ADD.ENTRY

-(LAMBDA (NAME) (* ; "Edited  9-Sep-87 18:29 by Masinter") (COND (SPY.POINTERS (\PUTBASEPTR SPY.BUFFER (LLSH SPY.NEXT 1) NAME) (COND ((IGEQ (LLSH (add SPY.NEXT 1) 1) SPY.BUFFER.SIZE) (SPY.OVERFLOW)))) (T (OR (LITATOM NAME) (SETQ NAME (QUOTE *FORM*))) (\PUTBASE SPY.BUFFER SPY.NEXT (\LOLOC NAME)) (COND ((IGEQ (add SPY.NEXT 1) SPY.BUFFER.SIZE) (SPY.OVERFLOW))))))
-)
+  [LAMBDA (NAME)
                                             (* ; "Edited 28-Jul-2023 08:17 by lmm")


+                                                          (* ; "Edited  9-Sep-87 18:29 by Masinter")

+    (\PUTBASEPTR SPY.BUFFER (LLSH SPY.NEXT 1)
+           NAME)
+    (COND
+       ((IGEQ (LLSH (add
 SPY.NEXT 1)
+                    1)
+              SPY.BUFFER.SIZE)
+        (SPY.OVERFLOW
])
 
 (SPY.ORIGINAL

   [LAMBDA (TREES)
                                     (* ; "Edited 28-Apr-94 14:00 by sybalsky")

@@ -951,6 +985,8 @@ Copyright (c) 1984-1985, 1987-1988, 1990-1991, 1993-1994 by Venue & Xerox Corpor
                            else
 (fetch
 (SPYRECORD NAME) of
 X])
 )
 
+(RPAQ? \BACKGROUND
 )
+
 (RPAQ? SPY.BUTTON
 )
 
 (RPAQQ SPY.OPEN
 #*(56 59)@@@@@@@@@@@@@@@@GLOLLC@@@@@@@@@@LFLFLC@@@@@@@@@@LFLFFF@@@@@@@@@@O@LFFF@@GLOL@@@@GLLFCL@@LFLF@@@@ANOLAH@@LFLF@@@@LFL@AH@@LFLF@@@@LFL@AH@@LFLF@@@@LFL@AH@@LFLF@@@@GLL@AH@@GLLF@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@IEGOOJ@@@@J@@HJ@@BOONHH@@BA@@@@HKOOOFNJHA@D@@HHBGOKNOEB@@@B@@@EDOMMBIGNJH@I@@@HBONJMEEKE@HA@@ECONMJB@KOOJCE@@@KOOJJHEAONHDJ@@KONJD@@@@AONIE@@GOMJH@@@BMOJEB@@FOB@@D@B@@AOEM@@GODDHA@@@AENMG@@KLH@@D@@@@BONM@@GM@HB@@@@BEFKG@@JJDBH@@@@@@INM@@ODA@DDD@@@BEOG@@@KJOMKB@@@AEEK@@JJEBNLIB@@DEOG@@DKNOKONHDDABFI@@BBKFOOMD@AAEFM@@IEIABEEOD@@@JJ@@EFLJKKGEB@EFEB@@J@@BOOHNHD@AEE@@EEEDONKEJ@EEBJ@@H@IOOOOOIEB@HD@@MDDOOOOMDHIEBJ@@BAOKOOOGONNJ@A@@HBKGOOOOOJKHBE@@DHLKMGMGOONJ@I@@@EMBOOJOOOKHBD@@BKDEOOJAOONJ@B@@BKIBOOHEOOOH@D@@HNDAONJBOJDDAA@@BO@DMGDEGOEB@A@@A@DBFJ@BL@@@@D@@@E@ICMAEOJDH@A@@B@@D@ADI@@@@BD@@HDA@JDBEFHH@@A@@@@@H@IDID@@B@D@@AA@A@@@B@A@@AA@@@@@D@@B@J@@A@A@@@@@H@@@D@@@@@J@@@A@@@D@AB@@@BA@@@@@@@@E@@@@@@D@@HH@@@B@@@@@@@B@@
@@ -958,13 +994,15 @@ Copyright (c) 1984-1985, 1987-1988, 1990-1991, 1993-1994 by Venue & Xerox Corpor
 
 (RPAQQ SPY.CLOSED
 #*(56 59)@@@@@@@@@@@@@@@@GLOLLC@@@@CHND@@LFLFLC@@@@FAHA@@LFLFFF@@@@FAH@@@O@LFFF@@GLOKNA@@GLLFCL@@LFFAH@@@ANOLAH@@LFFAHA@@LFL@AH@@LFFAH@@@LFL@AH@@LFFAHJ@@LFL@AH@@LFFAH@@@GLL@AH@@GLFAHB@@@@@@@@@@@@@@@D@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@A@@@@@IEGOOJ@@@@J@@HJ@@BOONHH@@BA@@@@HKOOOFNJHA@D@@HHBGOKNOEB@@@B@@@EDOMMBIGNJH@I@@@HBONJMEEKE@HA@@ECONMJB@KOOBCE@@@KOOJJHEAOOHDJ@@KONJD@@@@AONIE@@GOMJH@@@BMOJEB@@FOB@@D@B@@AOEM@@GODDHA@@@AENMG@@KLH@@D@@@@BONM@@GM@HB@@@@BEFKG@@JJDBH@@@@@@INM@@ODA@DDD@@@BEOG@@@KJOMKB@@@AEEK@@JJEBNLIB@@DEOG@@DKNOKONHDDABFI@@BBKFOOOD@AAEFM@@IEIABEGND@@@JJ@@EFLLDGGGB@EFEB@@J@@@@@IOHD@AEE@@EEAAEA@FI@EEBJ@@H@HDL@EAME@@HD@@MDEB@NHDJHDABJ@@BAB@@ABICF@J@A@@HB@KDDI@BLI@BE@@DID@A@@JHKDJ@I@@@D@DDDE@EBKEBD@@BAD@@@@A@OED@B@@BHAAAAA@CGNH@D@@H@D@@@@@MOE@AA@@BK@DDDDDGOJJ@A@@B@DA@B@CODFBBD@@EE@HBIAENK@@@A@@BLHBDDDON@@@BD@@KGDHJJIGJHB@@A@@BOBBECGOLB@B@D@@AAMLMKGOH@@@AA@@@GGONNON@H@A@A@@@IKKKKOLJ@@@@J@@@DFOKOO@D@@@BA@@@AEGMMD@A@@@@D@@HHBJMBLA@@@@@B@@
 )
-
-(DEFGLOBALVAR SPY.POINTERS
 T)
 (DECLARE%: DOEVAL@COMPILE DONTCOPY
 
 (GLOBALVARS SPY.OVERFLOWED \PERIODIC.INTERRUPT SPY.TREE SPY.BUFFER.SIZE SPY.NEXT SPY.BUFFER.THRESHOLD
        SPY.BUFFER SPY.FREQUENCY SPY.SHOW.THRESHOLD SPY.MAXLINES SPY.FONT)
 )
+(DECLARE%: DOEVAL@COMPILE DONTCOPY
+
+(SPECVARS \BACKGROUND)
+)
 (DECLARE%: EVAL@COMPILE 
 
 (PUTPROPS WITH-SPY
 MACRO
 [(FORM)
@@ -1014,19 +1052,18 @@ Copyright (c) 1984-1985, 1987-1988, 1990-1991, 1993-1994 by Venue & Xerox Corpor
 )
 
 (MOVD? 'NILL 'MODERNWINDOW)
-(PUTPROPS SPY COPYRIGHT ("Venue & Xerox Corporation" 1984 1985 1987 1988 1990 1991 1993 1994))
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (4753 7360 (SPYOBJ 4763 . 5052) (SPYOBJ.BUTTON 5054 . 5164) (SPYOBJ.SAVE 5166 . 5285) (
-SPYOBJ.COPY 5287 . 5349) (SPYOBJ.GET 5351 . 5480) (SPYOBJ.IMAGEBOX 5482 . 6006) (SPYOBJ.DISPLAY 6008
- . 6307) (SPYOBJ.LABEL 6309 . 6445) (SPYOBJ.HEIGHT 6447 . 6660) (SPYOBJ.COPYIN 6662 . 6705) (
-SPY.COPYBUTTON 6707 . 6799) (SPY.MERGEINFO 6801 . 7358)) (18202 59509 (SPY.FIND.TREE 18212 . 18621) (
-SPY.TOGGLE 18623 . 18813) (SPY.TREE 18815 . 19927) (SPY.LEGEND 19929 . 20279) (SPY.GRAPH.EDITOR 20281
- . 29846) (SPY.END 29848 . 30090) (SPY.MAKEGRAPHNODES 30092 . 32192) (SPY.MAX 32194 . 33077) (
-SPY.MERGE 33079 . 34510) (SPY.MERGE1 34512 . 40995) (SPY.MERGETREE 40997 . 43927) (SPY.NEXT.TREE 43929
- . 44603) (SPY.SUM 44605 . 45294) (SPY.TITLE 45296 . 45513) (SPY.MAKE.TREE 45515 . 47540) (
-SPY.UPDATE.TITLE 47542 . 50118) (SPY.DELETE 50120 . 50655) (SPY.DRAWBOX 50657 . 51182) (
-SPY.BUFFER.ENTRY 51184 . 51422) (SPY.BUTTON 51424 . 51993) (SPY.END.ENTRY 51995 . 52075) (SPY.START 
-52077 . 52361) (SPY.INIT 52363 . 52598) (\SPY.INTERRUPT 52600 . 53236) (SPY.DUMP.BUFFER 53238 . 54698)
- (SPY.START.ENTRY 54700 . 54828) (SPY.ADD.ENTRY 54830 . 55212) (SPY.ORIGINAL 55214 . 56041) (
-SPY.OVERFLOW 56043 . 56144) (SPY.MERGE.CALLEES 56146 . 59182) (SPY.PRINT 59184 . 59507)))))
+  (FILEMAP (NIL (4707 7314 (SPYOBJ 4717 . 5006) (SPYOBJ.BUTTON 5008 . 5118) (SPYOBJ.SAVE 5120 . 5239) (
+SPYOBJ.COPY 5241 . 5303) (SPYOBJ.GET 5305 . 5434) (SPYOBJ.IMAGEBOX 5436 . 5960) (SPYOBJ.DISPLAY 5962
+ . 6261) (SPYOBJ.LABEL 6263 . 6399) (SPYOBJ.HEIGHT 6401 . 6614) (SPYOBJ.COPYIN 6616 . 6659) (
+SPY.COPYBUTTON 6661 . 6753) (SPY.MERGEINFO 6755 . 7312)) (18156 60387 (SPY.FIND.TREE 18166 . 18575) (
+SPY.TOGGLE 18577 . 18767) (SPY.TREE 18769 . 19881) (SPY.LEGEND 19883 . 20233) (SPY.GRAPH.EDITOR 20235
+ . 29800) (SPY.END 29802 . 30044) (SPY.MAKEGRAPHNODES 30046 . 32146) (SPY.MAX 32148 . 33031) (
+SPY.MERGE 33033 . 34464) (SPY.MERGE1 34466 . 40949) (SPY.MERGETREE 40951 . 43881) (SPY.NEXT.TREE 43883
+ . 44557) (SPY.SUM 44559 . 45248) (SPY.TITLE 45250 . 45467) (SPY.MAKE.TREE 45469 . 47494) (
+SPY.UPDATE.TITLE 47496 . 50072) (SPY.DELETE 50074 . 50609) (SPY.DRAWBOX 50611 . 51136) (
+SPY.BUFFER.ENTRY 51138 . 51481) (SPY.BUTTON 51483 . 52052) (SPY.END.ENTRY 52054 . 52134) (SPY.START 
+52136 . 52420) (SPY.INIT 52422 . 52657) (\SPY.INTERRUPT 52659 . 54064) (SPY.DUMP.BUFFER 54066 . 55526)
+ (SPY.START.ENTRY 55528 . 55656) (SPY.ADD.ENTRY 55658 . 56090) (SPY.ORIGINAL 56092 . 56919) (
+SPY.OVERFLOW 56921 . 57022) (SPY.MERGE.CALLEES 57024 . 60060) (SPY.PRINT 60062 . 60385)))))
 STOP

library/SYSEDIT

@@ -1,12 +1,10 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
 
-
(FILECREATED "29-Apr-2023 16:15:10" {DSK}<home>larry>il>medley>library>SYSEDIT.;2
 1377   
-
-      :EDIT-BY "lmm"
+
(FILECREATED "18-Jul-2023 12:07:08" {DSK}<home>frank>il>medley>gmedley>library>SYSEDIT.;2
 1397   
 
       :CHANGES-TO (VARS SYSEDITCOMS)
 
-      :PREVIOUS-DATE "17-Apr-2023 14:19:03" {DSK}<home>larry>il>medley>library>SYSEDIT.;1)
+      :PREVIOUS-DATE "29-Apr-2023 16:15:10" {DSK}<home>frank>il>medley>gmedley>library>SYSEDIT.;1)
 
 
 (PRETTYCOMPRINT SYSEDITCOMS)
@@ -24,7 +22,7 @@
               (MSRECORDTRANFLG T))
         (P (MOVD? 'APPLY* 'SPREADAPPLY*X)
            (RESETVARS ((CROSSCOMPILING T))
-                  (FILESLOAD (SOURCE)
+                  (FILESLOAD (SOURCE FROM LOADUPS)
                          EXPORTS.ALL])
 
 (RPAQQ CLISPIFYPRETTYFLG
 NIL)
@@ -50,7 +48,7 @@
 (MOVD? 'APPLY* 'SPREADAPPLY*X)
 
 (RESETVARS ((CROSSCOMPILING T))
-           (FILESLOAD (SOURCE)
+           (FILESLOAD (SOURCE FROM LOADUPS)
                   EXPORTS.ALL))
 (DECLARE%: DONTCOPY
   (FILEMAP (NIL)))

library/UNICODE

@@ -1,13 +1,12 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
 
-
(FILECREATED "19-Jul-2022 15:36:40" 
-{DSK}<users>kaplan>local>medley3.5>working-medley>library>UNICODE.;198
 65644  
+
(FILECREATED "19-Jul-2023 09:26:13" {WMEDLEY}<library>UNICODE.;199
 65282  
 
-      :CHANGES-TO (FNS MAKE-UNICODE-FORMATS \UTF16BE.BACKCCODEFN \UTF8.BACKCCODEFN)
-                  (VARS UNICODECOMS)
+      :EDIT-BY rmk
 
-      :PREVIOUS-DATE "13-Jul-2022 11:38:18" 
-{DSK}<users>kaplan>local>medley3.5>working-medley>library>UNICODE.;196)
+      :CHANGES-TO (VARS UNICODECOMS)
+
+      :PREVIOUS-DATE "19-Jul-2022 15:36:40" {WMEDLEY}<library>UNICODE.;198)
 
 
 (PRETTYCOMPRINT UNICODECOMS)
@@ -58,10 +57,8 @@
               (GLOBALVARS *XCCSTOUNICODE* *UNICODETOXCCS*))
         (FNS HEXSTRING UTF8HEXSTRING NUTF8CODEBYTES NUTF8STRINGBYTES XTOUSTRING XCCSSTRING)
         (FNS SHOWCHARS)
-        (DECLARE%: EVAL@COMPILE DONTCOPY (P (OR (GETP 'EXPORTS.ALL 'FILE)
-                                                (PRINT 
-                                                 "NOTE: UNICODE requires EXPORTS.ALL for compilation"
-                                                       T)))
+        (DECLARE%: EVAL@COMPILE DONTCOPY (FILES (FROM LOADUPS)
+                                                EXPORTS.ALL)
                
                (* ;; "These control the layout of the translation tables.  Since many of the upper panels are sparse, doing it per-panel (128) seems more space-efficient, and residual alists can be shorter")

 
@@ -1194,8 +1191,8 @@
 )
 (DECLARE%: EVAL@COMPILE DONTCOPY 
 
-(OR (GETP 'EXPORTS.ALL 'FILE)
-    (PRINT "NOTE: UNICODE requires EXPORTS.ALL for compilation" T))
+(FILESLOAD (FROM
 LOADUPS)
+       EXPORTS.ALL)
 
 (DECLARE%: EVAL@COMPILE 
 
@@ -1218,15 +1215,15 @@
 )
 )
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (4031 18122 (UTF8.OUTCHARFN 4041 . 6872) (UTF8.INCCODEFN 6874 . 12364) (UTF8.PEEKCCODEFN
- 12366 . 17140) (\UTF8.BACKCCODEFN 17142 . 18120)) (18123 21904 (UTF16BE.OUTCHARFN 18133 . 18957) (
-UTF16BE.INCCODEFN 18959 . 19858) (UTF16BE.PEEKCCODEFN 19860 . 20931) (\UTF16BE.BACKCCODEFN 20933 . 
-21902)) (21934 23995 (MAKE-UNICODE-FORMATS 21944 . 23993)) (24092 25398 (UNICODE.UNMAPPED 24102 . 
-25396)) (25399 25935 (XCCS-UTF8-AFTER-OPEN 25409 . 25933)) (26768 27117 (XTOUCODE 26778 . 26946) (
-UTOXCODE 26948 . 27115)) (27157 43279 (READ-UNICODE-MAPPING-FILENAMES 27167 . 28268) (
-READ-UNICODE-MAPPING 28270 . 31568) (WRITE-UNICODE-MAPPING 31570 . 35787) (WRITE-UNICODE-INCLUDED 
-35789 . 40511) (WRITE-UNICODE-MAPPING-HEADER 40513 . 41745) (WRITE-UNICODE-MAPPING-FILENAME 41747 . 
-43277)) (46492 54971 (MAKE-UNICODE-TRANSLATION-TABLES 46502 . 54969)) (55388 63414 (HEXSTRING 55398 . 
-56559) (UTF8HEXSTRING 56561 . 58766) (NUTF8CODEBYTES 58768 . 59553) (NUTF8STRINGBYTES 59555 . 60036) (
-XTOUSTRING 60038 . 63049) (XCCSSTRING 63051 . 63412)) (63415 64884 (SHOWCHARS 63425 . 64882)))))
+  (FILEMAP (NIL (3717 17808 (UTF8.OUTCHARFN 3727 . 6558) (UTF8.INCCODEFN 6560 . 12050) (UTF8.PEEKCCODEFN
+ 12052 . 16826) (\UTF8.BACKCCODEFN 16828 . 17806)) (17809 21590 (UTF16BE.OUTCHARFN 17819 . 18643) (
+UTF16BE.INCCODEFN 18645 . 19544) (UTF16BE.PEEKCCODEFN 19546 . 20617) (\UTF16BE.BACKCCODEFN 20619 . 
+21588)) (21620 23681 (MAKE-UNICODE-FORMATS 21630 . 23679)) (23778 25084 (UNICODE.UNMAPPED 23788 . 
+25082)) (25085 25621 (XCCS-UTF8-AFTER-OPEN 25095 . 25619)) (26454 26803 (XTOUCODE 26464 . 26632) (
+UTOXCODE 26634 . 26801)) (26843 42965 (READ-UNICODE-MAPPING-FILENAMES 26853 . 27954) (
+READ-UNICODE-MAPPING 27956 . 31254) (WRITE-UNICODE-MAPPING 31256 . 35473) (WRITE-UNICODE-INCLUDED 
+35475 . 40197) (WRITE-UNICODE-MAPPING-HEADER 40199 . 41431) (WRITE-UNICODE-MAPPING-FILENAME 41433 . 
+42963)) (46178 54657 (MAKE-UNICODE-TRANSLATION-TABLES 46188 . 54655)) (55074 63100 (HEXSTRING 55084 . 
+56245) (UTF8HEXSTRING 56247 . 58452) (NUTF8CODEBYTES 58454 . 59239) (NUTF8STRINGBYTES 59241 . 59722) (
+XTOUSTRING 59724 . 62735) (XCCSSTRING 62737 . 63098)) (63101 64570 (SHOWCHARS 63111 . 64568)))))
 STOP

library/UNIXUTILS

@@ -1,28 +1,40 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
 
-
(FILECREATED "18-Jan-2023 20:36:10" {DSK}<home>frank>il>medley>gmedley>library>UNIXUTILS.;7
 5091   
+
(FILECREATED " 8-Oct-2023 15:06:52" {DSK}<home>frank>il>medley>gmedley>library>UNIXUTILS.;15
 14696  
 
-      :CHANGES-TO (FNS ShellBrowser ShellBrowse ShellOpen)
+      :CHANGES-TO (FNS ShellOpen UNIX-FILE-NAME ShellBrowser ShellBrowse ShellOpener)
                   (VARS UNIXUTILSCOMS)
-                  (FUNCTIONS ShellWhich)
 
-      :PREVIOUS-DATE "18-Jan-2023 13:22:28" {DSK}<home>frank>il>medley>gmedley>greetfiles>UNIXUTILS.;1
+      :PREVIOUS-DATE " 8-Oct-2023 02:35:47" {DSK}<home>frank>il>medley>gmedley>library>UNIXUTILS.;14
 )
 
 
 (PRETTYCOMPRINT UNIXUTILSCOMS)
 
-(RPAQQ UNIXUTILSCOMS
 ((GLOBALVARS ShellBrowser)
-                      (INITVARS (ShellBrowser))
-                      (FUNCTIONS ShellCommand ShellWhich)
-                      (FNS ShellBrowser ShellBrowse)))
+(RPAQQ UNIXUTILSCOMS

+       ((DECLARE%: EVAL@COMPILE DONTCOPY                     (* ; "For PROCESS-COMMAND")

+               (FILES (FROM LOADUPS)
+                      EXPORTS.ALL))
+        (GLOBALVARS ShellBrowser ShellOpener)
+        (INITVARS (ShellBrowser)
+               (ShellOpener))
+        (FUNCTIONS ShellCommand ShellWhich)
+        (FNS ShellBrowser ShellBrowse ShellOpener ShellOpen PROCESS-COMMAND SLASHIT UNIX-FILE-NAME)
+        (PROPS (UNIXUTILS FILETYPE))))
+(DECLARE%: EVAL@COMPILE DONTCOPY 
+
+(FILESLOAD (FROM
 LOADUPS)
+       EXPORTS.ALL)
+)
 (DECLARE%: DOEVAL@COMPILE DONTCOPY
 
-(GLOBALVARS ShellBrowser)
+(GLOBALVARS ShellBrowser ShellOpener)
 )
 
 (RPAQ? ShellBrowser
 )
 
+(RPAQ? ShellOpener
 )
+
 (CL:DEFUN ShellCommand
 (Cmd &OPTIONAL (Output T))
    (CL:WITH-OPEN-STREAM (s (CREATE-PROCESS-STREAM Cmd))
           (CL:TAGBODY [SETFILEINFO s 'ENDOFSTREAMOP #'(CL:LAMBDA (s)
@@ -34,62 +46,56 @@
 
 (CL:DEFUN ShellWhich
 (Cmd)
                                   (* ; "Edited 18-Jan-2023 13:19 by FGH")

    [CL:WITH-OPEN-STREAM (S (OPENSTREAM '{NODIRCORE} 'BOTH))
-          (ShellCommand
 (CONCAT "which " Cmd)
+          (ShellCommand
 (CONCAT "command -v " Cmd)
                  S)
           (COND
              ((EQ (GETEOFPTR S)
                   0)
               NIL)
              (T (SETFILEPTR S 0)
-                (MKSTRING (READ S])
+                (RSTRING S])
 (DEFINEQ
 
 (ShellBrowser

   [LAMBDA NIL
                                                (* ; "Edited 18-Jan-2023 20:30 by FGH")

-    (OR ShellBrowser (SETQ ShellBrowser (LET (CMDPATH)
-                                             (if
 (STRPOS "darwin" (OR (UNIX-GETENV "OSTYPE")
-                                                                      (UNIX-GETENV "PATH")))
-                                                 then
 
-                                                      (* ;; " MacOS")

 
-                                                      "open"
-                                               elseif
 (SETQ CMDPATH (ShellWhich
 "wslview"))
-                                                 then
 
-                                                      (* ;; "windows with WSL")

+    (* ;; "Figure out the browser  to use for the ShellOpen/ShellBrowse functions. ")

 
-                                                      CMDPATH
-                                               elseif
 (SETQ CMDPATH (ShellWhich
 "xdg-open"))
-                                                 then
 
-                                                      (* ;; "Linux systems with xdg-utils installed ")

+    (* ;; " Ordinarily, this would be the same as the generic ShellOpener.")

 
-                                                      CMDPATH
-                                               elseif
 (SETQ CMDPATH (ShellWhich
 "git"))
-                                                 then
 
-                                                      (* ;; " Systems with git installed")

+    (* ;; " But if a generic ShellOpener is not found, then there are some additional")

 
-                                                      (CONCAT CMDPATH " web--browse") 
-                                                             (* ; "")

-                                               elseif
 (SETQ CMDPATH (ShellWhich
 "lynx"))
-                                                 then
 
-                                                      (* ;; " Systems with lynx installed")

+    (* ;; " possibilities that will work for http/https URLs.  If one of these exists return it.")

 
-                                                      (LET (CMDPATH2)
-                                                           (if
 (SETQ CMDPATH2 (ShellWhich
 "xterm"))
-                                                               then
 (CONCAT CMDPATH2 " -e " CMDPATH)
-                                                             else
 (LIST CMDPATH)))
-                                               else
 
-                                                    (* ;; 
-
                                                    " Out of ideas - just return a dummy function")

+    (OR ShellBrowser (SETQ ShellBrowser
+                      (if
 (NOT (STREQUAL (ShellOpener
)
+                                      "true"))
+                          then
 ShellOpener
+                        else
 (LET (CMDPATH)
+                                  (if
 (SETQ CMDPATH (ShellWhich
 "git"))
+                                      then
 
+                                           (* ;; " Systems with git installed")

 
-                                                    "true"])
+                                           CMDPATH
+                                    elseif
 (SETQ CMDPATH (ShellWhich
 "lynx"))
+                                      then
 
+                                           (* ;; " Systems with lynx installed")

+
+                                           (LET (CMDPATH2)
+                                                (if
 (SETQ CMDPATH2 (ShellWhich
 "xterm"))
+                                                    then
 (CONCAT CMDPATH2 " -e " CMDPATH)
+                                                  else
 (LIST CMDPATH)))
+                                    else
 
+                                         (* ;; " Out of ideas - just return a dummy function")

+
+                                         "true"])
 
 (ShellBrowse

   [LAMBDA (URL)
                                              (* ; "Edited 18-Jan-2023 20:32 by FGH")

 
     (* ;; " Open the web page specified by URL using an external browser via shell call")

 
-    (* ;; 
-
  " URL must start with http:// or https:// (case ireelevant) or this function will just return NIL.")

+    (* ;; " URL must start with http:// or https:// or file:/// (case ireelevant) or this function will just return NIL.")

 
     (* ;; " Returns T otherwise.")

 
@@ -97,17 +103,189 @@
     (if
 (OR (EQ (STRPOS "http://" (L-CASE URL))
                 1)
             (EQ (STRPOS "https://" (L-CASE URL))
+                1)
+            (EQ (STRPOS "file:///" (L-CASE URL))
+                1))
+        then
 (ShellOpen
 URL)
+      else
 NIL])
+
+(ShellOpener

+  [LAMBDA NIL
+
+    (* ;; "Find an %"opener%" that will open files (and URLs) using the appropriate/default app on this machine")

+
+    (OR ShellOpener (SETQ ShellOpener (LET (CMDPATH)
+                                           (if
 (SETQ CMDPATH (ShellWhich
 "wslview"))
+                                               then
 
+                                                    (* ;; "windows with WSL")

+
+                                                    CMDPATH
+                                             elseif
 (SETQ CMDPATH (ShellWhich
 "cygstart"))
+                                               then
 
+                                                    (* ;; "windows with cygwin")

+
+                                                    CMDPATH
+                                             elseif
 (SETQ CMDPATH (ShellWhich
 "xdg-open"))
+                                               then
 
+                                                    (* ;; "Linux systems with xdg-utils installed ")

+
+                                                    CMDPATH
+                                             elseif
 (SETQ CMDPATH (ShellWhich
 "open"))
+                                               then
 
+                                                    (* ;; " MacOS open")

+
+                                                    CMDPATH
+                                             else
 
+                                                  (* ;; 
+
                                                  " Out of ideas - just return a dummy function")

+
+                                                  "true"])
+
+(ShellOpen

+  [LAMBDA (FilenameOrURL)
+
+    (* ;; "Open the  file or URL using the generic %"opener%" for this machine via a shell call.")

+
+    (* ;; " If FilenameOrURL starts with %"http://%" or %"https://%" or %"file:///%",  then we use (ShellBrowser) as")

+
+    (* ;; " the %"opener%" (which includes some browsers on a machine without a generic opener).")

+
+    (* ;; 
+
    " Otherwise FilenameOrURL is assumed to be a filename and will be opened using (ShellOpener).")

+
+    (* ;; " Returns T is all goes well; returns an error string if all does not go well")

+
+    (SETQ FilenameOrURL (MKSTRING FilenameOrURL))
+    (if
 (OR (EQ (STRPOS "http://" (L-CASE FilenameOrURL))
+                1)
+            (EQ (STRPOS "https://" (L-CASE FilenameOrURL))
+                1)
+            (EQ (STRPOS "file://" (L-CASE FilenameOrURL))
                 1))
         then
 (LET ((BROWSER (ShellBrowser
)))
-                  (if
 (LISTP BROWSER)
-                      then
 (CHAT 'SHELL NIL (CONCAT (CAR BROWSER)
-                                                   " '" URL "'"))
-                    else
 (ShellCommand
 (CONCAT BROWSER " '" URL "'" 
-                                              " >>/tmp/ShellBrowser-warnings-$$.txt")))
-                  T)
-      else
 NIL])
+                  (if
 (NOT (STREQUAL BROWSER "true"))
+                      then
 (if
 (LISTP BROWSER)
+                               then
 (CHAT 'SHELL NIL (CONCAT (CAR BROWSER)
+                                                            " '" FilenameOrURL "'"))
+                             else
 (ShellCommand
 (CONCAT BROWSER " '" FilenameOrURL "'" 
+                                                       " >>/tmp/ShellBrowser-warnings-$$.txt"))
+                                  T)
+                    else
 (CONCAT "Unable to find a browser to open: " FilenameOrURL)))
+      else

+      (LET ((OPENER (ShellOpener
))
+            (UNIXFILE (UNIX-FILE-NAME
 FilenameOrURL 'INPUT T)))
+           (if
 (NOT UNIXFILE)
+               then
 (CONCAT "File not found: " FilenameOrURL)
+             elseif
 (NOT (STREQUAL OPENER "true"))
+               then
 (CL:WITH-OPEN-STREAM
+                     (SHELLSTREAM (OPENSTREAM (CONCAT "{CORE}SHELLOUT" (RAND))
+                                         'BOTH))
+                     (ShellCommand
 (CONCAT OPENER " '" UNIXFILE "'" 
+                                          " >>/tmp/ShellOpener-warnings-$$.txt")
+                            SHELLSTREAM)
+                     (if
 (EQ (GETFILEPTR SHELLSTREAM)
+                             0)
+                         then
 T
+                       else
 (LET* ((OUTSTRING (ALLOCSTRING (GETFILEPTR SHELLSTREAM)
+                                                     " ")))
+                                  (CL:WITH-OPEN-STREAM (STRINGSTREAM (OPENSTRINGSTREAM OUTSTRING
+                                                                            'OUTPUT))
+                                         (SETFILEPTR SHELLSTREAM 0)
+                                         (CL:TAGBODY [SETFILEINFO SHELLSTREAM 'ENDOFSTREAMOP
+                                                            #'(CL:LAMBDA (s)
+                                                                     (GO OUT]
+                                                (CL:LOOP (PRINTCCODE (READCCODE SHELLSTREAM)
+                                                                STRINGSTREAM))
+                                                OUT))
+                                  OUTSTRING)))
+             else
 (CONCAT "Unable to find a file opener to open: " FilenameOrURL])
+
+(PROCESS-COMMAND

+  [LAMBDA (CMD)
                                              (* ; "Edited 17-Jul-2022 08:17 by rmk")

+
+    (* ;; "This sets up an asynchronous process and waits until it returns with an exit code.  Typically 0 means success.")

+
+    (CL:WITH-OPEN-STREAM (PS (CREATE-PROCESS-STREAM CMD))
+           (BIND
 CODE WHILE
 (EQ T (SETQ CODE (OR (SUBRCALL UNIX-HANDLECOMM 7 (fetch
 (STREAM F1)
+                                                                                of
 PS))
+                                                 0))) DO
 (BLOCK) FINALLY
 (RETURN CODE])
+
+(SLASHIT

+  [LAMBDA (X LCASEDIRS NOHOST)
                               (* ; "Edited 23-Sep-2023 15:27 by rmk")

+
+    (* ;; "It would also be nice to use the generic unpackfilename/packfilename tools.  But packfilename sticks in brackets again, and sticks a dot on when removing the version.")

+
+    (* ;; "Perhaps this should be a per file-device operation that maps device names into the local file system.")

+
+    (* ;; "This is a first approximation to a utility that converts a filename X on a host whose files physically reside in the local Unix file system into the strings that shell commands can use to reference that file.  For now, this just involves replacing directory brackets with /, removing the host, and perhaps lower-casing the directory.  It probably should be extended to deal with version number translation, for now it just keeps the ; version. ")

+
+    (LET [LASTDIRPOS SLASHED (DIRPOS (ADD1 (OR (STRPOS "}" X)
+                                               0]
+         [SETQ SLASHED (CONCATCODES (FOR
 I C FROM
 DIRPOS WHILE
 (SETQ C (NTHCHARCODE X I))
+                                       COLLECT
 (SELCHARQ C
+                                                    ((< >) 
+                                                         (SETQ LASTDIRPOS I)
+                                                         (CHARCODE /))
+                                                    (/ (SETQ LASTDIRPOS I)
+                                                       C)
+                                                    C]
+         (CL:WHEN (AND LCASEDIRS LASTDIRPOS)
+             (SETQ LASTDIRPOS (ADD1 (IDIFFERENCE LASTDIRPOS DIRPOS)))
+             (SETQ SLASHED (CONCAT (L-CASE (SUBSTRING SLASHED 1 LASTDIRPOS))
+                                  (OR (SUBSTRING SLASHED (ADD1 LASTDIRPOS))
+                                      ""))))
+         (CL:IF (OR (EQ DIRPOS 1)
+                    NOHOST)
+             SLASHED
+             (CONCAT (SUBSTRING X 1 (SUB1 DIRPOS))
+                    SLASHED))])
+
+(UNIX-FILE-NAME

+  [LAMBDA (FILE ACCESS COPY)
                                 (* ; "Edited  1-Oct-2023 20:52 by rmk")

+
+    (* ;; "Tries to return the string that would reference FILE in a Unix shell, for the use of PROCESS-COMMAND and ShellCommand.  If VERSION is 1, it assumes that the Unix file is doesn't have the Medley version convention.  If FILE does not have a corresponding Unix name, COPY is non-NIL, and ACCESS is INPUT, FILE will be copied to a unix tmp file (with COPY in its name) and that name will be returned.")

+
+    (CL:WHEN (\GETSTREAM FILE ACCESS T)
+        (SETQ FILE (OR (FULLNAME FILE)
+                       FILE)))                               (* ; "Might catch NODIRCORE")

+    (CL:WHEN FILE
+        (SETQ FILE (TRUEFILENAME FILE))
+        (CL:UNLESS (STREAMP FILE)
+            [SETQ FILE (\GETFILENAME FILE (SELECTQ ACCESS
+                                              (OUTPUT 'NEW)
+                                              (INPUT 'OLD)
+                                              (NIL (SETQ ACCESS 'INPUT)
+                                                   'OLD)
+                                              (\ILLEGAL.ARG ACCESS])
+        [SELECTQ (FILENAMEFIELD FILE 'HOST)
+            (UNIX [SUBSTRING FILE (ADD1 (CONSTANT (NCHARS "{UNIX}"])
+            (DSK (LET [(VERSION (FILENAMEFIELD FILE 'VERSION]
+                      (SETQ FILE (SLASHIT
 (PACKFILENAME 'HOST NIL 'VERSION NIL 'BODY FILE)))
+                      (CL:IF (AND VERSION (IGREATERP VERSION 1))
+                          (CONCAT FILE (CL:IF (FILENAMEFIELD FILE 'EXTENSION)
+                                           "."
+                                           "")
+                                 "~" VERSION "~")
+                          FILE)))
+            (CL:WHEN (AND COPY (EQ ACCESS 'INPUT)
+                          FILE)
+                (RESETLST
+                    (CL:WHEN (\GETSTREAM FILE 'INPUT T)      (* ; "Hope is randaccess")

+                        [RESETSAVE (GETFILEPTR FILE)
+                               `(PROGN (SETFILEPTR ,FILE OLDVALUE])
+                    (COPYFILE FILE (CONCAT "{UNIX}/tmp/medley-" (L-CASE COPY)
+                                          "-"
+                                          (IDATE)
+                                          "-"
+                                          (RAND)
+                                          (CL:IF (FILENAMEFIELD FILE 'EXTENSION)
+                                              (CONCAT "." (FILENAMEFIELD FILE 'EXTENSION))
+                                              "")))))])])
 )
+
+(PUTPROPS UNIXUTILS
 FILETYPE
 CL:COMPILE-FILE)
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (764 1137 (ShellCommand 764 . 1137)) (1139 1538 (ShellWhich 1139 . 1538)) (1539 5068 (
-ShellBrowser 1549 . 4072) (ShellBrowse 4074 . 5066)))))
+  (FILEMAP (NIL (1144 1517 (ShellCommand 1144 . 1517)) (1519 1916 (ShellWhich 1519 . 1916)) (1917 14618 
+(ShellBrowser 1927 . 3675) (ShellBrowse 3677 . 4362) (ShellOpener 4364 . 6052) (ShellOpen 6054 . 9357)
+ (PROCESS-COMMAND 9359 . 9972) (SLASHIT 9974 . 12016) (UNIX-FILE-NAME 12018 . 14616)))))
 STOP

lispusers/BACKGROUND-YIELD

@@ -1,21 +1,23 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
 
-
(FILECREATED "14-Nov-2021 22:05:58" {DSK}<home>larry>medley>lispusers>BACKGROUND-YIELD.;2
 1597   
+
(FILECREATED "28-Jul-2023 09:49:24" {DSK}<home>larry>il>medley>lispusers>BACKGROUND-YIELD.;2
 1770   
 
-      changes to%:  (VARS BACKGROUND-YIELD)
+      :EDIT-BY "lmm"
 
-      previous date%: "20-Sep-2021 11:37:28" {DSK}<home>larry>medley>lispusers>BACKGROUND-YIELD.;1)
+      :CHANGES-TO (FNS BACKGROUND-YIELD)
+
+      :PREVIOUS-DATE "14-Nov-2021 22:05:58" {DSK}<home>larry>il>medley>lispusers>BACKGROUND-YIELD.;1
+)
 
 
 (PRETTYCOMPRINT BACKGROUND-YIELDCOMS)
 
 (RPAQQ BACKGROUND-YIELDCOMS
 (
-                                 (* ;; 
-
                               " Add a call to BACKGROUNDFNS to yield when not otherwise busy")

+                             (* ;; " Add a call to BACKGROUNDFNS to yield when not otherwise busy")

 
-                                 (FNS BACKGROUND-YIELD INIT-YIELD)
-                                 (DECLARE%: DONTEVAL@LOAD DOCOPY (P (INIT-YIELD T)))
-                                 (VARS BACKGROUND-YIELD)))
+                             (FNS BACKGROUND-YIELD INIT-YIELD)
+                             (DECLARE%: DONTEVAL@LOAD DOCOPY (P (INIT-YIELD T)))
+                             (VARS BACKGROUND-YIELD)))
 
 
 
@@ -24,10 +26,13 @@
 (DEFINEQ
 
 (BACKGROUND-YIELD

-  [LAMBDA NIL
                                          (* ; "Edited 20-Sep-2021 11:37 by larry")

-    (IF
 (FIXP BACKGROUND-YIELD)
-        THEN
 (SUBRCALL YIELD BACKGROUND-YIELD)
-              (SUBRCALL CAUSE-INTERRUPT])
+  [LAMBDA NIL
                                                (* ; "Edited 28-Jul-2023 09:11 by lmm")


+                                                           (* ; "Edited 20-Sep-2021 11:37 by larry")

+    (LET ((\BACKGROUND T))
+         (DECLARE
 (SPECVARS \BACKGROUND))
+         (IF
 (FIXP BACKGROUND-YIELD)
+             THEN
 (SUBRCALL YIELD BACKGROUND-YIELD)
+                  (SUBRCALL CAUSE-INTERRUPT])
 
 (INIT-YIELD

   [LAMBDA (ONP)
                                        (* ; "Edited 19-Sep-2021 13:32 by larry")

@@ -46,5 +51,5 @@
 
 (RPAQQ BACKGROUND-YIELD
 833333)
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (833 1482 (BACKGROUND-YIELD 843 . 1098) (INIT-YIELD 1100 . 1480)))))
+  (FILEMAP (NIL (806 1655 (BACKGROUND-YIELD 816 . 1271) (INIT-YIELD 1273 . 1653)))))
 STOP

lispusers/EVALOBJ

@@ -1,22 +1,19 @@
-(DEFINE-FILE-INFO READTABLE "INTERLISP" PACKAGE "INTERLISP")
-
(FILECREATED "11-May-2018 08:22:13" 
-{DSK}<Users>kaplan>Local>medley3.5>lispcore>lispusers>EVALOBJ.;2
 15206  
+(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
 
-      changes to%:  (VARS EVALOBJCOMS)
+
(FILECREATED "18-Jul-2023 12:27:33" {DSK}<home>frank>il>medley>gmedley>lispusers>EVALOBJ.;2
 15110  
 
-      previous date%: " 6-May-2000 09:24:45" 
-{DSK}<Users>kaplan>Local>medley3.5>lispcore>lispusers>EVALOBJ.;1)
+      :CHANGES-TO (VARS EVALOBJCOMS)
 
+      :PREVIOUS-DATE "11-May-2018 08:22:13" {DSK}<home>frank>il>medley>gmedley>lispusers>EVALOBJ.;1
+)
 
-(* ; "
-Copyright (c) 1997, 1998, 1999, 2000, 2018 by Xerox Corporation.  All rights reserved.
-")
 
 (PRETTYCOMPRINT EVALOBJCOMS)
 
 (RPAQQ EVALOBJCOMS

        [(FILES IMOBJAPPLICATION)
-        (DECLARE%: DOEVAL@LOAD DONTCOPY (FILES EXPORTS.ALL))
+        (DECLARE%: DOEVAL@LOAD DONTCOPY (FILES (FROM LOADUPS)
+                                               EXPORTS.ALL))
         (FNS EVALOBJ.BUTTONEVENTINFN EVALOBJ.DISPLAYFN EVALOBJ.IMAGEBOXFN EVALOBJ.COPYFN 
              EVALOBJ.CREATE EVALOBJ.GETFN EVALOBJ.PUTFN)
         (FNS PARAMS TEXTSTREAMPARAM)
@@ -51,7 +48,8 @@ Copyright (c) 1997, 1998, 1999, 2000, 2018 by Xerox Corporation.  All rights res
 (FILESLOAD IMOBJAPPLICATION)
 (DECLARE%: DOEVAL@LOAD DONTCOPY 
 
-(FILESLOAD EXPORTS.ALL)
+(FILESLOAD (FROM
 LOADUPS)
+       EXPORTS.ALL)
 )
 (DEFINEQ
 
@@ -264,7 +262,7 @@ Copyright (c) 1997, 1998, 1999, 2000, 2018 by Xerox Corporation.  All rights res
                                                                                             SELECTION
                                                                                             )
                                                                                      (
-
                                                                                   EVALOBJ.SELTOOBJ

+
                                                                                     EVALOBJ.SELTOOBJ

                                                                                       TEXTSTREAM 
                                                                                       SELECTION
                                                                                       'CREATE/LOAD]
@@ -291,11 +289,10 @@ Copyright (c) 1997, 1998, 1999, 2000, 2018 by Xerox Corporation.  All rights res
 
 (ADDTOVAR LAMA
 )
 )
-(PUTPROPS EVALOBJ COPYRIGHT ("Xerox Corporation" 1997 1998 1999 2000 2018))
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (3038 9319 (EVALOBJ.BUTTONEVENTINFN 3048 . 4241) (EVALOBJ.DISPLAYFN 4243 . 5418) (
-EVALOBJ.IMAGEBOXFN 5420 . 6963) (EVALOBJ.COPYFN 6965 . 7188) (EVALOBJ.CREATE 7190 . 8606) (
-EVALOBJ.GETFN 8608 . 9009) (EVALOBJ.PUTFN 9011 . 9317)) (9320 11885 (PARAMS 9330 . 11261) (
-TEXTSTREAMPARAM 11263 . 11883)) (11886 13031 (EVALOBJ.DISMANTLEFN 11896 . 12179) (EVALOBJ.SELTOOBJ 
-12181 . 13029)))))
+  (FILEMAP (NIL (3016 9297 (EVALOBJ.BUTTONEVENTINFN 3026 . 4219) (EVALOBJ.DISPLAYFN 4221 . 5396) (
+EVALOBJ.IMAGEBOXFN 5398 . 6941) (EVALOBJ.COPYFN 6943 . 7166) (EVALOBJ.CREATE 7168 . 8584) (
+EVALOBJ.GETFN 8586 . 8987) (EVALOBJ.PUTFN 8989 . 9295)) (9298 11863 (PARAMS 9308 . 11239) (
+TEXTSTREAMPARAM 11241 . 11861)) (11864 13009 (EVALOBJ.DISMANTLEFN 11874 . 12157) (EVALOBJ.SELTOOBJ 
+12159 . 13007)))))
 STOP

lispusers/GITFNS

@@ -1,10 +1,12 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
 
-
(FILECREATED "30-Mar-2023 09:08:48" {WMEDLEY}<lispusers>GITFNS.;469
 119763 
+
(FILECREATED "23-Sep-2023 13:02:15" {WMEDLEY}<lispusers>GITFNS.;483
 124031 
 
-      :CHANGES-TO (FNS GIT-MAKE-PROJECT)
+      :EDIT-BY rmk
 
-      :PREVIOUS-DATE "11-Mar-2023 23:12:35" {WMEDLEY}<lispusers>GITFNS.;468)
+      :CHANGES-TO (FNS CDGITDIR)
+
+      :PREVIOUS-DATE "22-Sep-2023 12:08:14" {WMEDLEY}<lispusers>GITFNS.;482)
 
 
 (PRETTYCOMPRINT GITFNSCOMS)
@@ -47,6 +49,7 @@
         (INITVARS (GIT-MERGE-COMPARES T)
                (GIT-CDBROWSER-SEPARATE-DIRECTIONS T))
         (COMMANDS gwc bbc prc cob b? cdg cdw)
+        (FNS PRC-COMMAND)
         
         (* ;; "")

 
@@ -65,7 +68,7 @@
 
         (FNS GIT-COMMIT GIT-PUSH GIT-PULL GIT-APPROVAL GIT-GET-FILE GIT-FILE-EXISTS? 
              GIT-REMOTE-UPDATE GIT-REMOTE-ADD GIT-FILE-DATE GIT-FILE-HISTORY GIT-PRINT-FILE-HISTORY 
-             GIT-FETCH)
+             GIT-FETCH GIT-PR-BRANCHES)
         
         (* ;; "Differences")

 
@@ -77,8 +80,8 @@
         (* ;; "Branches")

 
         (FNS GIT-BRANCH-NUM GIT-CHECKOUT GIT-WHICH-BRANCH GIT-MAKE-BRANCH GIT-BRANCHES 
-             GIT-BRANCH-EXISTS? GIT-PICK-BRANCH GIT-PRC-MENU GIT-PULL-REQUESTS GIT-SHORT-BRANCH-NAME
-             GIT-LONG-NAME)
+             GIT-BRANCH-EXISTS? GIT-PICK-BRANCH GIT-BRANCH-MENU GIT-PULL-REQUESTS 
+             GIT-SHORT-BRANCH-NAME GIT-LONG-NAME GIT-PRC-BRANCHES)
         
         (* ;; "My branches")

 
@@ -98,7 +101,7 @@
 
         (FNS GIT-GET-DIFFERENT-FILES GIT-BRANCHES-COMPARE-DIRECTORIES GIT-WORKING-COMPARE-DIRECTORIES
              GIT-COMPARE-WORKTREE GITCDOBJBUTTONFN GIT-CD-LABELFN GIT-CD-MENUFN 
-             GIT-WORKING-COMPARE-FILES GIT-BRANCHES-COMPARE-FILES)
+             GIT-WORKING-COMPARE-FILES GIT-BRANCHES-COMPARE-FILES GIT-PR-COMPARE)
         (INITVARS (FROMGITN 0))
         
         (* ;; "")

@@ -106,8 +109,8 @@
         
         (* ;; "Utilities")

 
-        (FNS CDGITDIR GIT-COMMAND GITORIGIN GIT-INITIALS GIT-COMMAND-TO-FILE PROCESS-COMMAND 
-             GIT-RESULT-TO-LINES STRIPLOCAL)
+        (FNS CDGITDIR GIT-COMMAND GITORIGIN GIT-INITIALS GIT-COMMAND-TO-FILE GIT-RESULT-TO-LINES 
+             STRIPLOCAL)
         (PROPS (GITFNS FILETYPE))))
 
 
@@ -314,7 +317,8 @@
             PROJECT))])
 
 (GIT-PUT-PROJECT-FIELD

-  [LAMBDA (PROJECT FIELD NEWVALUE)
                           (* ; "Edited 11-Mar-2023 23:00 by rmk")


+  [LAMBDA (PROJECT FIELD NEWVALUE)
                           (* ; "Edited 10-Jun-2023 21:48 by rmk")


+                                                             (* ; "Edited 11-Mar-2023 23:00 by rmk")


                                                              (* ; "Edited  7-Jul-2022 11:25 by rmk")


                                                              (* ; "Edited 13-May-2022 10:40 by rmk")


                                                              (* ; "Edited  9-May-2022 20:02 by rmk")


@@ -322,24 +326,17 @@
 
     (* ;; "Replaces the value of a project field with NEWVALUE.  The project record is DONTCOPY, to avoid potential name conflicts, so this provides a functional interface.  One use:  augment EXCLUSIONS with a list of temporary debug and testing files that you don't want to see in the various file listings")

 
-    (CL:WHEN (SETQ PROJECT (IF
 (TYPE?
 GIT-PROJECT PROJECT)
-                               THEN
 PROJECT
-                             ELSEIF
 (CDR (ASSOC (OR (U-CASE PROJECT)
-                                                    GIT-DEFAULT-PROJECT)
-                                                GIT-PROJECTS))
-                             ELSEIF
 NOERROR
-                               THEN
 NIL
-                             ELSE
 (ERROR "NOT A GIT-PROJECT" PROJECT)))
-        (SELECTQ FIELD
-            (PROJECTNAME (REPLACE
 PROJECTNAME OF
 PROJECT WITH
 NEWVALUE))
-            (WHOST (REPLACE
 WHOST OF
 PROJECT WITH
 NEWVALUE))
-            (GITHOST (REPLACE
 GITHOST OF
 PROJECT WITH
 NEWVALUE))
-            (EXCLUSIONS (REPLACE
 EXCLUSIONS OF
 PROJECT WITH
 NEWVALUE))
-            (DEFAULTSUBDIRS 
-                 (REPLACE
 DEFAULTSUBDIRS OF
 PROJECT WITH
 NEWVALUE))
-            (CLONEPATH (REPLACE
 CLONEPATH OF
 PROJECT WITH
 NEWVALUE))
-            (MAINBRANCH (REPLACE
 MAINBRANCH OF
 PROJECT WITH
 NEWVALUE))
-            PROJECT))])
+    (SETQ PROJECT (GIT-GET-PROJECT
 PROJECT))
+    (SELECTQ FIELD
+        (PROJECTNAME (REPLACE
 PROJECTNAME OF
 PROJECT WITH
 NEWVALUE))
+        (WHOST (REPLACE
 WHOST OF
 PROJECT WITH
 NEWVALUE))
+        (GITHOST (REPLACE
 GITHOST OF
 PROJECT WITH
 NEWVALUE))
+        (EXCLUSIONS (REPLACE
 EXCLUSIONS OF
 PROJECT WITH
 NEWVALUE))
+        (DEFAULTSUBDIRS 
+             (REPLACE
 DEFAULTSUBDIRS OF
 PROJECT WITH
 NEWVALUE))
+        (CLONEPATH (REPLACE
 CLONEPATH OF
 PROJECT WITH
 NEWVALUE))
+        (MAINBRANCH (REPLACE
 MAINBRANCH OF
 PROJECT WITH
 NEWVALUE))
+        PROJECT])
 
 (GIT-PROJECT-PATH

   [LAMBDA (PROJECTNAME PROJECTPATH)
                          (* ; "Edited  8-May-2022 15:10 by rmk")

@@ -478,29 +475,7 @@
 
    (* ;; "Compares REMOTEBRANCH against the main orign branch, for pull-request assessment")

 
-    (LET ((RB REMOTEBRANCH)
-          (DR DRAFTS)
-          (PRS))
-         (IF
 PROJECT
-             THEN
 (SETQ PROJECT (GIT-GET-PROJECT
 PROJECT))
-           ELSEIF
 (GIT-GET-PROJECT
 RB NIL T)
-             THEN
 (SETQ PROJECT RB)
-                  (SETQ RB NIL)
-           ELSEIF
 (GIT-GET-PROJECT
 DRAFTS NIL T)
-             THEN
 (SETQ PROJECT DRAFTS)
-                  (SETQ DRFTS NIL))
-         (CL:WHEN (MEMB (U-CASE RB)
-                        '(DRAFT DRAFTS))
-             (SETQ RB NIL)
-             (SETQ DR T))
-         (GIT-FETCH
 PROJECT)
-         (SETQ PRS (GIT-PULL-REQUESTS
 T DR PROJECT))
-         (IF
 PRS
-             THEN
 (CL:WHEN (OR RB (SETQ RB (GIT-PICK-BRANCH
 (GIT-PRC-MENU
 DR PROJECT PRS)
-                                                  "Pull requests")))
-                      (GIT-BRANCHES-COMPARE-DIRECTORIES
 (GIT-MAINBRANCH
 PROJECT)
-                             RB NIL PROJECT))
-           ELSE
 "No open pull requests")))
+    (PRC-COMMAND
 REMOTEBRANCH DRAFTS PROJECT))
 
 (DEFCOMMAND cob (BRANCH NEXTTITLESTRING PROJECT)
 
@@ -553,6 +528,46 @@
    (SLASHIT (/CNDIR (CONCAT (GIT-GET-PROJECT
 PROJECT 'WHOST)
                            (OR SUBDIR "")))
           T))
+(DEFINEQ
+
+(PRC-COMMAND

+  [LAMBDA (REMOTEBRANCH DRAFTS PROJECT)
                      (* ; "Edited 28-Jul-2023 09:03 by rmk")

+    (LET (PRS PRMENU)
+         (IF
 PROJECT
+             THEN
 (SETQ PROJECT (GIT-GET-PROJECT
 PROJECT))
+           ELSEIF
 (GIT-GET-PROJECT
 REMOTEBRANCH NIL T)
+             THEN
 (SETQ PROJECT REMOTEBRANCH)
+                  (SETQ REMOTEBRANCH NIL)
+           ELSEIF
 (GIT-GET-PROJECT
 DRAFTS NIL T)
+             THEN
 (SETQ PROJECT DRAFTS)
+                  (SETQ DRAFTS NIL))
+         (CL:WHEN (MEMB (U-CASE REMOTEBRANCH)
+                        '(DRAFT DRAFTS))
+             (SETQ REMOTEBRANCH NIL)
+             (SETQ DRAFTS T))
+         (GIT-FETCH
 PROJECT)
+         (SETQ PRS (GIT-PULL-REQUESTS
 T DRAFTS PROJECT))
+         (CL:WHEN (AND REMOTEBRANCH (NEQ REMOTEBRANCH 'PinMenu))
+             (for
 PR in
 PRS when
 (OR (STRPOS REMOTEBRANCH (fetch
 PRDESCRIPTION of
 PR)
+                                            NIL NIL NIL NIL FILEDIRCASEARRAY)
+                                     (STRPOS REMOTEBRANCH (fetch
 PRNAME of
 PR)
+                                            NIL NIL NIL NIL FILEDIRCASEARRAY)) collect
 PR
+                finally
 (CL:WHEN $$VAL (SETQ PRS $$VAL))
+                      (SETQ REMOTEBRANCH NIL)))
+         (IF
 PRS
+             THEN
 (CL:UNLESS REMOTEBRANCH
+                      (SETQ PRS (GIT-PRC-BRANCHES
 DRAFTS PROJECT PRS))
+                      (SETQ PRMENU (GIT-BRANCH-MENU
 PRS (CONCAT (LENGTH PRS)
+                                                               " pull requests")
+                                          NIL))
+                      (SETQ REMOTEBRANCH (MENU PRMENU)))
+                  (if
 (EQ 'PinMenu REMOTEBRANCH)
+                      then
 (ADDMENU (GIT-BRANCH-MENU
 PRS (CONCAT (LENGTH PRS)
+                                                                " pull requests")))
+                    elseif
 REMOTEBRANCH
+                      then
 (GIT-PR-COMPARE
 REMOTEBRANCH PROJECT))
+           ELSE
 "No open pull requests"])
+)
 
 
 
@@ -1004,6 +1019,35 @@
 (GIT-FETCH

   [LAMBDA (PROJECT)
                                          (* ; "Edited  8-Jul-2022 10:32 by rmk")

     (GIT-COMMAND
 "git fetch" T NIL PROJECT])
+
+(GIT-PR-BRANCHES

+  [LAMBDA (DRAFT PROJECT PRS)
                                (* ; "Edited  8-Aug-2022 18:15 by rmk")


+                                                             (* ; "Edited  4-Aug-2022 18:55 by rmk")


+                                                             (* ; "Edited  9-Jul-2022 19:01 by rmk")


+                                                             (* ; "Edited 16-May-2022 19:44 by rmk")

+    (CL:UNLESS PRS
+        (SETQ PRS (GIT-PULL-REQUESTS
 T DRAFT PROJECT)))
+    (CL:WHEN PRS
+        (LET ((RELATIONS (GIT-BRANCH-RELATIONS
 (FOR
 PR IN
 PRS COLLECT
 (GITORIGIN
 (CADDR PR)))
+                                NIL T PROJECT)))
+             (SORT [FOR
 PR REL LABEL PRNAME (SUPERSETS _ (CAR RELATIONS))
+                        (EQUALS _ (CADR RELATIONS)) IN
 PRS
+                      COLLECT
 (SETQ PRNAME (fetch
 PRNAME of
 PR))
+                            (SETQ LABEL (CONCAT "#" (fetch
 (PULLREQUEST PRNUMBER) of
 PR)
+                                               " "
+                                               (IF
 [SETQ REL (CAR (CDR (SASSOC PRNAME SUPERSETS]
+                                                   THEN
 (CONCAT PRNAME " > " REL)
+                                                 ELSEIF
 [SETQ REL (CAR (CDR (SASSOC PRNAME EQUALS
]
+                                                   THEN
 (CONCAT PRNAME " = " REL)
+                                                 ELSE
 PRNAME)))
+                            (LIST (CL:IF (EQ 'DRAFT (FETCH
 PRSTATUS OF
 PR))
+                                      (CONCAT LABEL " (draft)")
+                                      LABEL)
+                                  (GITORIGIN
 PRNAME)
+                                  (CONCAT " " (FETCH
 PRDESCRIPTION OF
 PR)
+                                         "  #"
+                                         (FETCH
 PRNUMBER OF
 PR]
+                   T)))])
 )
 
 
@@ -1321,41 +1365,24 @@
         THEN
 (ERROR "Unknown branch" BRANCH])
 
 (GIT-PICK-BRANCH

-  [LAMBDA (BRANCHES TITLE)
                                   (* ; "Edited 18-May-2022 13:44 by rmk")

-    (CL:WHEN (MKLIST BRANCHES)
-        (MENU (CREATE
 MENU
-                     TITLE _ (OR TITLE 'Branches)
-                     ITEMS _ BRANCHES
-                     MENUFONT _ DEFAULTFONT)))])
+  [LAMBDA (BRANCHES TITLE)
                                   (* ; "Edited  6-Jul-2023 22:31 by rmk")


+                                                             (* ; "Edited 30-Jun-2023 16:58 by rmk")


+                                                             (* ; "Edited 18-May-2022 13:44 by rmk")

+    (MENU (GIT-BRANCH-MENU
 BRANCHES (OR TITLE (CONCAT (LENGTH BRANCHES)
+                                                     " branches"])
 
-(GIT-PRC-MENU

-  [LAMBDA (DRAFT PROJECT PRS)
                                (* ; "Edited  8-Aug-2022 18:15 by rmk")


-                                                             (* ; "Edited  4-Aug-2022 18:55 by rmk")


-                                                             (* ; "Edited  9-Jul-2022 19:01 by rmk")


-                                                             (* ; "Edited 16-May-2022 19:44 by rmk")

-    (CL:UNLESS PRS
-        (SETQ PRS (GIT-PULL-REQUESTS
 T DRAFT PROJECT)))
-    (CL:WHEN PRS
-        (LET ((RELATIONS (GIT-BRANCH-RELATIONS
 (FOR
 PR IN
 PRS COLLECT
 (GITORIGIN
 (CADDR PR)))
-                                NIL T PROJECT)))
-             (SORT [FOR
 PR REL LABEL PRNAME (SUPERSETS _ (CAR RELATIONS))
-                        (EQUALS _ (CADR RELATIONS)) IN
 PRS
-                      COLLECT
 (SETQ PRNAME (fetch
 PRNAME of
 PR))
-                            (SETQ LABEL (CONCAT "#" (fetch
 (PULLREQUEST PRNUMBER) of
 PR)
-                                               " "
-                                               (IF
 [SETQ REL (CAR (CDR (SASSOC PRNAME SUPERSETS]
-                                                   THEN
 (CONCAT PRNAME " > " REL)
-                                                 ELSEIF
 [SETQ REL (CAR (CDR (SASSOC PRNAME EQUALS
]
-                                                   THEN
 (CONCAT PRNAME " = " REL)
-                                                 ELSE
 PRNAME)))
-                            (LIST (CL:IF (EQ 'DRAFT (FETCH
 PRSTATUS OF
 PR))
-                                      (CONCAT LABEL " (draft)")
-                                      LABEL)
-                                  (GITORIGIN
 PRNAME)
-                                  (CONCAT " " (FETCH
 PRDESCRIPTION OF
 PR)
-                                         "  #"
-                                         (FETCH
 PRNUMBER OF
 PR]
-                   T)))])
+(GIT-BRANCH-MENU

+  [LAMBDA (BRANCHES TITLE PIN?)
                              (* ; "Edited  6-Jul-2023 22:31 by rmk")


+                                                             (* ; "Edited 30-Jun-2023 16:58 by rmk")


+                                                             (* ; "Edited 18-May-2022 13:44 by rmk")

+    (CL:WHEN (SETQ BRANCHES (MKLIST BRANCHES))
+        (CL:WHEN PIN?
+            [SETQ BRANCHES (APPEND BRANCHES '(("      Pin menu" 'PinMenu])
+        (CREATE
 MENU
+               TITLE _ (OR TITLE (CONCAT (LENGTH BRANCHES)
+                                        " branches"))
+               ITEMS _ BRANCHES
+               MENUFONT _ DEFAULTFONT))])
 
 (GIT-PULL-REQUESTS

   [LAMBDA (ALLINFO INCLUDEDRAFTS PROJECT)
                    (* ; "Edited  8-Aug-2022 13:12 by rmk")


@@ -1402,6 +1429,35 @@
     (* ;; "Allows short-hand reference to branch:  rmk40 will return rmk40--xyz")

 
     (FIND
 B IN
 (GIT-BRANCHES
 WHERE PROJECT EXCLUDEMERGED) SUCHTHAT
 (STRPOS BRANCH B])
+
+(GIT-PRC-BRANCHES

+  [LAMBDA (DRAFT PROJECT PRS)
                                (* ; "Edited  8-Aug-2022 18:15 by rmk")


+                                                             (* ; "Edited  4-Aug-2022 18:55 by rmk")


+                                                             (* ; "Edited  9-Jul-2022 19:01 by rmk")


+                                                             (* ; "Edited 16-May-2022 19:44 by rmk")

+    (CL:UNLESS PRS
+        (SETQ PRS (GIT-PULL-REQUESTS
 T DRAFT PROJECT)))
+    (CL:WHEN PRS
+        (LET ((RELATIONS (GIT-BRANCH-RELATIONS
 (FOR
 PR IN
 PRS COLLECT
 (GITORIGIN
 (CADDR PR)))
+                                NIL T PROJECT)))
+             (SORT [FOR
 PR REL LABEL PRNAME (SUPERSETS _ (CAR RELATIONS))
+                        (EQUALS _ (CADR RELATIONS)) IN
 PRS
+                      COLLECT
 (SETQ PRNAME (fetch
 PRNAME of
 PR))
+                            (SETQ LABEL (CONCAT "#" (fetch
 (PULLREQUEST PRNUMBER) of
 PR)
+                                               " "
+                                               (IF
 [SETQ REL (CAR (CDR (SASSOC PRNAME SUPERSETS]
+                                                   THEN
 (CONCAT PRNAME " > " REL)
+                                                 ELSEIF
 [SETQ REL (CAR (CDR (SASSOC PRNAME EQUALS
]
+                                                   THEN
 (CONCAT PRNAME " = " REL)
+                                                 ELSE
 PRNAME)))
+                            (LIST (CL:IF (EQ 'DRAFT (FETCH
 PRSTATUS OF
 PR))
+                                      (CONCAT LABEL " (draft)")
+                                      LABEL)
+                                  (GITORIGIN
 PRNAME)
+                                  (CONCAT " " (FETCH
 PRDESCRIPTION OF
 PR)
+                                         "  #"
+                                         (FETCH
 PRNUMBER OF
 PR]
+                   T)))])
 )
 
 
@@ -1664,7 +1720,8 @@
          (LIST DIR1 DIR2 MAPPINGS))])
 
 (GIT-BRANCHES-COMPARE-DIRECTORIES

-  [LAMBDA (BRANCH1 BRANCH2 LOCAL PROJECT)
                    (* ; "Edited 12-Sep-2022 14:41 by rmk")


+  [LAMBDA (BRANCH1 BRANCH2 LOCAL PROJECT)
                    (* ; "Edited 10-Jun-2023 17:28 by rmk")


+                                                             (* ; "Edited 12-Sep-2022 14:41 by rmk")


                                                              (* ; "Edited 20-Jul-2022 21:18 by rmk")


                                                              (* ; "Edited 22-May-2022 22:47 by rmk")


                                                              (* ; "Edited  9-May-2022 15:14 by rmk")


@@ -1683,10 +1740,11 @@
          (SETQ MAPPINGS (CADDR DIRS))
          (IF
 DIRS
              THEN
 (TERPRI T)
-                  (SETQ CDVALUE (COMPAREDIRECTORIES (CAR DIRS)
+                  [SETQ CDVALUE (COMPAREDIRECTORIES (CAR DIRS)
                                        (CADR DIRS)
                                        '(> < ~= -* *-)
-                                       '*>*.*)) 
+                                       '*>*.*
+                                       (GIT-GET-PROJECT
 PROJECT 'EXCLUSIONS] 
 
                   (* ;; "We know that both sides come from Unix/unversioned, even if they have been copied into versioned FROMGIT, so we make a pass to remove the misleading versions.")

 
@@ -1754,6 +1812,10 @@
 (GIT-WORKING-COMPARE-DIRECTORIES

   [LAMBDA (SUBDIRS SELECT EXCLUDEDFILES FIXDIRECTORYDATES UPDATE PROJECT)
 
+    (* ;; "Edited 17-Jun-2023 22:54 by rmk")

+
+    (* ;; "Edited 10-Jun-2023 21:32 by rmk")

+
     (* ;; "Edited 20-Jul-2022 21:18 by rmk")

 
     (* ;; "Edited 25-Jun-2022 21:37 by rmk")

@@ -1793,7 +1855,13 @@
                                      (GITSUBDIR
 SUBDIR T PROJECT)
                                      (OR SELECT '(> < ~= -* *-))
                                      NIL
-                                     (FETCH
 EXCLUSIONS OF
 PROJECT)
+                                     (for
 E DPOS in
 (GIT-GET-PROJECT
 PROJECT 'EXCLUSIONS)
+                                        collect
 (SETQ DPOS (STRPOS SUBDIR (FILENAMEFIELD E
+                                                                                 'DIRECTORY)
+                                                                  1 NIL T T FILEDIRCASEARRAY))
+                                              (CL:IF DPOS
+                                                  (SUBSTRING E (ADD1 DPOS))
+                                                  E))
                                      NIL NIL NIL FIXDIRECTORYDATES))
                   [FOR
 CDE IN
 (FETCH
 CDENTRIES OF
 CDVAL)
                      DO
 (CL:WHEN (FETCH
 INFO1 OF
 CDE)
@@ -2067,6 +2135,11 @@
                                               " " FILE)
                 (CONCAT (GIT-SHORT-BRANCH-NAME
 BRANCH2)
                        " " FILE])
+
+(GIT-PR-COMPARE

+  [LAMBDA (RB PROJECT)
                                       (* ; "Edited  6-Jul-2023 22:22 by rmk")

+    (GIT-BRANCHES-COMPARE-DIRECTORIES
 (GIT-MAINBRANCH
 PROJECT)
+           RB NIL PROJECT])
 )
 
 (RPAQ? FROMGITN
 0)
@@ -2083,11 +2156,13 @@
 (DEFINEQ
 
 (CDGITDIR

-  [LAMBDA (PROJECT)
                                          (* ; "Edited  8-Jul-2022 10:34 by rmk")


+  [LAMBDA (PROJECT)
                                          (* ; "Edited 23-Sep-2023 13:01 by rmk")


+                                                             (* ; "Edited  8-Jul-2022 10:34 by rmk")


                                                              (* ; "Edited  7-Jul-2022 09:36 by rmk")


                                                              (* ; "Edited  7-May-2022 22:41 by rmk")


                                                             (* ; "Edited  2-Nov-2021 21:12 by rmk:")

-    (CONCAT "cd " [SLASHIT (STRIPHOST
 (TRUEFILENAME (FETCH
 GITHOST OF
 PROJECT]
+    (CONCAT "cd " (SLASHIT (TRUEFILENAME (FETCH
 GITHOST OF
 PROJECT))
+                         NIL T)
            " && "])
 
 (GIT-COMMAND

@@ -2198,16 +2273,6 @@
                      (ERROR (CONCAT "Command failed: " CMD)))
                  NIL])
 
-(PROCESS-COMMAND

-  [LAMBDA (CMD)
                                              (* ; "Edited 17-Jul-2022 08:17 by rmk")

-
-    (* ;; "This sets up an asynchronous process and waits until it returns with an exit code.  Typically 0 means success.")

-
-    (CL:WITH-OPEN-STREAM (PS (CREATE-PROCESS-STREAM CMD))
-           (BIND
 CODE WHILE
 (EQ T (SETQ CODE (OR (SUBRCALL UNIX-HANDLECOMM 7 (fetch
 (STREAM F1)
-                                                                                of
 PS))
-                                                 0))) DO
 (BLOCK) FINALLY
 (RETURN CODE])
-
 (GIT-RESULT-TO-LINES

   [LAMBDA (FILE ALL)
                                         (* ; "Edited 16-Jul-2022 22:21 by rmk")

 
@@ -2234,32 +2299,33 @@
 
 (PUTPROPS GITFNS
 FILETYPE
 :TCOMPL)
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (3979 20805 (GIT-CLONEP 3989 . 5252) (GIT-INIT 5254 . 5884) (GIT-MAKE-PROJECT 5886 . 
-13487) (GIT-GET-PROJECT 13489 . 15414) (GIT-PUT-PROJECT-FIELD 15416 . 17433) (GIT-PROJECT-PATH 17435
- . 18479) (FIND-ANCESTOR-DIRECTORY 18481 . 18830) (GIT-FIND-CLONE 18832 . 19913) (GIT-MAINBRANCH 19915
- . 20310) (GIT-MAINBRANCH? 20312 . 20803)) (27232 30020 (ALLSUBDIRS 27242 . 28528) (MEDLEYSUBDIRS 
-28530 . 29223) (GITSUBDIRS 29225 . 30018)) (30021 34811 (TOGIT 30031 . 31437) (FROMGIT 31439 . 32420) 
-(GIT-DELETE-FILE 32422 . 33268) (MYMEDLEY-DELETE-FILES 33270 . 34809)) (34812 37815 (MYMEDLEYSUBDIR 
-34822 . 35278) (GITSUBDIR 35280 . 35723) (STRIPDIR 35725 . 36096) (STRIPHOST 36098 . 36338) (STRIPNAME
- 36340 . 37093) (STRIPWHERE 37095 . 37813)) (37816 39718 (GFILE4MFILE 37826 . 38189) (MFILE4GFILE 
-38191 . 38760) (GIT-REPO-FILENAME 38762 . 39716)) (39767 49589 (GIT-COMMIT 39777 . 40603) (GIT-PUSH 
-40605 . 41249) (GIT-PULL 41251 . 41863) (GIT-APPROVAL 41865 . 42214) (GIT-GET-FILE 42216 . 44181) (
-GIT-FILE-EXISTS? 44183 . 44457) (GIT-REMOTE-UPDATE 44459 . 45183) (GIT-REMOTE-ADD 45185 . 45492) (
-GIT-FILE-DATE 45494 . 46425) (GIT-FILE-HISTORY 46427 . 48361) (GIT-PRINT-FILE-HISTORY 48363 . 49413) (
-GIT-FETCH 49415 . 49587)) (49619 60212 (GIT-BRANCH-DIFF 49629 . 55969) (GIT-COMMIT-DIFFS 55971 . 56524
-) (GIT-BRANCH-RELATIONS 56526 . 60210)) (60257 72489 (GIT-BRANCH-NUM 60267 . 60840) (GIT-CHECKOUT 
-60842 . 61901) (GIT-WHICH-BRANCH 61903 . 62201) (GIT-MAKE-BRANCH 62203 . 64416) (GIT-BRANCHES 64418 . 
-66686) (GIT-BRANCH-EXISTS? 66688 . 67392) (GIT-PICK-BRANCH 67394 . 67722) (GIT-PRC-MENU 67724 . 69727)
- (GIT-PULL-REQUESTS 69729 . 71875) (GIT-SHORT-BRANCH-NAME 71877 . 72168) (GIT-LONG-NAME 72170 . 72487)
-) (72519 75854 (GIT-MY-CURRENT-BRANCH 72529 . 72899) (GIT-MY-BRANCHP 72901 . 73406) (
-GIT-MY-NEXT-BRANCH 73408 . 73902) (GIT-MY-BRANCHES 73904 . 75852)) (75900 79852 (GIT-ADD-WORKTREE 
-75910 . 77394) (GIT-REMOVE-WORKTREE 77396 . 78326) (GIT-LIST-WORKTREES 78328 . 79132) (WORKTREEDIR 
-79134 . 79850)) (79900 111109 (GIT-GET-DIFFERENT-FILES 79910 . 86334) (
-GIT-BRANCHES-COMPARE-DIRECTORIES 86336 . 92493) (GIT-WORKING-COMPARE-DIRECTORIES 92495 . 97321) (
-GIT-COMPARE-WORKTREE 97323 . 101301) (GITCDOBJBUTTONFN 101303 . 105793) (GIT-CD-LABELFN 105795 . 
-106877) (GIT-CD-MENUFN 106879 . 109319) (GIT-WORKING-COMPARE-FILES 109321 . 109941) (
-GIT-BRANCHES-COMPARE-FILES 109943 . 111107)) (111179 119696 (CDGITDIR 111189 . 111749) (GIT-COMMAND 
-111751 . 113309) (GITORIGIN 113311 . 114008) (GIT-INITIALS 114010 . 114314) (GIT-COMMAND-TO-FILE 
-114316 . 117805) (PROCESS-COMMAND 117807 . 118420) (GIT-RESULT-TO-LINES 118422 . 119029) (STRIPLOCAL 
-119031 . 119694)))))
+  (FILEMAP (NIL (4053 20503 (GIT-CLONEP 4063 . 5326) (GIT-INIT 5328 . 5958) (GIT-MAKE-PROJECT 5960 . 
+13561) (GIT-GET-PROJECT 13563 . 15488) (GIT-PUT-PROJECT-FIELD 15490 . 17131) (GIT-PROJECT-PATH 17133
+ . 18177) (FIND-ANCESTOR-DIRECTORY 18179 . 18528) (GIT-FIND-CLONE 18530 . 19611) (GIT-MAINBRANCH 19613
+ . 20008) (GIT-MAINBRANCH? 20010 . 20501)) (25911 28038 (PRC-COMMAND 25921 . 28036)) (28094 30882 (
+ALLSUBDIRS 28104 . 29390) (MEDLEYSUBDIRS 29392 . 30085) (GITSUBDIRS 30087 . 30880)) (30883 35673 (
+TOGIT 30893 . 32299) (FROMGIT 32301 . 33282) (GIT-DELETE-FILE 33284 . 34130) (MYMEDLEY-DELETE-FILES 
+34132 . 35671)) (35674 38677 (MYMEDLEYSUBDIR 35684 . 36140) (GITSUBDIR 36142 . 36585) (STRIPDIR 36587
+ . 36958) (STRIPHOST 36960 . 37200) (STRIPNAME 37202 . 37955) (STRIPWHERE 37957 . 38675)) (38678 40580
+ (GFILE4MFILE 38688 . 39051) (MFILE4GFILE 39053 . 39622) (GIT-REPO-FILENAME 39624 . 40578)) (40629 
+52459 (GIT-COMMIT 40639 . 41465) (GIT-PUSH 41467 . 42111) (GIT-PULL 42113 . 42725) (GIT-APPROVAL 42727
+ . 43076) (GIT-GET-FILE 43078 . 45043) (GIT-FILE-EXISTS? 45045 . 45319) (GIT-REMOTE-UPDATE 45321 . 
+46045) (GIT-REMOTE-ADD 46047 . 46354) (GIT-FILE-DATE 46356 . 47287) (GIT-FILE-HISTORY 47289 . 49223) (
+GIT-PRINT-FILE-HISTORY 49225 . 50275) (GIT-FETCH 50277 . 50449) (GIT-PR-BRANCHES 50451 . 52457)) (
+52489 63082 (GIT-BRANCH-DIFF 52499 . 58839) (GIT-COMMIT-DIFFS 58841 . 59394) (GIT-BRANCH-RELATIONS 
+59396 . 63080)) (63127 76230 (GIT-BRANCH-NUM 63137 . 63710) (GIT-CHECKOUT 63712 . 64771) (
+GIT-WHICH-BRANCH 64773 . 65071) (GIT-MAKE-BRANCH 65073 . 67286) (GIT-BRANCHES 67288 . 69556) (
+GIT-BRANCH-EXISTS? 69558 . 70262) (GIT-PICK-BRANCH 70264 . 70754) (GIT-BRANCH-MENU 70756 . 71459) (
+GIT-PULL-REQUESTS 71461 . 73607) (GIT-SHORT-BRANCH-NAME 73609 . 73900) (GIT-LONG-NAME 73902 . 74219) (
+GIT-PRC-BRANCHES 74221 . 76228)) (76260 79595 (GIT-MY-CURRENT-BRANCH 76270 . 76640) (GIT-MY-BRANCHP 
+76642 . 77147) (GIT-MY-NEXT-BRANCH 77149 . 77643) (GIT-MY-BRANCHES 77645 . 79593)) (79641 83593 (
+GIT-ADD-WORKTREE 79651 . 81135) (GIT-REMOVE-WORKTREE 81137 . 82067) (GIT-LIST-WORKTREES 82069 . 82873)
+ (WORKTREEDIR 82875 . 83591)) (83641 115865 (GIT-GET-DIFFERENT-FILES 83651 . 90075) (
+GIT-BRANCHES-COMPARE-DIRECTORIES 90077 . 96422) (GIT-WORKING-COMPARE-DIRECTORIES 96424 . 101848) (
+GIT-COMPARE-WORKTREE 101850 . 105828) (GITCDOBJBUTTONFN 105830 . 110320) (GIT-CD-LABELFN 110322 . 
+111404) (GIT-CD-MENUFN 111406 . 113846) (GIT-WORKING-COMPARE-FILES 113848 . 114468) (
+GIT-BRANCHES-COMPARE-FILES 114470 . 115634) (GIT-PR-COMPARE 115636 . 115863)) (115935 123964 (CDGITDIR
+ 115945 . 116632) (GIT-COMMAND 116634 . 118192) (GITORIGIN 118194 . 118891) (GIT-INITIALS 118893 . 
+119197) (GIT-COMMAND-TO-FILE 119199 . 122688) (GIT-RESULT-TO-LINES 122690 . 123297) (STRIPLOCAL 123299
+ . 123962)))))
 STOP

lispusers/PSEUDOHOSTS

@@ -1,23 +1,26 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
 
-
(FILECREATED "31-Oct-2022 23:32:43" {WMEDLEY}<lispusers>PSEUDOHOSTS.;151
 27537  
+
(FILECREATED "22-Sep-2023 15:29:50" {WMEDLEY}<lispusers>PSEUDOHOSTS.;158
 26638  
 
-      :CHANGES-TO (FNS OPENFILE.PH)
+      :EDIT-BY rmk
 
-      :PREVIOUS-DATE "14-Jul-2022 17:54:43" {WMEDLEY}<lispusers>PSEUDOHOSTS.;150)
+      :CHANGES-TO (FNS PSEUDOHOST SLASHIT CONTRACT.PH)
+                  (VARS PSEUDOHOSTSCOMS)
+
+      :PREVIOUS-DATE "26-Jul-2023 12:34:37" {WMEDLEY}<lispusers>PSEUDOHOSTS.;155)
 
 
 (PRETTYCOMPRINT PSEUDOHOSTSCOMS)
 
 (RPAQQ PSEUDOHOSTSCOMS

-       [
+       (
         (* ;; "Public entries")

 
         (FNS PSEUDOHOST PSEUDOHOSTP PSEUDOHOSTS TARGETHOST TRUEFILENAME PSEUDOFILENAME)
         
         (* ;; "Internals")

 
-        (FNS EXPAND.PH CONTRACT.PH SLASHIT UNSLASHIT GETHOSTINFO.PH)
+        (FNS EXPAND.PH CONTRACT.PH UNSLASHIT GETHOSTINFO.PH)
         (FNS OPENFILE.PH GETFILENAME.PH DIRECTORYNAMEP.PH CLOSEFILE.PH REOPENFILE.PH DELETEFILE.PH 
              OPENP.PH UNREGISTERFILE.PH REGISTERFILE.PH GENERATEFILES.PH GETFILEINFO.PH 
              SETFILEINFO.PH NEXTFILEFN.PH FILEINFOFN.PH RENAMEFILE.PH)
@@ -26,8 +29,8 @@
            (MOVD 'GETHOSTINFO.PH 'GETHOSTINFO))
         (DECLARE%: EVAL@COMPILE DONTCOPY (RECORDS PHDEVICE PHGENFILESTATE TARGETDEVICE)
                (MACROS PSEUDOHOST.NAME PSEUDOHOST.TARGETVAL)
-               (P (CL:UNLESS (GETP 'EXPORTS.ALL 'FILE)
-                      (LOAD 'EXPORTS.ALL))])
+               (FILES (FROM LOADUPS)
+                      EXPORTS.ALL))))
 
 
 
@@ -38,6 +41,8 @@
 (PSEUDOHOST

   [LAMBDA (HOST PREFIX)
 
+    (* ;; "Edited 22-Sep-2023 15:29 by rmk")

+
     (* ;; "Edited 25-Jun-2022 17:00 by rmk")

 
     (* ;; "Edited 24-Feb-2022 23:56 by rmk: Expand prefix so that it is rooted in a real host and not a previously defined pseudohost.")

@@ -53,8 +58,8 @@
                  (CHARCODE }))
         (SETQ HOST (SUBSTRING HOST 1 -2)))
     (SETQ HOST (U-CASE (MKATOM HOST)))
-    [IF
 PREFIX
-        THEN
 (CL:WHEN (PSEUDOHOSTP
 HOST)                     (* ; 
+    [if
 PREFIX
+        then
 (CL:WHEN (PSEUDOHOSTP
 HOST)                     (* ; 
 
                                                       "Redefining: first clear out the previous one")

                  (PSEUDOHOST
 HOST NIL))
              [LET (TARGETHOST
 TARGETDEVICE PREFIXHOST)
@@ -77,7 +82,7 @@
                   (SELECTQ TARGETHOST
                       ((DSK CORE) 
                            (SETQ PREFIX (UNSLASHIT
 PREFIX)))
-                      (UNIX (SETQ PREFIX (SLASHIT
 PREFIX)))
+                      (UNIX (SETQ PREFIX (SLASHIT PREFIX)))
                       NIL)
                   (SETQ TARGETDEVICE (OR (\GETDEVICEFROMHOSTNAME TARGETHOST)
                                          (ERROR "UNKNOWN TARGET HOST" TARGETHOST)))
@@ -85,8 +90,8 @@
                   (* ;; "Save the last directory marker to pack on if needed.")

 
                   (\DEFINEDEVICE HOST
-                         (CREATE
 FDEV
-                            USING
 TARGETDEVICE DEVICENAME _ HOST FDEV1 _ TARGETDEVICE FDEV2 _ PREFIX
+                         (create
 FDEV
+                            using
 TARGETDEVICE DEVICENAME _ HOST FDEV1 _ TARGETDEVICE FDEV2 _ PREFIX
                                   OPENFILELST _ NIL OPENFILE _ (FUNCTION OPENFILE.PH)
                                   GETFILENAME _ (FUNCTION GETFILENAME.PH)
                                   DIRECTORYNAMEP _ (FUNCTION DIRECTORYNAMEP.PH)
@@ -103,7 +108,7 @@
 
                   (* ;; "The ultimate target device keeps a map of prefixes and the hostnames they map to.  The longest matching prefix is chosen when a name that expands to the target device is contracted.")

 
-                  (CHANGE
 (FETCH
 (TARGETDEVICE PREFIXMAP) OF
 TARGETDEVICE)
+                  (change
 (fetch
 (TARGETDEVICE PREFIXMAP) OF
 TARGETDEVICE)
                          (SORT (CONS (LIST PREFIX HOST (CL:IF (EQ (CHARCODE /)
                                                                   (NTHCHARCODE PREFIX -1))
                                                            '/
@@ -112,12 +117,12 @@
                                (FUNCTION (LAMBDA (P1 P2)
                                            (IGREATERP (NCHARS (CAR P1))
                                                   (NCHARS (CAR P2]
-      ELSEIF
 (SETQ PREFIX (CADR (PSEUDOHOSTP
 HOST)))
-        THEN
 
+      elseif
 (SETQ PREFIX (CADR (PSEUDOHOSTP
 HOST)))
+        then
 
              (* ;; "\DEFINEDEVICE removes the name-mapping but doesn't remove the device.  Maybe that's on purpose for other devices, but not here.")

 
              (LET* ((PHHOST (\GETDEVICEFROMNAME HOST \FILEDEVICES))
-                    (TARGETDEV (FETCH
 (PHDEVICE TARGETDEV) OF
 PHHOST)))
+                    (TARGETDEV (fetch
 (PHDEVICE TARGETDEV) OF
 PHHOST)))
                    (UNINTERRUPTABLY
                        (CL:WHEN TARGETDEV                    (* ; 
 
                                                             "Don't want to fail uninterruptably")

@@ -132,13 +137,13 @@
   [LAMBDA (HOST)
                                             (* ; "Edited 24-Feb-2022 23:51 by rmk")


                                                              (* ; "Edited 18-Jan-2022 11:29 by rmk")

     (LET ((DEV (\GETDEVICEFROMNAME HOST T T)))
-         (CL:WHEN (AND DEV (TYPE?
 FDEV (FETCH
 (PHDEVICE TARGETDEV) OF
 DEV)))
+         (CL:WHEN (AND DEV (type?
 FDEV (fetch
 (PHDEVICE TARGETDEV) OF
 DEV)))
              (LIST (FETCH
 (FDEV DEVICENAME) OF
 DEV)
                    (FETCH
 (PHDEVICE PREFIX)
                           DEV)))])
 
 (PSEUDOHOSTS

-  [LAMBDA NIL                                                (* ; "Edited 17-Jan-2022 18:15 by rmk")

+  [LAMBDA NIL
                                                (* ; "Edited 17-Jan-2022 18:15 by rmk")

     (FOR
 DEV IN
 \FILEDEVICES WHEN
 (TYPE?
 FDEV (FETCH
 (PHDEVICE TARGETDEV) OF
 DEV))
        COLLECT
 (LIST (FETCH
 (FDEV DEVICENAME) OF
 DEV)
                      (FETCH
 (PHDEVICE PREFIX) OF
 DEV])
@@ -149,26 +154,32 @@
         (FETCH
 (FDEV DEVICENAME) OF
 (FETCH
 (PHDEVICE TARGETDEV) OF
 (\GETDEVICEFROMNAME HOST))))])
 
 (TRUEFILENAME

-  [LAMBDA (FILE)
                                             (* ; "Edited 26-Jan-2022 23:33 by rmk")


+  [LAMBDA (FILE)
                                             (* ; "Edited 26-Jul-2023 07:53 by rmk")


+                                                             (* ; "Edited 26-Jan-2022 23:33 by rmk")


                                                              (* ; "Edited 25-Jan-2022 08:47 by rmk")

-    (LET (FILENAME DEVICE)
-         (IF
 (STREAMP FILE)
-             THEN
 (SETQ FILENAME (FETCH
 (STREAM FULLFILENAME) OF
 FILE))
-                  (SETQ DEVICE (FETCH
 (STREAM DEVICE) OF
 FILE))
-           ELSE
 (SETQ FILENAME (\ADD.CONNECTED.DIR FILE))
-                (SETQ DEVICE (\GETDEVICEFROMNAME FILENAME)))
-         (CL:IF (TYPE?
 PHDEVICE DEVICE)
-             (EXPAND.PH
 FILENAME DEVICE)
-             FILENAME)])
+    (if
 (LISTP FILE)
+        then
 (for
 F in
 FILE collect
 (TRUEFILENAME
 F))
+      else
 (LET (FILENAME DEVICE)
+                (IF
 (STREAMP FILE)
+                    THEN
 (SETQ FILENAME (FETCH
 (STREAM FULLFILENAME) OF
 FILE))
+                         (SETQ DEVICE (FETCH
 (STREAM DEVICE) OF
 FILE))
+                  ELSE
 (SETQ FILENAME (\ADD.CONNECTED.DIR FILE))
+                       (SETQ DEVICE (\GETDEVICEFROMNAME FILENAME)))
+                (CL:IF (TYPE?
 PHDEVICE DEVICE)
+                    (EXPAND.PH
 FILENAME DEVICE)
+                    FILENAME)])
 
 (PSEUDOFILENAME

-  [LAMBDA (FILE)
                                             (* ; "Edited 29-Jan-2022 23:08 by rmk")


+  [LAMBDA (FILE)
                                             (* ; "Edited 26-Jul-2023 12:34 by rmk")


+                                                             (* ; "Edited 29-Jan-2022 23:08 by rmk")


                                                              (* ; "Edited 28-Jan-2022 09:06 by rmk")

-    (FOR
 D PN (FILENAME _ (IF
 (STREAMP FILE)
-                              THEN
 (FETCH
 (STREAM FULLFILENAME) OF
 FILE)
-                            ELSE
 (\ADD.CONNECTED.DIR FILE))) IN
 \FILEDEVICES
-       WHEN
 (TYPE?
 PHDEVICE D) UNLESS
 (EQ FILENAME (SETQ PN (CONTRACT.PH
 FILENAME D)))
-       DO
 (RETURN PN) FINALLY
 (RETURN FILENAME])
+    (if
 (LISTP FILE)
+        then
 (for
 F in
 FILE collect
 (PSEUDOFILENAME
 F))
+      else
 (FOR
 D PN (FILENAME _ (IF
 (STREAMP FILE)
+                                     THEN
 (FETCH
 (STREAM FULLFILENAME) OF
 FILE)
+                                   ELSE
 (\ADD.CONNECTED.DIR FILE))) IN
 \FILEDEVICES
+              WHEN
 (TYPE?
 PHDEVICE D) UNLESS
 (EQ FILENAME (SETQ PN (CONTRACT.PH
 FILENAME D)))
+              DO
 (RETURN PN) FINALLY
 (RETURN FILENAME])
 )
 
 
@@ -205,6 +216,8 @@
 (CONTRACT.PH

   [LAMBDA (NAME PHDEV)
 
+    (* ;; "Edited 22-Sep-2023 14:30 by rmk")

+
     (* ;; "Edited 30-Jan-2022 00:20 by rmk: the smallest pseudoname for NAME.  If the NAME was constructed by expanding, then")

 
     (* ;; "Finds the smallest pseudoname for NAME.  The PHDEV is used only to find its targetdev, that's where we scan for matching prefixes.  This is so we can find the lowest matching pseudohost in the target's prefix map.  If the hosts are defined as {DSK}...{H1}...{H2}, DSK knows the prefixes that lead to H1 and H2, picks the longest matching prefix and replaces it by the corresponding host.")

@@ -230,7 +243,7 @@
 
                   (SETQ CONNECTOR (CADDR PM))
                   [SETQ SUFFIX (CONCAT CONNECTOR (IF
 (EQ CONNECTOR '/)
-                                                     THEN
 (SLASHIT
 SUFFIX)
+                                                     THEN
 (SLASHIT SUFFIX)
                                                    ELSE
 (UNSLASHIT
 SUFFIX])
               (RETURN (PACK* '{ (CADR PM)
                              "}"
@@ -240,31 +253,6 @@
 
                                                     (RETURN NAME)))])
 
-(SLASHIT

-  [LAMBDA (X LCASEDIRS)
                                      (* ; "Edited 26-Jan-2022 15:08 by rmk")


-                                                             (* ; "Edited  3-Jan-2022 11:44 by rmk")


-                                                             (* ; "Edited 22-Dec-2021 20:18 by rmk")


-                                                            (* ; "Edited  2-Nov-2021 22:54 by rmk:")

-    (LET [LASTDIRPOS SLASHED (DIRPOS (ADD1 (OR (STRPOS "}" X)
-                                               0]
-         [SETQ SLASHED (CONCATCODES (FOR
 I C FROM
 DIRPOS WHILE
 (SETQ C (NTHCHARCODE X I))
-                                       COLLECT
 (SELCHARQ C
-                                                    ((< >) 
-                                                         (SETQ LASTDIRPOS I)
-                                                         (CHARCODE /))
-                                                    (/ (SETQ LASTDIRPOS I)
-                                                       C)
-                                                    C]
-         (CL:WHEN (AND LCASEDIRS LASTDIRPOS)
-             (SETQ LASTDIRPOS (ADD1 (IDIFFERENCE LASTDIRPOS DIRPOS)))
-             (SETQ SLASHED (CONCAT (L-CASE (SUBSTRING SLASHED 1 LASTDIRPOS))
-                                  (OR (SUBSTRING SLASHED (ADD1 LASTDIRPOS))
-                                      ""))))
-         (CL:IF (EQ DIRPOS 1)
-             SLASHED
-             (CONCAT (SUBSTRING X 1 (SUB1 DIRPOS))
-                    SLASHED))])
-
 (UNSLASHIT

   [LAMBDA (X LCASEDIRS)
                                      (* ; "Edited 26-Jan-2022 15:09 by rmk")


                                                              (* ; "Edited 22-Dec-2021 20:18 by rmk")


@@ -401,7 +389,7 @@
            STREAM])
 
 (GENERATEFILES.PH

-  [LAMBDA (FDEV PATTERN DESIREDPROPS OPTIONS)                (* ; "Edited 17-Jan-2022 20:46 by rmk")

+  [LAMBDA (FDEV PATTERN DESIREDPROPS OPTIONS)
                (* ; "Edited 17-Jan-2022 20:46 by rmk")

 
     (* ;; "FDEV is the pseudohost. We will generate from the target directory using its GENFILESTATE, but fiddle the output so that it looks like it is coming from the pseudo host.")

 
@@ -428,7 +416,7 @@
     (PSEUDOHOST.TARGETVAL SETFILEINFO (STREAM ATTRIBUTE VALUE DEVICE])
 
 (NEXTFILEFN.PH

-  [LAMBDA (GENFILESTATE NAMEONLY)                            (* ; "Edited 17-Jan-2022 21:27 by rmk")

+  [LAMBDA (GENFILESTATE NAMEONLY)
                            (* ; "Edited 17-Jan-2022 21:27 by rmk")

     (LET* ((TARGETGENOBJ (CADR GENFILESTATE))
            (TARGETGENFILESTATE (FETCH
 GENFILESTATE OF
 TARGETGENOBJ))
            (FILENAME (APPLY* (FETCH
 NEXTFILEFN OF
 TARGETGENOBJ)
@@ -439,13 +427,13 @@
           FILENAME])
 
 (FILEINFOFN.PH

-  [LAMBDA (GENFILESTATE ATTRIBUTE)                           (* ; "Edited 17-Jan-2022 20:52 by rmk")

+  [LAMBDA (GENFILESTATE ATTRIBUTE)
                           (* ; "Edited 17-Jan-2022 20:52 by rmk")

     (APPLY* (FETCH
 FILEINFOFN OF
 (CADR GENFILESTATE))
            (FETCH
 GENFILESTATE OF
 (CADR GENFILESTATE))
            ATTRIBUTE])
 
 (RENAMEFILE.PH

-  [LAMBDA (OLD-DEVICE OLD-NAME NEW-DEVICE NEW-NAME)          (* ; "Edited 18-Jan-2022 09:52 by rmk")

+  [LAMBDA (OLD-DEVICE OLD-NAME NEW-DEVICE NEW-NAME)
          (* ; "Edited 18-Jan-2022 09:52 by rmk")

     (LET ((OLDTARGETDEV (FETCH
 (PHDEVICE TARGETDEV) OF
 OLD-DEVICE))
           (NEWTARGETDEV (FETCH
 (PHDEVICE TARGETDEV) OF
 NEW-DEVICE))
           (NEWTARGETNAME NEW-NAME)
@@ -519,17 +507,16 @@
 )
 
 
-(CL:UNLESS (GETP 'EXPORTS.ALL 'FILE)
-    (LOAD 'EXPORTS.ALL))
+(FILESLOAD (FROM
 LOADUPS)
+       EXPORTS.ALL)
 )
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (1268 9300 (PSEUDOHOST 1278 . 6837) (PSEUDOHOSTP 6839 . 7352) (PSEUDOHOSTS 7354 . 7711) 
-(TARGETHOST 7713 . 7987) (TRUEFILENAME 7989 . 8676) (PSEUDOFILENAME 8678 . 9298)) (9328 16867 (
-EXPAND.PH 9338 . 10591) (CONTRACT.PH 10593 . 13258) (SLASHIT 13260 . 14828) (UNSLASHIT 14830 . 16576) 
-(GETHOSTINFO.PH 16578 . 16865)) (16868 24872 (OPENFILE.PH 16878 . 17951) (GETFILENAME.PH 17953 . 18242
-) (DIRECTORYNAMEP.PH 18244 . 18868) (CLOSEFILE.PH 18870 . 19337) (REOPENFILE.PH 19339 . 19904) (
-DELETEFILE.PH 19906 . 20190) (OPENP.PH 20192 . 20487) (UNREGISTERFILE.PH 20489 . 21031) (
-REGISTERFILE.PH 21033 . 21567) (GENERATEFILES.PH 21569 . 22609) (GETFILEINFO.PH 22611 . 22913) (
-SETFILEINFO.PH 22915 . 23114) (NEXTFILEFN.PH 23116 . 23658) (FILEINFOFN.PH 23660 . 23931) (
-RENAMEFILE.PH 23933 . 24870)))))
+  (FILEMAP (NIL (1315 9921 (PSEUDOHOST 1325 . 6930) (PSEUDOHOSTP 6932 . 7445) (PSEUDOHOSTS 7447 . 7808) 
+(TARGETHOST 7810 . 8084) (TRUEFILENAME 8086 . 9048) (PSEUDOFILENAME 9050 . 9919)) (9949 15964 (
+EXPAND.PH 9959 . 11212) (CONTRACT.PH 11214 . 13925) (UNSLASHIT 13927 . 15673) (GETHOSTINFO.PH 15675 . 
+15962)) (15965 23985 (OPENFILE.PH 15975 . 17048) (GETFILENAME.PH 17050 . 17339) (DIRECTORYNAMEP.PH 
+17341 . 17965) (CLOSEFILE.PH 17967 . 18434) (REOPENFILE.PH 18436 . 19001) (DELETEFILE.PH 19003 . 19287
+) (OPENP.PH 19289 . 19584) (UNREGISTERFILE.PH 19586 . 20128) (REGISTERFILE.PH 20130 . 20664) (
+GENERATEFILES.PH 20666 . 21710) (GETFILEINFO.PH 21712 . 22014) (SETFILEINFO.PH 22016 . 22215) (
+NEXTFILEFN.PH 22217 . 22763) (FILEINFOFN.PH 22765 . 23040) (RENAMEFILE.PH 23042 . 23983)))))
 STOP

lispusers/tmax/TMAX

@@ -1,17 +1,13 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
 
-
(FILECREATED "17-Mar-2022 23:12:47" {DSK}<Users>kaplan>Local>medley3.5>my-medley>lispusers>TMAX.;3
 25981  
+
(FILECREATED "18-Jul-2023 12:34:39" {DSK}<home>frank>il>medley>gmedley>lispusers>tmax>TMAX.;2
 25955  
 
       :CHANGES-TO (VARS TMAXCOMS)
 
-      :PREVIOUS-DATE "24-Oct-2021 23:45:20" 
-{DSK}<Users>kaplan>Local>medley3.5>my-medley>lispusers>TMAX.;2)
+      :PREVIOUS-DATE "17-Mar-2022 23:12:47" {DSK}<home>frank>il>medley>gmedley>lispusers>tmax>TMAX.;1
+)
 
 
-(* ; "
-Copyright (c) 1987, 1997, 1999 by Stanford University.
-")
-
 (PRETTYCOMPRINT TMAXCOMS)
 
 (RPAQQ TMAXCOMS

@@ -25,7 +21,8 @@ Copyright (c) 1987, 1997, 1999 by Stanford University.
         [DECLARE%: DONTCOPY (P (DOFILESLOAD (LIST* '(SOURCE)
                                                    TMAX.FILE.LIST)))
                (DECLARE%: EVAL@COMPILE DONTCOPY (P (OR (GETPROP 'EXPORTS.ALL 'FILE)
-                                                       (LOAD 'EXPORTS.ALL]
+                                                       (FILESLOAD (FROM LOADUPS)
+                                                              EXPORTS.ALL]
         (P (DOFILESLOAD TMAX.FILE.LIST))
         
 
@@ -103,7 +100,8 @@ Copyright (c) 1987, 1997, 1999 by Stanford University.
 (DECLARE%: EVAL@COMPILE DONTCOPY 
 
 (OR (GETPROP 'EXPORTS.ALL 'FILE)
-    (LOAD 'EXPORTS.ALL))
+    (FILESLOAD (FROM
 LOADUPS)
+           EXPORTS.ALL))
 )
 )
 
@@ -560,16 +558,15 @@ Copyright (c) 1987, 1997, 1999 by Stanford University.
                                                              "Displays number-group menu"]
 
 (TSP.FUNCTION.HOOKS
)
-(PUTPROPS TMAX COPYRIGHT ("Stanford University" 1987 1997 1999))
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (8231 15446 (TSP.DISPLAY.FMMENU 8241 . 8806) (TSP.SETUP.FILENAMES 8808 . 10059) (
-TSP.SETUP.FMMENU 10061 . 10521) (TSP.FMMENU 10523 . 11709) (TSP.FM.APPLY 11711 . 12030) (UPDATE.ALL 
-12032 . 12704) (DOWNDATE.ALL 12706 . 13076) (TSP.FUNCTION.HOOKS 13078 . 14508) (TSP.GETFN 14510 . 
-15070) (TSP.PUTFN 15072 . 15444)) (15492 17741 (AutoUpdate.TOGGLE 15502 . 15738) (UPDATE? 15740 . 
-15885) (NGROUP.Menu.TOGGLE 15887 . 16269) (NGROUPMENU.ENABLED? 16271 . 16507) (
-NGROUP.Text-Before.TOGGLE 16509 . 16759) (TEXTBEFORE.ENABLED? 16761 . 16924) (NGROUP.Text-After.TOGGLE
- 16926 . 17174) (TEXTAFTER.ENABLED? 17176 . 17337) (Manual.Index.TOGGLE 17339 . 17578) (
-MANUALINDEX.ENABLED? 17580 . 17739)) (17775 23248 (GET.TSP.FONT 17785 . 18949) (GET.TSP.FONT.FAMILY 
-18951 . 19799) (GET.TSP.FONT.SIZE 19801 . 20289) (GET.TSP.FONT.FACE 20291 . 20990) (ABBREVIATE.FONT 
-20992 . 22492) (TMAX.SHADEOBJ 22494 . 23246)) (23288 24504 (TSP.LIST.OF.OBJECTS 23298 . 24502)))))
+  (FILEMAP (NIL (8270 15485 (TSP.DISPLAY.FMMENU 8280 . 8845) (TSP.SETUP.FILENAMES 8847 . 10098) (
+TSP.SETUP.FMMENU 10100 . 10560) (TSP.FMMENU 10562 . 11748) (TSP.FM.APPLY 11750 . 12069) (UPDATE.ALL 
+12071 . 12743) (DOWNDATE.ALL 12745 . 13115) (TSP.FUNCTION.HOOKS 13117 . 14547) (TSP.GETFN 14549 . 
+15109) (TSP.PUTFN 15111 . 15483)) (15531 17780 (AutoUpdate.TOGGLE 15541 . 15777) (UPDATE? 15779 . 
+15924) (NGROUP.Menu.TOGGLE 15926 . 16308) (NGROUPMENU.ENABLED? 16310 . 16546) (
+NGROUP.Text-Before.TOGGLE 16548 . 16798) (TEXTBEFORE.ENABLED? 16800 . 16963) (NGROUP.Text-After.TOGGLE
+ 16965 . 17213) (TEXTAFTER.ENABLED? 17215 . 17376) (Manual.Index.TOGGLE 17378 . 17617) (
+MANUALINDEX.ENABLED? 17619 . 17778)) (17814 23287 (GET.TSP.FONT 17824 . 18988) (GET.TSP.FONT.FAMILY 
+18990 . 19838) (GET.TSP.FONT.SIZE 19840 . 20328) (GET.TSP.FONT.FACE 20330 . 21029) (ABBREVIATE.FONT 
+21031 . 22531) (TMAX.SHADEOBJ 22533 . 23285)) (23327 24543 (TSP.LIST.OF.OBJECTS 23337 . 24541)))))
 STOP

medley

@@ -1 +1 @@
-scripts/medley/medley.sh
+scripts/medley/medley.command

run-medley

@@ -202,4 +202,3 @@ echo "greet: $LDEINIT"
 export INMEDLEY=1
 
 "$prog" $display $noscroll $geometry $screensize $mem -title "$title" $pass "$LDESRCESYSOUT"
-

scripts/README.md

@@ -7,18 +7,38 @@ Loading from an old 'starter' sysout
 * loadup-mid-from-init.sh  -- phase 2 (creates init.sysout)
 * loadup-lisp-from-mid.sh  -- phase 3 (creates lisp.sysout)
 * loadup-full-from-lisp.sh -- phase 4 (creates full.sysout)
-* loadup-aux.sh            -- phase 5,(creates exports.all whereis.hash
+* loadup-apps-from-full.sh -- phase 5 (creates app.sysout, with notecards, rooms and clos; optional)
+* loadup-aux.sh            -- phase 6 (creates exports.all whereis.hash)
+* loadup-db-from-full.sh   -- phase 7 (makes unreleased 'fuller.sysout' and fuller.database)
 
-* loadup-full.sh  -- Phase 1-4 only
+All of these scripts read from and write to a directory specified by the env variable LOADUP_WORKDIR.
+LOADUP_WORKDIR defaults to /tmp/loadups-$$ (where $$ is the PID of the script). Note that all /tmp files
+are cleared after 10 days or upon system reboot. You can replicate the old work directory scheme 
+where files were never deleted automatically by simply setting LOADUP_WORKDIR to "./tmp"
 
-* loadup-db.sh    -- phase 6 (makes unreleased 'fuller.sysout' and fuller.database
-* copy-all.sh     -- copy loadups from tmp/ to loadups/ and library/
+* loadup-all.sh [-apps] -- Phases 1-4 & 6 (plus Phase 5 with -apps flag)
+* loadup-db.sh    -- phase 7 only based on full.syout in loadup directory
 
+These two scripts call the 7 scripts above as specified and then (if successful) copy (ln) the results
+to the loadups directory using a versioned copy.  The files are hardlinked into loadups from the workdir
+if workdir and loadups are on the same filesystem, otherwise they are copied. 
+
+* loadup-full.sh  -- Phases 1-4 only, no copy into loadups at the end.
+
+## releases
+
+* release-medley.sh --  will create Medley release tars and upload as a release on github.  
+                      Arguments: -d to make a draft release. \<Tag> to use as a tag for this 
+                      release on github (defaults to meldey-\<date>-\<seconds since epoch>).
+                      Both are optional.
+
+* release-make-tars.sh -- will create the Medley release tars and store them in the releases directory.
 
 ## possibly handy scripts
 
 * lsee <lispfile>  -- show lisp file with font-control-characters rendered as linux color changes
-* cpv file1 file2  -- copies file1 to file2 (or directory name) adding versions
+* cpv file1 file2  -- hardlinks (or copies) file1 to file2 (or directory name) adding versions
+                      choice of hardlink or copy depends on whether the files are on the same filesystem.
 * restore-versions.sh -- pulls out old versions from git history and links in with medley versioning conventions
 
 ## Not useful anymore 

scripts/copy-all.sh

@@ -1,22 +1,31 @@
 #!/bin/sh
 
-export MEDLEYDIR=`pwd`
-
 if [ ! -x run-medley ] ; then
     echo run from MEDLEYDIR
     exit 1
 fi
 
-# was
-# cp -p tmp/full.sysout tmp/lisp.sysout tmp/*.dribble tmp/whereis.hash loadups/
-# cp -p tmp/exports.all tmp/RDSYS tmp/RDSYS.LCOM library/
-# just copy the files that are released
+. scripts/loadup-setup.sh
 
-./scripts/cpv tmp/full.sysout loadups
-./scripts/cpv tmp/lisp.sysout loadups
-./scripts/cpv tmp/whereis.hash loadups
-./scripts/cpv tmp/exports.all library
+echo ">>>>> START ${script_name}"
+
+./scripts/cpv "${LOADUP_WORKDIR}"/full.sysout "${LOADUP_OUTDIR}"  | sed -e "s#${MEDLEYDIR}/##g"
+./scripts/cpv "${LOADUP_WORKDIR}"/lisp.sysout "${LOADUP_OUTDIR}"  | sed -e "s#${MEDLEYDIR}/##g"
 if [ "${1}" = "-apps" ]; then
-    ./scripts/cpv tmp/apps.sysout loadups
+    ./scripts/cpv "${LOADUP_WORKDIR}"/apps.sysout "${LOADUP_OUTDIR}" | sed -e "s#${MEDLEYDIR}/##g"
 fi
 
+./scripts/cpv "${LOADUP_WORKDIR}"/whereis.hash "${LOADUP_OUTDIR}" | sed -e "s#${MEDLEYDIR}/##g"
+./scripts/cpv "${LOADUP_WORKDIR}"/exports.all "${LOADUP_OUTDIR}" | sed -e "s#${MEDLEYDIR}/##g"
+
+./scripts/cpv "${LOADUP_WORKDIR}"/init.dribble "${LOADUP_OUTDIR}" | sed -e "s#${MEDLEYDIR}/##g"
+./scripts/cpv "${LOADUP_WORKDIR}"/lisp.dribble "${LOADUP_OUTDIR}" | sed -e "s#${MEDLEYDIR}/##g"
+./scripts/cpv "${LOADUP_WORKDIR}"/full.dribble "${LOADUP_OUTDIR}" | sed -e "s#${MEDLEYDIR}/##g"
+./scripts/cpv "${LOADUP_WORKDIR}"/whereis.dribble "${LOADUP_OUTDIR}" | sed -e "s#${MEDLEYDIR}/##g"
+
+./scripts/cpv "${LOADUP_WORKDIR}"/RDSYS library | sed -e "s#${MEDLEYDIR}/##g"
+./scripts/cpv "${LOADUP_WORKDIR}"/RDSYS.LCOM library | sed -e "s#${MEDLEYDIR}/##g"
+
+echo "<<<<< END ${script_name}"
+echo ""
+exit 0

scripts/copy-db.sh

@@ -0,0 +1,17 @@
+#!/bin/sh
+
+if [ ! -x run-medley ] ; then
+    echo run from MEDLEYDIR
+    exit 1
+fi
+
+. scripts/loadup-setup.sh
+
+echo ">>>>> START ${script_name}"
+
+./scripts/cpv "${LOADUP_WORKDIR}"/fuller.database "${LOADUP_OUTDIR}"
+./scripts/cpv "${LOADUP_WORKDIR}"/fuller.dribble "${LOADUP_OUTDIR}"
+
+echo "<<<<< END ${script_name}"
+echo ""
+exit 0

scripts/cpv

@@ -2,14 +2,19 @@
 
 # cpv file dest
 # could extend with -r or copying multiple files
-# could change from cp to ln
+
+ln_or_cp () {
+    f=$(df $(dirname $1) | tail -1 | awk '{ print $1 }')
+    d=$(df $(dirname $2) | tail -1 | awk '{ print $1 }')
+    if [ "$f" != "$d" ]; then cmd="cp -p"; else cmd="ln"; fi
+    echo $cmd
+}
 
 file="$1"
 dest="$2"
 
-
 if [ ! -f "$file" ]; then
-    echo no such file "$file"
+    echo "Error: no such file "$file". Exiting."
     exit 1
 fi
 
@@ -18,9 +23,16 @@ if [ -d "$dest" ]; then
     dest=$dest/`basename $file`
 fi
 
+# if (the new) $dest is a directory, then just bail
+if [ -d "$dest" ]; then
+    echo "Error: destination file ($dest) is a directory. Exiting."
+    exit 1
+fi
+
 # if no such file $dest then just copy
 if [ ! -f "$dest" ]; then
-    ln $file $dest		#WAS cp -p $file $dest 
+    $(ln_or_cp $file $dest) $file $dest
+    echo "Added $(basename $dest) to $(dirname $dest)"
     exit 0
 fi
 
@@ -41,7 +53,7 @@ if [ $max -eq 0 ]; then		# no current versions
     new=2
 else
     if cmp -q $dest $dest.~$max~ >/dev/null 2>&1
-    then			# they're different 
+    then			# they're different
 	max=`expr $max + 1`	# make newer version
 	mv $dest $dest.~$max~
 	new=`expr $max + 1`
@@ -51,11 +63,10 @@ else
     fi
 fi
 
-# make new version
+# make new version and link it
 
-ln $file $dest.~$new~		# cp -p $file $dest.~$new~
-ln $dest.~$new~ $dest		# and link it
-
-
-
-	
+$(ln_or_cp $file $dest.~new~) $file $dest.~$new~
+echo "Added $(basename $dest.~$new~) to $(dirname $dest.~$new~)"
+rm -f $dest
+ln $dest.~$new~ $dest
+echo "Linked $(basename $dest) to $(basename $dest.~$new~) in $(dirname $dest)"

scripts/loadup-all.sh

@@ -1,12 +1,12 @@
 #!/bin/sh
 
-export MEDLEYDIR=`pwd`
-
 if [ ! -x run-medley ] ; then
     echo run from MEDLEYDIR
     exit 1
 fi
 
+. scripts/loadup-setup.sh
+
 if [ "$1" = "-apps" ]; then
     apps="./scripts/loadup-apps-from-full.sh"
 else
@@ -21,7 +21,13 @@ fi
     ./scripts/loadup-aux.sh && \
     ./scripts/copy-all.sh $1
 
-echo "**** DONE ****"
+if [ $? -eq 0 ];
+then
+  echo "+++++ loadup-all.sh: SUCCESS +++++"
+else
+  echo "----- loadup-all.sh: FAILURE -----"
+fi
+
 
 
 

scripts/loadup-apps-from-full.sh

@@ -1,32 +1,14 @@
-#!/bin/bash
+#!/bin/sh
 
-#set -x
+if [ ! -x run-medley ] ; then
+    echo must run from MEDLEYDIR ;
+    exit 1 ;
+fi
 
-# function to discover what directory this script is being executed from
-where_am_i() {
+. scripts/loadup-setup.sh
 
-    # call this with ${BASH_SOURCE[0]:-$0} as its (only) parameter
+loadup_start
 
-    local SCRIPT_PATH="$1";
-
-    pushd . > '/dev/null';
-
-    while [ -h "$SCRIPT_PATH" ];
-    do
-        cd "$( dirname -- "$SCRIPT_PATH"; )";
-        SCRIPT_PATH="$( readlink -f -- "$SCRIPT_PATH"; )";
-    done
-
-    cd "$( dirname -- "$SCRIPT_PATH"; )" > '/dev/null';
-    SCRIPT_PATH="$( pwd; )";
-
-    popd  > '/dev/null';
-
-    echo "${SCRIPT_PATH}"
-}
-
-SCRIPTDIR=$(where_am_i "${BASH_SOURCE[0]:-$0}")
-export MEDLEYDIR=$(cd ${SCRIPTDIR} && cd .. && pwd)
 export ROOMSDIR=${MEDLEYDIR}/rooms
 export CLOSDIR=${MEDLEYDIR}/clos
 
@@ -41,33 +23,35 @@ if [ ! -e ${NOTECARDSDIR} ]; then
     fi
 fi
 
-if [ -z "${SYSOUTDIR}" ]; then
-    export SYSOUTDIR=${MEDLEYDIR}/tmp
-fi
+cat >"${cmfile}" <<"EOF"
+"
 
-if [ -z "${FULLSYSOUTPATH}" ]; then
-    FULLSYSOUTPATH=${SYSOUTDIR}/full.sysout
-    if [ ! -e ${FULLSYSOUTPATH} ]; then
-       FULLSYSOUTPATH=${MEDLEYDIR}/loadups/full.sysout
-    fi
-fi
+(PROGN
+   (IL:MEDLEY-INIT-VARS 'IL:GREET)
+   (IL:LOAD (IL:CONCAT (QUOTE {DSK}) (IL:UNIX-GETENV(QUOTE NOTECARDSDIR))(QUOTE |/system/NOTECARDS.LCOM|)) 'IL:SYSLOAD)
+   (IL:LOAD (IL:CONCAT (QUOTE {DSK}) (IL:UNIX-GETENV(QUOTE ROOMSDIR))(QUOTE /ROOMS)) 'IL:SYSLOAD)
+   (IL:LOAD (IL:CONCAT (QUOTE {DSK}) (IL:UNIX-GETENV(QUOTE CLOSDIR))(QUOTE /DEFSYS.DFASL)) 'IL:SYSLOAD)
+   (IL:LOAD (IL:CONCAT (QUOTE {DSK}) (IL:UNIX-GETENV(QUOTE MEDLEYDIR))(QUOTE |lispusers/BUTTONS.LCOM|)) 'IL:SYSLOAD)
+   (IL:LOAD
+       (IL:CONCAT (QUOTE {DSK}) (IL:UNIX-GETENV (QUOTE LOADUP_SOURCEDIR)) (QUOTE /LOADUP-APPS.LCOM))
+       'IL:SYSLOAD
+   )
+   (IL:HARDRESET)
+)
+SHH
+(PROGN
+   (IL:ENDLOADUP)
+   (CLOS::LOAD-CLOS)
+   (IL:|Apps.LOADUP|)
+   (IL:MAKESYS
+       (IL:CONCAT (QUOTE {DSK})(IL:UNIX-GETENV(QUOTE LOADUP_WORKDIR))(IL:L-CASE (QUOTE /apps.sysout)))
+       :APPS)
+)
+(IL:LOGOUT T)
 
-cd ${MEDLEYDIR}
+"
+EOF
 
-scr="-sc 1024x768 -g 1042x790"
-
-mkdir -p ${SYSOUTDIR}
-touch ${SYSOUTDIR}/loadup.timestamp
-
-./run-medley $scr -loadup "${MEDLEYDIR}/sources/LOADUP-APPS.CM" "${FULLSYSOUTPATH}"
-
-if [ ${SYSOUTDIR}/apps.sysout -nt ${SYSOUTDIR}/loadup.timestamp ]; then
-    echo ---- made ----
-    ls -l ${SYSOUTDIR}/apps.*
-    echo --------------
-else
-    echo XXXXX FAILURE XXXXX
-    ls -l ${SYSOUTDIR}/apps.*
-    exit 1
-fi
+./run-medley ${scr} -loadup "${cmfile}" "${LOADUP_WORKDIR}/full.sysout"
 
+loadup_finish "apps.sysout" "apps.*"

scripts/loadup-aux.sh

@@ -1,28 +1,31 @@
 #!/bin/sh
 
-export MEDLEYDIR=`pwd`
-
 if [ ! -f run-medley ] ; then
     echo run from MEDLEYDIR
     exit 1
 fi
 
-mkdir -p tmp
-touch tmp/loadup.timestamp
+. scripts/loadup-setup.sh
 
-scr="-sc 1024x768 -g 1042x790"
+loadup_start
 
-echo '" (IL:MEDLEY-INIT-VARS)(IL:LOAD(QUOTE MEDLEY-UTILS))(IL:MAKE-EXPORTS-ALL)(IL:MAKE-WHEREIS-HASH)(IL:LOGOUT T)"' > tmp/loadup-aux.cm
-./run-medley $scr -loadup "$MEDLEYDIR"/tmp/loadup-aux.cm tmp/full.sysout
+cat >"${cmfile}" <<"EOF"
+"
+(PROG
+  ((WORKDIR (IL:CONCAT (QUOTE {DSK}) (IL:UNIX-GETENV (QUOTE LOADUP_WORKDIR)) (QUOTE /))))
+  (IL:MEDLEY-INIT-VARS)
+  (IL:LOAD(QUOTE MEDLEY-UTILS))
+  (IL:MAKE-EXPORTS-ALL (IL:CONCAT WORKDIR (IL:L-CASE (QUOTE exports.all))))
+  (IL:MAKE-WHEREIS-HASH
+    (IL:CONCAT WORKDIR (IL:L-CASE (QUOTE whereis.dribble)))
+    (IL:CONCAT WORKDIR (IL:L-CASE (QUOTE whereis.hash-tmp)))
+    (IL:CONCAT WORKDIR (IL:L-CASE (QUOTE whereis.hash)))
+  )
+  (IL:LOGOUT T)
+)
+"
+EOF
 
-if [ tmp/whereis.hash -nt tmp/loadup.timestamp ]; then
-    
-    echo ---- made ----
-    ls -l tmp/whereis.hash tmp/exports.all
-    echo --------------
+./run-medley ${scr} -loadup "${cmfile}" "${LOADUP_WORKDIR}"/full.sysout
 
-else
-    echo XXXXX FAILURE XXXXX
-    ls -l tmp/whereis.hash tmp/exports.all
-    exit 1
-fi
+loadup_finish "whereis.hash" "whereis.hash" "exports.all"

scripts/loadup-db-from-full.sh

@@ -0,0 +1,41 @@
+#!/bin/sh
+
+if [ ! -x run-medley ] ; then
+    echo run from MEDLEYDIR
+    exit 1
+fi
+
+. scripts/loadup-setup.sh
+
+loadup_start
+
+SYSOUT="${MEDLEYDIR}/loadups/full.sysout"
+if [ ! -f "${SYSOUT}" ];
+then
+  echo "Error: cannot find ${SYSOUT}.  Exiting."
+  exit 1
+fi
+
+cat >"${cmfile}" <<"EOF"
+"
+
+(PROG
+  ((WORKDIR (IL:CONCAT (QUOTE {DSK}) (IL:UNIX-GETENV (QUOTE LOADUP_WORKDIR)) (QUOTE /))))
+  (IL:MEDLEY-INIT-VARS)
+  (IL:FILESLOAD MEDLEY-UTILS)
+  (SETQ IL:DIRECTORIES (CONS (IL:UNIX-GETENV (QUOTE LOADUP_SOURCEDIR)) IL:DIRECTORIES))
+  (IL:MAKE-FULLER-DB
+    (IL:CONCAT WORKDIR (IL:L-CASE (QUOTE fuller.dribble)))
+    (IL:CONCAT WORKDIR (IL:L-CASE (QUOTE fuller.database)))
+    (IL:CONCAT WORKDIR (IL:L-CASE (QUOTE fuller.sysout)))
+  )
+  (IL:LOGOUT T)
+)
+
+"
+EOF
+
+./run-medley ${scr} -loadup "${cmfile}" "${SYSOUT}"
+
+loadup_finish "fuller.database" "fuller*"
+

scripts/loadup-db.sh

@@ -1,26 +1,22 @@
 #!/bin/sh
 
-export MEDLEYDIR=`pwd`
-
-if [ ! -f run-medley ] ; then
+if [ ! -x run-medley ] ; then
     echo run from MEDLEYDIR
     exit 1
 fi
 
-touch tmp/db.timestamp
+. scripts/loadup-setup.sh
 
-scr="-sc 1024x768 -g 1042x790"
-
-echo '" (IL:MEDLEY-INIT-VARS)(IL:FILESLOAD MEDLEY-UTILS)(IL:MAKE-FULLER-DB)(IL:LOGOUT T)"' > tmp/db.cm
-./run-medley $scr -loadup "$MEDLEYDIR"/tmp/db.cm -n
-if [ tmp/fuller.database -nt tmp/db.timestamp ]; then
-    
-    echo ---- made ----
-    ls -l tmp/fuller*
-    echo --------------
+./scripts/loadup-db-from-full.sh && ./scripts/copy-db.sh
 
+if [ $? -eq 0 ];
+then
+  echo "+++++ loadup-db.sh: SUCCESS +++++"
 else
-    echo XXXXX FAILURE XXXXX
-    ls -l tmp/fuller*
-    exit 1
+  echo "----- loadup-db.sh: FAILURE -----"
 fi
+
+
+
+
+