From 2f43179c3916531a6b56dd0a79484cc1866adcf8 Mon Sep 17 00:00:00 2001
From: Thomas Nagy <tnagy2pow10@gmail.com>
Date: Mon, 28 Oct 2013 21:32:25 +0100
Subject: [PATCH] 1.7 -> 1.8

---
 waf-light                 |  2 +-
 waflib/Configure.py       |  4 ++--
 waflib/Context.py         |  6 +++---
 waflib/Scripting.py       |  2 +-
 waflib/extras/codelite.py | 10 +++++-----
 waflib/extras/msvs.py     |  8 ++++----
 wscript                   |  2 +-
 7 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/waf-light b/waf-light
index c269651c..bfc3a388 100755
--- a/waf-light
+++ b/waf-light
@@ -32,7 +32,7 @@ POSSIBILITY OF SUCH DAMAGE.
 
 import os, sys
 
-VERSION="1.7.11"
+VERSION="1.8.0"
 REVISION="x"
 INSTALL="x"
 C1='x'
diff --git a/waflib/Configure.py b/waflib/Configure.py
index 8f65bc40..f3e8ab5e 100644
--- a/waflib/Configure.py
+++ b/waflib/Configure.py
@@ -434,11 +434,11 @@ def cmd_to_list(self, cmd):
 	return cmd
 
 @conf
-def check_waf_version(self, mini='1.6.99', maxi='1.8.0'):
+def check_waf_version(self, mini='1.7.99', maxi='1.9.0'):
 	"""
 	Raise a Configuration error if the Waf version does not strictly match the given bounds::
 
-		conf.check_waf_version(mini='1.7.0', maxi='1.8.0')
+		conf.check_waf_version(mini='1.8.0', maxi='1.9.0')
 
 	:type  mini: number, tuple or string
 	:param mini: Minimum required version
diff --git a/waflib/Context.py b/waflib/Context.py
index 5bd6b01b..6e7d3522 100644
--- a/waflib/Context.py
+++ b/waflib/Context.py
@@ -11,13 +11,13 @@ from waflib import Utils, Errors, Logs
 import waflib.Node
 
 # the following 3 constants are updated on each new release (do not touch)
-HEXVERSION=0x1070b00
+HEXVERSION=0x1080000
 """Constant updated on new releases"""
 
-WAFVERSION="1.7.11"
+WAFVERSION="1.8.0"
 """Constant updated on new releases"""
 
-WAFREVISION="50f631bc5e00bdda966c68094229b99be9a21084"
+WAFREVISION="feaad909d5b46bfdb121cd5d217ba2031bc4ed10"
 """Constant updated on new releases"""
 
 ABI = 98
diff --git a/waflib/Scripting.py b/waflib/Scripting.py
index bbcdbea7..6082d19a 100644
--- a/waflib/Scripting.py
+++ b/waflib/Scripting.py
@@ -447,7 +447,7 @@ class Dist(Context.Context):
 		try:
 			return self.excl
 		except AttributeError:
-			self.excl = Node.exclude_regs + ' **/waf-1.7.* **/.waf-1.7* **/waf3-1.7.* **/.waf3-1.7* **/*~ **/*.rej **/*.orig **/*.pyc **/*.pyo **/*.bak **/*.swp **/.lock-w*'
+			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*'
 			nd = self.root.find_node(Context.out_dir)
 			if nd:
 				self.excl += ' ' + nd.path_from(self.base_path)
diff --git a/waflib/extras/codelite.py b/waflib/extras/codelite.py
index 14fa42c0..6f1a2376 100644
--- a/waflib/extras/codelite.py
+++ b/waflib/extras/codelite.py
@@ -588,10 +588,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.7.*
-waf3-1.7.*/**
-.waf-1.7.*
-.waf3-1.7.*/**
+waf-1.8.*
+waf3-1.8.*/**
+.waf-1.8.*
+.waf3-1.8.*/**
 **/*.sdf
 **/*.suo
 **/*.ncb
@@ -603,7 +603,7 @@ waf3-1.7.*/**
                 self.source = self.ctx.srcnode.ant_glob('**', excl=self.exclude_files)
 
         def get_build_command(self, props):
-                params = self.get_build_params(props) + (self.ctx.cmd,)               
+                params = self.get_build_params(props) + (self.ctx.cmd,)
                 return "%s %s %s" % params
 
         def get_clean_command(self, props):
diff --git a/waflib/extras/msvs.py b/waflib/extras/msvs.py
index 187bd021..967cdbfc 100644
--- a/waflib/extras/msvs.py
+++ b/waflib/extras/msvs.py
@@ -618,10 +618,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.7.*
-waf3-1.7.*/**
-.waf-1.7.*
-.waf3-1.7.*/**
+waf-1.8.*
+waf3-1.8.*/**
+.waf-1.8.*
+.waf3-1.8.*/**
 **/*.sdf
 **/*.suo
 **/*.ncb
diff --git a/wscript b/wscript
index ce4dd29d..d4397dec 100644
--- a/wscript
+++ b/wscript
@@ -10,7 +10,7 @@ To add a tool that does not exist in the folder compat15, pass an absolute path:
 """
 
 
-VERSION="1.7.11"
+VERSION="1.8.0"
 APPNAME='waf'
 REVISION=''