summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorDirk Baechle <dl9obn@darc.de>2013-05-03 23:15:51 (GMT)
committerDirk Baechle <dl9obn@darc.de>2013-05-03 23:15:51 (GMT)
commit0947775a51fa7bdb446b40c08f417fe6ce1ebbdc (patch)
treef783e3547d18fdfb589c81aceb3d4251ecd20e2b /bin
parent6885c3fd4f501aff9d5cde7b0bb3aedaf5b63e10 (diff)
downloadSCons-0947775a51fa7bdb446b40c08f417fe6ce1ebbdc.zip
SCons-0947775a51fa7bdb446b40c08f417fe6ce1ebbdc.tar.gz
SCons-0947775a51fa7bdb446b40c08f417fe6ce1ebbdc.tar.bz2
- relinked the build of all documentation outputs to the bootstrap process
- corrected the doc folder SConscripts and added XSL and titlepage files where required
Diffstat (limited to 'bin')
-rw-r--r--bin/scons-proc.py18
-rw-r--r--bin/scons_dev_master.py15
2 files changed, 17 insertions, 16 deletions
diff --git a/bin/scons-proc.py b/bin/scons-proc.py
index 5be1f00..9567db8 100644
--- a/bin/scons-proc.py
+++ b/bin/scons-proc.py
@@ -267,29 +267,35 @@ class Function(SConsThing):
prefix = 'f-'
tag = 'function'
- def xml_term(self):
+ def xml_terms(self):
if self.arguments is None:
a = stf.newNode("arguments")
stf.setText(a, '()')
arguments = [a]
else:
- arguments = self.arguments
- t = stf.newNode("term")
+ arguments = self.arguments
+ tlist = []
for arg in arguments:
signature = 'both'
if stf.hasAttribute(arg, 'signature'):
signature = stf.getAttribute(arg, 'signature')
s = stf.getText(arg).strip()
if signature in ('both', 'global'):
- syn = stf.newNode("synopsis")
+ t = stf.newNode("term")
+ syn = stf.newNode("literal")
stf.setText(syn, '%s%s' % (self.name, s))
stf.appendNode(t, syn)
+ tlist.append(t)
if signature in ('both', 'env'):
- syn = stf.newNode("synopsis")
+ t = stf.newNode("term")
+ syn = stf.newNode("literal")
stf.setText(syn, 'env.%s%s' % (self.name, s))
stf.appendNode(t, syn)
+ tlist.append(t)
- return t
+ if not tlist:
+ tlist.append(stf.newNode("term"))
+ return tlist
def entityfunc(self):
return self.name
diff --git a/bin/scons_dev_master.py b/bin/scons_dev_master.py
index 9372df4..3c41ac0 100644
--- a/bin/scons_dev_master.py
+++ b/bin/scons_dev_master.py
@@ -25,19 +25,14 @@ PYTHON_PACKAGES = [
]
BUILDING_PACKAGES = [
- 'docbook',
- 'docbook-dsssl',
- 'docbook-utils',
- 'docbook-xml',
- 'groff-base',
- 'jade',
- 'jadetex',
- 'man2html',
+ 'python-libxml2',
+ 'python-libxslt1',
+ 'fop',
+ 'python-dev',
'python-epydoc',
'rpm',
- 'sp',
'tar',
-
+
# additional packages that Bill Deegan's web page suggests
#'docbook-to-man',
#'docbook-xsl',