[geany/geany] df03bc: waf: Don't relink scintilla and geany on every build

Jiří Techet git-noreply at xxxxx
Fri Jan 9 00:35:43 UTC 2015

Branch:      refs/heads/master
Author:      Jiří Techet <techet at gmail.com>
Committer:   Jiří Techet <techet at gmail.com>
Date:        Fri, 09 Jan 2015 00:35:43 UTC
Commit:      df03bcace008b8dcc77f595d2441790e77f4e707

Log Message:
waf: Don't relink scintilla and geany on every build

The ant_glob() function doesn't return a list of strings but rather
a list of waflib.Node.Nod3 objects. These print as paths so build
works but apparently confuse waf which thinks the files have
changed every time the waf command is performed.

Relinking scintilla and geany on every waf invocation is especially
problemmatic during "sudo waf install" where scintilla and geany
binaries get owned by the root user. This isn't a big problem on Linux
but on OS X this prevents subsequent waf calls to update the
binaries and the build fails.

To fix the issue, just convert the waflib.Node.Nod3 objects
to relative (string) paths.

Modified Paths:

Modified: wscript
2 lines changed, 1 insertions(+), 1 deletions(-)
@@ -416,7 +416,7 @@ def build(bld):
     # Scintilla
     files = bld.srcnode.ant_glob('scintilla/**/*.cxx', src=True, dir=False)
-    scintilla_sources.update(files)
+    scintilla_sources.update([file.path_from(bld.srcnode) for file in files])
         features        = ['c', 'cxx', 'cxxstlib'],
         name            = 'scintilla',

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

More information about the Commits mailing list