From c3cbd4c35350b4bae24fc3bb15998f16217ac922 Mon Sep 17 00:00:00 2001 From: Thomas Nagy Date: Fri, 22 Mar 2013 15:47:41 +0100 Subject: [PATCH] New version 1.7.10 --- ChangeLog | 2 ++ docs/book/configuration.txt | 4 ++-- docs/book/cprog.txt | 2 +- docs/book/download.txt | 26 +++++++++++++------------- waf-light | 2 +- waflib/Context.py | 6 +++--- wscript | 2 +- 7 files changed, 23 insertions(+), 21 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8e03e33b..b9e54393 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,8 @@ NEW IN WAF 1.7.10 * Python config tests enhancements #1231 #1261 * Enable the distribution of non-python data files #1265 * Improved the boost configuration output #1266 +* Exclude intltoolcache from waf dist # 1267 +* Use Utils.readf/Utils.writef to prevent build cache loss on windows platforms NEW IN WAF 1.7.9 ---------------- diff --git a/docs/book/configuration.txt b/docs/book/configuration.txt index f35237f4..75cbfe57 100644 --- a/docs/book/configuration.txt +++ b/docs/book/configuration.txt @@ -178,7 +178,7 @@ out = 'build' def configure(ctx): ctx.find_program('touch', var='TOUCH') - ctx.check_waf_version(mini='1.7.9') + ctx.check_waf_version(mini='1.7.10') ctx.find_file('fstab', ['/opt', '/etc']) --------------- @@ -394,7 +394,7 @@ Checking for program some_app : not found $ cat build/config.log <2> # project configured on Tue Jul 13 19:15:04 2010 by -# waf 1.7.9 (abi 98, python 20605f0 on linux2) +# waf 1.7.10 (abi 98, python 20605f0 on linux2) # using /home/waf/bin/waf configure # Checking for program some_app diff --git a/docs/book/cprog.txt b/docs/book/cprog.txt index 8faa08b0..ebd9889b 100644 --- a/docs/book/cprog.txt +++ b/docs/book/cprog.txt @@ -683,7 +683,7 @@ The outputs are written in the build directory into the file 'config.log': [source,shishell] ------------------ # project configured on Tue Aug 31 17:30:21 2010 by -# waf 1.7.9 (abi 98, python 20605f0 on linux2) +# waf 1.7.10 (abi 98, python 20605f0 on linux2) # using /home/waf/bin/waf configure # --- diff --git a/docs/book/download.txt b/docs/book/download.txt index 83dc93b8..7cc895d9 100644 --- a/docs/book/download.txt +++ b/docs/book/download.txt @@ -11,10 +11,10 @@ The Waf binary is a python script which does not require any installation whatso [source,shishell] --------------- -$ wget http://waf.googlecode.com/files/waf-1.7.9 -$ mv waf-1.7.9 waf +$ wget http://waf.googlecode.com/files/waf-1.7.10 +$ mv waf-1.7.10 waf $ python waf --version -waf 1.7.9 (54dc13ba5f51bfe2ae277451ec5ac1d0a91c7aaf) +waf 1.7.10 (54dc13ba5f51bfe2ae277451ec5ac1d0a91c7aaf) --------------- The +waf+ file has its own library compressed in a binary stream in the same file. Upon execution, the library is uncompressed in a hidden folder in the current directory. The folder will be re-created if removed. This scheme enables different Waf versions to be executed from the same folders: @@ -22,7 +22,7 @@ The +waf+ file has its own library compressed in a binary stream in the same fil [source,shishell] --------------- $ ls -ld .waf* -.waf-1.7.9-2c924e3f453eb715218b9cc852291170 +.waf-1.7.10-2c924e3f453eb715218b9cc852291170 --------------- NOTE: The binary file requires http://docs.python.org/library/bz2.html[bzip2] compression support, which may be unavailable in some self-compiled cPython installations. @@ -33,18 +33,18 @@ Building Waf requires a Python interpreter having a version number in the range [source,shishell] --------------- -$ wget http://waf.googlecode.com/files/waf-1.7.9.tar.bz2 -$ tar xjvf waf-1.7.9.tar.bz2 -$ cd waf-1.7.9 +$ wget http://waf.googlecode.com/files/waf-1.7.10.tar.bz2 +$ tar xjvf waf-1.7.10.tar.bz2 +$ cd waf-1.7.10 $ python waf-light Configuring the project 'build' finished successfully (0.001s) Checking for program python : /usr/bin/python Checking for python version : (2, 6, 5, 'final', 0) 'configure' finished successfully (0.176s) -Waf: Entering directory `/waf-1.7.9/build' +Waf: Entering directory `/waf-1.7.10/build' [1/1] create_waf: -> waf -Waf: Leaving directory `/waf-1.7.9/build' +Waf: Leaving directory `/waf-1.7.10/build' 'build' finished successfully (2.050s) --------------- @@ -86,7 +86,7 @@ The following will create a custom waf file which will import and execute 'foo' $ python waf-light --make-waf --tools=compat15,$PWD/aba.py --prelude=$'\tfrom waflib.extras import aba\n\taba.foo()' $ ./waf --help -This is Waf 1.7.9 +This is Waf 1.7.10 [...] --------------- @@ -112,7 +112,7 @@ On unix-like systems, it is usually much more convenient to set the executable p --------------- $ chmod 755 waf $ ./waf --version -waf 1.7.9 (54dc13ba5f51bfe2ae277451ec5ac1d0a91c7aaf) +waf 1.7.10 (54dc13ba5f51bfe2ae277451ec5ac1d0a91c7aaf) --------------- If the command-line interpreter supports aliases, it is recommended to set the alias once: @@ -121,7 +121,7 @@ If the command-line interpreter supports aliases, it is recommended to set the a --------------- $ alias waf=$PWD/waf $ waf --version -waf 1.7.9 (54dc13ba5f51bfe2ae277451ec5ac1d0a91c7aaf) +waf 1.7.10 (54dc13ba5f51bfe2ae277451ec5ac1d0a91c7aaf) --------------- Or, the execution path may be modified to point at the location of the waf binary: @@ -130,7 +130,7 @@ Or, the execution path may be modified to point at the location of the waf binar --------------- $ export PATH=$PWD:$PATH $ waf --version -waf 1.7.9 (54dc13ba5f51bfe2ae277451ec5ac1d0a91c7aaf) +waf 1.7.10 (54dc13ba5f51bfe2ae277451ec5ac1d0a91c7aaf) --------------- In the next sections of the book, we assume that either an alias or the execution path have been set in a way that +waf+ may be called directly. diff --git a/waf-light b/waf-light index d97b8e0d..471e65b1 100755 --- a/waf-light +++ b/waf-light @@ -32,7 +32,7 @@ POSSIBILITY OF SUCH DAMAGE. import os, sys -VERSION="1.7.9" +VERSION="1.7.10" REVISION="x" INSTALL="x" C1='x' diff --git a/waflib/Context.py b/waflib/Context.py index cc49e004..f6e98f30 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=0x1070900 +HEXVERSION=0x1070a00 """Constant updated on new releases""" -WAFVERSION="1.7.9" +WAFVERSION="1.7.10" """Constant updated on new releases""" -WAFREVISION="9e92489dbc008e4abae9c147b1d63b48296797c2" +WAFREVISION="661a034d911e4379c9dfac604d7dfb086a8c4212" """Constant updated on new releases""" ABI = 98 diff --git a/wscript b/wscript index 24053999..12586192 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.9" +VERSION="1.7.10" APPNAME='waf' REVISION=''