From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Matthias Meulien Newsgroups: gmane.emacs.devel Subject: Re: Tree-sitter integration in python.el Date: Tue, 04 Oct 2022 13:21:45 +0200 Message-ID: <877d1fhm0m.fsf@gmail.com> References: <3A68545C-2E40-4BB4-8563-8041A5452634@gmail.com> <87y1twlr0v.fsf@gmail.com> <83czb8ycpo.fsf@gnu.org> <87tu4klfcw.fsf@gmail.com> <83sfk4w1yu.fsf@gnu.org> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="4553"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Cc: casouri@gmail.com, emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Tue Oct 04 13:28:14 2022 Return-path: Envelope-to: ged-emacs-devel@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1ofg5t-00012T-3U for ged-emacs-devel@m.gmane-mx.org; Tue, 04 Oct 2022 13:28:13 +0200 Original-Received: from localhost ([::1]:60222 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ofg5s-000659-1Y for ged-emacs-devel@m.gmane-mx.org; Tue, 04 Oct 2022 07:28:12 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:32900) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1offzl-0006B5-RA for emacs-devel@gnu.org; Tue, 04 Oct 2022 07:21:54 -0400 Original-Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]:39555) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1offzh-0007oF-GR; Tue, 04 Oct 2022 07:21:53 -0400 Original-Received: by mail-wr1-x42c.google.com with SMTP id f11so18167968wrm.6; Tue, 04 Oct 2022 04:21:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:from:to:cc:subject:date; bh=7ox/fUmBQ1YEEuSWaKGo8Kwv9QAO7+XFpVnwcBkVyHU=; b=mgbmCa9sWlIadvXwvOSgoh496LXfDFsk2Rm3FDI3ggveZbLkCTXyD9FWDPFB3hGw4t O4y3hdjIudXFJYEK5aUJ/ovAuGw6U4RUujAsDzfgrw4kNwCO5G7f3Kf3ccNOq4174PZ1 ldt6ExPVOX7EwPH6jS3O76inuwTwfvCHa5ysLspMrXJA+cYfF1vS5BVMpaNdcVQSq3zZ 0p8lELKi1+7xLimw/WVf2x/jRC3RuSkqfyyTTwi3bdm7ifUSrUNHOnQko253kbPPl5i/ MQ8N9InVhO4oYrkrSEEElSDZxUcoQVoj1uhcSpGSuV06ZTog56QLkCkmdEPSTRNNlI7z pnyw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date; bh=7ox/fUmBQ1YEEuSWaKGo8Kwv9QAO7+XFpVnwcBkVyHU=; b=5rAxaVRUGn82c7HgW5xs83n2De39ksFjfl9YFZHkMjFZXHlejh+MOfjsp6Ia5HP7xk AyBwNxjuLzrMU23lxplYW1gTsQKoXopByqe4Zy607JRw3pjtL6Knxu4orxao8AAt6B07 K0KiOD9KjkSiZPC4aHAy8Oe6/FVbbhMUo0sO/tuhPD/24DqACKgB2yxsF6BPe0zsu3U+ GVSa2rD8tG3MqX3IswhYaEEq24Sr30nCvMEoPb9e1bAECQLTfQ1waZEOyW5CwX43cNuS tYKh4LdLeZf66Ia0MBM8IUJA++/fEN3c8bH/ALt5PuKCvoT/JVjnqZOXMi6Hu685h7K5 U5Rw== X-Gm-Message-State: ACrzQf0SaId3XWrt8oOBmkLcd2x4+XH3iutp5ItmMkgjzwMCiAwH1n4q ey6MTmeDCkkqiWJHFGC1SN66VTypIk4= X-Google-Smtp-Source: AMsMyM4ChRZti2XGaZdNpFEuBbHahsQyGFbrdffbZDsNXr0q/qGXzDrJMAOorUrd3QRJWoIHeTURaA== X-Received: by 2002:adf:cf07:0:b0:22e:3ea0:4fa9 with SMTP id o7-20020adfcf07000000b0022e3ea04fa9mr5171463wrj.147.1664882507535; Tue, 04 Oct 2022 04:21:47 -0700 (PDT) Original-Received: from carbon.localdomain ([2a01:e0a:245:c850:98f5:429a:aa8e:95bb]) by smtp.gmail.com with ESMTPSA id e18-20020adff352000000b0022cdb687bf9sm15490940wrp.0.2022.10.04.04.21.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Oct 2022 04:21:46 -0700 (PDT) In-Reply-To: <83sfk4w1yu.fsf@gnu.org> (Eli Zaretskii's message of "Tue, 04 Oct 2022 09:13:29 +0300") Received-SPF: pass client-ip=2a00:1450:4864:20::42c; envelope-from=orontee@gmail.com; helo=mail-wr1-x42c.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.io gmane.emacs.devel:296873 Archived-At: Eli Zaretskii 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