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

Exclude waf-2 folders in waf-2.0

Browse Source
This commit is contained in:
Thomas Nagy 2017-08-19 10:11:36 +02:00
parent 0e06d4730e
commit bfe1512a55
No known key found for this signature in database
GPG Key ID: 49B4C67C05277AAA
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docs/sphinx/tutorial.rst
View File

@ -30,14 +30,14 @@ Let's start with a new wscript file in the directory '/tmp/myproject'::
def build(bld):
print("build!")
We will also use a Waf binary file, for example waf-1.8.8, which we will copy in the project directory::
We will also use a Waf binary file, for example waf-2.0.0, which we will copy in the project directory::
$ cd /tmp/myproject
$ wget https://waf.io/waf-1.8.8
$ wget https://waf.io/waf-2.0.0
To execute the project, we will simply call the command as an argument to ``waf``::
$ ./waf-1.8.8 configure build
$ ./waf-2.0.0 configure build
configure!
build!

4
waflib/Scripting.py
View File

@ -336,7 +336,7 @@ def distclean(ctx):
# remove local waf cache folders
if not Options.commands:
for x in '.waf-1. waf-1. .waf3-1. waf3-1.'.split():
for x in '.waf-2 waf-2 .waf3-2 waf3-2'.split():
if f.startswith(x):
shutil.rmtree(fp, ignore_errors=True)
@ -492,7 +492,7 @@ class Dist(Context.Context):
try:
return self.excl
except AttributeError:
self.excl = Node.exclude_regs + ' **/waf-1.8.* **/.waf-1.8* **/waf3-1.8.* **/.waf3-1.8* **/*~ **/*.rej **/*.orig **/*.pyc **/*.pyo **/*.bak **/*.swp **/.lock-w*'
self.excl = Node.exclude_regs + ' **/waf-2.* **/.waf-2.* **/waf3-2.* **/.waf3-2.* **/*~ **/*.rej **/*.orig **/*.pyc **/*.pyo **/*.bak **/*.swp **/.lock-w*'
if Context.out_dir:
nd = self.root.find_node(Context.out_dir)
if nd:

8
waflib/extras/codelite.py
View File

@ -589,10 +589,10 @@ class vsnode_project_view(vsnode_alias):
vsnode_alias.__init__(self, ctx, node, name)
self.tg = self.ctx() # fake one, cannot remove
self.exclude_files = Node.exclude_regs + '''
waf-1.8.*
waf3-1.8.*/**
.waf-1.8.*
.waf3-1.8.*/**
waf-2*
waf3-2*/**
.waf-2*
.waf3-2*/**
**/*.sdf
**/*.suo
**/*.ncb

8
waflib/extras/msvs.py
View File

@ -638,10 +638,10 @@ class vsnode_project_view(vsnode_alias):
vsnode_alias.__init__(self, ctx, node, name)
self.tg = self.ctx() # fake one, cannot remove
self.exclude_files = Node.exclude_regs + '''
waf-1.8.*
waf3-1.8.*/**
.waf-1.8.*
.waf3-1.8.*/**
waf-2*
waf3-2*/**
.waf-2*
.waf3-2*/**
**/*.sdf
**/*.suo
**/*.ncb