p36850791
/
kinetic-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

changing rosmake's invocation of make to have a consistent path and not force spurious rebuilds

This commit is contained in:
Tully Foote 2010-06-23 00:35:54 +00:00
parent 7ef28703ad
commit fbe26c57a6
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bin/rosmake
View File

@ -40,7 +40,9 @@ def assert_rospack_built():
# Do not try to build rospack if a ROS_NOBUILD flag is present
return True
if subprocess.call(["make", "-C", os.path.join(os.environ["ROS_ROOT"], "tools/rospack")], stdout=subprocess.PIPE, stderr=subprocess.PIPE) :
#cmd = ["make", "-C", os.path.join(os.environ["ROS_ROOT"], "tools/rospack")] Doesn't work with cmake 2.6, will trigger rebuilds due to different paths. Fixed in 2.8.
cmd = ["bash", "-c", "cd %s && make"%(os.path.join(os.environ["ROS_ROOT"], "tools/rospack"))]
if subprocess.call(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE) :
print "Rospack failed to build"
return False