Merge branch 'master' into rmk82--REGIONMANAGER-cleanup

Author: masinter

.github/workflows/buildLoadup.yml

@@ -128,6 +128,8 @@ jobs:
       combined_release_tag: ${{ steps.job_outputs.outputs.COMBINED_RELEASE_TAG }}
       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 }}
 
@@ -154,7 +156,7 @@ 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
       # Find latest release (draft or normal)
       - name: Get maiko release information
@@ -176,7 +178,6 @@ jobs:
           echo "maiko_tag=${tag}" >> ${GITHUB_OUTPUT}
         env:
           GITHUB_TOKEN: ${{ secrets.MAIKO_TOKEN }}
-
       # Setup environment variables & establish job outputs
       - name: Setup Environment Variables
         run: |
@@ -198,6 +199,7 @@ jobs:
           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
@@ -337,6 +339,17 @@ jobs:
           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 ##############################################################
@@ -371,8 +384,7 @@ jobs:
           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 "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
@@ -410,23 +422,23 @@ jobs:
 
 
 
-# JOB: windows_installer #############################################################
+# JOB: cygwin_installer #############################################################
 
   #
   # Create the Windows installer, push it up to the release on github and
   # update the downloads page on OIO
   #
-  windows_installer:
+  cygwin_installer:
 
-    runs-on: windows-latest
+    runs-on: windows-2022
 
-    needs: [inputs, sentry, loadup]
+    needs: [inputs, sentry, loadup, linux_installer]
     if: |
       needs.sentry.outputs.release_not_built == 'true'
       || needs.inputs.outputs.force == 'true'
 
     outputs:
-      windows_installer_filename: ${{ steps.jobout.outputs.INSTALLER_FILENAME }}
+      cygwin_installer: ${{ steps.compile_iss.outputs.CYGWIN_INSTALLER }}
 
     steps:
 
@@ -446,29 +458,65 @@ jobs:
           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: |
-          $url = "https://online.interlisp.org/downloads/vncviewer64-1.12.0.exe"
-          $output = "installers\win\vncviewer64-1.12.0.exe"
-          (New-Object System.Net.WebClient).DownloadFile($url, $output)
+          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
 
-      # Run iscc.exe to compile the installer
-      - name: Compile medley.iss
+      # Download cygwin installer to be included by medley.iss
+      - name: Download cygwin installer
+        id: cygwin
         shell: powershell
         run: |
-           iscc installers\win\medley.iss
+          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
+      #  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: |
+           $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
         id: push
         uses: ncipollo/release-action@v1
         with:
           allowUpdates: true
-          artifacts: installers/win/medley-*.exe
+          artifacts: installers/cygwin/${{ env.CYGWIN_INSTALLER }}
           tag: ${{ env.MEDLEY_RELEASE_TAG }}
           token: ${{ secrets.GITHUB_TOKEN }}
           omitBodyDuringUpdate: true
@@ -487,7 +535,7 @@ jobs:
 
     runs-on: ubuntu-latest
 
-    needs: [inputs, sentry, loadup, linux_installer, macos_installer, windows_installer]
+    needs: [inputs, sentry, loadup, linux_installer, macos_installer, cygwin_installer]
     if: |
       needs.sentry.outputs.release_not_built == 'true'
       || needs.inputs.outputs.force == 'true'
@@ -503,6 +551,8 @@ jobs:
           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
@@ -514,7 +564,7 @@ jobs:
       # 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 installer to release
+      - name: Upload windows placeholder.txt to release
         id: pushph
         uses: ncipollo/release-action@v1
         with:
@@ -552,6 +602,7 @@ jobs:
                -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~@@@CYGWIN.INSTALLER@@@~${CYGWIN_INSTALLER}~g" \
                < "${local_template}" > "${local_filename}"
             # Create sftp instruction file
             echo "-rm ${remote_filepath}.oldold" > batch
@@ -566,6 +617,12 @@ 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 #####################################################################

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

greetfiles/APPS-INIT.LCOM

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