commit: 3ec4d246bcca3b0cb6dcfbaf404e55bd241976d7
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 5 17:38:44 2013 +0000
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Thu Feb 26 19:15:21 2015 +0000
URL:
http://sources.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=3ec4d246
update doc scripts for the new structure
---
Makefile | 4 ++--
doc/make_subarch_table_guidexml.py | 5 ++++-
doc/make_target_table.py | 13 +++++++------
3 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/Makefile b/Makefile
index 757113c..d2f17f7 100644
--- a/Makefile
+++ b/Makefile
@@ -24,10 +24,10 @@ $(MAN_PAGES): files/%: doc/%.txt doc/asciidoc.conf Makefile
catalyst
files/catalyst.1: doc/subarches.generated.txt
files/catalyst-spec.5: doc/subarches.generated.txt doc/targets.generated.txt
-doc/subarches.generated.txt: $(wildcard arch/*.py)
doc/make_subarch_table_guidexml.py
+doc/subarches.generated.txt: $(wildcard catalyst/arch/*.py)
doc/make_subarch_table_guidexml.py
./doc/make_subarch_table_guidexml.py
-doc/targets.generated.txt: doc/make_target_table.py $(wildcard
modules/*_target.py)
+doc/targets.generated.txt: doc/make_target_table.py $(wildcard
catalyst/targets/*.py)
"./$<" > "$@"
$(DOCS): files/%.html: doc/%.txt doc/asciidoc.conf Makefile
diff --git a/doc/make_subarch_table_guidexml.py
b/doc/make_subarch_table_guidexml.py
index 16c8776..54e0a4a 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 <sebast...@pipping.org>
+# Copyright (C) 2013 Brian dolbec <dol...@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 ad4d292..9e7ebe8 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 <wk...@drexel.edu>
# Copyright (C) 2012 Sebastian Pipping <sebast...@pipping.org>
+# Copyright (C) 2013 Brian dolbec <dol...@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]
