From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id C39F0138247 for ; Fri, 22 Nov 2013 07:13:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 67FB6E094F; Fri, 22 Nov 2013 07:13:42 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E36B1E0949 for ; Fri, 22 Nov 2013 07:13:31 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C738E33F334 for ; Fri, 22 Nov 2013 07:13:29 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 6A068D010F for ; Fri, 22 Nov 2013 07:13:27 +0000 (UTC) From: "Brian Dolbec" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Dolbec" Message-ID: <1385100144.446aeeb00f0d4d8d62ea0801454283de9636a6c2.dol-sen@gentoo> Subject: [gentoo-commits] proj/catalyst:rewrite-on-master commit in: /, doc/ X-VCS-Repository: proj/catalyst X-VCS-Files: Makefile doc/make_subarch_table_guidexml.py doc/make_target_table.py X-VCS-Directories: / doc/ X-VCS-Committer: dol-sen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: 446aeeb00f0d4d8d62ea0801454283de9636a6c2 X-VCS-Branch: rewrite-on-master Date: Fri, 22 Nov 2013 07:13:27 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 34cc4b1d-4429-47e3-80b2-e9e2c327db15 X-Archives-Hash: 92aefd4120b99f584ea8aa311da69f04 commit: 446aeeb00f0d4d8d62ea0801454283de9636a6c2 Author: Brian Dolbec gentoo org> AuthorDate: Wed Jun 5 17:38:44 2013 +0000 Commit: Brian Dolbec gmail com> CommitDate: Fri Nov 22 06:02:24 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=446aeeb0 update doc scripts for the new structure --- Makefile | 6 +++--- doc/make_subarch_table_guidexml.py | 5 ++++- doc/make_target_table.py | 13 +++++++------ 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index 98accbe..52e0297 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ # Copyright (C) 2011 Sebastian Pipping # Licensed under GPL v2 or later -PACKAGE_VERSION = `fgrep '__version__=' catalyst | sed 's|^__version__="\(.*\)"$$|\1|'` +#PACKAGE_VERSION = `fgrep '__version__=' catalyst | sed 's|^__version__="\(.*\)"$$|\1|'` MAN_PAGE_SOURCES = $(wildcard doc/*.?.txt) MAN_PAGES = $(patsubst doc/%.txt,files/%,$(MAN_PAGE_SOURCES)) MAN_PAGE_INCLUDES = doc/subarches.generated.txt doc/targets.generated.txt @@ -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 +# Copyright (C) 2013 Brian dolbec # 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 # Copyright (C) 2012 Sebastian Pipping +# Copyright (C) 2013 Brian dolbec # 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]