[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/07: gnu: python-afdko: Remove generated code.
From: |
guix-commits |
Subject: |
02/07: gnu: python-afdko: Remove generated code. |
Date: |
Wed, 14 Sep 2022 15:09:16 -0400 (EDT) |
mbakke pushed a commit to branch master
in repository guix.
commit b0ddbb05729e86ce4efb7eac8909317e16d7bed7
Author: Marius Bakke <marius@gnu.org>
AuthorDate: Wed Sep 14 13:18:50 2022 +0200
gnu: python-afdko: Remove generated code.
* gnu/packages/fontutils.scm (python-afdko)[source](modules, snippet): New
fields.
[arguments]: Add regenerate-hotconv-grammar phase.
[native-inputs]: Add ANTLR4 and OPENJDK.
---
gnu/packages/fontutils.scm | 30 +++++++++++++++++++++++++++---
1 file changed, 27 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm
index da324a6a9d..fbe9c10e37 100644
--- a/gnu/packages/fontutils.scm
+++ b/gnu/packages/fontutils.scm
@@ -9,7 +9,7 @@
;;; Copyright © 2017, 2018, 2020–2022 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net>
;;; 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, 2021 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2021, 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
@@ -145,7 +145,15 @@ them as it goes.")
(method url-fetch)
(uri (pypi-uri "afdko" version))
(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)
(arguments
(list
@@ -173,6 +181,17 @@ them as it goes.")
(substitute* "c/makeotf/lib/hotconv/CMakeLists.txt"
(("antlr4_static")
"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
;; shell scripts, so move the wrap phase after the tests.
(delete 'wrap)
@@ -195,7 +214,12 @@ them as it goes.")
`("PATH" prefix (,bindir))))
commands)))))))
(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))
(inputs (list java-antlr4-runtime-cpp `(,util-linux "lib")))
(propagated-inputs
- branch master updated (cad4b0cc07 -> 883d4e0abf), guix-commits, 2022/09/14
- 02/07: gnu: python-afdko: Remove generated code.,
guix-commits <=
- 05/07: gnu: python-tqdm: Update to 4.64.1., guix-commits, 2022/09/14
- 01/07: gnu: stcgal: Patch tests for PyYAML 6., guix-commits, 2022/09/14
- 03/07: gnu: Remove duplicate copyright line., guix-commits, 2022/09/14
- 04/07: gnu: ungoogled-chromium: Update to 105.0.5195.125-1., guix-commits, 2022/09/14
- 07/07: gnu: python-scikit-learn: Update to 1.1.2., guix-commits, 2022/09/14
- 06/07: gnu: python-pingouin: Don't pin scikit-learn version., guix-commits, 2022/09/14