fix(emacs)

ref: #2141
This commit is contained in:
Jacob Heider 2023-10-24 20:19:00 -04:00
parent c828b9c191
commit 97e44314cb
No known key found for this signature in database
GPG key ID: 51E3FD0EE62677B6

View file

@ -21,26 +21,35 @@ runtime:
EMACS_ROOT: ${{prefix}} EMACS_ROOT: ${{prefix}}
EMACSLOADPATH: ${{prefix}}/share/emacs/lisp EMACSLOADPATH: ${{prefix}}/share/emacs/lisp
EMACSDATA: ${{prefix}}/share/emacs/etc EMACSDATA: ${{prefix}}/share/emacs/etc
EMACSPATH: ${{prefix}}/libexec/emacs/{{version.marketing}}
build: build:
dependencies: dependencies:
freedesktop.org/pkg-config: ^0.29.2 freedesktop.org/pkg-config: ^0.29.2
script: | script:
./configure $ARGS - ./configure $ARGS
make --jobs {{ hw.concurrency }} install - make --jobs {{ hw.concurrency }} install
# we specify this with the env-var # we specify this with the env-var
cd {{prefix}}/share/emacs - cd {{prefix}}/share/emacs
mv {{version.marketing}}/lisp . - mv {{version.marketing}}/lisp .
mv site-lisp/* lisp - mv site-lisp/* lisp
rmdir site-lisp - rmdir site-lisp
# doing it step by step to prove we didnt leave anything here # doing it step by step to prove we didnt leave anything here
rm {{version.marketing}}/site-lisp/subdirs.el - rm {{version.marketing}}/site-lisp/subdirs.el
rmdir {{version.marketing}}/site-lisp - rmdir {{version.marketing}}/site-lisp
mv {{version.marketing}}/etc . - mv {{version.marketing}}/etc .
rmdir {{version.marketing}} - rmdir {{version.marketing}}
# we need a stable EMACSPATH to advertise
- run: |
DIR=$(ls)
mv $DIR/* .
rmdir $DIR
ln -s . $DIR
working-directory: ${{prefix}}/libexec/emacs/{{version.marketing}}
env: env:
ARGS: ARGS:
@ -60,13 +69,16 @@ provides:
- bin/emacs - bin/emacs
test: test:
script: | script:
emacs --version | grep "GNU Emacs {{version.marketing}}" - emacs --version | grep "GNU Emacs {{version.marketing}}"
four=$(emacs --batch --eval="(print (+ 2 2))") - four=$(emacs --batch --eval="(print (+ 2 2))")
test $four = 4 - test $four = 4
emacs -batch -l $FIXTURE - emacs -batch -l $FIXTURE
# test EMACSPATH
- emacs --batch --eval '(progn (package-initialize) (print (with-output-to-string (package-list-packages))) (kill-emacs))'
fixture: | fixture: |
(require 'simple) (require 'simple)
(defun my-print-message () (defun my-print-message ()