From: Matthias Meulien <orontee@gmail.com>
To: Eli Zaretskii <eliz@gnu.org>
Cc: casouri@gmail.com, emacs-devel@gnu.org
Subject: Re: Tree-sitter integration in python.el
Date: Tue, 04 Oct 2022 13:21:45 +0200 [thread overview]
Message-ID: <877d1fhm0m.fsf@gmail.com> (raw)
In-Reply-To: <83sfk4w1yu.fsf@gnu.org> (Eli Zaretskii's message of "Tue, 04 Oct 2022 09:13:29 +0300")
Eli Zaretskii <eliz@gnu.org> writes:
> (...) Would you please share the changes you made, FTR? Then others
> who face the same problem could easily find the solution. TIA.
Sure, but let me make clear that it's an unclean hack and using
https://github.com/casouri/tree-sitter-module may prove to be more
robust.
diff --unified tree-sitter-ruby/Makefile tree-sitter-python/Makefile
--- tree-sitter-ruby/Makefile 2022-10-03 23:01:34.963750322 +0200
+++ tree-sitter-python/Makefile 2022-10-04 13:06:46.014817832 +0200
@@ -31,7 +31,7 @@
ifeq (, $(CPPSRC))
ADDITIONALLIBS :=
else
- ADDITIONALLIBS := -lc++
+ ADDITIONALLIBS :=
endif
# collect sources
@@ -71,14 +71,14 @@
ifneq (,$(filter $(shell uname),FreeBSD NetBSD DragonFly))
PCLIBDIR := $(PREFIX)/libdata/pkgconfig
endif
-
-all: libtree-sitter-$(PARSER_NAME).a libtree-sitter-$(PARSER_NAME).$(SOEXTVER) bindings/c/$(PARSER_NAME).h bindings/c/tree-sitter-$(PARSER_NAME).pc
+
+all: libtree-sitter-$(PARSER_NAME).a libtree-sitter-$(PARSER_NAME).$(SOEXTVER)
libtree-sitter-$(PARSER_NAME).a: $(OBJ)
$(AR) rcs $@ $^
libtree-sitter-$(PARSER_NAME).$(SOEXTVER): $(OBJ)
- $(CC) $(LDFLAGS) $(LINKSHARED) $^ $(LDLIBS) -o $@
+ g++ $(LDFLAGS) $(LINKSHARED) $^ $(LDLIBS) -o $@
ln -sf $@ libtree-sitter-$(PARSER_NAME).$(SOEXT)
ln -sf $@ libtree-sitter-$(PARSER_NAME).$(SOEXTVER_MAJOR)
@@ -102,10 +102,6 @@
install -m755 libtree-sitter-$(PARSER_NAME).$(SOEXTVER) '$(DESTDIR)$(LIBDIR)'/libtree-sitter-$(PARSER_NAME).$(SOEXTVER)
ln -sf libtree-sitter-$(PARSER_NAME).$(SOEXTVER) '$(DESTDIR)$(LIBDIR)'/libtree-sitter-$(PARSER_NAME).$(SOEXTVER_MAJOR)
ln -sf libtree-sitter-$(PARSER_NAME).$(SOEXTVER) '$(DESTDIR)$(LIBDIR)'/libtree-sitter-$(PARSER_NAME).$(SOEXT)
- install -d '$(DESTDIR)$(INCLUDEDIR)'/tree_sitter
- install -m644 bindings/c/$(PARSER_NAME).h '$(DESTDIR)$(INCLUDEDIR)'/tree_sitter/
- install -d '$(DESTDIR)$(PCLIBDIR)'
- install -m644 bindings/c/tree-sitter-$(PARSER_NAME).pc '$(DESTDIR)$(PCLIBDIR)'/
clean:
rm -f $(OBJ) libtree-sitter-$(PARSER_NAME).a libtree-sitter-$(PARSER_NAME).$(SOEXT) libtree-sitter-$(PARSER_NAME).$(SOEXTVER_MAJOR) libtree-sitter-$(PARSER_NAME).$(SOEXTVER)
--
Matthias
next prev parent reply other threads:[~2022-10-04 11:21 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-22 18:42 Tree-sitter integration in python.el Yuan Fu
2022-09-26 19:10 ` Jostein Kjønigsen
2022-09-27 22:16 ` Yuan Fu
2022-10-03 18:07 ` Matthias Meulien
2022-10-03 18:38 ` Eli Zaretskii
2022-10-03 22:19 ` Matthias Meulien
2022-10-03 22:31 ` Yuan Fu
2022-10-03 22:47 ` Matthias Meulien
2022-10-06 2:56 ` Yuan Fu
2022-10-06 7:18 ` Matthias Meulien
2022-10-06 18:26 ` Yuan Fu
2022-10-06 20:53 ` Matthias Meulien
2022-10-07 8:25 ` Yuan Fu
2022-10-07 10:03 ` Augusto Stoffel
2022-10-07 17:53 ` chad
2022-10-07 19:09 ` Eli Zaretskii
2022-10-07 22:17 ` Yuan Fu
2022-10-07 22:10 ` Yuan Fu
2022-10-08 6:30 ` Eli Zaretskii
2022-10-08 20:57 ` Yuan Fu
2022-10-09 4:13 ` Eli Zaretskii
2022-10-11 22:15 ` Stefan Monnier
2022-10-12 5:04 ` Yuan Fu
2022-10-12 17:52 ` Stefan Monnier
2022-10-12 22:55 ` Yuan Fu
2022-10-12 23:43 ` Yuan Fu
2022-10-13 0:16 ` [SPAM UNSURE] " Stephen Leake
2022-10-13 5:55 ` Eli Zaretskii
2022-10-15 23:15 ` Yuan Fu
2022-10-08 8:03 ` Augusto Stoffel
2022-10-08 16:20 ` [External] : " Drew Adams
2022-10-10 15:38 ` Augusto Stoffel
2022-10-08 21:06 ` Yuan Fu
2022-10-10 7:16 ` Augusto Stoffel
2022-10-10 15:10 ` Yuan Fu
2022-10-10 15:53 ` Augusto Stoffel
2022-10-12 5:08 ` Yuan Fu
2022-10-11 22:18 ` Stefan Monnier
2022-10-04 6:13 ` Eli Zaretskii
2022-10-04 11:21 ` Matthias Meulien [this message]
2022-10-04 12:33 ` Eli Zaretskii
2022-10-04 17:11 ` Matthias Meulien
2022-10-03 22:25 ` Yuan Fu
2022-10-16 7:31 ` Eli Zaretskii
2022-10-16 8:15 ` Yuan Fu
2022-10-16 8:18 ` Eli Zaretskii
2022-10-03 22:35 ` Matthias Meulien
-- strict thread matches above, loose matches on Subject: below --
2022-10-03 21:53 lkg.ch@pm.me
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
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=877d1fhm0m.fsf@gmail.com \
--to=orontee@gmail.com \
--cc=casouri@gmail.com \
--cc=eliz@gnu.org \
--cc=emacs-devel@gnu.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.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).