diff options
author | Brian Dolbec <dolsen@gentoo.org> | 2013-06-05 10:38:44 -0700 |
---|---|---|
committer | Brian Dolbec <dolsen@gentoo.org> | 2013-11-21 22:02:24 -0800 |
commit | 446aeeb00f0d4d8d62ea0801454283de9636a6c2 (patch) | |
tree | 63274937199633bf4b2956824a7f1ff4bbd189e3 /doc | |
parent | doc/catalyst-config.5.txt: Document linking issues with binary packages (diff) | |
download | catalyst-446aeeb00f0d4d8d62ea0801454283de9636a6c2.tar.gz catalyst-446aeeb00f0d4d8d62ea0801454283de9636a6c2.tar.bz2 catalyst-446aeeb00f0d4d8d62ea0801454283de9636a6c2.zip |
update doc scripts for the new structure
Diffstat (limited to 'doc')
-rwxr-xr-x | doc/make_subarch_table_guidexml.py | 5 | ||||
-rwxr-xr-x | doc/make_target_table.py | 13 |
2 files changed, 11 insertions, 7 deletions
diff --git a/doc/make_subarch_table_guidexml.py b/doc/make_subarch_table_guidexml.py index 16c87769..54e0a4a8 100755 --- a/doc/make_subarch_table_guidexml.py +++ b/doc/make_subarch_table_guidexml.py @@ -1,5 +1,6 @@ #! /usr/bin/env python2 # Copyright (C) 2011 Sebastian Pipping <sebastian@pipping.org> +# Copyright (C) 2013 Brian dolbec <dolsen@gentoo.org> # Licensed under GPL v2 or later @@ -102,10 +103,12 @@ if __name__ == '__main__': subarch_title_to_subarch_id = dict() subarch_id_to_pattern_arch_genericrch_id = dict() - for (dirpath, dirnames, filenames) in os.walk('arch'): + for (dirpath, dirnames, filenames) in os.walk('catalyst/arch'): for _fn in filenames: if not _fn.endswith('.py'): continue + if _fn == '__init__.py': + continue fn = os.path.join(dirpath, _fn) handle_file(fn, subarch_title_to_subarch_id, subarch_id_to_pattern_arch_genericrch_id) diff --git a/doc/make_target_table.py b/doc/make_target_table.py index ad4d2928..9e7ebe83 100755 --- a/doc/make_target_table.py +++ b/doc/make_target_table.py @@ -1,16 +1,17 @@ #!/usr/bin/env python2 # Copyright (C) 2012 W. Trevor King <wking@drexel.edu> # Copyright (C) 2012 Sebastian Pipping <sebastian@pipping.org> +# Copyright (C) 2013 Brian dolbec <dolsen@gentoo.org> # Licensed under GPL v2 or later # This script should be run from the root of the catalyst source. +# source the testpath file then run "doc/make_target_table.py" + from __future__ import print_function import sys as _sys -_sys.path.insert(0, 'modules') # so we can find the `catalyst` module - import glob import re @@ -20,15 +21,15 @@ def key_netboot_before_netboot2((target_name, module)): if __name__ == '__main__': - extractor = re.compile('^modules/(([^ ]+)_target).py$') + extractor = re.compile('^catalyst/targets/(([^ ]+)).py$') targets = list() - for filename in sorted(glob.glob('modules/*_target.py')): - if 'generic' in filename: + for filename in sorted(glob.glob('catalyst/targets/*.py')): + if '__init__' in filename: continue match = extractor.match(filename) target_name = match.group(2).replace('_', '-') - module_name = match.group(1) + module_name = 'catalyst.targets.' + match.group(1) __import__(module_name) module = _sys.modules[module_name] |