From unknown Mon Aug 18 00:08:10 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#59737 <59737@debbugs.gnu.org> To: bug#59737 <59737@debbugs.gnu.org> Subject: Status: 29.0.60; Fix tree-sitter-build-scripts Reply-To: bug#59737 <59737@debbugs.gnu.org> Date: Mon, 18 Aug 2025 07:08:10 +0000 retitle 59737 29.0.60; Fix tree-sitter-build-scripts reassign 59737 emacs submitter 59737 Theodor Thornhill severity 59737 wishlist thanks From debbugs-submit-bounces@debbugs.gnu.org Thu Dec 01 03:49:42 2022 Received: (at submit) by debbugs.gnu.org; 1 Dec 2022 08:49:42 +0000 Received: from localhost ([127.0.0.1]:38384 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p0fGH-0006b1-LX for submit@debbugs.gnu.org; Thu, 01 Dec 2022 03:49:42 -0500 Received: from lists.gnu.org ([209.51.188.17]:53296) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p0fGF-0006av-7R for submit@debbugs.gnu.org; Thu, 01 Dec 2022 03:49:39 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p0fGC-0007wF-7W for bug-gnu-emacs@gnu.org; Thu, 01 Dec 2022 03:49:37 -0500 Received: from out2.migadu.com ([188.165.223.204]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p0fGA-0007sS-8k for bug-gnu-emacs@gnu.org; Thu, 01 Dec 2022 03:49:35 -0500 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=thornhill.no; s=key1; t=1669884571; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type; bh=j7qBNhMud3O1JqlAq1rSlNIqgWKDyylw9DZJHdxR6No=; b=spsBmcRIQyf0OeeLzPzQmpQ/Xe4hQ4abtTEtiwdeLz8mUxMoMSLq1N9aL1wz4QNyGigLME WG1v/am04HGyJ3FZxiYLB8kxvhZX9l+/V5dCyhtZlbv4OONa1lh4pVcqDNid8SbDuWq0i4 o4fj8Cf17kMAMvmVAW5d9pqLj11uC3YKlBPenWZBq2K6t7zcCqhzldlMy2r1fTo9zutdbq JfYZWExLWhC+rFK0Srui22rkwoagx8MdGtbzkcbXHfbnInalkywWVZkSIF0B5Hw8Ujlb0/ d27hGy7zvgLacNRZenQfy4mdjZ0gyRYq/5GOe6hStV2h1zF+yiUWJcTff4efag== From: Theodor Thornhill To: bug-gnu-emacs@gnu.org Subject: 29.0.60; Fix tree-sitter-build-scripts Date: Thu, 01 Dec 2022 09:49:31 +0100 Message-ID: <87mt87zexw.fsf@thornhill.no> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Migadu-Flow: FLOW_OUT Received-SPF: pass client-ip=188.165.223.204; envelope-from=theo@thornhill.no; helo=out2.migadu.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, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.4 (-) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.4 (--) --=-=-= Content-Type: text/plain Hello there! Attached is a patch to build typescript in addition to tsx. Theo --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=0001-Fix-tree-sitter-build-scripts.patch >From 077bd1ff9825721bc6023f9e81e379774429bb13 Mon Sep 17 00:00:00 2001 From: Theodor Thornhill Date: Thu, 1 Dec 2022 09:39:17 +0100 Subject: [PATCH] Fix tree-sitter build scripts * admin/notes/tree-sitter/build-module/batch.sh (languages): Add tsx. * admin/notes/tree-sitter/build-module/build.sh (lang): Make guards to account for typescript/tsx. It's a little hacky because of the nested nature of that particular repository. --- admin/notes/tree-sitter/build-module/batch.sh | 1 + admin/notes/tree-sitter/build-module/build.sh | 29 ++++++++++++------- 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/admin/notes/tree-sitter/build-module/batch.sh b/admin/notes/tree-sitter/build-module/batch.sh index deed18978a..d45f37f4b6 100755 --- a/admin/notes/tree-sitter/build-module/batch.sh +++ b/admin/notes/tree-sitter/build-module/batch.sh @@ -12,6 +12,7 @@ languages= 'python' 'rust' 'typescript' + 'tsx' ) for language in "${languages[@]}" diff --git a/admin/notes/tree-sitter/build-module/build.sh b/admin/notes/tree-sitter/build-module/build.sh index 102ab310fa..02c6ebaf5d 100755 --- a/admin/notes/tree-sitter/build-module/build.sh +++ b/admin/notes/tree-sitter/build-module/build.sh @@ -12,20 +12,23 @@ lang= echo "Building ${lang}" # Retrieve sources. -git clone "https://github.com/tree-sitter/tree-sitter-${lang}.git" \ - --depth 1 --quiet -if [ "${lang}" == "typescript" ] +if [ "${lang}" == "typescript" ] || [ "${lang}" == "tsx" ] then - lang="typescript/tsx" + git clone "https://github.com/tree-sitter/tree-sitter-typescript.git" \ + --depth 1 --quiet + + lang="typescript/${lang}" +else + git clone "https://github.com/tree-sitter/tree-sitter-${lang}.git" \ + --depth 1 --quiet fi -cp tree-sitter-lang.in "tree-sitter-${lang}/src" -cp emacs-module.h "tree-sitter-${lang}/src" + cp "tree-sitter-${lang}/grammar.js" "tree-sitter-${lang}/src" cd "tree-sitter-${lang}/src" -if [ "${lang}" == "typescript/tsx" ] +if [ "${lang}" == "typescript/$1" ] then - lang="tsx" + lang=$1 fi # Build. @@ -50,7 +53,7 @@ lang= # Copy out. -if [ "${lang}" == "typescript" ] +if [ "${lang}" == "typescript" ] || [ "${lang}" == "tsx" ] then cp "libtree-sitter-${lang}.${soext}" .. cd .. @@ -59,4 +62,10 @@ lang= mkdir -p ../../dist cp "libtree-sitter-${lang}.${soext}" ../../dist cd ../../ -rm -rf "tree-sitter-${lang}" + +if [ "${lang}" == "typescript" ] || [ "${lang}" == "tsx" ] +then + rm -rf "tree-sitter-typescript" +else + rm -rf "tree-sitter-${lang}" +fi -- 2.34.1 --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Fri Dec 02 19:25:56 2022 Received: (at control) by debbugs.gnu.org; 3 Dec 2022 00:25:56 +0000 Received: from localhost ([127.0.0.1]:49718 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p1GLs-0003FI-34 for submit@debbugs.gnu.org; Fri, 02 Dec 2022 19:25:56 -0500 Received: from mail-ot1-f46.google.com ([209.85.210.46]:37787) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p1GLq-0003Et-Jy for control@debbugs.gnu.org; Fri, 02 Dec 2022 19:25:55 -0500 Received: by mail-ot1-f46.google.com with SMTP id a7-20020a056830008700b0066c82848060so3904753oto.4 for ; Fri, 02 Dec 2022 16:25:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=to:subject:message-id:date:mime-version:from:from:to:cc:subject :date:message-id:reply-to; bh=lX5tdcq7cobF/MWuRhiaU29M6DfVNwEav74MpNhHj5k=; b=BcpHNwVEoscDqWrdN+RF7yKwNQvCN5ewP0W2mDiWpLwpkJsQdkoGUcYBbQM46TYzSy PY8FXECU2UTt5PymjMchnjr2gO4ZR9oseZScAW7KEzDc/SHtweRIAGAkAWyp9OR1844B 1Gg+24LigMvBR9g2RjNoGK0wr1nytQ9ofvze0gU1MSW+RtUL7YQQDcihtdUDxBawTrp/ sCTMJenx4Qj0tdws2g5mfbFlXtZ1fcmiQuxs+5Hp7ju/sGgbBwOt3IXHnDRTtIjCeJaJ o3rB6ixTd156pWdvXuEBSlm5MySQK02fW7jYv+Y1/w8WdSr55CeOXE9j4lgk2h1m4rGO Egtg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=to:subject:message-id:date:mime-version:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=lX5tdcq7cobF/MWuRhiaU29M6DfVNwEav74MpNhHj5k=; b=pTTlo/wIZfZtBiOq/OO9sPqud0CFEG4a4AcPT9Xh8sxNPnsl+ZOqMApCtgMnkOuwr4 ZPWPuuY/2xUo8q3d0AcAr1J3UxE12bC1T8KOEWVwcAFKApd4fTL6jZhTsTHpLqWV2aM/ wFNky2Tp+m+E786AQ0HN51zG8jHkDmD+oAkSDGn3T5S+ZDNLAf2B+RJ4SD4njC1h7yhH twQ2f/qpWDTRA1lbM+Y/CNUBDHRyvKI1091Bjn3iT7hg9rV7AqxOpmuLV6hOdl1ZzGvg BRrsAgFJh9aR1VweEXACsEsYdmDeTkAu/cZF/r/z3ZUxbMfCUPr+w2x0Xf0HQNL4CMtp g2Cw== X-Gm-Message-State: ANoB5plhh7/z/p7gxFLoU9PAhtrQvxFX/rvJL89ARn2265YNjnOqFUhX KMdIfZSBGaKweFl7gKqVHsLVCNQAUxPJvGVngDwwXjue X-Google-Smtp-Source: AA0mqf59QXDj62wLncBCz3zWuZPA/QhNfMNiLiBHS9QtYluHEtTozDwOaK603+XHf7kRjWBt7zGD7OVhpYUQUKIYuR4= X-Received: by 2002:a9d:5c81:0:b0:661:c48b:12db with SMTP id a1-20020a9d5c81000000b00661c48b12dbmr27428389oti.105.1670027149091; Fri, 02 Dec 2022 16:25:49 -0800 (PST) Received: from 753933720722 named unknown by gmailapi.google.com with HTTPREST; Fri, 2 Dec 2022 16:25:48 -0800 From: Stefan Kangas X-Hashcash: 1:20:221203:control@debbugs.gnu.org::/7krz++tvMXBu1TZ:7nwD MIME-Version: 1.0 Date: Fri, 2 Dec 2022 16:25:48 -0800 Message-ID: Subject: control message for bug #59737 To: control@debbugs.gnu.org Content-Type: text/plain; charset="UTF-8" X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) severity 59737 wishlist quit From debbugs-submit-bounces@debbugs.gnu.org Tue Dec 06 19:19:42 2022 Received: (at 59737) by debbugs.gnu.org; 7 Dec 2022 00:19:42 +0000 Received: from localhost ([127.0.0.1]:46028 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p2iA2-0005vG-HU for submit@debbugs.gnu.org; Tue, 06 Dec 2022 19:19:42 -0500 Received: from mail-pl1-f178.google.com ([209.85.214.178]:43603) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p2iA0-0005v7-1r; Tue, 06 Dec 2022 19:19:41 -0500 Received: by mail-pl1-f178.google.com with SMTP id d3so15543089plr.10; Tue, 06 Dec 2022 16:19:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=to:cc:date:message-id:subject:mime-version :content-transfer-encoding:from:from:to:cc:subject:date:message-id :reply-to; bh=uP6+U33GRh5SF0OqYFME0k9fLZUZ/rFWJYwBzS+r0Ts=; b=Wzu+ugNm/uBZ5oQoA6YjEGX7yUmJO0vEzpKJURd+Wva/SAczbbb/5V1EPRzQVzDXTc JRGPVJ95a/IDYzUP7WqVjVzmqiAGDM6MRB4CqO40qbM6B7sky+jV5YBxuiDxHwGsPtjt VjXFlxdciY482p++36K1E11HE0W6nvqls+E4Nf/6TCttM6zFOW6kzc/nhpS9WbH9yxNt CElb1AOgSDsqRgHwLRfUyCDnITd8h5OjsArmRrF6YZCaEa56Itv2xBL4QgE/NU+ARN7c dPUoM9ykZmLZ1SVBW6ANlqInZIuFtDTWyAub5GaK5Ic3yPNlzryU8YkEaym9ScloHzqH MWdA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=to:cc:date:message-id:subject:mime-version :content-transfer-encoding:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=uP6+U33GRh5SF0OqYFME0k9fLZUZ/rFWJYwBzS+r0Ts=; b=VglAgFg8L21AMr+pivkRy4Hddp8bIk8I9aP3HV35HdLmX6ocxlcKzjteweFtIviREB bHVZn16xdttlIgHdwQYjfUxm5WaW/XZe7v6YFvBNE/I9TQSAhYCczNu9TDeEQiPwTz17 o+NW4DB5DJi9Xm0TH3G5H3Z3TvCU5FmGgYGvmCSi+jvDYBhp+vvmSJAtN5aBl2ex7+4G wjSyXKrLWb2fGLa+5Ksw3+7hdD5RnHlQ5/YMieU9ASi4kSQNwf/KsM15VTysOomMKwyL TpjZquBpCO+YliBC8LknF9xSVeiXPA9OGgh9bjBP8dhqGxvNEL5sgtM8JkNLgAJQjln5 E3sw== X-Gm-Message-State: ANoB5pm9tp8Dp4kMKM9rV7/g5ybcTXVIkiubKQdikmPXigOZ+HMIj9xU OVGH5cXPTAO4mbR5s0sfzqI= X-Google-Smtp-Source: AA0mqf4tP0gVaAwKL2loJE/cUkbEV17NnyiB73RACtbKIKY3mefESvvc8LiEQ6sDp5U4fcMkqRaYlA== X-Received: by 2002:a17:902:d40a:b0:189:1890:77df with SMTP id b10-20020a170902d40a00b00189189077dfmr73184588ple.132.1670372374105; Tue, 06 Dec 2022 16:19:34 -0800 (PST) Received: from smtpclient.apple (cpe-172-117-161-177.socal.res.rr.com. [172.117.161.177]) by smtp.gmail.com with ESMTPSA id e21-20020a170902d39500b00189240585a7sm592020pld.173.2022.12.06.16.19.33 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 06 Dec 2022 16:19:33 -0800 (PST) From: Yuan Fu Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3696.120.41.1.1\)) Subject: Re: bug#59737: 29.0.60; Fix tree-sitter-build-scripts Message-Id: <3852F295-5209-4240-9118-7BD64352B4A9@gmail.com> Date: Tue, 6 Dec 2022 16:19:32 -0800 To: Theodor Thornhill X-Mailer: Apple Mail (2.3696.120.41.1.1) X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 59737 Cc: 59737-done@debbugs.gnu.org, 59737@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Theodor Thornhill writes: > Hello there! > > Attached is a patch to build typescript in addition to tsx. > > Theo Ah, I was trying to find this bug report and wasn=E2=80=99t able to. = Turns out the default filter of debbugs.el filsters out wishlist by default :-( Anyway, I worked on the build script and it should now produce tsx and typescript separately. Thanks! Yuan From unknown Mon Aug 18 00:08:10 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Wed, 04 Jan 2023 12:24:06 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator