IntenseWebs/sphinx
3
0
Fork 0
mirror of https://github.com/sphinx-doc/sphinx.git synced 2025-02-25 18:55:22 -06:00
Code Issues Packages Projects Releases Wiki Activity

merge with 0.5

Browse Source
This commit is contained in:
Georg Brandl 2009-02-17 18:34:22 +01:00
commit 55fde211f7
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGES
View File

@ -135,6 +135,10 @@ New features added
Release 0.5.2 (in development) Release 0.5.2 (in development)
============================== ==============================
* #82: Determine the correct path for dependencies noted by
docutils. This fixes behavior where a source with dependent
files was always reported as changed.
* Recognize toctree directives that are not on section toplevel, * Recognize toctree directives that are not on section toplevel,
but within block items, such as tables. but within block items, such as tables.

8
sphinx/environment.py
View File

@ -629,13 +629,17 @@ class BuildEnvironment:
""" """
Process docutils-generated dependency info. Process docutils-generated dependency info.
""" """
cwd = os.getcwd()
deps = doctree.settings.record_dependencies deps = doctree.settings.record_dependencies
if not deps: if not deps:
return return
docdir = path.dirname(self.doc2path(docname, base=None)) docdir = path.dirname(self.doc2path(docname, base=None))
for dep in deps.list: for dep in deps.list:
dep = path.join(docdir, dep) # the dependency path is relative to the working dir, so get
self.dependencies.setdefault(docname, set()).add(dep) # one relative to the srcdir
fullpath = path.normpath(path.join(cwd, dep))
relpath = fullpath[len(path.normpath(self.srcdir))+len(path.sep):]
self.dependencies.setdefault(docname, set()).add(relpath)
def process_downloads(self, docname, doctree): def process_downloads(self, docname, doctree):
""" """