Fixes for relocatability [round 2] #74
Open
Conversation
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
…e it breaks compatibility" This reverts commit c0867ef.
In merging the original pull request, the C side was changed to respect an originally set CAD_ROOT rather than defaulting to CAD_ROOT_DEFAULT. However, this was left, so the code never actually took effect. Rename the variable being set to CAD_ROOT, but make it conditional to respect an external user's override of CAD_ROOT.
By making the magic.tcl path relative to the path of the executable itself rather than embedding the path during build time.
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.
I'm updating our distribution of magic and noticed that my fixes in #41
had broken, so this attempts to restore them. I understand that there's
a number of different configurations that people use magic in, so I'm
happy to carry these locally in our distribution setup if they break something
else, but I figured I'd at least have another go at it.
The three changes here are:
bin/magicscript.I understand this got reverted in c0867ef because it broke symlinking to the script. This adds an extra
readlink -fto fix that corner case. However, since I don't know the exact details of what broke there, it'd be good to verify that.CAD_ROOTrather than using theCAD_ROOT_DEFAULTvariable I added. However, the corresponding creation of theCAD_ROOT_DEFAULTvariable in magic.tcl was not adjusted, so cad root was not set automatically. Fix that by renaming theCAD_ROOT_DEFAULTtoCAD_ROOTthere also (making sure to respect it if already set).magicdnullandmagicexec. This fixes downstream tooling that does things likemagic --versionwhich currently just starts a tcl interpreter (blocking forever) ismagic.tclis not found because it was relocated.