FWGS/waf
2
0
Fork 0
mirror of https://gitlab.com/ita1024/waf.git synced 2024-11-22 01:46:15 +01:00
Code Issues Projects Releases Wiki Activity

Remove top/out/progress_bar options if necessary

Browse Source
This commit is contained in:
Waf Project 2024-11-09 18:48:12 +08:00
parent 22738deb0e
commit 8576f9745e
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
waflib/Build.py
View File

@ -109,7 +109,7 @@ class BuildContext(Context.Context):
self.keep = Options.options.keep self.keep = Options.options.keep
"""Whether the build should continue past errors""" """Whether the build should continue past errors"""
self.progress_bar = Options.options.progress_bar self.progress_bar = getattr(Options.options, 'progress_bar', 0)
""" """
Level of progress status: Level of progress status:

4
waflib/Configure.py
View File

@ -95,7 +95,7 @@ class ConfigurationContext(Context.Context):
top = self.top_dir top = self.top_dir
if not top: if not top:
top = Options.options.top top = getattr(Options.options, 'top', None)
if not top: if not top:
top = getattr(Context.g_module, Context.TOP, None) top = getattr(Context.g_module, Context.TOP, None)
if not top: if not top:
@ -107,7 +107,7 @@ class ConfigurationContext(Context.Context):
out = self.out_dir out = self.out_dir
if not out: if not out:
out = Options.options.out out = getattr(Options.options, 'out', None)
if not out: if not out:
out = getattr(Context.g_module, Context.OUT, None) out = getattr(Context.g_module, Context.OUT, None)
if not out: if not out:

4
waflib/Scripting.py
View File

@ -56,10 +56,10 @@ def waf_entry_point(current_directory, version, wafdir):
if options.version: if options.version:
print('%s %s (%s)'%(Context.WAFNAME, Context.WAFVERSION, Context.WAFREVISION)) print('%s %s (%s)'%(Context.WAFNAME, Context.WAFVERSION, Context.WAFREVISION))
sys.exit(0) sys.exit(0)
if options.top: if getattr(options, 'top', None):
start_dir = Context.run_dir = Context.top_dir = options.top start_dir = Context.run_dir = Context.top_dir = options.top
no_climb = True no_climb = True
if options.out: if getattr(options, 'out', None):
Context.out_dir = options.out Context.out_dir = options.out
# if 'configure' is in the commands, do not search any further # if 'configure' is in the commands, do not search any further