Skip to content

Commit

Permalink
Added -t option to mesgen.emf and used it to fix win32 github action
Browse files Browse the repository at this point in the history
  • Loading branch information
Steven Phillips committed Dec 29, 2023
1 parent 71ff3b1 commit 5bda04a
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/binaries-win32.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ jobs:
- name: Create mes
shell: pwsh
run: |
..\src\.win32vc16-release-mecw\mecw32.exe -p -n "@mesgen" -f -p ..\src\.win32vc16s-release-mew\mew32.exe -o ../../binaries-win32/mes-win32.exe
..\src\.win32vc16-release-mecw\mecw32.exe -p -n "@mesgen" -f -p ..\src\.win32vc16s-release-mew\mew32.exe -o ../../binaries-win32/mes-win32.exe -t ..\3rdparty\tfs\.win32vc16-release\tfs.exe
working-directory: ./microemacs/mesingle

- name: Upload Packages
Expand Down
7 changes: 6 additions & 1 deletion microemacs/mesingle/mesgen.emf
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
;
;set-variable $debug 8
set-variable %mes-opts ""
set-variable %mes-tfs "tfs"
set-variable #l0 0
!while &exi &cat ".about.arg" #l0
set-variable #l1 &ind &cat ".about.arg" &pinc #l0 1
Expand All @@ -27,13 +28,17 @@ set-variable #l0 0
-1 ml-write " : Output file name"
-1 ml-write " -p <file>"
-1 ml-write " : MicroEmacs program/executable file"
-1 ml-write " -t <file>"
-1 ml-write " : TFS executable - must run on current platform"
4 exit-emacs 1
!endif
set-variable %mes-opts &cat %mes-opts &rig #l1 1
!if &sin "o" #l1
set-variable %mes-outn &ind &cat ".about.arg" &pinc #l0 1
!elif &sin "p" #l1
set-variable %mes-prog &ind &cat ".about.arg" &pinc #l0 1
!elif &sin "t" #l1
set-variable %mes-tfs &ind &cat ".about.arg" &pinc #l0 1
!endif
!done
set-variable %mes-verb &sub &len %mes-opts &len &rep %mes-opts "V" ""
Expand Down Expand Up @@ -78,7 +83,7 @@ define-macro mesingle-gen
!return
!endif
!if &seq &set #l1 &whi &cat #l0 "tfs" "ERROR"
!if &seq &set #l1 &whi "tfs" "ERROR"
!if &seq &set #l1 &whi %mes-tfs "ERROR"
-2 ml-write "mesgen Error: failed to locate tfs executable"
!abort
!endif
Expand Down

0 comments on commit 5bda04a

Please sign in to comment.