Skip to content
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

Chore: Update tree-sitter-bitbake #280

Merged

Conversation

idillon-sfl
Copy link
Member

@idillon-sfl idillon-sfl commented Jul 11, 2024

This fixes nested variable expansions in shell regions

cmake_runcmake_build() {
	bbnote ${DESTDIR:+DESTDIR=${DESTDIR} }${CMAKE_VERBOSE} cmake --build '${B}' "$@" -- ${EXTRA_OECMAKE_BUILD}
	eval ${DESTDIR:+DESTDIR=${DESTDIR} }${CMAKE_VERBOSE} cmake --build '${B}' "$@" -- ${EXTRA_OECMAKE_BUILD}
}

Here's a test I added: https://github.com/idillon-sfl/tree-sitter-bitbake/blob/821169a172bfe3c7125927ca151e299a1f43759b/test/corpus/shell.txt#L45

Note the new version of tree-sitter-bitbake does not handle shell variable expansions anymore. It was a lot of trouble, and we now use tree-sitter-bash instead for those.

@idillon-sfl idillon-sfl marked this pull request as draft July 11, 2024 17:30
@idillon-sfl idillon-sfl force-pushed the update-tree-sitter-bitbake branch 9 times, most recently from e790069 to 8f24e62 Compare July 17, 2024 14:51
These checks are not necesarry anymore, since the new tree-sitter-bitbake does not detect variable expansions in bash regions anymore.
@idillon-sfl idillon-sfl marked this pull request as ready for review July 18, 2024 15:18
@idillon-sfl idillon-sfl merged commit bf5334e into yoctoproject:staging Jul 18, 2024
5 checks passed
@idillon-sfl idillon-sfl deleted the update-tree-sitter-bitbake branch July 18, 2024 15:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants