From 646b1d998ae7f2bc430dd02cef7fb92eb26925d6 Mon Sep 17 00:00:00 2001 From: Thomas Nagy Date: Sun, 23 Sep 2012 09:48:20 +0200 Subject: [PATCH] docs --- docs/book/configuration.txt | 4 ++-- docs/book/cprog.txt | 2 +- docs/book/download.txt | 26 +++++++++++++------------- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/docs/book/configuration.txt b/docs/book/configuration.txt index 02366a17..53672640 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.0') + ctx.check_waf_version(mini='1.7.3') 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.0 (abi 98, python 20605f0 on linux2) +# waf 1.7.3 (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 bb4f55d4..a5b00872 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.0 (abi 98, python 20605f0 on linux2) +# waf 1.7.3 (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 3c29ca47..0e582b48 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.0 -$ mv waf-1.7.0 waf +$ wget http://waf.googlecode.com/files/waf-1.7.3 +$ mv waf-1.7.3 waf $ python waf --version -waf 1.7.0 (54dc13ba5f51bfe2ae277451ec5ac1d0a91c7aaf) +waf 1.7.3 (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.0-2c924e3f453eb715218b9cc852291170 +.waf-1.7.3-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.0.tar.bz2 -$ tar xjvf waf-1.7.0.tar.bz2 -$ cd waf-1.7.0 +$ wget http://waf.googlecode.com/files/waf-1.7.3.tar.bz2 +$ tar xjvf waf-1.7.3.tar.bz2 +$ cd waf-1.7.3 $ 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.0/build' +Waf: Entering directory `/waf-1.7.3/build' [1/1] create_waf: -> waf -Waf: Leaving directory `/waf-1.7.0/build' +Waf: Leaving directory `/waf-1.7.3/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.0 +This is Waf 1.7.3 [...] --------------- @@ -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.0 (54dc13ba5f51bfe2ae277451ec5ac1d0a91c7aaf) +waf 1.7.3 (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.0 (54dc13ba5f51bfe2ae277451ec5ac1d0a91c7aaf) +waf 1.7.3 (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.0 (54dc13ba5f51bfe2ae277451ec5ac1d0a91c7aaf) +waf 1.7.3 (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.