diff --git a/.github/workflows/build-linux.yml b/.github/workflows/build-linux.yml index 39710660..c71b1fa8 100644 --- a/.github/workflows/build-linux.yml +++ b/.github/workflows/build-linux.yml @@ -98,7 +98,7 @@ jobs: cd ../.. zip -r ../../downloads/Jasspa_MicroEmacs_${MEVER}_bin_linux_openssl bin cd .. - ./bin/linux5-intel64/tfs -o ../packages/Jasspa_MicroEmacs_${MEVER}_openssl_linux_intel64.tfs -a ./mesingle/tfs_hd tfs + ./bin/linux5-intel64/tfs -o ../packages/Jasspa_MicroEmacs_${MEVER}_openssl_linux5_intel64.tfs -a ./mesingle/tfs_hd tfs - name: Generate docs run: | diff --git a/.github/workflows/build-macos-apple.yml b/.github/workflows/build-macos-apple.yml index d7ab4c66..768a6ce8 100644 --- a/.github/workflows/build-macos-apple.yml +++ b/.github/workflows/build-macos-apple.yml @@ -104,7 +104,7 @@ jobs: cd ../.. zip -r ../../downloads/Jasspa_MicroEmacs_${MEVER}_bin_macos_apple_openssl bin cd .. - ./bin/macos14-apple64/tfs -o ../packages/Jasspa_MicroEmacs_${MEVER}_openssl_macos_apple64.tfs -a ./mesingle/tfs_hd tfs + ./bin/macos14-apple64/tfs -o ../packages/Jasspa_MicroEmacs_${MEVER}_openssl_macos14_apple64.tfs -a ./mesingle/tfs_hd tfs - name: Upload macos-apple downloads uses: actions/upload-artifact@v4 diff --git a/.github/workflows/build-macos-intel.yml b/.github/workflows/build-macos-intel.yml index 19966b28..c4d830b1 100644 --- a/.github/workflows/build-macos-intel.yml +++ b/.github/workflows/build-macos-intel.yml @@ -103,7 +103,7 @@ jobs: cd ../.. zip -r ../../downloads/Jasspa_MicroEmacs_${MEVER}_bin_macos_intel_openssl bin cd .. - ./bin/macos13-intel64/tfs -o ../packages/Jasspa_MicroEmacs_${MEVER}_openssl_macos_intel64.tfs -a ./mesingle/tfs_hd tfs + ./bin/macos13-intel64/tfs -o ../packages/Jasspa_MicroEmacs_${MEVER}_openssl_macos13_intel64.tfs -a ./mesingle/tfs_hd tfs - name: Upload macos-intel downloads uses: actions/upload-artifact@v4 diff --git a/.github/workflows/build-webpages.yml b/.github/workflows/build-webpages.yml index 579433ae..5dcd4f24 100644 --- a/.github/workflows/build-webpages.yml +++ b/.github/workflows/build-webpages.yml @@ -21,8 +21,6 @@ jobs: - name: Compile nroff tools run: | - mkdir downloads - mkdir packages cd ./nroff make @@ -31,6 +29,13 @@ jobs: export PATH=`pwd`/nroff/bin/linux:$PATH cd ./microemacs/doc make web_pages/me/index.html + + - name: Build package store + run: | + cd microemacs/doc/web_pages + curl -fsSL https://github.com/bjasspa/jasspa/releases/latest/download/Jasspa_MicroEmacs_Latest_packages.zip + cd me + unzip ../Jasspa_MicroEmacs_Latest_packages.zip - name: Upload web-pages as artifact uses: actions/upload-pages-artifact@v3 diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml index f0dfeb18..cd5bf8d2 100644 --- a/.github/workflows/build-windows.yml +++ b/.github/workflows/build-windows.yml @@ -89,7 +89,7 @@ jobs: cd tfs Compress-Archive -Path bin -DestinationPath ..\..\..\..\..\..\downloads\Jasspa_MicroEmacs_${env:MEVER}_bin_windows_openssl.zip cd .. - ..\..\..\..\bin\windows100-intel32\tfs -o ../../../../../packages/Jasspa_MicroEmacs_${env:MEVER}_openssl_windows_intel32.tfs -a ../../../../mesingle/tfs_hd tfs + ..\..\..\..\bin\windows100-intel32\tfs -o ../../../../../packages/Jasspa_MicroEmacs_${env:MEVER}_openssl_windows100_intel32.tfs -a ../../../../mesingle/tfs_hd tfs - name: Get ehf help file uses: dawidd6/action-download-artifact@v6 diff --git a/microemacs/macros/mepinst.emf b/microemacs/macros/mepinst.emf index 54f989a0..b45c73b5 100644 --- a/microemacs/macros/mepinst.emf +++ b/microemacs/macros/mepinst.emf @@ -8,6 +8,7 @@ ; Authors: Steven Phillips ; set-variable .help.purl "http://d1j8pqz26umfbo.cloudfront.net/packages/" +set-variable .help.purl "http://docs.asid.family/packages/" 0 define-macro me-pinstall set-variable #l1 @1 @@ -16,53 +17,41 @@ set-variable .help.purl "http://d1j8pqz26umfbo.cloudfront.net/packages/" !else set-variable #l2 @2 !endif - find-buffer "*jmplst*" - !if &equ $window-eline 1 + !if ¬ &exi .jmpver ml-write "Downloading JASSPA MicroEmacs Package list ... " - 1 buffer-mode "hide" + find-buffer "*jmplst*" !force insert-file &cat .help.purl "jmp.idx" - !if &equ $window-eline 1 - ml-write "Failed to download MicroEmacs package list - computer or server may be offline" - !abort - !endif beginning-of-buffer - !if ¬ &seq @wl "JMP1" - !force delete-buffer "*jmplst*" - ml-write "This version of MicroEmacs is not compatible with the current package list, try upgrading" - !abort - !endif - !endif - !if &band @# 2 - set-variable #l3 &spr "^%s-%s-%s-%s-%s-\\(%s\\)?-\\(%s\\)?\t\\(\\d+\\)\t\\([_\\d]+\\)\t\\(.*\\)" #l1 &lget $build 1 &lget $build 2 &lget $build 3 &lget $build 4 &lget $build 5 &lget $build 6 - !else - set-variable #l3 &spr "^\\(%s\\)\\(\t\\)\\(\\d+\\)\t\\([_\\d]+\\)\t\\(.*\\)" #l1 - !endif - beginning-of-buffer - !repeat - search-buffer "me" #l3 - !if ¬ $status - !if &gre $window-line 1 - ml-write &spr "Error: Failed to find a version of '%s' compatible with this version of MicroEmacs, try upgrading" #l1 + !if &les $window-eline 3 + set-variable #p9 " Failed to download MicroEmacs package list, \n computer or server may be offline. " + !elif ¬ &seq @wl "JMP2" + set-variable #p9 " This version of MicroEmacs is not compatible \n with the current package server, try upgrading. " + !else + forward-line + !if &les $version &set #l3 @wl + set-variable #p9 &spr " This version of MicroEmacs is not compatible \n with the current package server. \n\n Upgrade to version %s or newer. " #l3 !else - ml-write &spr "Error: Failed to find package '%s', please report" #l1 + forward-line + set-variable .jmpver @wl !endif - !abort - !endif - !if &sgre &set #l8 @s3 $version - !elif &sgre @s4 $version - !break !endif - !done - set-variable #l3 @s5 - !if ¬ &gre @s3 #l2 + !force delete-buffer "*jmplst*" + !iif ¬ &exi .jmpver !abort + !endif + !if ¬ &gre .jmpver #l2 ml-write &spr "MicroEmacs Package %s: Up-to-date" #l1 !return !endif + !if &band @# 2 + set-variable #l3 &spr "Jasspa_MicroEmacs_%s_%s_%s%s_%s%s.tfs" .jmpver #l1 &lget $build 1 &lget $build 2 &lget $build 3 &lget $build 4 + !else + set-variable #l3 &spr "Jasspa_MicroEmacs_%s_%s.tfs" .jmpver #l1 + !endif ml-write &spr "MicroEmacs Package %s: Downloading ... " #l1 set-variable #l4 $temp-name !force 0x80 file-op &cat .help.purl #l3 #l4 !if ¬ $status - ml-write &spr "[Error: Failed to download package file %s]" #l3 + set-variable #p9 &spr " Failed to download package file: \n\n %s " #l3 !abort !endif set-variable #l3 &set #l5 &cat "file:" &stat a $user-path @@ -122,22 +111,23 @@ set-variable .help.purl "http://d1j8pqz26umfbo.cloudfront.net/packages/" !endif 0x20 file-op #l4 !if #l7 - 1000 ml-write &spr "Error: Failed to %s MicroEmacs Package %s - %d,%d" &con &band @# 1 "install" "update" #l1 #l6 #l7 + set-variable #p9 &spr " Failed to %s MicroEmacs Package %s (%d,%d) " &con &band @# 1 "install" "update" #l1 #l6 #l7 + !abort !elif ¬ #l6 - 1000 ml-write &spr "Error: Failed to find any content in MicroEmacs Package %s" #l1 - !else - find-file &cat $user-path "jmp.lst" - beginning-of-buffer - insert-string &spr "%s\t%s\n" #l1 #l8 - !force search-buffer "me" &spr "^%s\t" #l1 - !if $status - beginning-of-line - set-mark - forward-line - -1 kill-region - !endif - save-buffer - delete-buffer $buffer-bname - ml-write &spr "MicroEmacs Package %s: %s complete" #l1 &con &band @# 1 "Install" "Update" + set-variable #p9 &spr " Failed to find any content in MicroEmacs Package %s " #l1 + !abort + !endif + find-file &cat $user-path "jmp.lst" + beginning-of-buffer + insert-string &spr "%s\t%s\n" #l1 #l8 + !force search-buffer "me" &spr "^%s\t" #l1 + !if $status + beginning-of-line + set-mark + forward-line + -1 kill-region !endif + save-buffer + delete-buffer $buffer-bname + ml-write &spr "MicroEmacs Package %s: %s complete" #l1 &con &band @# 1 "Install" "Update" !emacro diff --git a/microemacs/macros/osd.emf b/microemacs/macros/osd.emf index 56845074..ce9f414a 100755 --- a/microemacs/macros/osd.emf +++ b/microemacs/macros/osd.emf @@ -668,7 +668,7 @@ osd 21 80 "" "\HTriangle" f Triangle set-variable #l4 $status goto-position "\x88" !if ¬ #l4 - 3 osd-dialog "Package Installer" &spr " Error: Failed to install package (%s) " #l1 10 6 " \HCancel " + 3 osd-dialog "Package Installer" &spr " Error: Failed to install package (%s) \n\n%s" #l1 #l9 10 6 " \HCancel " !abort !endif !emacro