public inbox for gentoo-dev@lists.gentoo.org
 help / color / mirror / Atom feed
From: Vadim Misbakh-Soloviov <mva@gentoo.org>
To: gentoo-dev@lists.gentoo.org
Cc: sarnex@gentoo.org, matt@offtopica.uk
Subject: [gentoo-dev] [PATCH] eclass/tree-sitter-grammar: fix ABI autodetecton
Date: Thu,  9 Dec 2021 23:27:30 +0700	[thread overview]
Message-ID: <20211209162730.146929-1-mva@gentoo.org> (raw)
In-Reply-To: <b53fb09b0ed00e84df7b37c34700017a5ae703c7.camel@gentoo.org>

  Some grammars packages (like, for example, tree-sitter-agda) uses
  different versioning scheme from vast majority of grammars in
  tree-sitter github organization.

  Also, third-party grammars doesn't follow tree-sitter versioning.

  Also, some grammars (like tree-sitter-haskell, for example) only had
  old release tagged, but having compatible and useful grammars in
  current HEAD.

  Also, some grammars like tree-sitter-verilog, even have only v0.0 tag.

  So, instead of assuming grammar ABI version based on ${PV} (ver_test)
  we decided to take ABI version drectly from source code.

Signed-off-by: Vadim Misbakh-Soloviov <mva@gentoo.org>
---
Changes since previous commit: applied @mgorny's suggestion about sed
script.

 eclass/tree-sitter-grammar.eclass | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/eclass/tree-sitter-grammar.eclass b/eclass/tree-sitter-grammar.eclass
index 46573027f96..7207ecf3ddd 100644
--- a/eclass/tree-sitter-grammar.eclass
+++ b/eclass/tree-sitter-grammar.eclass
@@ -40,15 +40,13 @@ EXPORT_FUNCTIONS src_compile src_install
 # @INTERNAL
 # @DESCRIPTION:
 # This internal function determines the ABI version of a grammar library based
-# on the package version.
+# on a constant in the source file.
 _get_tsg_abi_ver() {
-	if ver_test -gt 0.21; then
-		die "Grammar too new; unknown ABI version"
-	elif ver_test -ge 0.19.0; then
-		echo 13
-	else
-		die "Grammar too old; unknown ABI version"
-	fi
+	# This sed script finds ABI definition string in parser source file,
+	# substitutes all the string until the ABI number, and prints remains
+	# (the ABI number itself)
+	sed -n 's/#define LANGUAGE_VERSION //p' "${S}"/parser.c ||
+		die "Unable to extract ABI version for this grammar"
 }

 # @FUNCTION: tree-sitter-grammar_src_compile
@@ -89,8 +87,10 @@ tree-sitter-grammar_src_compile() {
 tree-sitter-grammar_src_install() {
 	debug-print-function ${FUNCNAME} "${@}"

-	dolib.so "${WORKDIR}"/lib${PN}$(get_libname $(_get_tsg_abi_ver))
-	dosym lib${PN}$(get_libname $(_get_tsg_abi_ver)) \
+	local soname=lib${PN}$(get_libname $(_get_tsg_abi_ver))
+
+	dolib.so "${WORKDIR}/${soname}"
+	dosym "${soname}" \
 		  /usr/$(get_libdir)/lib${PN}$(get_libname)
 }
 fi
-- 
2.34.1



  reply	other threads:[~2021-12-09 16:27 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-12-09  3:10 [gentoo-dev] [PATCH] eclass/tree-sitter-grammar: fix ABI autodetecton Vadim Misbakh-Soloviov
2021-12-09  7:26 ` Michał Górny
2021-12-09 16:27   ` Vadim Misbakh-Soloviov [this message]
2021-12-09 16:29     ` Vadim A. Misbakh-Soloviov
2021-12-20  4:13       ` Vadim A. Misbakh-Soloviov

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20211209162730.146929-1-mva@gentoo.org \
    --to=mva@gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    --cc=matt@offtopica.uk \
    --cc=sarnex@gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox