Replace hardcoded __master and __ip arguments with makefile variables and preprocessor variables #27
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
…itions this allows the ROS_MASTER_URI to be inferred from the compiling computer's env. this commit also bumps a TODO to stop hardcoding up to actual runtime configurability. Signed-off-by: Eric McCann <[email protected]>
…finitions this allows the ROS_MASTER_URI to be inferred from the compiling computer's env. this commit also bumps a TODO to stop hardcoding up to actual runtime configurability. Signed-off-by: Eric McCann <[email protected]>
nuclearmistake
force-pushed
the
master
branch
from
ea143bc to
7a0f624
Compare
|
Thanks for your contribution Eric. Seems an interesting improvement. |
|
|
||
| ### End customization region | ||
|
|
||
| LOCAL_CFLAGS := -DROS_MASTER_URI="__master:=$(ROS_MASTER_URI)" -DROS_ANDROID_IP="__ip:=$(ROS_ANDROID_IP)" |
There was a problem hiding this comment.
Missing single quotes to retain the double quotes on the literal string:
LOCAL_CFLAGS := -DROS_MASTER_URI='"__master:=$(ROS_MASTER_URI)"' -DROS_ANDROID_IP='"__ip:=$(ROS_ANDROID_IP)"'
Please fix this and submit it again so it can be merged.
|
Please address the issues I've marked and let me know so I can merge the code. Also ROS_ANDROID_IP should default to the environment variable if defined. |
|
@nuclearmistake did you see my comments? |
jubeira
pushed a commit
to jubeira/roscpp_android
that referenced
this pull request
Feb 1, 2019
…e-linking Fix rosbag_storage static linking
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.
There could be a centrally located makefile that both would get the value for the master URI and the ROS_IP from, but at least this is a step towards being ideal.
Eventually, the ROS_IP should probably be pulled from the java networking APIs or by parsing the output of "netcfg", and the ROS_MASTER_URI should be pulled from property storage or a chooser in the app, but at least this is more visible to people trying to experiment with roscpp_android.
I cannot yet test these changes as my build is hanging up on orocos-bfl. Will follow up once I get past that hurdle.