From 99488f94eafca7df753ce1454a1b2da8474f1810 Mon Sep 17 00:00:00 2001 From: Stephen Leake Date: Thu, 5 Oct 2023 09:36:09 -0700 Subject: [PATCH 1/7] Release ada-mode 8.1.0, gpr-mode 1.0.4 and dependencies --- .../emacs_ada_mode/emacs_ada_mode-8.1.0.toml | 40 +++++++++++++++++ .../emacs_gpr_mode/emacs_gpr_mode-1.0.4.toml | 43 +++++++++++++++++++ .../emacs_gpr_query-1.0.2.toml | 28 ++++++++++++ index/em/emacs_wisi/emacs_wisi-4.3.0.toml | 26 +++++++++++ .../stephes_ada_library-3.7.3.toml | 23 ++++++++++ index/wi/wisitoken/wisitoken-4.2.0.toml | 35 +++++++++++++++ 6 files changed, 195 insertions(+) create mode 100644 index/em/emacs_ada_mode/emacs_ada_mode-8.1.0.toml create mode 100644 index/em/emacs_gpr_mode/emacs_gpr_mode-1.0.4.toml create mode 100644 index/em/emacs_gpr_query/emacs_gpr_query-1.0.2.toml create mode 100644 index/em/emacs_wisi/emacs_wisi-4.3.0.toml create mode 100644 index/st/stephes_ada_library/stephes_ada_library-3.7.3.toml create mode 100644 index/wi/wisitoken/wisitoken-4.2.0.toml diff --git a/index/em/emacs_ada_mode/emacs_ada_mode-8.1.0.toml b/index/em/emacs_ada_mode/emacs_ada_mode-8.1.0.toml new file mode 100644 index 000000000..8ba42180b --- /dev/null +++ b/index/em/emacs_ada_mode/emacs_ada_mode-8.1.0.toml @@ -0,0 +1,40 @@ +name = "emacs_ada_mode" +description = "Parser for Emacs ada-mode" +tags = ["emacs", "ada-mode"] +version = "8.1.0" +licenses = "GPL-3.0-or-later" + +authors = ["Stephen Leake"] +maintainers = ["Stephen Leake "] +maintainers-logins = ["stephe-ada-guru"] + +website = "https://www.nongnu.org/ada-mode/" + +project-files = ["emacs_ada_mode.gpr"] + +executables = ["ada_mode_wisi_lalr_parse", + "ada_mode_wisi_lr1_parse", + "run_ada_lalr_parse", + "run_ada_lr1_parse" + ] + +[[actions]] +type = "pre-build" +command = ["make", "-f", "Alire.make", "ada_annex_p_re2c.c"] + +[[depends-on]] +stephes_ada_library = "~3.7.3" +wisitoken = "~4.2.0" +emacs_wisi = "~4.3.0" + +# Debian 11.2 Bullseye Dec 2022 has re2c 2.0.3 +re2c = ">=2.0.3" + +# We use Ada 2022 syntax, so need the -gnat2022 switch; introduced in gnat FSF 11, Community 2021. +gnat = "(>=11 & <2000) | >=2021" + + +[origin] +commit = "114ab44aa9ccfaa004f450426b7a14bff1ebe347" +url = "git+https://git.savannah.nongnu.org/git/ada-mode.git" + diff --git a/index/em/emacs_gpr_mode/emacs_gpr_mode-1.0.4.toml b/index/em/emacs_gpr_mode/emacs_gpr_mode-1.0.4.toml new file mode 100644 index 000000000..1319167f2 --- /dev/null +++ b/index/em/emacs_gpr_mode/emacs_gpr_mode-1.0.4.toml @@ -0,0 +1,43 @@ +name = "emacs_gpr_mode" +description = "parser for Emacs gpr mode" +tags = ["indent", "highlight", "parser", "gpr", "emacs"] +version = "1.0.4" +licenses = "GPL-3.0-or-later" + +authors = ["Stephen Leake"] +maintainers = ["Stephen Leake "] +maintainers-logins = ["stephe-ada-guru"] + +website = "https://elpa.gnu.org/packages/gpr-mode.html" + +long-description = """ +Generalized LR error-correcting parser generated using WisiToken, +interfaced to Emacs via the wisi package. + +Provides semantic highlighting, indent, single-file navigation. +""" + +project-files = ["emacs_gpr_mode.gpr"] + +executables = ["gpr_mode_wisi_parse"] + +[[actions]] +type = "pre-build" +command = ["make", "-f", "Alire.make", "gpr_re2c.c"] + +[[depends-on]] +stephes_ada_library = "~3.7.3" +wisitoken = "~4.1.0" +emacs_wisi = "~4.3.0" + +# MSYS has 2.2; Debian, MacOS have 3.0 (oct 2022) +re2c = ">=2.2" + +# We use Ada 2022 syntax, so need the -gnat2022 switch; introduced in gnat FSF 11, Community 2021. +gnat = "(>=11 & <2000) | >=2021" + + +[origin] +commit = "6bc569c4e6e020017ef45807322a551b5455b097" +url = "git+https://git.savannah.nongnu.org/git/ada-mode.git" + diff --git a/index/em/emacs_gpr_query/emacs_gpr_query-1.0.2.toml b/index/em/emacs_gpr_query/emacs_gpr_query-1.0.2.toml new file mode 100644 index 000000000..ff597bf44 --- /dev/null +++ b/index/em/emacs_gpr_query/emacs_gpr_query-1.0.2.toml @@ -0,0 +1,28 @@ +name = "emacs_gpr_query" +description = "Emacs xref backend using information output by GNAT compiler." +tags = ["emacs", "xref"] +version = "1.0.2" +licenses = "GPL-3.0-or-later" + +authors = ["Stephen Leake"] +maintainers = ["Stephen Leake "] +maintainers-logins = ["stephe-ada-guru"] + +website = "https://elpa.gnu.org/packages/gpr-query.html" + +project-files = ["emacs_gpr_query.gpr"] + +executables = ["gpr_query"] + +[[depends-on]] +gnatcoll = "^22.0.0" +gnatcoll_sqlite = "^22.0.0" +gnatcoll_xref = "^22.0.0" + +# We use Ada 2022 syntax, so need the -gnat2022 switch; introduced in gnat FSF 11, Community 2021. +gnat = "(>=11 & <2000) | >=2021" + +[origin] +commit = "9619300ce22062e2677b0536e7b69dca182f316e" +url = "git+https://git.savannah.gnu.org/git/emacs/elpa.git" + diff --git a/index/em/emacs_wisi/emacs_wisi-4.3.0.toml b/index/em/emacs_wisi/emacs_wisi-4.3.0.toml new file mode 100644 index 000000000..6a0ab7925 --- /dev/null +++ b/index/em/emacs_wisi/emacs_wisi-4.3.0.toml @@ -0,0 +1,26 @@ +name = "emacs_wisi" +description = "Ada code for Emacs wisi ELPA package" +tags = ["emacs", "indent", "project", "compile", "xref"] +version = "4.3.0" +licenses = "GPL-3.0-or-later" + +authors = ["Stephen Leake"] +maintainers = ["Stephen Leake "] +maintainers-logins = ["stephe-ada-guru"] + +website = "https://elpa.gnu.org/packages/wisi.html" + +project-files = ["wisi_alire.gpr"] + +[[depends-on]] +stephes_ada_library = "~3.7.2" +wisitoken = "~4.2.0" + +# We use Ada 2022 syntax, so need the -gnat2022 switch; introduced in gnat FSF 11, Community 2021. +gnat = "(>=11 & <2000) | >=2021" + + +[origin] +commit = "5422a04736f6bb6bbd089ddb7348a870c0d545dd" +url = "git+https://git.savannah.nongnu.org/git/ada-mode.git" + diff --git a/index/st/stephes_ada_library/stephes_ada_library-3.7.3.toml b/index/st/stephes_ada_library/stephes_ada_library-3.7.3.toml new file mode 100644 index 000000000..74c46dc92 --- /dev/null +++ b/index/st/stephes_ada_library/stephes_ada_library-3.7.3.toml @@ -0,0 +1,23 @@ +name = "stephes_ada_library" +description = "Stephe's Ada library; miscellaneous useful stuff." +tags = ["containers", "trees"] +version = "3.7.3" +licenses = "GPL-3.0-or-later" + +authors = ["Stephen Leake"] +maintainers = ["Stephen Leake "] +maintainers-logins = ["stephe-ada-guru"] + +website = "https://stephe-leake.org/ada/sal.html" + +project-files = ["build/stephes_ada_library.gpr"] + +[[depends-on]] +# We use Ada 2022 syntax, so need the -gnat2020 or -gnat2022 switch; +# introduced in gnat FSF 11 has -gnat2020, gnat FSF 12 has both. +gnat = "(>=11 & <2000) | >=2021" + +[origin] +commit = "08b4830747b4a4c049d36da2b39a6dce29f37407" +url = "git+https://git.savannah.nongnu.org/git/ada-mode.git" + diff --git a/index/wi/wisitoken/wisitoken-4.2.0.toml b/index/wi/wisitoken/wisitoken-4.2.0.toml new file mode 100644 index 000000000..057176cf0 --- /dev/null +++ b/index/wi/wisitoken/wisitoken-4.2.0.toml @@ -0,0 +1,35 @@ +name = "wisitoken" +description = "Generalized error correcting LALR and packrat parser generator" +tags = ["parser", "generator", "generalized"] +version = "4.2.0" +licenses = "GPL-3.0-or-later" + +authors = ["Stephen Leake"] +maintainers = ["Stephen Leake "] +maintainers-logins = ["stephe-ada-guru"] + +website = "https://stephe-leake.org/ada/wisitoken.html" + +project-files = ["build/wisitoken_alire.gpr", "build/wisitoken_alire_mains.gpr"] + +# We use ".exe" extension even on non-Windows, to simplify the makefiles. +executables = ["wisitoken-bnf-generate.exe"] + +[[depends-on]] +# While wisitoken-bnf-generate can output a Tree-Sitter grammar file, +# it does not use any tree-sitter code, so we have no dependency on +# tree-sitter. +# +# The development code includes tests that run the tree-sitter parser, +# so to run those in an Alire build, we will need a tree-sitter crate. +gnatcoll = "^22.0.0" +stephes_ada_library = "~3.7.2" + +# We use Ada 2022 syntax, so need the -gnat2022 switch; introduced in gnat FSF 11, Community 2021. +gnat = "(>=11 & <2000) | >=2021" + + +[origin] +commit = "842de658c41c06a1552f851210f59837695c4def" +url = "git+https://git.savannah.nongnu.org/git/ada-mode.git" + From d32ab476849923d26333872d5ab4e62b0246b198 Mon Sep 17 00:00:00 2001 From: Stephen Leake Date: Fri, 6 Oct 2023 01:53:46 -0700 Subject: [PATCH 2/7] Fix "incorrect line termination" bug * index/wi/wisitoken/wisitoken-4.2.0.toml: Patched for "incorrect line termination" in s-memory.adb. --- index/wi/wisitoken/wisitoken-4.2.0.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index/wi/wisitoken/wisitoken-4.2.0.toml b/index/wi/wisitoken/wisitoken-4.2.0.toml index 057176cf0..5330838aa 100644 --- a/index/wi/wisitoken/wisitoken-4.2.0.toml +++ b/index/wi/wisitoken/wisitoken-4.2.0.toml @@ -30,6 +30,6 @@ gnat = "(>=11 & <2000) | >=2021" [origin] -commit = "842de658c41c06a1552f851210f59837695c4def" +commit = "6d960ad8320c08d7abd31cc73d7d53187e6edcda" url = "git+https://git.savannah.nongnu.org/git/ada-mode.git" From b00f1cae5c7a80b7f837865bbda969e60e86263a Mon Sep 17 00:00:00 2001 From: Stephen Leake Date: Fri, 6 Oct 2023 02:16:28 -0700 Subject: [PATCH 3/7] One more try for "incorrect line termination" bug * index/wi/wisitoken/wisitoken-4.2.0.toml: Fix syntax in .gitattributes. --- index/wi/wisitoken/wisitoken-4.2.0.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index/wi/wisitoken/wisitoken-4.2.0.toml b/index/wi/wisitoken/wisitoken-4.2.0.toml index 5330838aa..7dc3c15d4 100644 --- a/index/wi/wisitoken/wisitoken-4.2.0.toml +++ b/index/wi/wisitoken/wisitoken-4.2.0.toml @@ -30,6 +30,6 @@ gnat = "(>=11 & <2000) | >=2021" [origin] -commit = "6d960ad8320c08d7abd31cc73d7d53187e6edcda" +commit = "46a8a0741a0368e7ff8e37a995fca25726121fdc" url = "git+https://git.savannah.nongnu.org/git/ada-mode.git" From 5b233d1e2127ddefd5b7f290c8c0df9a6845b9f2 Mon Sep 17 00:00:00 2001 From: Stephen Leake Date: Fri, 6 Oct 2023 09:20:17 -0700 Subject: [PATCH 4/7] * index/wi/wisitoken/wisitoken-4.2.0.toml: One more try --- index/wi/wisitoken/wisitoken-4.2.0.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index/wi/wisitoken/wisitoken-4.2.0.toml b/index/wi/wisitoken/wisitoken-4.2.0.toml index 7dc3c15d4..aa59f122d 100644 --- a/index/wi/wisitoken/wisitoken-4.2.0.toml +++ b/index/wi/wisitoken/wisitoken-4.2.0.toml @@ -30,6 +30,6 @@ gnat = "(>=11 & <2000) | >=2021" [origin] -commit = "46a8a0741a0368e7ff8e37a995fca25726121fdc" +commit = "d83f6c2aec107cffa8cdca39252acb56274b0c20" url = "git+https://git.savannah.nongnu.org/git/ada-mode.git" From 19d23bef7e65798fe1e39006f02ef17a939bee4e Mon Sep 17 00:00:00 2001 From: Stephen Leake Date: Fri, 6 Oct 2023 09:32:10 -0700 Subject: [PATCH 5/7] * index/wi/wisitoken/wisitoken-4.2.0.toml: Another try --- index/wi/wisitoken/wisitoken-4.2.0.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index/wi/wisitoken/wisitoken-4.2.0.toml b/index/wi/wisitoken/wisitoken-4.2.0.toml index aa59f122d..0fe05fb51 100644 --- a/index/wi/wisitoken/wisitoken-4.2.0.toml +++ b/index/wi/wisitoken/wisitoken-4.2.0.toml @@ -30,6 +30,6 @@ gnat = "(>=11 & <2000) | >=2021" [origin] -commit = "d83f6c2aec107cffa8cdca39252acb56274b0c20" +commit = "6accb40b4dc03c00212dad792879f850b50e16aa" url = "git+https://git.savannah.nongnu.org/git/ada-mode.git" From 702e6ea527d4ef4055663c48c0b77d9ad7a5a4a3 Mon Sep 17 00:00:00 2001 From: Stephen Leake Date: Fri, 6 Oct 2023 10:08:22 -0700 Subject: [PATCH 6/7] * index/wi/wisitoken/wisitoken-4.2.0.toml: One more try --- index/wi/wisitoken/wisitoken-4.2.0.toml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/index/wi/wisitoken/wisitoken-4.2.0.toml b/index/wi/wisitoken/wisitoken-4.2.0.toml index 0fe05fb51..118cbcf19 100644 --- a/index/wi/wisitoken/wisitoken-4.2.0.toml +++ b/index/wi/wisitoken/wisitoken-4.2.0.toml @@ -15,6 +15,11 @@ project-files = ["build/wisitoken_alire.gpr", "build/wisitoken_alire_mains.gpr"] # We use ".exe" extension even on non-Windows, to simplify the makefiles. executables = ["wisitoken-bnf-generate.exe"] +[[actions]] +# FIXME: it's not clear how to make this Windows-only. +type = "pre-build" +command = ["dos2unix", "memory/s-memory.adb"] + [[depends-on]] # While wisitoken-bnf-generate can output a Tree-Sitter grammar file, # it does not use any tree-sitter code, so we have no dependency on @@ -30,6 +35,6 @@ gnat = "(>=11 & <2000) | >=2021" [origin] -commit = "6accb40b4dc03c00212dad792879f850b50e16aa" +commit = "0204c44b70d9dfe249e105fde5783a5be87a6692" url = "git+https://git.savannah.nongnu.org/git/ada-mode.git" From e331a8411a91570a7ed45c4e5a216a7b33d33326 Mon Sep 17 00:00:00 2001 From: Stephen Leake Date: Sat, 7 Oct 2023 08:37:14 -0700 Subject: [PATCH 7/7] * index/wi/wisitoken/wisitoken-4.2.0.toml: This should work --- index/wi/wisitoken/wisitoken-4.2.0.toml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/index/wi/wisitoken/wisitoken-4.2.0.toml b/index/wi/wisitoken/wisitoken-4.2.0.toml index 118cbcf19..266d8517e 100644 --- a/index/wi/wisitoken/wisitoken-4.2.0.toml +++ b/index/wi/wisitoken/wisitoken-4.2.0.toml @@ -15,11 +15,10 @@ project-files = ["build/wisitoken_alire.gpr", "build/wisitoken_alire_mains.gpr"] # We use ".exe" extension even on non-Windows, to simplify the makefiles. executables = ["wisitoken-bnf-generate.exe"] -[[actions]] -# FIXME: it's not clear how to make this Windows-only. -type = "pre-build" +[[actions.'case(os)'.windows]] +type = "post-fetch" command = ["dos2unix", "memory/s-memory.adb"] - + [[depends-on]] # While wisitoken-bnf-generate can output a Tree-Sitter grammar file, # it does not use any tree-sitter code, so we have no dependency on @@ -35,6 +34,6 @@ gnat = "(>=11 & <2000) | >=2021" [origin] -commit = "0204c44b70d9dfe249e105fde5783a5be87a6692" +commit = "463d2cbfeac33bc04b714d1b07e8a0dec2ee688e" url = "git+https://git.savannah.nongnu.org/git/ada-mode.git"