[Windows] make more relocatable wrapper #1086
Merged
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
|
Please target the default branch with any changes. |
seanyen
force-pushed
the
seanyen/relocatable_wrapper
branch
from
a11153e to
3620f4e
Compare
|
Done. Btw, a little bit off-topic, are you open to add GitHub workflow to run the basic Windows CI for catkin? I can work on that. |
dirk-thomas
changed the title
dirk-thomas
reviewed
May 8, 2020
|
Thanks for the feedback. The new iteration is ready for review. |
dirk-thomas
reviewed
May 12, 2020
seanyen
force-pushed
the
seanyen/relocatable_wrapper
branch
from
f5d5431 to
c71c042
Compare
dirk-thomas
reviewed
May 20, 2020
|
Thanks for the patch. |
|
@dirk-thomas Thanks for the merge! And it would be great this can be cherry-picked to |
dirk-thomas
pushed a commit
that referenced
this pull request
May 21, 2020
* relocatable wrapper. * address the feedback. * address the feedback. * correct the usage.
|
Cherry-picked to |
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.
This pull request is to remove a compile time variable dependency to
@PYTHON_EXECUTABLE@variable. This is motivated by trying to relocate an existing ROS installation to a different location in Windows, where one can either use tool (e.g.,conda) or its own script to patch the hard-coded paths for the plain-text files (e.g.,pythonscripts, CMake files,pkg-configfiles, etc.)However, it is challenging to patch the string literal baked in binary files. So I turned to see why it is not an issue for
setuptoolswrapper. By reading the launcher code, I realized that it reads the SHEBANG line and use it as the hint ofPythonruntime location, and fallback to simply usePython.exeif none is specified or found. By this approach, the binary doesn't have the dependency to the compile time variable, and we can be more close to makecatkininstallation relocatable (at least with existing tools' help).