HybridDog/geany
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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.
This commit is contained in:
Jiří Techet 2015-01-09 01:35:43 +01:00
parent c131466a00
commit df03bcace0
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wscript
View File

@ -416,7 +416,7 @@ def build(bld):
# Scintilla # Scintilla
files = bld.srcnode.ant_glob('scintilla/**/*.cxx', src=True, dir=False) 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])
bld( bld(
features = ['c', 'cxx', 'cxxstlib'], features = ['c', 'cxx', 'cxxstlib'],
name = 'scintilla', name = 'scintilla',