diff options
| author | Robin Gareus <robin@gareus.org> | 2020-01-20 23:08:55 +0100 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2020-01-25 04:07:41 +0100 |
| commit | 19603d075f7013453c79711a646301df694c7b03 (patch) | |
| tree | 11372f869f868b521b465610ecc5c91d216a1f55 /doc | |
| parent | 2e9ac80e998bc79d5ef9029415008198b22168dc (diff) | |
Update waf to v2.0.19
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/updating_waf.txt | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/doc/updating_waf.txt b/doc/updating_waf.txt index 69c1225d63..0c192d4489 100644 --- a/doc/updating_waf.txt +++ b/doc/updating_waf.txt @@ -1,15 +1,20 @@ -Download waf (https://waf.io/) - -autowaf.py is present in the tools directory of the Ardour source code. -a patch for C++11/clang can be found in tools/waflib.patch (needed for waf 1.8.19) - -Current waf is build as follows; +# Download waf (https://waf.io/) +# +# autowaf.py and misc.py are present in the tools directory of the Ardour source code. +# - waf-str.patch is needed for py2/py3 compatible install_dir: +# * in py2 paths are byte-arrays and would need to be converted using .encode("utf-8") +# (otherwise waf expands them /t/o/p/a/t/h/s/l/i/k/e/t/h/i/s) +# * however py3 cannot handled encoded arrays: +# (TypeError: cannot use a string pattern on a bytes-like object) +# +# Current waf is build as follows: ARDOURSRC=`pwd` cd /tmp -curl https://waf.io/waf-1.6.11.tar.bz2 | tar xj -cd waf-1.6.11 +curl https://waf.io/waf-2.0.19.tar.bz2 | tar xj +cd waf-2.0.19 + +patch -p1 < $ARDOURSRC/tools/waf-str.patch -patch -p1 < $ARDOURSRC/tools/waflib.patch -./waf-light -v --make-waf --tools=misc,doxygen,$ARDOURSRC/tools/autowaf.py --prelude='' +./waf-light -v --make-waf --tools=misc,doxygen,$ARDOURSRC/tools/autowaf.py,$ARDOURSRC/tools/misc.py --prelude='' cp ./waf $ARDOURSRC/waf |