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

redoing r6527 to fix breakage on non-rosmake-based builders

This commit is contained in:
Ken Conley 2009-10-15 22:55:01 +00:00
parent ec1f7e604d
commit cff0f53e13
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
tools/rosdoc/src/rosdoc/landing_page.py
View File

@ -55,12 +55,26 @@ def link_name(rd_config):
elif rd_config['builder'] in ['epydoc', 'sphinx']: elif rd_config['builder'] in ['epydoc', 'sphinx']:
return 'Python API' return 'Python API'
else: else:
return builder return rd_config['builder']
return n return n
def generate_links(ctx, package, base_dir, rd_configs): def generate_links(ctx, package, base_dir, rd_configs):
# need to generate links for builders that specify an output_dir # rosmake is the one builder that doesn't have an output_dir
links = [_href(c['output_dir'], link_name(c)) for c in rd_configs if 'output_dir' in c and c['output_dir'] != '.'] # specification, nor output for that matter, so filter it out from
# landing page processing
configs = [c for c in rd_configs if c['builder'] != 'rosmake']
output_dirs = [c.get('output_dir', None) for c in configs]
# filter out empties
output_dirs = [d for d in output_dirs if d and d != '.']
# length check. if these are unequal, cannot generate landing
# page. this is often true if the config is merely generating
# local. Ignore 'rosmake' builder as it doesn't have output spec
if len(output_dirs) != len(configsj):
return None
links = [_href(d, link_name(c)) for c, d in zip(configs, output_dirs)]
msgs = roslib.msgs.list_msg_types(package, False) msgs = roslib.msgs.list_msg_types(package, False)
srvs = roslib.srvs.list_srv_types(package, False) srvs = roslib.srvs.list_srv_types(package, False)
@ -96,7 +110,7 @@ def generate_landing_page(ctx):
# to the base directory and no landing page is required # to the base directory and no landing page is required
# (or it means that the config is corrupt) # (or it means that the config is corrupt)
if not links: if not links:
print "ignoring landing page for", package #print "ignoring landing page for", package
continue continue
html_dir = html_path(package, ctx.docdir) html_dir = html_path(package, ctx.docdir)