Repository navigation
Conversation
The Qt Designer section still gave python2.7 locations for qtvcp_plugin.py in a package install. The package installs it under $(SITEPY)/qtvcp/plugins (src/Makefile), which configure resolves to the deb_system platlib, /usr/lib/python3/dist-packages. Also add the leading slash the old paths were missing. Refs LinuxCNC#1320
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Finishes the last item andypugh pointed out on #1320: the QtVCP docs still gave python2.7 locations for
qtvcp_plugin.pyin a package install.The package installs it under
$(SITEPY)/qtvcp/plugins(src/Makefile), andconfigureresolvesSITEPYto thedeb_systemplatlib, so the file is at/usr/lib/python3/dist-packages/qtvcp/plugins/qtvcp_plugin.py. The old paths were also missing their leading slash.Targeted at 2.9 because it has the same text and the contributing guide puts doc fixes on the oldest applicable branch. Happy to retarget to master if you prefer.
Left alone on purpose:
////FIXME comment block, so it is not rendered.docs/src/gui/gladevcp.adoc(Troubleshooting) still mentions a stale/usr/lib/python2.6/dist-packages/hal.so. That is a historical upgrade tip rather than a wrong path, so whether to drop it is your call. I can add it here if you want.Not built locally (no asciidoc toolchain on this machine); the change is two literal lines replaced by one.
Refs #1320