Branch: refs/heads/master Author: Jiří Techet techet@gmail.com Committer: Jiří Techet techet@gmail.com Date: Mon, 13 Apr 2015 21:00:43 UTC Commit: f6fbda768e67ec7ac943dc5381eaf8b4aef7129c https://github.com/geany/geany/commit/f6fbda768e67ec7ac943dc5381eaf8b4aef712...

Log Message: ----------- waf: explicitly set the location of signallist.i and geany.html in the build tree

On OS X signallist.i is always rebuilt because waf looks for it in the build tree but generates it inside the source tree for some reason so it's always missing in the build tree. Set the target explicitly to the build tree to fix the problem.

Similarly, set the target for geany.html to the build tree. Thanks to this waf also creates the 'doc' directory in the build tree which is otherwise missing and the cwd command fails for this reason (e.g. when the _build_ directory is removed).

These two task generators are the only ones that don't use the 'features' parameter - the features in the other task generators should already handle the source/build tree problems for us (see the Waf Book section 6.3.3. Nodes, tasks, and task generators).

Modified Paths: -------------- wscript

Modified: wscript 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -477,7 +477,7 @@ def build(bld): # signallist.i bld( source = 'data/geany.glade', - target = 'src/signallist.i', + target = bld.path.get_bld().make_node('src/signallist.i'), name = 'signallist.i', rule = gen_signallist)

@@ -536,7 +536,7 @@ def build(bld): bld( source = ['doc/geany.txt'], deps = ['doc/geany.css'], - target = 'doc/geany.html', + target = bld.path.get_bld().make_node('doc/geany.html'), name = 'geany.html', cwd = os.path.join(bld.path.abspath(), 'doc'), rule = '%s -stg --stylesheet=geany.css geany.txt %s' % (rst2html, html_doc_filename))

-------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).