me/guix
Archived
1
0
Fork 0
Code Activity

gnu: python-afdko: Remove generated code.

Browse source 
* gnu/packages/fontutils.scm (python-afdko)[source](modules, snippet): New
fields.
[arguments]: Add regenerate-hotconv-grammar phase.
[native-inputs]: Add ANTLR4 and OPENJDK.
This commit is contained in:
Marius Bakke 2022-09-14 13:18:50 +02:00
parent 0b8d2f407c
commit b0ddbb0572
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
1 changed files with 27 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
gnu/packages/fontutils.scm
View file

@ -9,7 +9,7 @@
;;; Copyright © 2017, 2018, 2020–2022 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2017, 2018, 2020–2022 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2018, 2019, 2020, 2021 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2018, 2019, 2020, 2021 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2019, 2020 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2019, 2020, 2022 Marius Bakke <marius@gnu.org>
;;; Copyright © 2020 Roel Janssen <roel@gnu.org> ;;; Copyright © 2020 Roel Janssen <roel@gnu.org>
;;; Copyright © 2020, 2021 Nicolas Goaziou <mail@nicolasgoaziou.fr> ;;; Copyright © 2020, 2021 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2021, 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2021, 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
@ -145,7 +145,15 @@ them as it goes.")
(method url-fetch) (method url-fetch)
(uri (pypi-uri "afdko" version)) (uri (pypi-uri "afdko" version))
(sha256 (sha256
(base32 "171r9f7n8fgz37dkcgpzj508lxfafcyzzx43ps12j1z2nk1sk905")))) (base32 "171r9f7n8fgz37dkcgpzj508lxfafcyzzx43ps12j1z2nk1sk905"))
(modules '((guix build utils)))
(snippet
#~(begin
(with-directory-excursion "c/makeotf/lib/hotconv"
;; Delete ANTLR-generated code.
(for-each delete-file
(find-files
"." "Feat(Parser|Lexer).*\\.(h|cpp|interp|tokens)$")))))))
(build-system python-build-system) (build-system python-build-system)
(arguments (arguments
(list (list
@ -173,6 +181,17 @@ them as it goes.")
(substitute* "c/makeotf/lib/hotconv/CMakeLists.txt" (substitute* "c/makeotf/lib/hotconv/CMakeLists.txt"
(("antlr4_static") (("antlr4_static")
"antlr4-runtime")))) "antlr4-runtime"))))
(add-after 'unpack 'regenerate-hotconv-grammar
(lambda _
(let ((antlr-version #$(package-version
(this-package-native-input "antlr4"))))
(with-directory-excursion "c/makeotf/lib/hotconv"
(substitute* "BuildGrammar.py"
(("antlr_version = .*")
(string-append "antlr_version = \""
antlr-version
"\"")))
(invoke "python" "BuildGrammar.py")))))
;; The test suite expects the commands to be Python rather than ;; The test suite expects the commands to be Python rather than
;; shell scripts, so move the wrap phase after the tests. ;; shell scripts, so move the wrap phase after the tests.
(delete 'wrap) (delete 'wrap)
@ -195,7 +214,12 @@ them as it goes.")
`("PATH" prefix (,bindir)))) `("PATH" prefix (,bindir))))
commands))))))) commands)))))))
(native-inputs (native-inputs
(list ninja python-pytest python-scikit-build python-setuptools-scm (list antlr4
openjdk ;required by antlr4
ninja
python-pytest
python-scikit-build
python-setuptools-scm
python-wheel)) python-wheel))
(inputs (list java-antlr4-runtime-cpp `(,util-linux "lib"))) (inputs (list java-antlr4-runtime-cpp `(,util-linux "lib")))
(propagated-inputs (propagated-inputs