gnu: tree-sitter-grammar: Migrate to tree-sitter-build-system.
gnu/packages/tree-sitter.scm (tree-sitter-delete-generated-files): New variable. (tree-sitter-grammar): Remove source-directory argument, add inputs argument, change package names, remove custom build code, update build system to tree-sitter-build-system. (tree-sitter-grammar-html): Rename to tree-sitter-html.
This commit is contained in:
parent
5401b5822a
commit
2419a16365
1 changed files with 20 additions and 33 deletions
|
@ -29,6 +29,7 @@
|
||||||
#:use-module (gnu packages node)
|
#:use-module (gnu packages node)
|
||||||
#:use-module (guix build-system cargo)
|
#:use-module (guix build-system cargo)
|
||||||
#:use-module (guix build-system gnu)
|
#:use-module (guix build-system gnu)
|
||||||
|
#:use-module (guix build-system tree-sitter)
|
||||||
#:use-module (guix gexp)
|
#:use-module (guix gexp)
|
||||||
#:use-module (guix git-download)
|
#:use-module (guix git-download)
|
||||||
#:use-module (guix packages)
|
#:use-module (guix packages)
|
||||||
|
@ -187,17 +188,26 @@ can be embedded in any application.
|
||||||
This package includes the @command{tree-sitter} command-line tool.")
|
This package includes the @command{tree-sitter} command-line tool.")
|
||||||
(license license:expat)))
|
(license license:expat)))
|
||||||
|
|
||||||
|
(define tree-sitter-delete-generated-files
|
||||||
|
#~(begin
|
||||||
|
(use-modules (guix build utils))
|
||||||
|
(delete-file "binding.gyp")
|
||||||
|
(delete-file-recursively "bindings")
|
||||||
|
(delete-file "src/grammar.json")
|
||||||
|
(delete-file "src/node-types.json")
|
||||||
|
(delete-file "src/parser.c")
|
||||||
|
(delete-file-recursively "src/tree_sitter")))
|
||||||
|
|
||||||
(define* (tree-sitter-grammar
|
(define* (tree-sitter-grammar
|
||||||
language language-for-synopsis version commit hash
|
language language-for-synopsis version commit hash
|
||||||
#:key
|
#:key
|
||||||
(repository-url
|
(repository-url
|
||||||
(format #f "https://github.com/tree-sitter/tree-sitter-~a" language))
|
(format #f "https://github.com/tree-sitter/tree-sitter-~a"
|
||||||
(source-directory ""))
|
language))
|
||||||
|
(inputs '()))
|
||||||
(let ((synopsis (string-append language-for-synopsis
|
(let ((synopsis (string-append language-for-synopsis
|
||||||
" grammar for tree-sitter"))
|
" grammar for tree-sitter"))
|
||||||
(name (string-append "tree-sitter-grammar-" language))
|
(name (string-append "tree-sitter-" language)))
|
||||||
(src-dir source-directory)
|
|
||||||
(lib (format #f "libtree-sitter-~a.so" language)))
|
|
||||||
(package
|
(package
|
||||||
(name name)
|
(name name)
|
||||||
(version version)
|
(version version)
|
||||||
|
@ -208,38 +218,15 @@ This package includes the @command{tree-sitter} command-line tool.")
|
||||||
(url repository-url)
|
(url repository-url)
|
||||||
(commit commit)))
|
(commit commit)))
|
||||||
(file-name (git-file-name name version))
|
(file-name (git-file-name name version))
|
||||||
(sha256 (base32 hash))))
|
(sha256 (base32 hash))
|
||||||
(build-system gnu-build-system)
|
(snippet tree-sitter-delete-generated-files)))
|
||||||
(arguments
|
(build-system tree-sitter-build-system)
|
||||||
(list
|
(inputs inputs)
|
||||||
#:phases
|
|
||||||
#~(modify-phases %standard-phases
|
|
||||||
(delete 'configure)
|
|
||||||
(replace 'build
|
|
||||||
(lambda _
|
|
||||||
(with-directory-excursion (string-append #$src-dir "src")
|
|
||||||
(let* ((scanner? (or (file-exists? "scanner.c")
|
|
||||||
(file-exists? "scanner.cc")))
|
|
||||||
(CC (if (file-exists? "scanner.cc") "g++" "gcc"))
|
|
||||||
(compile (lambda (f) (invoke CC "-fPIC" "-c" "-I." f)))
|
|
||||||
(link-args `("-fPIC" "-shared" "parser.o"
|
|
||||||
,@(if scanner? '("scanner.o") '())
|
|
||||||
"-o" ,#$lib)))
|
|
||||||
(invoke "gcc" "-fPIC" "-c" "-I." "parser.c")
|
|
||||||
(for-each
|
|
||||||
(lambda (f) (when (file-exists? f) (compile f)))
|
|
||||||
'("scanner.c" "scanner.cc"))
|
|
||||||
(apply invoke CC link-args)))))
|
|
||||||
(delete 'check)
|
|
||||||
(replace 'install
|
|
||||||
(lambda _
|
|
||||||
(install-file (string-append #$src-dir "src/" #$lib)
|
|
||||||
(string-append #$output "/lib/tree-sitter")))))))
|
|
||||||
(synopsis synopsis)
|
(synopsis synopsis)
|
||||||
(description (string-append synopsis "."))
|
(description (string-append synopsis "."))
|
||||||
(license license:expat))))
|
(license license:expat))))
|
||||||
|
|
||||||
(define-public tree-sitter-grammar-html
|
(define-public tree-sitter-html
|
||||||
(tree-sitter-grammar
|
(tree-sitter-grammar
|
||||||
"html" "HTML"
|
"html" "HTML"
|
||||||
"0.19.0" "v0.19.0"
|
"0.19.0" "v0.19.0"
|
||||||
|
|
Reference in a new issue