Merged COPYING and license and created help_ehf as a separate asset f…

…or other actions
bjasspa · Sep 8, 2024 · 365b0f3 · 365b0f3
1 parent b3cf53d
commit 365b0f3
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 383 deletions.
diff --git a/.github/workflows/build-linux.yml b/.github/workflows/build-linux.yml
@@ -44,7 +44,7 @@ jobs:
           rm ./.gitignore
           cd ..
           export MEVER=`./bin/linux5-intel64/mec -p @contribs/ver.emf`
-          zip -r ../downloads/Jasspa_MicroEmacs_${MEVER}_bin_linux_binaries bin COPYING license.txt readme.txt
+          zip -r ../downloads/Jasspa_MicroEmacs_${MEVER}_bin_linux_binaries bin COPYING.txt readme.txt
 
       - name: Create linux mecs
         run: |
@@ -53,10 +53,9 @@ jobs:
           rm -rf bin/linux5-intel64
           mkdir -p bin/linux5-intel64
           ../bin/linux5-intel64/mec -p "@mesgen" -f -p ../bin/linux5-intel64/mec -t ../bin/linux5-intel64/tfs -o bin/linux5-intel64/mecs
-          cp ../COPYING ./
-          cp ../license.txt ./
+          cp ../COPYING.txt ./
           cp ../readme.txt ./
-          zip -r ../../downloads/Jasspa_MicroEmacs_${MEVER}_abin_linux_mecs bin COPYING license.txt readme.txt
+          zip -r ../../downloads/Jasspa_MicroEmacs_${MEVER}_abin_linux_mecs bin COPYING.txt readme.txt
           
       - name: Create linux mews
         run: |
@@ -65,7 +64,7 @@ jobs:
           rm -rf bin/linux5-intel64
           mkdir -p bin/linux5-intel64
           ../bin/linux5-intel64/mec -p "@mesgen" -f -p ../bin/linux5-intel64/mew -t ../bin/linux5-intel64/tfs -o bin/linux5-intel64/mews
-          zip -r ../../downloads/Jasspa_MicroEmacs_${MEVER}_abin_linux_mews bin COPYING license.txt readme.txt
+          zip -r ../../downloads/Jasspa_MicroEmacs_${MEVER}_abin_linux_mews bin COPYING.txt readme.txt
 
       - name: Create linux OpenSSL download
         run: |
@@ -89,12 +88,11 @@ jobs:
           make me.ehf
           rm -rf tfs
           mkdir -p tfs/macros
-          mv me.ehf tfs/macros
+          cp me.ehf tfs/macros
           cd tfs
-          cp ../../COPYING ./
-          cp ../../license.txt ./
+          cp ../../COPYING.txt ./
           cp ../../readme.txt ./
-          zip -r ../../../downloads/Jasspa_MicroEmacs_${MEVER}_help_ehf macros COPYING license.txt readme.txt
+          zip -r ../../../downloads/Jasspa_MicroEmacs_${MEVER}_help_ehf macros COPYING.txt readme.txt
           cd ..
           ../bin/linux5-intel64/tfs -o ../../packages/Jasspa_MicroEmacs_${MEVER}_hlpehf.tfs -a ../mesingle/tfs_hd tfs
 
@@ -105,10 +103,9 @@ jobs:
           cd macros
           make -f Makefile release
           cd ../release/jasspa/
-          cp ../../COPYING ./
-          cp ../../license.txt ./
+          cp ../../COPYING.txt ./
           cp ../../readme.txt ./
-          zip -r ../../../downloads/Jasspa_MicroEmacs_${MEVER}_macros macros COPYING license.txt readme.txt
+          zip -r ../../../downloads/Jasspa_MicroEmacs_${MEVER}_macros macros COPYING.txt readme.txt
           cd ..
           ../bin/linux5-intel64/tfs -o ../../packages/Jasspa_MicroEmacs_${MEVER}_macros.tfs -a ../mesingle/tfs_hd jasspa
 
@@ -124,3 +121,9 @@ jobs:
           name: linux-packages
           path: packages
 
+      - name: Upload help ehf
+        uses: actions/upload-artifact@v4
+        with: 
+          name: help-ehf
+          path: microemacs/doc/me.ehf
+
diff --git a/.github/workflows/build-macos-apple.yml b/.github/workflows/build-macos-apple.yml
@@ -51,7 +51,7 @@ jobs:
           rm ./.gitignore
           cd ..
           export MEVER=`./bin/macos14-apple64/mec -p @contribs/ver.emf`
-          zip -r ../downloads/Jasspa_MicroEmacs_${MEVER}_bin_macos_apple_binaries bin COPYING license.txt readme.txt
+          zip -r ../downloads/Jasspa_MicroEmacs_${MEVER}_bin_macos_apple_binaries bin COPYING.txt readme.txt
 
       - name: Create macos-apple mecs
         run: |
@@ -60,10 +60,9 @@ jobs:
           rm -rf bin
           mkdir -p bin/macos14-apple64
           ../bin/macos14-apple64/mec -p "@mesgen" -f -p ../bin/macos14-apple64/mec -t ../bin/macos14-apple64/tfs -o bin/macos14-apple64/mecs
-          cp ../COPYING ./
-          cp ../license.txt ./
+          cp ../COPYING.txt ./
           cp ../readme.txt ./
-          zip -r ../../downloads/Jasspa_MicroEmacs_${MEVER}_abin_macos_apple_mecs bin COPYING license.txt readme.txt
+          zip -r ../../downloads/Jasspa_MicroEmacs_${MEVER}_abin_macos_apple_mecs bin COPYING.txt readme.txt
 
       - name: Create macos-apple mews
         run: |
@@ -72,7 +71,7 @@ jobs:
           rm -rf bin
           mkdir -p bin/macos14-apple64
           ../bin/macos14-apple64/mec -p "@mesgen" -f -p ../bin/macos14-apple64/mew -t ../bin/macos14-apple64/tfs -o bin/macos14-apple64/mews
-          zip -r ../../downloads/Jasspa_MicroEmacs_${MEVER}_abin_macos_apple_mews bin COPYING license.txt readme.txt
+          zip -r ../../downloads/Jasspa_MicroEmacs_${MEVER}_abin_macos_apple_mews bin COPYING.txt readme.txt
 
       - name: Create macos-apple OpenSSL download
         run: |

diff --git a/.github/workflows/build-macos-intel.yml b/.github/workflows/build-macos-intel.yml
@@ -50,7 +50,7 @@ jobs:
           mv macos13-intel64-* macos13-intel64
           cd ..
           export MEVER=`./bin/macos13-intel64/mec -p @contribs/ver.emf`
-          zip -r ../downloads/Jasspa_MicroEmacs_${MEVER}_bin_macos_intel_binaries bin/macos13-intel64 COPYING license.txt readme.txt
+          zip -r ../downloads/Jasspa_MicroEmacs_${MEVER}_bin_macos_intel_binaries bin/macos13-intel64 COPYING.txt readme.txt
 
       - name: Create macos-intel mecs
         run: |
@@ -59,10 +59,9 @@ jobs:
           rm -rf bin
           mkdir -p bin/macos13-intel64
           ../bin/macos13-intel64/mec -p "@mesgen" -f -p ../bin/macos13-intel64/mec -t ../bin/macos13-intel64/tfs -o bin/macos13-intel64/mecs
-          cp ../COPYING ./
-          cp ../license.txt ./
+          cp ../COPYING.txt ./
           cp ../readme.txt ./
-          zip -r ../../downloads/Jasspa_MicroEmacs_${MEVER}_abin_macos_intel_mecs bin COPYING license.txt readme.txt
+          zip -r ../../downloads/Jasspa_MicroEmacs_${MEVER}_abin_macos_intel_mecs bin COPYING.txt readme.txt
 
       - name: Create macos-intel mews
         run: |
@@ -71,7 +70,7 @@ jobs:
           rm -rf bin
           mkdir -p bin/macos13-intel64
           ../bin/macos13-intel64/mec -p "@mesgen" -f -p ../bin/macos13-intel64/mew -t ../bin/macos13-intel64/tfs -o bin/macos13-intel64/mews
-          zip -r ../../downloads/Jasspa_MicroEmacs_${MEVER}_abin_macos_intel_mews bin COPYING license.txt readme.txt
+          zip -r ../../downloads/Jasspa_MicroEmacs_${MEVER}_abin_macos_intel_mews bin COPYING.txt readme.txt
 
       - name: Create macos-intel OpenSSL download
         run: |

diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml
@@ -66,7 +66,7 @@ jobs:
           Rename-Item -Path windows100-intel32-msvc17 -NewName windows100-intel32
           cd ..
           $env:MEVER=$(.\bin\windows100-intel32\mec -p @contribs/ver.emf)
-          Compress-Archive -Path bin,COPYING,license.txt,readme.txt -DestinationPath ..\downloads\Jasspa_MicroEmacs_${env:MEVER}_bin_windows_binaries
+          Compress-Archive -Path bin,COPYING.txt,readme.txt -DestinationPath ..\downloads\Jasspa_MicroEmacs_${env:MEVER}_bin_windows_binaries
 
       - name: Create windows100 openssl download
         shell: pwsh
@@ -101,10 +101,9 @@ jobs:
           cd .\mesingle
           mkdir -Path bin\windows100-intel32
           ..\bin\windows100-intel32\mec.exe -p "@mesgen" -f -p ..\bin\windows100-intel32-msvc17s\mec.exe -t ..\bin\windows100-intel32\tfs.exe -o bin\windows100-intel32\mecs.exe
-          Copy-Item -Path ..\COPYING -Destination .
-          Copy-Item -Path ..\license.txt -Destination .
+          Copy-Item -Path ..\COPYING.txt -Destination .
           Copy-Item -Path ..\readme.txt -Destination .
-          Compress-Archive -Path bin,COPYING,license.txt,readme.txt -DestinationPath ..\..\downloads\Jasspa_MicroEmacs_${env:MEVER}_abin_windows_mecs
+          Compress-Archive -Path bin,COPYING.txt,readme.txt -DestinationPath ..\..\downloads\Jasspa_MicroEmacs_${env:MEVER}_abin_windows_mecs
 
       - name: Compile windows100 static mecw
         shell: pwsh
@@ -123,7 +122,7 @@ jobs:
           cd .\mesingle
           Remove-Item bin\windows100-intel32\mecs.exe
           ..\bin\windows100-intel32\mec.exe -p "@mesgen" -f -p ..\bin\windows100-intel32-msvc17s\mew.exe -t ..\bin\windows100-intel32\tfs.exe -o bin\windows100-intel32\mews.exe
-          Compress-Archive -Path bin,COPYING,license.txt,readme.txt -DestinationPath ..\..\downloads\Jasspa_MicroEmacs_${env:MEVER}_abin_windows_mews
+          Compress-Archive -Path bin,COPYING.txt,readme.txt -DestinationPath ..\..\downloads\Jasspa_MicroEmacs_${env:MEVER}_abin_windows_mews
 
       - name: Upload Packages
         uses: actions/upload-artifact@v4