-
Notifications
You must be signed in to change notification settings - Fork 1.2k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[new-packages] tree-sitter-c, tree-sitter-lua, tree-sitter-markdown, tree-sitter-query, tree-sitter-vim, tree-sitter-vimdoc #23499
Open
calebabutler
wants to merge
6
commits into
msys2:master
Choose a base branch
from
calebabutler:add-neovim-dependencies
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
a72f623
Add dependencies needed by neovim
calebabutler 3b7b43b
Change pkgrel for neovim
calebabutler bf7d655
Remove lib from dependency names
calebabutler a2e6021
Fix so that clang can build
calebabutler a61ca0b
Remove symlink; add to neovim runtime path instead
calebabutler 42f989e
Accidentally added package
calebabutler File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
|
|
||
| _realname=tree-sitter-c | ||
| pkgbase=mingw-w64-${_realname} | ||
| pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}") | ||
| pkgver=0.23.5 | ||
| pkgrel=1 | ||
| pkgdesc='C grammar for tree-sitter (mingw-64)' | ||
| arch=('any') | ||
| mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64') | ||
| msys2_references=( | ||
| 'archlinux: tree-sitter-c' | ||
| ) | ||
| url='https://github.com/tree-sitter/tree-sitter-c' | ||
| msys2_repository_url='https://github.com/tree-sitter/tree-sitter-c' | ||
| license=('spdx:MIT') | ||
| makedepends=( | ||
| "make" | ||
| "${MINGW_PACKAGE_PREFIX}-cc" | ||
| "${MINGW_PACKAGE_PREFIX}-tree-sitter" | ||
| ) | ||
| source=("https://github.com/tree-sitter/${_realname}/archive/refs/tags/v${pkgver}.tar.gz") | ||
| sha256sums=('f7e50412230150ce514efcccb962ff9b452d9f358e0a2c89f2a0a0256c2ec886') | ||
|
|
||
| prepare() { | ||
| cd "${srcdir}/${_realname}-${pkgver}" | ||
| tree-sitter generate src/grammar.json | ||
| } | ||
|
|
||
| build() { | ||
| cd "${srcdir}/${_realname}-${pkgver}" | ||
| # To get around Windows not being supported | ||
| OS='unknown' make CC='cc' LINKSHARED='-shared' PREFIX="${MINGW_PREFIX}" PARSER_URL=$url | ||
| } | ||
|
|
||
| package() { | ||
| install -d "${pkgdir}${MINGW_PREFIX}/lib/tree_sitter" | ||
| cd "${srcdir}/${_realname}-${pkgver}" | ||
| OS='unknown' make DESTDIR="${pkgdir}" PREFIX="${MINGW_PREFIX}" install | ||
| cp "${pkgdir}${MINGW_PREFIX}/lib/lib${_realname}.so" "${pkgdir}${MINGW_PREFIX}/lib/tree_sitter/${_realname#tree-sitter-}.so" | ||
| install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE" | ||
| } | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
|
|
||
| _realname=tree-sitter-lua | ||
| pkgbase=mingw-w64-${_realname} | ||
| pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}") | ||
| pkgver=0.2.0 | ||
| pkgrel=1 | ||
| pkgdesc='Lua grammar for tree-sitter (mingw-64)' | ||
| arch=('any') | ||
| mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64') | ||
| msys2_references=( | ||
| 'archlinux: tree-sitter-lua' | ||
| ) | ||
| url='https://github.com/tree-sitter-grammars/tree-sitter-lua' | ||
| msys2_repository_url='https://github.com/tree-sitter-grammars/tree-sitter-lua' | ||
| license=('spdx:MIT') | ||
| makedepends=( | ||
| "make" | ||
| "${MINGW_PACKAGE_PREFIX}-cc" | ||
| "${MINGW_PACKAGE_PREFIX}-tree-sitter" | ||
| ) | ||
| source=("https://github.com/tree-sitter-grammars/${_realname}/archive/refs/tags/v${pkgver}.tar.gz") | ||
| sha256sums=('6c41227cd0a59047b19d31f0031d4d901f08bfd78d6fc7f55c89e5b8374c794e') | ||
|
|
||
| prepare() { | ||
| cd "${srcdir}/${_realname}-${pkgver}" | ||
| tree-sitter generate src/grammar.json | ||
| } | ||
|
|
||
| build() { | ||
| cd "${srcdir}/${_realname}-${pkgver}" | ||
| # To get around Windows not being supported | ||
| OS='unknown' make CC='cc' LINKSHARED='-shared' PREFIX="${MINGW_PREFIX}" PARSER_URL=$url | ||
| } | ||
|
|
||
| package() { | ||
| install -d "${pkgdir}${MINGW_PREFIX}/lib/tree_sitter" | ||
| cd "${srcdir}/${_realname}-${pkgver}" | ||
| OS='unknown' make DESTDIR="${pkgdir}" PREFIX="${MINGW_PREFIX}" install | ||
| cp "${pkgdir}${MINGW_PREFIX}/lib/lib${_realname}.so" "${pkgdir}${MINGW_PREFIX}/lib/tree_sitter/${_realname#tree-sitter-}.so" | ||
| install -Dm644 LICENSE.md "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE.md" | ||
| } | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
|
|
||
| _realname=tree-sitter-markdown | ||
| pkgbase=mingw-w64-${_realname} | ||
| pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}") | ||
| pkgver=0.3.2 | ||
| pkgrel=1 | ||
| pkgdesc='Markdown grammar for tree-sitter (mingw-64)' | ||
| arch=('any') | ||
| mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64') | ||
| msys2_references=( | ||
| 'archlinux: tree-sitter-markdown' | ||
| ) | ||
| url='https://github.com/tree-sitter-grammars/tree-sitter-markdown' | ||
| msys2_repository_url='https://github.com/tree-sitter-grammars/tree-sitter-markdown' | ||
| license=('spdx:MIT') | ||
| makedepends=( | ||
| "make" | ||
| "${MINGW_PACKAGE_PREFIX}-cc" | ||
| "${MINGW_PACKAGE_PREFIX}-tree-sitter" | ||
| ) | ||
| source=("https://github.com/tree-sitter-grammars/${_realname}/archive/refs/tags/v${pkgver}.tar.gz") | ||
| sha256sums=('5dac48a6d971eb545aab665d59a18180d21963afc781bbf40f9077c06cb82ae5') | ||
|
|
||
| prepare() { | ||
| cd "${srcdir}/${_realname}-${pkgver}/tree-sitter-markdown" | ||
| tree-sitter generate --no-bindings src/grammar.json | ||
|
|
||
| cd "../tree-sitter-markdown-inline" | ||
| tree-sitter generate --no-bindings src/grammar.json | ||
| } | ||
|
|
||
| build() { | ||
| cd "${srcdir}/${_realname}-${pkgver}" | ||
| # To get around Windows not being supported | ||
| OS='unknown' make CC='cc' LINKSHARED='-shared' PREFIX="${MINGW_PREFIX}" PARSER_URL=$url | ||
| } | ||
|
|
||
| package() { | ||
| install -d "${pkgdir}${MINGW_PREFIX}/lib/tree_sitter" | ||
| cd "${srcdir}/${_realname}-${pkgver}" | ||
| OS='unknown' make DESTDIR="${pkgdir}" PREFIX="${MINGW_PREFIX}" install | ||
| cp "${pkgdir}${MINGW_PREFIX}/lib/lib${_realname}.so" "${pkgdir}${MINGW_PREFIX}/lib/tree_sitter/${_realname#tree-sitter-}.so" | ||
| cp "${pkgdir}${MINGW_PREFIX}/lib/lib${_realname}-inline.so" "${pkgdir}${MINGW_PREFIX}/lib/tree_sitter/${_realname#tree-sitter-}_inline.so" | ||
| install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE" | ||
| } | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
|
|
||
| _realname=tree-sitter-query | ||
| pkgbase=mingw-w64-${_realname} | ||
| pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}") | ||
| pkgver=0.5.0 | ||
| pkgrel=1 | ||
| pkgdesc='TS query grammar for tree-sitter (mingw-64)' | ||
| arch=('any') | ||
| mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64') | ||
| msys2_references=( | ||
| 'archlinux: tree-sitter-query' | ||
| ) | ||
| url='https://github.com/tree-sitter-grammars/tree-sitter-query' | ||
| msys2_repository_url='https://github.com/tree-sitter-grammars/tree-sitter-query' | ||
| license=('spdx:Apache-2.0') | ||
| makedepends=( | ||
| "make" | ||
| "${MINGW_PACKAGE_PREFIX}-cc" | ||
| "${MINGW_PACKAGE_PREFIX}-tree-sitter" | ||
| ) | ||
| source=("https://github.com/tree-sitter-grammars/${_realname}/archive/refs/tags/v${pkgver}.tar.gz") | ||
| sha256sums=('e33907fd334350e32e49b3875c36bcf070defe490357632fac9398e6d4540a80') | ||
|
|
||
| prepare() { | ||
| cd "${srcdir}/${_realname}-${pkgver}" | ||
| tree-sitter generate src/grammar.json | ||
| } | ||
|
|
||
| build() { | ||
| cd "${srcdir}/${_realname}-${pkgver}" | ||
| # To get around Windows not being supported | ||
| OS='unknown' make CC='cc' LINKSHARED='-shared' PREFIX="${MINGW_PREFIX}" PARSER_URL=$url | ||
| } | ||
|
|
||
| package() { | ||
| install -d "${pkgdir}${MINGW_PREFIX}/lib/tree_sitter" | ||
| cd "${srcdir}/${_realname}-${pkgver}" | ||
| OS='unknown' make DESTDIR="${pkgdir}" PREFIX="${MINGW_PREFIX}" install | ||
| cp "${pkgdir}${MINGW_PREFIX}/lib/lib${_realname}.so" "${pkgdir}${MINGW_PREFIX}/lib/tree_sitter/${_realname#tree-sitter-}.so" | ||
| install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE" | ||
| } | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
|
|
||
| _realname=tree-sitter-vim | ||
| pkgbase=mingw-w64-${_realname} | ||
| pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}") | ||
| pkgver=0.4.0 | ||
| pkgrel=1 | ||
| pkgdesc='Vimscript grammar for tree-sitter (mingw-64)' | ||
| arch=('any') | ||
| mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64') | ||
| msys2_references=( | ||
| 'archlinux: tree-sitter-vim' | ||
| ) | ||
| url='https://github.com/tree-sitter-grammars/tree-sitter-vim' | ||
| msys2_repository_url='https://github.com/tree-sitter-grammars/tree-sitter-vim' | ||
| license=('spdx:MIT') | ||
| makedepends=( | ||
| "make" | ||
| "${MINGW_PACKAGE_PREFIX}-cc" | ||
| "${MINGW_PACKAGE_PREFIX}-tree-sitter" | ||
| ) | ||
| source=("https://github.com/tree-sitter-grammars/${_realname}/archive/refs/tags/v${pkgver}.tar.gz") | ||
| sha256sums=('9f856f8b4a10ab43348550fa2d3cb2846ae3d8e60f45887200549c051c66f9d5') | ||
|
|
||
| prepare() { | ||
| cd "${srcdir}/${_realname}-${pkgver}" | ||
| tree-sitter generate src/grammar.json | ||
| } | ||
|
|
||
| build() { | ||
| cd "${srcdir}/${_realname}-${pkgver}" | ||
| # To get around Windows not being supported | ||
| OS='unknown' make CC='cc' LINKSHARED='-shared' PREFIX="${MINGW_PREFIX}" PARSER_URL=$url | ||
| } | ||
|
|
||
| package() { | ||
| install -d "${pkgdir}${MINGW_PREFIX}/lib/tree_sitter" | ||
| cd "${srcdir}/${_realname}-${pkgver}" | ||
| OS='unknown' make DESTDIR="${pkgdir}" PREFIX="${MINGW_PREFIX}" install | ||
| cp "${pkgdir}${MINGW_PREFIX}/lib/lib${_realname}.so" "${pkgdir}${MINGW_PREFIX}/lib/tree_sitter/${_realname#tree-sitter-}.so" | ||
| install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE" | ||
| } | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
|
|
||
| _realname=tree-sitter-vimdoc | ||
| pkgbase=mingw-w64-${_realname} | ||
| pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}") | ||
| pkgver=3.0.0 | ||
| pkgrel=1 | ||
| pkgdesc='Vim help file grammar for tree-sitter (mingw-64)' | ||
| arch=('any') | ||
| mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64') | ||
| msys2_references=( | ||
| 'archlinux: tree-sitter-vimdoc' | ||
| ) | ||
| url='https://github.com/neovim/tree-sitter-vimdoc' | ||
| msys2_repository_url='https://github.com/neovim/tree-sitter-vimdoc' | ||
| license=('spdx:Apache-2.0') | ||
| makedepends=( | ||
| "make" | ||
| "${MINGW_PACKAGE_PREFIX}-cc" | ||
| "${MINGW_PACKAGE_PREFIX}-tree-sitter" | ||
| ) | ||
| source=("https://github.com/neovim/${_realname}/archive/refs/tags/v${pkgver}.tar.gz") | ||
| sha256sums=('a639bf92bf57bfa1cdc90ca16af27bfaf26a9779064776dd4be34c1ef1453f6c') | ||
|
|
||
| prepare() { | ||
| cd "${srcdir}/${_realname}-${pkgver}" | ||
| tree-sitter generate src/grammar.json | ||
| } | ||
|
|
||
| build() { | ||
| cd "${srcdir}/${_realname}-${pkgver}" | ||
| # To get around Windows not being supported | ||
| OS='unknown' make CC='cc' LINKSHARED='-shared' PREFIX="${MINGW_PREFIX}" PARSER_URL=$url | ||
| } | ||
|
|
||
| package() { | ||
| install -d "${pkgdir}${MINGW_PREFIX}/lib/tree_sitter" | ||
| cd "${srcdir}/${_realname}-${pkgver}" | ||
| OS='unknown' make DESTDIR="${pkgdir}" PREFIX="${MINGW_PREFIX}" install | ||
| cp "${pkgdir}${MINGW_PREFIX}/lib/lib${_realname}.so" "${pkgdir}${MINGW_PREFIX}/lib/tree_sitter/${_realname#tree-sitter-}.so" | ||
| install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE" | ||
| } | ||
|
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
symlink won't work as you expect: https://www.msys2.org/docs/symlinks/
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You are correct; this cannot be the best solution as it inadvertently bundles the
tree-sitter-*so files with neovim. I changed it so that thetree-sitter-*packages add to the neovim runtime path directly in their respective packages.