mirror of https://gitlab.com/ita1024/waf.git
Update use_config - Issue 1608
This commit is contained in:
parent
34c6ee8c0e
commit
41bd22ebfa
|
@ -61,7 +61,7 @@ checkWAF()
|
||||||
# neither waf nor miniwaf could be found
|
# neither waf nor miniwaf could be found
|
||||||
if [ ! -x "$WAF" ] ; then
|
if [ ! -x "$WAF" ] ; then
|
||||||
printf "$RED""not found""$NORMAL""\n"
|
printf "$RED""not found""$NORMAL""\n"
|
||||||
echo "Go to http://code.google.com/p/waf/"
|
echo "Go to https://waf.io/"
|
||||||
echo "and download a waf version"
|
echo "and download a waf version"
|
||||||
exit $EXIT_FAILURE
|
exit $EXIT_FAILURE
|
||||||
else
|
else
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
#Waf-launcher
|
#Waf-launcher
|
||||||
This is a simple wrapper for the
|
This is a simple wrapper for the
|
||||||
[waf build system](http://code.google.com/p/waf/)
|
[waf build system](https://waf.io/)
|
||||||
|
|
||||||
Since many windows users does not have python installed by default,
|
Since many windows users does not have python installed by default,
|
||||||
the exe file from this project can be included along with the copy of
|
the exe file from this project can be included along with the copy of
|
||||||
|
|
|
@ -55,7 +55,7 @@ waf_dir = ''
|
||||||
|
|
||||||
local_repo = ''
|
local_repo = ''
|
||||||
"""Local repository containing additional Waf tools (plugins)"""
|
"""Local repository containing additional Waf tools (plugins)"""
|
||||||
remote_repo = 'http://waf.googlecode.com/git/'
|
remote_repo = 'https://raw.githubusercontent.com/waf-project/waf/master/'
|
||||||
"""
|
"""
|
||||||
Remote directory containing downloadable waf tools. The missing tools can be downloaded by using::
|
Remote directory containing downloadable waf tools. The missing tools can be downloaded by using::
|
||||||
|
|
||||||
|
|
|
@ -130,9 +130,9 @@ def download_tool(tool, force=False, ctx=None):
|
||||||
|
|
||||||
raise Errors.WafError('Could not load the Waf tool')
|
raise Errors.WafError('Could not load the Waf tool')
|
||||||
|
|
||||||
def load_tool(tool, tooldir=None, ctx=None):
|
def load_tool(tool, tooldir=None, ctx=None, with_sys_path=True):
|
||||||
try:
|
try:
|
||||||
module = Context.load_tool_default(tool, tooldir)
|
module = Context.load_tool_default(tool, tooldir, ctx, with_sys_path)
|
||||||
except ImportError as e:
|
except ImportError as e:
|
||||||
if Options.options.download:
|
if Options.options.download:
|
||||||
module = download_tool(tool, ctx=ctx)
|
module = download_tool(tool, ctx=ctx)
|
||||||
|
|
Loading…
Reference in New Issue