waf-1.8.18

zzl88 · Jan 6, 2016 · 7d85fcd · 7d85fcd
1 parent 62efd56
commit 7d85fcd
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 9 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,12 @@
+NEW IN WAF 1.8.18
+-----------------
+* Fixed a regression in exec_cfg() introduced in 1fbac66 #1670
+* Added a new option --clear-failed to unit test builds #1678
+* Added support for scriptlet expressions of the form ${FOO:SRC[0].abspath()}
+* Added define comments to configuration headers: conf.define(.., commment='')
+* Added experimental Wix and Satellizer tools #1666
+* Added backslash replacement to resx processing
+
 NEW IN WAF 1.8.17
 -----------------
 * Added customizations that enable building whole projects from the build folder instead of the variant folder

diff --git a/README b/README
@@ -39,5 +39,5 @@ $ cd demos/c/
 $ ./waf configure build
 
 ---------------------------
-Thomas Nagy, 2014-2015 (ita)
+Thomas Nagy, 2014-2016 (ita)
 
diff --git a/waf-light b/waf-light
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 # encoding: ISO8859-1
-# Thomas Nagy, 2005-2015
+# Thomas Nagy, 2005-2016
 
 """
 Redistribution and use in source and binary forms, with or without
@@ -32,7 +32,7 @@ POSSIBILITY OF SUCH DAMAGE.
 
 import os, sys, inspect
 
-VERSION="1.8.17"
+VERSION="1.8.18"
 REVISION="x"
 GIT="x"
 INSTALL="x"

diff --git a/waflib/Context.py b/waflib/Context.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 # encoding: utf-8
-# Thomas Nagy, 2010 (ita)
+# Thomas Nagy, 2010-2016 (ita)
 
 """
 Classes and functions required for waf commands
@@ -11,13 +11,13 @@
 import waflib.Node
 
 # the following 3 constants are updated on each new release (do not touch)
-HEXVERSION=0x1081100
+HEXVERSION=0x1081200
 """Constant updated on new releases"""
 
-WAFVERSION="1.8.17"
+WAFVERSION="1.8.18"
 """Constant updated on new releases"""
 
-WAFREVISION="cd7579a727d1b390bf9cbf111c1b20e811370bc0"
+WAFREVISION="62efd566280f494cdf4d7940aac85f2b59ef660b"
 """Git revision when the waf version is updated"""
 
 ABI = 98

diff --git a/wscript b/wscript
@@ -1,6 +1,6 @@
 #! /usr/bin/env python
 # encoding: utf-8
-# Thomas Nagy, 2005-2015
+# Thomas Nagy, 2005-2016
 
 """
 to make a custom waf file use the option --tools
@@ -10,7 +10,7 @@ To add a tool that does not exist in the folder compat15, pass an absolute path:
 """
 
 
-VERSION="1.8.17"
+VERSION="1.8.18"
 APPNAME='waf'
 REVISION=''