[kernel-team] 39/86: Split modules.
debian-kernel at lists.debian.org
debian-kernel at lists.debian.org
Mon Dec 21 00:34:56 UTC 2015
This is an automated email from the git hooks/post-receive script.
benh pushed a commit to branch benh/kconfigeditor2
in repository kernel-team.
commit e5154103fe607a58051adac609e93b6e0fb570e8
Author: Bastian Blank <waldi at debian.org>
Date: Mon Mar 16 20:39:55 2009 +0000
Split modules.
svn path=/people/waldi/utils/kconfigeditor2/; revision=13133
---
utils/kconfigeditor2/bin/process.py | 2 +-
.../kconfig/{package/files.py => config.py} | 107 +-------------------
.../lib/kconfigeditor/kconfig/menu/file.py | 2 +-
.../lib/kconfigeditor/kconfig/package/__init__.py | 0
utils/kconfigeditor2/lib/kconfigeditor/package.py | 109 +++++++++++++++++++++
5 files changed, 115 insertions(+), 105 deletions(-)
diff --git a/utils/kconfigeditor2/bin/process.py b/utils/kconfigeditor2/bin/process.py
index 73504ac..3ef9341 100755
--- a/utils/kconfigeditor2/bin/process.py
+++ b/utils/kconfigeditor2/bin/process.py
@@ -4,7 +4,7 @@ import optparse, os, sys
def main(package, source, config_output, ignore_silent):
from kconfigeditor.kconfig.menu.all import All
- from kconfigeditor.kconfig.package.files import Files
+ from kconfigeditor.package import Files
package = Files(package)
arches = {}
diff --git a/utils/kconfigeditor2/lib/kconfigeditor/kconfig/package/files.py b/utils/kconfigeditor2/lib/kconfigeditor/kconfig/config.py
similarity index 61%
rename from utils/kconfigeditor2/lib/kconfigeditor/kconfig/package/files.py
rename to utils/kconfigeditor2/lib/kconfigeditor/kconfig/config.py
index 6c04b1c..063f3a9 100644
--- a/utils/kconfigeditor2/lib/kconfigeditor/kconfig/package/files.py
+++ b/utils/kconfigeditor2/lib/kconfigeditor/kconfig/config.py
@@ -1,108 +1,9 @@
-import os
-
-from debian_linux.config import ConfigCoreHierarchy
-
-from kconfigeditor.kconfig.menu.file import FileChoice, FileConfig
+from __future__ import absolute_import
-class Files(dict):
- def __init__(self, root):
- self.kernelarch = {}
- self.files = {}
- self.filenames = {}
- self.root = os.path.join(root, "debian/config")
- self.config = ConfigCoreHierarchy([self.root])
-
- self._read_base()
-
- for key, files in self.filenames.iteritems():
- r = self.setdefault(key, FileList())
- for f in files:
- if f in self.files:
- f = self.files[f]
- else:
- f = self.files.setdefault(f, File(file(os.path.join(self.root, f)), f))
- r.append_file(f)
-
- def _read_arch(self, arch):
- config_entry = self.config.merge('base', arch)
- self.kernelarch[arch,] = config_entry.get('kernel-arch', arch)
-
- kconfig = self.check_config("%s/config" % arch, True, arch)
- self.filenames[arch,] = kconfig
-
- for featureset in self.config['base', arch]['featuresets']:
- self._read_featureset(arch, featureset)
-
- def _read_base(self):
- self.kernelarch[()] = None
- self.filenames[()] = self.check_config('config', True)
-
- for arch in self.config['base',]['arches']:
- self._read_arch(arch)
-
- def _read_featureset(self, arch, featureset):
- # TODO
- if featureset != 'none':
- return
-
- config_entry = self.config.merge('base', arch, featureset)
- self.kernelarch[arch, featureset] = config_entry.get('kernel-arch', arch)
-
- kconfig = []
- kconfig.extend(self.check_config("featureset-%s/config" % featureset, False, None, featureset))
- kconfig.extend(self.check_config("%s/%s/config" % (arch, featureset), False, arch, featureset))
- self.filenames[arch, featureset] = kconfig
-
- for flavour in self.config['base', arch, featureset]['flavours']:
- self._read_flavour(arch, featureset, flavour)
-
- def _read_flavour(self, arch, featureset, flavour):
- config_entry = self.config.merge('base', arch, featureset, flavour)
- self.kernelarch[arch, featureset, flavour] = config_entry.get('kernel-arch', arch)
-
- kconfig = []
- kconfig.extend(self.check_config("%s/config.%s" % (arch, flavour), False, arch, None, flavour))
- kconfig.extend(self.check_config("%s/%s/config.%s" % (arch, featureset, flavour), False, arch, featureset, flavour))
- self.filenames[arch, featureset, flavour] = kconfig
-
- def _get_config(self, *entry_name):
- entry_real = ('image',) + entry_name
- entry = self.config.get(entry_real, None)
- if entry is None:
- return None
- return entry.get('configs', None)
-
- def check_config_default(self, fail, f):
- f1 = self.root + '/' + f
- if os.path.exists(f1):
- return [f]
- if fail:
- raise RuntimeError("%s unavailable" % f)
- return []
-
- def check_config_files(self, files):
- ret = []
- for f in files:
- f1 = self.root + '/' + f
- if os.path.exists(f1):
- ret.append(f)
- break
- else:
- raise RuntimeError("%s unavailable" % f)
- return ret
-
- def check_config(self, default, fail, *entry_name):
- configs = self._get_config(*entry_name)
- if configs is None:
- return self.check_config_default(fail, default)
- return self.check_config_files(configs)
+import os
-class FileList(object):
- def __init__(self):
- self._files = []
+from .menu.file import FileChoice, FileConfig
- def append_file(self, item):
- self._files.append(item)
class File(dict):
def __init__(self, fd, filename):
@@ -121,7 +22,7 @@ class File(dict):
nr += 1
incomplete = len(f) != nr
if ret:
- if incomplete and 0:
+ if incomplete:
ret.insert(0, "## choice: INCOMPLETE: %s" % f.prompt)
else:
ret.insert(0, "## choice: %s" % f.prompt)
diff --git a/utils/kconfigeditor2/lib/kconfigeditor/kconfig/menu/file.py b/utils/kconfigeditor2/lib/kconfigeditor/kconfig/menu/file.py
index 0e7ebd5..af017ad 100644
--- a/utils/kconfigeditor2/lib/kconfigeditor/kconfig/menu/file.py
+++ b/utils/kconfigeditor2/lib/kconfigeditor/kconfig/menu/file.py
@@ -123,7 +123,7 @@ class _BlockContainer(object):
split_rules = r"""
^
(?P<ind>\s*)
- (---\s*)?(?P<word>[a-z_]+)(\s*---)?
+ (-{2,}\s*)?(?P<word>[a-z_]+)(\s*-{2,})?
(
\s*(?P<rest2>["'].+)
|
diff --git a/utils/kconfigeditor2/lib/kconfigeditor/kconfig/package/__init__.py b/utils/kconfigeditor2/lib/kconfigeditor/kconfig/package/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/utils/kconfigeditor2/lib/kconfigeditor/package.py b/utils/kconfigeditor2/lib/kconfigeditor/package.py
new file mode 100644
index 0000000..f92a994
--- /dev/null
+++ b/utils/kconfigeditor2/lib/kconfigeditor/package.py
@@ -0,0 +1,109 @@
+from __future__ import absolute_import
+
+import os
+
+from debian_linux.config import ConfigCoreHierarchy
+
+from .kconfig.menu.file import FileChoice, FileConfig
+from .kconfig.config import File
+
+class Files(dict):
+ def __init__(self, root):
+ self.kernelarch = {}
+ self.files = {}
+ self.filenames = {}
+ self.root = os.path.join(root, "debian/config")
+ self.config = ConfigCoreHierarchy([self.root])
+
+ self._read_base()
+
+ for key, files in self.filenames.iteritems():
+ r = self.setdefault(key, FileList())
+ for f in files:
+ if f in self.files:
+ f = self.files[f]
+ else:
+ f = self.files.setdefault(f, File(file(os.path.join(self.root, f)), f))
+ r.append_file(f)
+
+ def _read_arch(self, arch):
+ config_entry = self.config.merge('base', arch)
+ self.kernelarch[arch,] = config_entry.get('kernel-arch', arch)
+
+ kconfig = self.check_config("%s/config" % arch, True, arch)
+ self.filenames[arch,] = kconfig
+
+ for featureset in self.config['base', arch]['featuresets']:
+ self._read_featureset(arch, featureset)
+
+ def _read_base(self):
+ self.kernelarch[()] = None
+ self.filenames[()] = self.check_config('config', True)
+
+ for arch in self.config['base',]['arches']:
+ self._read_arch(arch)
+
+ def _read_featureset(self, arch, featureset):
+ # TODO
+ if featureset != 'none':
+ return
+
+ config_entry = self.config.merge('base', arch, featureset)
+ self.kernelarch[arch, featureset] = config_entry.get('kernel-arch', arch)
+
+ kconfig = []
+ kconfig.extend(self.check_config("featureset-%s/config" % featureset, False, None, featureset))
+ kconfig.extend(self.check_config("%s/%s/config" % (arch, featureset), False, arch, featureset))
+ self.filenames[arch, featureset] = kconfig
+
+ for flavour in self.config['base', arch, featureset]['flavours']:
+ self._read_flavour(arch, featureset, flavour)
+
+ def _read_flavour(self, arch, featureset, flavour):
+ config_entry = self.config.merge('base', arch, featureset, flavour)
+ self.kernelarch[arch, featureset, flavour] = config_entry.get('kernel-arch', arch)
+
+ kconfig = []
+ kconfig.extend(self.check_config("%s/config.%s" % (arch, flavour), False, arch, None, flavour))
+ kconfig.extend(self.check_config("%s/%s/config.%s" % (arch, featureset, flavour), False, arch, featureset, flavour))
+ self.filenames[arch, featureset, flavour] = kconfig
+
+ def _get_config(self, *entry_name):
+ entry_real = ('image',) + entry_name
+ entry = self.config.get(entry_real, None)
+ if entry is None:
+ return None
+ return entry.get('configs', None)
+
+ def check_config_default(self, fail, f):
+ f1 = self.root + '/' + f
+ if os.path.exists(f1):
+ return [f]
+ if fail:
+ raise RuntimeError("%s unavailable" % f)
+ return []
+
+ def check_config_files(self, files):
+ ret = []
+ for f in files:
+ f1 = self.root + '/' + f
+ if os.path.exists(f1):
+ ret.append(f)
+ break
+ else:
+ raise RuntimeError("%s unavailable" % f)
+ return ret
+
+ def check_config(self, default, fail, *entry_name):
+ configs = self._get_config(*entry_name)
+ if configs is None:
+ return self.check_config_default(fail, default)
+ return self.check_config_files(configs)
+
+class FileList(object):
+ def __init__(self):
+ self._files = []
+
+ def append_file(self, item):
+ self._files.append(item)
+
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/kernel-team.git
More information about the Kernel-svn-changes
mailing list