me
/
guix
Archived
1
0
Fork 0
Code

gnu: emacs-org: Fix generated version string. 

* gnu/packages/emacs-xyz.scm (emacs-org)[arguments]<#:phase>: Re-order phases.
Set ORGVERSION on the last MAKE invocation.
Nicolas Goaziou 2022-12-05 22:55:14 +01:00
parent 517618b240
commit 55fc653edf
No known key found for this signature in database
GPG Key ID: DA00B4F048E92F2D
1 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
gnu/packages/emacs-xyz.scm
View File

@ -14166,18 +14166,17 @@ passive voice.")
#:test-command #~(list "make" "test-dirty") #:test-command #~(list "make" "test-dirty")
#:phases #:phases
#~(modify-phases %standard-phases #~(modify-phases %standard-phases
(add-after 'unpack 'configure (replace 'expand-load-path
;; XXX: Generate "org-loaddefs.el" and set proper version string. ;; Make sure `load-path' includes "lisp" directory, otherwise
;; byte-compilation fails.
(lambda args
(with-directory-excursion "lisp"
(apply (assoc-ref %standard-phases 'expand-load-path) args))))
(add-after 'expand-load-path 'bootstrap
;; XXX: Generate "org-loaddefs.el".
(lambda _ (lambda _
(invoke "make" "autoloads" (invoke "make" "autoloads")))
(string-append "ORGVERSION=" #$version)) (add-before 'check 'fix-tests
(let ((elpa (elpa-directory #$output))
(info (string-append #$output "/share/info")))
(substitute* "local.mk"
(("^lispdir.*") (string-append "lispdir = " elpa))
(("^datadir.*") (string-append "datadir = " elpa "/etc"))
(("^infodir.*") (string-append "infodir = " info))))))
(add-after 'configure 'fix-tests
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
;; XXX: Running tests updates ID locations. The process expects ;; XXX: Running tests updates ID locations. The process expects
;; a file to be writeable in "~/.emacs.d/". ;; a file to be writeable in "~/.emacs.d/".
@ -14201,15 +14200,15 @@ passive voice.")
(substitute* "testing/lisp/test-org.el" (substitute* "testing/lisp/test-org.el"
(("test-org/org-(encode-time|time-string-to-time) .*" all) (("test-org/org-(encode-time|time-string-to-time) .*" all)
(string-append all " (skip-unless nil)\n"))))) (string-append all " (skip-unless nil)\n")))))
(replace 'expand-load-path
;; Make sure `load-path' includes "lisp" directory, otherwise
;; byte-compilation fails.
(lambda args
(with-directory-excursion "lisp"
(apply (assoc-ref %standard-phases 'expand-load-path) args))))
(replace 'install (replace 'install
(lambda _ (lambda _
(invoke "make" "install"))) (let ((elpa (elpa-directory #$output))
(info (string-append #$output "/share/info")))
(substitute* "local.mk"
(("^lispdir.*") (string-append "lispdir = " elpa))
(("^datadir.*") (string-append "datadir = " elpa "/etc"))
(("^infodir.*") (string-append "infodir = " info))))
(invoke "make" "install" (string-append "ORGVERSION=" #$version))))
(add-after 'install 'install-org-news (add-after 'install 'install-org-news
;; Install ORG-NEWS files in doc directory. ;; Install ORG-NEWS files in doc directory.
(lambda _ (lambda _