FWGS
/
waf
mirror of https://gitlab.com/ita1024/waf.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Rework 3e06a0b9a2

This commit is contained in:
Thomas Nagy 2018-07-29 13:18:40 +02:00
parent 3f4acd6ff3
commit 31a5fa3829
No known key found for this signature in database
GPG Key ID: 49B4C67C05277AAA
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
waflib/Scripting.py
View File

@ -34,7 +34,7 @@ def waf_entry_point(current_directory, version, wafdir):
# Store current directory before any chdir
Context.waf_dir = wafdir
Context.launch_dir = current_directory
Context.run_dir = Context.launch_dir = current_directory
start_dir = current_directory
no_climb = os.environ.get('NOCLIMB')
@ -122,7 +122,8 @@ def waf_entry_point(current_directory, version, wafdir):
if no_climb:
break
if not Context.run_dir:
wscript = os.path.normpath(os.path.join(Context.run_dir, Context.WSCRIPT_FILE))
if not os.path.exists(wscript):
if options.whelp:
Logs.warn('These are the generic options (no wscript/project found)')
ctx.parser.print_help()
@ -137,7 +138,7 @@ def waf_entry_point(current_directory, version, wafdir):
sys.exit(1)
try:
set_main_module(os.path.normpath(os.path.join(Context.run_dir, Context.WSCRIPT_FILE)))
set_main_module(wscript)
except Errors.WafError as e:
Logs.pprint('RED', e.verbose_msg)
Logs.error(str(e))