summaryrefslogtreecommitdiffstats
path: root/src/engine/SCons/Tool/docbook
diff options
context:
space:
mode:
authorStefan Zimmermann <zimmermann.code@gmail.com>2014-03-31 16:24:42 (GMT)
committerStefan Zimmermann <zimmermann.code@gmail.com>2014-03-31 16:24:42 (GMT)
commitcffcd3c38568d3f82ff83916bbbd1b129373558c (patch)
treeff268c97886e3cc905115185a35405b3fd83348a /src/engine/SCons/Tool/docbook
parentea1890249923aab9cda388b2d22b566dbb7b8949 (diff)
parentd4f8c6e320484c106446918c37affdddacd5c7a3 (diff)
downloadSCons-cffcd3c38568d3f82ff83916bbbd1b129373558c.zip
SCons-cffcd3c38568d3f82ff83916bbbd1b129373558c.tar.gz
SCons-cffcd3c38568d3f82ff83916bbbd1b129373558c.tar.bz2
Merged with [default]
Diffstat (limited to 'src/engine/SCons/Tool/docbook')
-rw-r--r--src/engine/SCons/Tool/docbook/__init__.py5
-rw-r--r--src/engine/SCons/Tool/docbook/__init__.xml2
2 files changed, 6 insertions, 1 deletions
diff --git a/src/engine/SCons/Tool/docbook/__init__.py b/src/engine/SCons/Tool/docbook/__init__.py
index 72ea175..aacc26d 100644
--- a/src/engine/SCons/Tool/docbook/__init__.py
+++ b/src/engine/SCons/Tool/docbook/__init__.py
@@ -429,6 +429,11 @@ def DocbookEpub(env, target, source=None, *args, **kw):
mime_file.close()
zf.write(mime_file.name, compress_type = zipfile.ZIP_STORED)
for s in source:
+ if os.path.isfile(str(s)):
+ head, tail = os.path.split(str(s))
+ if not head:
+ continue
+ s = head
for dirpath, dirnames, filenames in os.walk(str(s)):
for fname in filenames:
path = os.path.join(dirpath, fname)
diff --git a/src/engine/SCons/Tool/docbook/__init__.xml b/src/engine/SCons/Tool/docbook/__init__.xml
index 0748738..6559d16 100644
--- a/src/engine/SCons/Tool/docbook/__init__.xml
+++ b/src/engine/SCons/Tool/docbook/__init__.xml
@@ -21,7 +21,7 @@ See its __doc__ string for a discussion of the format.
<sconsdoc xmlns="http://www.scons.org/dbxsd/v1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0/scons.xsd scons.xsd">
+ xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">
<tool name="docbook">
<summary>