Update Waf once more.
git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@3104 ea778897-0a13-0410-b9d1-a72fbfd435f5
This commit is contained in:
parent
168d682c21
commit
585979d516
@ -1,3 +1,9 @@
|
|||||||
|
2008-10-16 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
|
||||||
|
|
||||||
|
* wscript, waf:
|
||||||
|
Update Waf once more.
|
||||||
|
|
||||||
|
|
||||||
2008-10-16 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
|
2008-10-16 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
|
||||||
|
|
||||||
* src/editor.c:
|
* src/editor.c:
|
||||||
|
27
wscript
27
wscript
@ -34,7 +34,7 @@ Missing features: --enable-binreloc, make targets: dist, pdf (in doc/)
|
|||||||
Known issues: Dependency handling is buggy, e.g. if src/document.h is
|
Known issues: Dependency handling is buggy, e.g. if src/document.h is
|
||||||
changed, depending source files are not rebuilt (maybe Waf bug).
|
changed, depending source files are not rebuilt (maybe Waf bug).
|
||||||
|
|
||||||
Requires WAF 1.5 (SVN r4661 or later) and Python 2.4 (or later).
|
Requires WAF 1.5 (SVN r4695 or later) and Python 2.4 (or later).
|
||||||
"""
|
"""
|
||||||
|
|
||||||
|
|
||||||
@ -203,13 +203,13 @@ def configure(conf):
|
|||||||
conf.write_config_header('config.h')
|
conf.write_config_header('config.h')
|
||||||
|
|
||||||
Utils.pprint('BLUE', 'Summary:')
|
Utils.pprint('BLUE', 'Summary:')
|
||||||
print_message('Install Geany ' + VERSION + ' in', conf.env['PREFIX'])
|
print_message(conf, 'Install Geany ' + VERSION + ' in', conf.env['PREFIX'])
|
||||||
print_message('Using GTK version', gtk_version)
|
print_message(conf, 'Using GTK version', gtk_version)
|
||||||
print_message('Build with GTK printing support', have_gtk_210 and 'yes' or 'no')
|
print_message(conf, 'Build with GTK printing support', have_gtk_210 and 'yes' or 'no')
|
||||||
print_message('Build with plugin support', Options.options.no_plugins and 'no' or 'yes')
|
print_message(conf, 'Build with plugin support', Options.options.no_plugins and 'no' or 'yes')
|
||||||
print_message('Use virtual terminal support', Options.options.no_vte and 'no' or 'yes')
|
print_message(conf, 'Use virtual terminal support', Options.options.no_vte and 'no' or 'yes')
|
||||||
if svn_rev != '-1':
|
if svn_rev != '-1':
|
||||||
print_message('Compiling Subversion revision', svn_rev)
|
print_message(conf, 'Compiling Subversion revision', svn_rev)
|
||||||
conf.env.append_value('CCFLAGS', '-g -DGEANY_DEBUG')
|
conf.env.append_value('CCFLAGS', '-g -DGEANY_DEBUG')
|
||||||
|
|
||||||
conf.env.append_value('CCFLAGS', '-DHAVE_CONFIG_H')
|
conf.env.append_value('CCFLAGS', '-DHAVE_CONFIG_H')
|
||||||
@ -462,15 +462,8 @@ def launch(command, status, success_color='GREEN'):
|
|||||||
|
|
||||||
return ret
|
return ret
|
||||||
|
|
||||||
line_len = 0
|
|
||||||
|
|
||||||
def print_message(msg, result, color = 'GREEN'):
|
def print_message(conf, msg, result, color = 'GREEN'):
|
||||||
global line_len
|
conf.check_message_1(msg)
|
||||||
if line_len == 0:
|
conf.check_message_2(result, color)
|
||||||
line_len = Configure.ConfigurationContext().line_just
|
|
||||||
|
|
||||||
line_len = max(line_len, len(msg))
|
|
||||||
print "%s :" % msg.ljust(line_len),
|
|
||||||
Utils.pprint(color, result)
|
|
||||||
Runner.print_log(msg, '\n\n')
|
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user