diff --git a/docs/sphinx/tutorial.rst b/docs/sphinx/tutorial.rst index 754ac1ec..351941dc 100644 --- a/docs/sphinx/tutorial.rst +++ b/docs/sphinx/tutorial.rst @@ -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-1.9.14, which we will copy in the project directory:: $ cd /tmp/myproject - $ wget https://waf.io/waf-1.8.8 + $ wget https://waf.io/waf-1.9.14 To execute the project, we will simply call the command as an argument to ``waf``:: - $ ./waf-1.8.8 configure build + $ ./waf-1.9.14 configure build configure! build! diff --git a/waflib/Scripting.py b/waflib/Scripting.py index 610ccdea..3dfc5307 100644 --- a/waflib/Scripting.py +++ b/waflib/Scripting.py @@ -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-1.* **/.waf-1.* **/waf3-1.* **/.waf3-1.* **/*~ **/*.rej **/*.orig **/*.pyc **/*.pyo **/*.bak **/*.swp **/.lock-w*' if Context.out_dir: nd = self.root.find_node(Context.out_dir) if nd: diff --git a/waflib/extras/codelite.py b/waflib/extras/codelite.py index 5bb7cc43..14cfa28a 100644 --- a/waflib/extras/codelite.py +++ b/waflib/extras/codelite.py @@ -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-1.* +waf3-1.*/** +.waf-1.* +.waf3-1.*/** **/*.sdf **/*.suo **/*.ncb diff --git a/waflib/extras/msvs.py b/waflib/extras/msvs.py index a2b08646..ec728f33 100644 --- a/waflib/extras/msvs.py +++ b/waflib/extras/msvs.py @@ -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-1.* +waf3-1.*/** +.waf-1.* +.waf3-1.*/** **/*.sdf **/*.suo **/*.ncb