[SCM] Samba Shared Repository - branch master updated

Andrew Bartlett abartlet at samba.org
Wed Sep 5 07:30:02 UTC 2018


The branch, master has been updated
       via  8de348e third_party: Import exact files from waf-2.0.8/waflib
       via  8f022a0 script/autobuild: Fix formatting in send_email
       via  67ed1ea script/autobuild: re-use CACHE_SUFFIX from waflib
       via  72c3ff9 buildtools/wafsamba: use CACHE_SUFFIX instead of a hard-coded name
       via  6fc9f1a lib/mscat: fix logging in wscript
       via  4c7c10b lib/audit_logging: update to waf 2.0
       via  f495f64 buildtools/wafsamba: remove ENFORCE_GROUP_ORDERING
       via  0a9d98b ctdb/wscript: rework how version number is retrieved
       via  fdd89fe selftest/tests.py: update to support waf 2.0
       via  72a9e6d wscript: port build_system_heimdal to waf 2.0
       via  1efe689 wscript: port build_system_mitkrb5 to waf 2.0
       via  7944ed6 buildtools/wafsamba: port stale_files to waf 2.0
       via  2a3fcdf buildtools/wafsamba: generate build options output with waf 2.0
       via  75d5bcb selftest/wscript: properly handle env.cwd which is a list, not a string
       via  31f8945 wafsamba: install Python modules back to bin/python, not bin/python_modules
       via  77f3a13 buildtools/wafsamba: use cflags instead of ccflags for waf 2.0
       via  1d25ae5 buildtools/wafsamba: use context instead of options for cross-compile checks for waf 2.0
       via  aebcd69 buildtools/wafsamba: crosscompile should use Utils.subprocess in waf 2.0
       via  fb43723 buildtools/wafsamba: use top and out for waf 2.0
       via  5c3d31e cdtb/wscript: use top and out for waf 2.0
       via  699977a wscript: adopt to waf 2.0
       via  0fdba4b buildtools/wafsamba: use top for waf 2.0
       via  cdda0d9 buildtools/wafsamba: change SAMBA_BUILD_ENV to use bldnode.abspath()
       via  35ebfd3 selftest/wscript: handle lists in environmental variables in waf
       via  2a63619 waf heimdal: use absolute path to compile_et
       via  1fdcbd0 wafsamba: use correct context for APPNAME
       via  850ceec buildtools/wafsamba: compile asn1 files by adding missing code from compat15
       via  2e401d2 wscript: adopt to waf-2.0
       via  175be93 ctdb/wscript: adopt to waf-2.0
       via  7aaa1e6 buildtools/wafsamba/samba_abi: always_run helper was deprecated in waf 2.0
       via  9f2f5b4 source3/libsmb/wscript: remove unneeded import
       via  d00ba40 nsswitch/libwbclient/wscript: import from waflib
       via  944fce2 auth/wscript: import from waflib
       via  3fc4786 buildtools/wafsamba: add install_dir to build context
       via  69c655f buildtools/wafsamba: reduce imports
       via  7eab91a buildtools/wafsamba: adopt to waf 2.0.8
       via  3b7dfc5 third_party/waf: upgrade to waf 2.0.8
       via  79c4ba2 auth/wscript: fix options use
       via  c5ab9ea heimdal wscript changes
       via  ef4b2d4 wscript_configure_system_mitkrb5: update to handle waf 2.0.4
       via  e58ca30 wscript_build_embedded_heimdal: update to handle waf 2.0.4
       via  1dc80eb wscript_build: update to handle waf 2.0.4
       via  c73b779 wscript: update to handle waf 2.0.4
       via  0119a87 third_party/wscript: update to handle waf 2.0.4
       via  f14b8cb third_party/uid_wrapper/wscript: update to handle waf 2.0.4
       via  051e7e7 third_party/socket_wrapper/wscript: update to handle waf 2.0.4
       via  4c44153 third_party/resolv_wrapper/wscript: update to handle waf 2.0.4
       via  7e2deed third_party/popt/wscript: update to handle waf 2.0.4
       via  2847a38 third_party/pam_wrapper/wscript: update to handle waf 2.0.4
       via  2b21e67 third_party/nss_wrapper/wscript: update to handle waf 2.0.4
       via  3e71f06 third_party/cmocka/wscript: update to handle waf 2.0.4
       via  ba03d12 third_party/aesni-intel/wscript: update to handle waf 2.0.4
       via  ca5008a testsuite/headers/wscript_build: update to handle waf 2.0.4
       via  0c423a3 source4/lib/tls/wscript: update to handle waf 2.0.4
       via  c797e92 source4/heimdal_build/wscript_configure: update to handle waf 2.0.4
       via  055aae9 source4/heimdal_build/wscript_build: update to handle waf 2.0.4
       via  029ac7d source4/dsdb/samdb/ldb_modules/wscript: update to handle waf 2.0.4
       via  8b5ad02 source3/wscript_configure_system_ncurses: update to handle waf 2.0.4
       via  91e099d source3/wscript: update to handle waf 2.0.4
       via  c898f18 source3/build/charset.py: update to handle waf 2.0.4
       via  0de67cf selftest/wscript: update to handle waf 2.0.4
       via  fa1ca71 python/wscript: update to handle waf 2.0.4
       via  7f6ce8f pidl/wscript: update to handle waf 2.0.4
       via  e1e5b57 packaging/wscript: update to handle waf 2.0.4
       via  8a74116 nsswitch/wscript_build: update to handle waf 2.0.4
       via  e676183 lib/util/wscript_configure: update to handle waf 2.0.4
       via  5f57714 lib/util/wscript: update to handle waf 2.0.4
       via  d4cef3b lib/tevent/wscript: update to handle waf 2.0.4
       via  15288c3 lib/tdb/wscript: update to handle waf 2.0.4
       via  62bb573 lib/talloc/wscript: update to handle waf 2.0.4
       via  ea57883 lib/replace/wscript: update to handle waf 2.0.4
       via  0c703f1 lib/ldb/wscript: update to handle waf 2.0.4
       via  b0a12c8 lib/crypto/wscript_configure: update to handle waf 2.0.4
       via  b999fd3 lib/crypto/wscript: update to handle waf 2.0.4
       via  18c3598 dynconfig/wscript: update to handle waf 2.0.4
       via  efa94eb docs-xml/wscript_build: update to handle waf 2.0.4
       via  65074d8 ctdb/wscript: update to handle waf 2.0.4
       via  4e65b33 third_party:waf: update to upstream 2.0.4 release
       via  faef275 build:wafsamba: Remove unnecessary parameters to cmd_and_log
       via  247d12c build:wafsamba: Ignore cfg_file absolute paths differences
       via  cbc6534 thirdparty:waf: New files for waf 1.9.10
       via  48cf9cc selftest/tests.py: Update path to waflib
       via  5967335 script/autobuild: use --out instead of -b when calling configure
       via  9aa8f2b build:wafsamba: detail where we are processing the autobuild
       via  5d99786 build:wafsamba: Update dist/distcheck commands
       via  8077f46 build:wafsamba: Build on waf 1.9
      from  f3e349b krb5-samba: interdomain trust uses different salt principal

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 8de348e9d025d336a7985a9025fe08b7096c0394
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Wed Sep 5 09:58:21 2018 +1200

    third_party: Import exact files from waf-2.0.8/waflib
    
    wget https://waf.io/waf-2.0.8.tar.bz2
    tar -xf waf-2.0.8.tar.bz2
    rsync -a waf-2.0.8/waflib/ third_party/waf/waflib/
    
    The previous import was damaged by auto-strip/correct of whitespace
    and had other small corrections.
    
    Check with git show -w.
    
    Signed-off-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-by: Gary Lockyer <gary at catalyst.net.nz>
    
    Autobuild-User(master): Andrew Bartlett <abartlet at samba.org>
    Autobuild-Date(master): Wed Sep  5 09:29:39 CEST 2018 on sn-devel-144

commit 8f022a0be81333fcaa7ac20147028eef73e2179e
Author: Alexander Bokovoy <ab at samba.org>
Date:   Mon Sep 3 13:20:31 2018 +0300

    script/autobuild: Fix formatting in send_email
    
    Commit cb40e2bbc8a34a1ec3584ab585c5bf44c037ef0e introduced a print
    statement with a broken formatting. Reported by pylint.
    
    Signed-off-by: Alexander Bokovoy <ab at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit 67ed1ea6c468ce537e61183771dbc76241acfe67
Author: Alexander Bokovoy <ab at samba.org>
Date:   Mon Sep 3 13:07:23 2018 +0300

    script/autobuild: re-use CACHE_SUFFIX from waflib
    
    Signed-off-by: Alexander Bokovoy <ab at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit 72c3ff9ae2090652e9f3e77374494103e1fd2723
Author: Alexander Bokovoy <ab at samba.org>
Date:   Mon Sep 3 13:04:58 2018 +0300

    buildtools/wafsamba: use CACHE_SUFFIX instead of a hard-coded name
    
    waflib.Build provides CACHE_SUFFIX constant to append to the target
    name. We have a reference to samba-specific cache suffix (.cache.py)
    while original WAF uses _cache.py as a cache suffix since 2011 (see
    commit 44a967e326cc2e670a31b3712e4763b72d65e81b in WAF project code).
    
    Signed-off-by: Alexander Bokovoy <ab at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit 6fc9f1a89d2826f690db2118703935e48e01b2d3
Author: Alexander Bokovoy <ab at samba.org>
Date:   Mon Sep 3 12:51:59 2018 +0300

    lib/mscat: fix logging in wscript

commit 4c7c10b2c53b85ca257515abc5544d22b7ab0865
Author: Alexander Bokovoy <ab at samba.org>
Date:   Thu Jul 5 14:26:57 2018 +0300

    lib/audit_logging: update to waf 2.0
    
    Signed-off-by: Alexander Bokovoy <ab at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit f495f64e2ea831cdc5c2a1a4954df738754de72b
Author: Alexander Bokovoy <ab at samba.org>
Date:   Wed Jul 4 11:47:42 2018 +0300

    buildtools/wafsamba: remove ENFORCE_GROUP_ORDERING
    
    ENFORCE_GROUP_ORDERING is not needed with waf 2.0 anymore
    
    Signed-off-by: Alexander Bokovoy <ab at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit 0a9d98ba1521b711e4987d6709327bcf6ec64b6c
Author: Alexander Bokovoy <ab at samba.org>
Date:   Wed Jul 4 11:05:10 2018 +0300

    ctdb/wscript: rework how version number is retrieved
    
    Using default context functions before waf initialization occured
    is prone to error. Postpone calling samba_version.* code until we
    got default context initialized.
    
    Signed-off-by: Alexander Bokovoy <ab at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit fdd89fefb523ebbb78247c84289a4894c34b7213
Author: Alexander Bokovoy <ab at samba.org>
Date:   Tue Jul 3 14:57:48 2018 +0300

    selftest/tests.py: update to support waf 2.0
    
    Signed-off-by: Alexander Bokovoy <ab at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit 72a9e6d115603ecb9de3ebaf9a56ff2fa0b41b9e
Author: Alexander Bokovoy <ab at samba.org>
Date:   Tue Jul 3 13:07:44 2018 +0300

    wscript: port build_system_heimdal to waf 2.0
    
    Signed-off-by: Alexander Bokovoy <ab at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit 1efe68908dcdae9551cb0f7f56a9ce0d08a9fe09
Author: Alexander Bokovoy <ab at samba.org>
Date:   Tue Jul 3 13:07:09 2018 +0300

    wscript: port build_system_mitkrb5 to waf 2.0
    
    Signed-off-by: Alexander Bokovoy <ab at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit 7944ed6e7be60803eb4f0073ac6ac2e79413b4ab
Author: Alexander Bokovoy <ab at samba.org>
Date:   Tue Jul 3 13:06:40 2018 +0300

    buildtools/wafsamba: port stale_files to waf 2.0
    
    Signed-off-by: Alexander Bokovoy <ab at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit 2a3fcdf1ef16f2efc936bed61fe85e3bb9e7fba9
Author: Alexander Bokovoy <ab at samba.org>
Date:   Tue Jul 3 12:48:39 2018 +0300

    buildtools/wafsamba: generate build options output with waf 2.0
    
    With WAF 2.0 we get all defines in environment at the same level.
    Fix build options source code generator to handle this.
    
    I felt uneasy at filtering out some defines so instead the code
    is mangling generic defines to be correct for C compiler by
    replacing '-', '.', and '()' with an underscore ('_').
    
    Signed-off-by: Alexander Bokovoy <ab at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit 75d5bcb4d84f697bed5e13569b10a893fe487ff3
Author: Alexander Bokovoy <ab at samba.org>
Date:   Tue Jul 3 11:18:05 2018 +0300

    selftest/wscript: properly handle env.cwd which is a list, not a string
    
    Signed-off-by: Alexander Bokovoy <ab at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit 31f8945aa6611160d72b24a0f82c40a2419f1362
Author: Alexander Bokovoy <ab at samba.org>
Date:   Tue Jul 3 11:09:12 2018 +0300

    wafsamba: install Python modules back to bin/python, not bin/python_modules
    
    Partially revert 80fce353e740c793619005ac102ab07fb5e7d280 which started
    installing generated Python modules into python_modules directory back
    in 2013. This, unfortunately, does not work anymore as Python gets quite
    confused with our setup even when both bin/python and bin/python_modules
    directories are part of sys.path.
    
    Signed-off-by: Alexander Bokovoy <ab at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit 77f3a1387fac0503007ba6e3e26b9d3576b29387
Author: Alexander Bokovoy <ab at samba.org>
Date:   Wed Jun 27 16:44:12 2018 +0300

    buildtools/wafsamba: use cflags instead of ccflags for waf 2.0
    
    Signed-off-by: Alexander Bokovoy <ab at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit 1d25ae580b4a625c8ce0ab183c04d599090ee073
Author: Alexander Bokovoy <ab at samba.org>
Date:   Wed Jun 27 16:42:29 2018 +0300

    buildtools/wafsamba: use context instead of options for cross-compile checks for waf 2.0
    
    Signed-off-by: Alexander Bokovoy <ab at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit aebcd698764d9c8e55db14b7650481a1992ee938
Author: Alexander Bokovoy <ab at samba.org>
Date:   Wed Jun 27 16:34:53 2018 +0300

    buildtools/wafsamba: crosscompile should use Utils.subprocess in waf 2.0
    
    Signed-off-by: Alexander Bokovoy <ab at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit fb43723bc1f054bb29194b1a569037dd1db71459
Author: Alexander Bokovoy <ab at samba.org>
Date:   Wed Jun 27 15:03:08 2018 +0300

    buildtools/wafsamba: use top and out for waf 2.0
    
    Signed-off-by: Alexander Bokovoy <ab at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit 5c3d31eb14a621f1a8999f531532e77109e5ead5
Author: Alexander Bokovoy <ab at samba.org>
Date:   Wed Jun 27 14:56:32 2018 +0300

    cdtb/wscript: use top and out for waf 2.0
    
    Signed-off-by: Alexander Bokovoy <ab at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit 699977a2e7e49eb9cf15141075726134e5ddd34c
Author: Alexander Bokovoy <ab at samba.org>
Date:   Wed Jun 27 14:54:09 2018 +0300

    wscript: adopt to waf 2.0
    
    Signed-off-by: Alexander Bokovoy <ab at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit 0fdba4be9c425220ba459ad421f03cce4ab7ae70
Author: Alexander Bokovoy <ab at samba.org>
Date:   Wed Jun 27 14:33:36 2018 +0300

    buildtools/wafsamba: use top for waf 2.0
    
    Signed-off-by: Alexander Bokovoy <ab at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit cdda0d9048b8d4bf0f12b13453f2c85413d8d808
Author: Alexander Bokovoy <ab at samba.org>
Date:   Wed Jun 27 13:45:56 2018 +0300

    buildtools/wafsamba: change SAMBA_BUILD_ENV to use bldnode.abspath()
    
    Signed-off-by: Alexander Bokovoy <ab at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit 35ebfd3d4ef1b32ef1ac51c6e20506b24fd3abc3
Author: Alexander Bokovoy <ab at samba.org>
Date:   Wed Jun 27 12:26:09 2018 +0300

    selftest/wscript: handle lists in environmental variables in waf
    
    Signed-off-by: Alexander Bokovoy <ab at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit 2a63619c1fdfe15d196ebf077522a05990abe53d
Author: Alexander Bokovoy <ab at samba.org>
Date:   Wed Jun 27 00:25:03 2018 +0300

    waf heimdal: use absolute path to compile_et
    
    Signed-off-by: Alexander Bokovoy <ab at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit 1fdcbd0696e7acb1bca42099606aeec9c5a8dedd
Author: Alexander Bokovoy <ab at samba.org>
Date:   Wed Jun 27 00:24:31 2018 +0300

    wafsamba: use correct context for APPNAME
    
    Signed-off-by: Alexander Bokovoy <ab at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit 850ceec8109580279e4e1493aac835d86f1f597f
Author: Thomas Nagy <tnagy at waf.io>
Date:   Tue Jun 26 21:16:26 2018 +0200

    buildtools/wafsamba: compile asn1 files by adding missing code from compat15
    
    Signed-off-by:    Thomas Nagy <tnagy at waf.io>
    Reviewed-by: Alexander Bokovoy <ab at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit 2e401d2475ce019a8e964ae6379dcc61c7334934
Author: Alexander Bokovoy <ab at samba.org>
Date:   Fri Jun 15 17:03:28 2018 +0300

    wscript: adopt to waf-2.0
    
    Signed-off-by: Alexander Bokovoy <ab at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit 175be9377ebfb8b2fac87de2d68d06a9f5b80a0f
Author: Alexander Bokovoy <ab at samba.org>
Date:   Fri Jun 15 17:01:59 2018 +0300

    ctdb/wscript: adopt to waf-2.0
    
    Signed-off-by: Alexander Bokovoy <ab at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit 7aaa1e680e978c63136c0f7c6d230d9f60599a09
Author: Alexander Bokovoy <ab at samba.org>
Date:   Fri Jun 15 16:32:33 2018 +0300

    buildtools/wafsamba/samba_abi: always_run helper was deprecated in waf 2.0
    
    Signed-off-by: Alexander Bokovoy <ab at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit 9f2f5b4d5d44ba2f42251f54ba88c7e0d13372f7
Author: Alexander Bokovoy <ab at samba.org>
Date:   Fri Jun 15 16:21:06 2018 +0300

    source3/libsmb/wscript: remove unneeded import
    
    Signed-off-by: Alexander Bokovoy <ab at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit d00ba4003125898d0c4928ac6ad205bad79ee3c2
Author: Alexander Bokovoy <ab at samba.org>
Date:   Fri Jun 15 16:20:34 2018 +0300

    nsswitch/libwbclient/wscript: import from waflib
    
    Signed-off-by: Alexander Bokovoy <ab at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit 944fce2596fa0a2a73f53f03ebb4128b8d4220d6
Author: Alexander Bokovoy <ab at samba.org>
Date:   Fri Jun 15 16:18:34 2018 +0300

    auth/wscript: import from waflib
    
    Signed-off-by: Alexander Bokovoy <ab at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit 3fc478665800e0055365f356dd077a34091b4f52
Author: Alexander Bokovoy <ab at samba.org>
Date:   Wed Jun 27 16:06:44 2018 +0300

    buildtools/wafsamba: add install_dir to build context
    
    Signed-off-by: Alexander Bokovoy <ab at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit 69c655fe9823fae3965bdb9538778253916301a0
Author: Alexander Bokovoy <ab at samba.org>
Date:   Fri Jun 15 16:17:14 2018 +0300

    buildtools/wafsamba: reduce imports
    
    Signed-off-by: Alexander Bokovoy <ab at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit 7eab91a068ec9c95f8be3ae08e6d1d2f60ea0727
Author: Alexander Bokovoy <ab at samba.org>
Date:   Fri Jun 15 13:32:00 2018 +0300

    buildtools/wafsamba: adopt to waf 2.0.8
    
    Signed-off-by: Alexander Bokovoy <ab at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit 3b7dfc51acc2dc0ea52cbf1733107f14405828e0
Author: Alexander Bokovoy <ab at samba.org>
Date:   Fri Jun 15 13:29:45 2018 +0300

    third_party/waf: upgrade to waf 2.0.8
    
    Signed-off-by: Alexander Bokovoy <ab at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit 79c4ba26b0e75f632ba5a60fd2a4d5783630bd2a
Author: Alexander Bokovoy <ab at samba.org>
Date:   Tue Jun 5 19:24:55 2018 +0300

    auth/wscript: fix options use
    
    Signed-off-by: Alexander Bokovoy <ab at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit c5ab9ead8b982aba506436656baed0ebaac4b2ea
Author: Alexander Bokovoy <ab at samba.org>
Date:   Fri Apr 20 14:01:51 2018 +0300

    heimdal wscript changes
    
    Signed-off-by: Alexander Bokovoy <ab at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit ef4b2d4574efafaf7f74f92cd2d7f6e4a5144fd4
Author: Alexander Bokovoy <ab at samba.org>
Date:   Fri Feb 2 16:34:33 2018 +0200

    wscript_configure_system_mitkrb5: update to handle waf 2.0.4
    
    Signed-off-by: Alexander Bokovoy <ab at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit e58ca30bc0352ace41072cf07a85c40cb370a837
Author: Alexander Bokovoy <ab at samba.org>
Date:   Fri Feb 2 16:34:33 2018 +0200

    wscript_build_embedded_heimdal: update to handle waf 2.0.4
    
    Signed-off-by: Alexander Bokovoy <ab at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit 1dc80eb15cd967aef41ae9c0be02d623b1280528
Author: Alexander Bokovoy <ab at samba.org>
Date:   Fri Feb 2 16:34:33 2018 +0200

    wscript_build: update to handle waf 2.0.4
    
    Signed-off-by: Alexander Bokovoy <ab at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit c73b7795b8769ec038f2ed61ce192148d12b5646
Author: Alexander Bokovoy <ab at samba.org>
Date:   Fri Feb 2 16:34:33 2018 +0200

    wscript: update to handle waf 2.0.4
    
    Signed-off-by: Alexander Bokovoy <ab at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit 0119a8791ca0ec728df8f7b7de00d813fec30857
Author: Alexander Bokovoy <ab at samba.org>
Date:   Fri Feb 2 16:34:33 2018 +0200

    third_party/wscript: update to handle waf 2.0.4
    
    Signed-off-by: Alexander Bokovoy <ab at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit f14b8cb0dc1e590ee32c862e4efb839515b55d51
Author: Alexander Bokovoy <ab at samba.org>
Date:   Fri Feb 2 16:34:33 2018 +0200

    third_party/uid_wrapper/wscript: update to handle waf 2.0.4
    
    Signed-off-by: Alexander Bokovoy <ab at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit 051e7e74fdf99673d00a7a02a62e5099fc38f198
Author: Alexander Bokovoy <ab at samba.org>
Date:   Fri Feb 2 16:34:33 2018 +0200

    third_party/socket_wrapper/wscript: update to handle waf 2.0.4
    
    Signed-off-by: Alexander Bokovoy <ab at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit 4c441530475daf23a71b70a7fc93ec04b1941f99
Author: Alexander Bokovoy <ab at samba.org>
Date:   Fri Feb 2 16:34:33 2018 +0200

    third_party/resolv_wrapper/wscript: update to handle waf 2.0.4
    
    Signed-off-by: Alexander Bokovoy <ab at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit 7e2deed7c5709d1f73ec001d5ec36fd086aa70ad
Author: Alexander Bokovoy <ab at samba.org>
Date:   Fri Feb 2 16:34:33 2018 +0200

    third_party/popt/wscript: update to handle waf 2.0.4
    
    Signed-off-by: Alexander Bokovoy <ab at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit 2847a382d8ad79c80f8bf3c7cd80c978fbe6d0c2
Author: Alexander Bokovoy <ab at samba.org>
Date:   Fri Feb 2 16:34:32 2018 +0200

    third_party/pam_wrapper/wscript: update to handle waf 2.0.4
    
    Signed-off-by: Alexander Bokovoy <ab at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit 2b21e67e1574e0afed26070f48b88d426237a3c5
Author: Alexander Bokovoy <ab at samba.org>
Date:   Fri Feb 2 16:34:32 2018 +0200

    third_party/nss_wrapper/wscript: update to handle waf 2.0.4
    
    Signed-off-by: Alexander Bokovoy <ab at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit 3e71f06a86c850c6ffdf910817c51a678e8f4df7
Author: Alexander Bokovoy <ab at samba.org>
Date:   Fri Feb 2 16:34:32 2018 +0200

    third_party/cmocka/wscript: update to handle waf 2.0.4
    
    Signed-off-by: Alexander Bokovoy <ab at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit ba03d12094075ba1e448720f8bc1ae4782625797
Author: Alexander Bokovoy <ab at samba.org>
Date:   Fri Feb 2 16:34:32 2018 +0200

    third_party/aesni-intel/wscript: update to handle waf 2.0.4
    
    Signed-off-by: Alexander Bokovoy <ab at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit ca5008a49d72ea2078d0b35dc28dfade17fbdbad
Author: Alexander Bokovoy <ab at samba.org>
Date:   Fri Feb 2 16:34:32 2018 +0200

    testsuite/headers/wscript_build: update to handle waf 2.0.4
    
    Signed-off-by: Alexander Bokovoy <ab at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit 0c423a3a9285497c5ec4fb40142020ff0fbcece5
Author: Alexander Bokovoy <ab at samba.org>
Date:   Fri Feb 2 16:34:32 2018 +0200

    source4/lib/tls/wscript: update to handle waf 2.0.4
    
    Signed-off-by: Alexander Bokovoy <ab at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit c797e92127cd52453a41c072135dad9c2864b275
Author: Alexander Bokovoy <ab at samba.org>
Date:   Fri Feb 2 16:34:32 2018 +0200

    source4/heimdal_build/wscript_configure: update to handle waf 2.0.4
    
    Signed-off-by: Alexander Bokovoy <ab at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit 055aae90062f12d6304614515949099bfcd4d19d
Author: Alexander Bokovoy <ab at samba.org>
Date:   Fri Feb 2 16:34:32 2018 +0200

    source4/heimdal_build/wscript_build: update to handle waf 2.0.4
    
    Signed-off-by: Alexander Bokovoy <ab at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit 029ac7d63590571ef808254d47ec542f691191df
Author: Alexander Bokovoy <ab at samba.org>
Date:   Fri Feb 2 16:34:32 2018 +0200

    source4/dsdb/samdb/ldb_modules/wscript: update to handle waf 2.0.4
    
    Signed-off-by: Alexander Bokovoy <ab at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit 8b5ad021b49815d7dabe44d5f28475e8c1e32050
Author: Alexander Bokovoy <ab at samba.org>
Date:   Fri Feb 2 16:34:32 2018 +0200

    source3/wscript_configure_system_ncurses: update to handle waf 2.0.4
    
    Signed-off-by: Alexander Bokovoy <ab at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit 91e099d61f8044668f7f37244337f6f2f835a2e8
Author: Alexander Bokovoy <ab at samba.org>
Date:   Fri Feb 2 16:34:32 2018 +0200

    source3/wscript: update to handle waf 2.0.4
    
    Signed-off-by: Alexander Bokovoy <ab at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit c898f18f801fb3dfd7a33b07c1714a6d860457ae
Author: Alexander Bokovoy <ab at samba.org>
Date:   Fri Feb 2 16:34:32 2018 +0200

    source3/build/charset.py: update to handle waf 2.0.4
    
    Signed-off-by: Alexander Bokovoy <ab at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit 0de67cf1c71b633dc78b54b1a83bd056a178dc0d
Author: Alexander Bokovoy <ab at samba.org>
Date:   Fri Feb 2 16:34:32 2018 +0200

    selftest/wscript: update to handle waf 2.0.4
    
    Signed-off-by: Alexander Bokovoy <ab at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit fa1ca713542747d8f6fa7f9e7c1ad2faf993d7c8
Author: Alexander Bokovoy <ab at samba.org>
Date:   Fri Feb 2 16:34:32 2018 +0200

    python/wscript: update to handle waf 2.0.4
    
    Signed-off-by: Alexander Bokovoy <ab at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit 7f6ce8f834f7448364fb465ecfc2d5640ffb2b09
Author: Alexander Bokovoy <ab at samba.org>
Date:   Fri Feb 2 16:34:31 2018 +0200

    pidl/wscript: update to handle waf 2.0.4
    
    Signed-off-by: Alexander Bokovoy <ab at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit e1e5b57f72029751951991d358da777594237168
Author: Alexander Bokovoy <ab at samba.org>
Date:   Fri Feb 2 16:34:31 2018 +0200

    packaging/wscript: update to handle waf 2.0.4
    
    Signed-off-by: Alexander Bokovoy <ab at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit 8a7411633e175bdc97174fbca2f5366816fbef8f
Author: Alexander Bokovoy <ab at samba.org>
Date:   Fri Feb 2 16:34:31 2018 +0200

    nsswitch/wscript_build: update to handle waf 2.0.4
    
    Signed-off-by: Alexander Bokovoy <ab at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit e6761832f44ac4cec99f527e84b5d2e7b67b730b
Author: Alexander Bokovoy <ab at samba.org>
Date:   Fri Feb 2 16:34:31 2018 +0200

    lib/util/wscript_configure: update to handle waf 2.0.4
    
    Signed-off-by: Alexander Bokovoy <ab at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit 5f5771408477d627a0cdfc9a7cb221a729d5956a
Author: Alexander Bokovoy <ab at samba.org>
Date:   Fri Feb 2 16:34:31 2018 +0200

    lib/util/wscript: update to handle waf 2.0.4
    
    Signed-off-by: Alexander Bokovoy <ab at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit d4cef3b10314615f775d64bb2445958e8d513b10
Author: Alexander Bokovoy <ab at samba.org>
Date:   Fri Feb 2 16:34:31 2018 +0200

    lib/tevent/wscript: update to handle waf 2.0.4
    
    Signed-off-by: Alexander Bokovoy <ab at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit 15288c38b3e89b889dfc0f5c20fff2b4e749188c
Author: Alexander Bokovoy <ab at samba.org>
Date:   Fri Feb 2 16:34:31 2018 +0200

    lib/tdb/wscript: update to handle waf 2.0.4
    
    Signed-off-by: Alexander Bokovoy <ab at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit 62bb5734b50384637e682ac7219947dacad4aa07
Author: Alexander Bokovoy <ab at samba.org>
Date:   Fri Feb 2 16:34:31 2018 +0200

    lib/talloc/wscript: update to handle waf 2.0.4
    
    Signed-off-by: Alexander Bokovoy <ab at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit ea578830ceebb0b4606dbde1359008d176819cd5
Author: Alexander Bokovoy <ab at samba.org>
Date:   Fri Feb 2 16:34:31 2018 +0200

    lib/replace/wscript: update to handle waf 2.0.4
    
    Signed-off-by: Alexander Bokovoy <ab at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit 0c703f1d3a75bd975463459f1d53b916ddcc166b
Author: Alexander Bokovoy <ab at samba.org>
Date:   Fri Feb 2 16:34:31 2018 +0200

    lib/ldb/wscript: update to handle waf 2.0.4
    
    Signed-off-by: Alexander Bokovoy <ab at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit b0a12c81b1afb3fab3ce9ecb4d3ddfe59b624fa8
Author: Alexander Bokovoy <ab at samba.org>
Date:   Fri Feb 2 16:34:31 2018 +0200

    lib/crypto/wscript_configure: update to handle waf 2.0.4
    
    Signed-off-by: Alexander Bokovoy <ab at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit b999fd3c25648af902d57e921e5d3efc1cc6a81c
Author: Alexander Bokovoy <ab at samba.org>
Date:   Fri Feb 2 16:34:31 2018 +0200

    lib/crypto/wscript: update to handle waf 2.0.4
    
    Signed-off-by: Alexander Bokovoy <ab at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit 18c3598b66a5b29486a2c7c8c465620d77b5818c
Author: Alexander Bokovoy <ab at samba.org>
Date:   Fri Feb 2 16:34:31 2018 +0200

    dynconfig/wscript: update to handle waf 2.0.4
    
    Signed-off-by: Alexander Bokovoy <ab at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit efa94eb39a6d49f4f73d5ab83899f11b6e1e5de8
Author: Alexander Bokovoy <ab at samba.org>
Date:   Fri Feb 2 16:34:31 2018 +0200

    docs-xml/wscript_build: update to handle waf 2.0.4
    
    Signed-off-by: Alexander Bokovoy <ab at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit 65074d8901d348a6614657e0d3e23c2280ac22e7
Author: Alexander Bokovoy <ab at samba.org>
Date:   Fri Feb 2 16:34:30 2018 +0200

    ctdb/wscript: update to handle waf 2.0.4
    
    Signed-off-by: Alexander Bokovoy <ab at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit 4e65b33c1d40bb2c243f775f388056aed31d8671
Author: Alexander Bokovoy <ab at samba.org>
Date:   Wed Jan 31 11:48:43 2018 +0200

    third_party:waf: update to upstream 2.0.4 release
    
    Update third_party/waf/ to 2.0.4 to bring us closer to Python 3
    
    This change requires a number of changes in buildtools/ too.
    
    Signed-off-by: Alexander Bokovoy <ab at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit faef27506977db01cc4619140a71652463914378
Author: Thomas Nagy <tnagy at waf.io>
Date:   Tue Aug 29 20:54:43 2017 +0200

    build:wafsamba: Remove unnecessary parameters to cmd_and_log
    
    Signed-off-by: Thomas Nagy <tnagy at waf.io>
    Reviewed-by: Alexander Bokovoy <ab at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit 247d12c4facc59d4d31ebea62234663f8b938ac0
Author: Thomas Nagy <tnagy at waf.io>
Date:   Sat Apr 15 18:56:11 2017 +0200

    build:wafsamba: Ignore cfg_file absolute paths differences
    
    Due to build variants, cfg_file paths are written as absolute paths.
    
    Signed-off-by: Thomas Nagy <tnagy at waf.io>
    Reviewed-by: Alexander Bokovoy <ab at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit cbc6534682829b3115147f73ca9a7eb41008374c
Author: Thomas Nagy <tnagy at waf.io>
Date:   Sat Mar 26 13:32:11 2016 +0100

    thirdparty:waf: New files for waf 1.9.10
    
    Signed-off-by: Thomas Nagy <tnagy at waf.io>
    Reviewed-by: Alexander Bokovoy <ab at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit 48cf9ccd2b086f902286668738d07455044f466b
Author: Thomas Nagy <tnagy at waf.io>
Date:   Thu Apr 13 18:48:20 2017 +0200

    selftest/tests.py: Update path to waflib
    
    Signed-off-by: Thomas Nagy <tnagy at waf.io>
    Reviewed-by: Alexander Bokovoy <ab at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit 59673353877569a163a95ccf9cf6730c0099e772
Author: Thomas Nagy <tnagy at waf.io>
Date:   Thu Apr 13 18:47:50 2017 +0200

    script/autobuild: use --out instead of -b when calling configure
    
    Signed-off-by: Thomas Nagy <tnagy at waf.io>
    Reviewed-by: Alexander Bokovoy <ab at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit 9aa8f2badd660d4ec464d052a0a2ca84387aad88
Author: Thomas Nagy <tnagy at waf.io>
Date:   Thu Apr 13 18:46:50 2017 +0200

    build:wafsamba: detail where we are processing the autobuild
    
    Signed-off-by: Thomas Nagy <tnagy at waf.io>
    Reviewed-by: Alexander Bokovoy <ab at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit 5d99786151a6ed10baa85173c2a4e35a1db76097
Author: Thomas Nagy <tnagy at waf.io>
Date:   Thu Apr 13 18:45:50 2017 +0200

    build:wafsamba: Update dist/distcheck commands
    
    Signed-off-by: Thomas Nagy <tnagy at waf.io>
    Reviewed-by: Alexander Bokovoy <ab at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit 8077f462c9854bf8ff3e5ce09c0f22f02cb21910
Author: Thomas Nagy <tnagy at waf.io>
Date:   Sat Mar 26 13:18:07 2016 +0100

    build:wafsamba: Build on waf 1.9
    
    Signed-off-by: Thomas Nagy <tnagy at waf.io>
    Reviewed-by: Alexander Bokovoy <ab at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

-----------------------------------------------------------------------

Summary of changes:
 buildtools/bin/waf                                 |  130 +-
 buildtools/bin/waf-1.9                             |  164 +++
 buildtools/wafsamba/configure_file.py              |    6 +-
 buildtools/wafsamba/generic_cc.py                  |    8 +-
 buildtools/wafsamba/hpuxcc.py                      |   10 +-
 buildtools/wafsamba/irixcc.py                      |    8 +-
 buildtools/wafsamba/nothreads.py                   |    6 +-
 buildtools/wafsamba/pkgconfig.py                   |    2 +-
 buildtools/wafsamba/samba3.py                      |    9 +-
 buildtools/wafsamba/samba_abi.py                   |   18 +-
 buildtools/wafsamba/samba_autoconf.py              |   95 +-
 buildtools/wafsamba/samba_autoproto.py             |    6 +-
 buildtools/wafsamba/samba_bundled.py               |   18 +-
 buildtools/wafsamba/samba_conftests.py             |   42 +-
 buildtools/wafsamba/samba_cross.py                 |   24 +-
 buildtools/wafsamba/samba_deps.py                  |   30 +-
 buildtools/wafsamba/samba_dist.py                  |   45 +-
 buildtools/wafsamba/samba_git.py                   |    2 +-
 buildtools/wafsamba/samba_headers.py               |   13 +-
 buildtools/wafsamba/samba_install.py               |   11 +-
 buildtools/wafsamba/samba_optimisation.py          |  269 ----
 buildtools/wafsamba/samba_patterns.py              |   13 +-
 buildtools/wafsamba/samba_perl.py                  |    8 +-
 buildtools/wafsamba/samba_pidl.py                  |   15 +-
 buildtools/wafsamba/samba_python.py                |   38 +-
 buildtools/wafsamba/samba_third_party.py           |    6 +-
 buildtools/wafsamba/samba_utils.py                 |  179 ++-
 buildtools/wafsamba/samba_version.py               |    4 +-
 buildtools/wafsamba/samba_waf18.py                 |  427 ++++++
 buildtools/wafsamba/samba_wildcard.py              |   17 +-
 buildtools/wafsamba/stale_files.py                 |    6 +-
 buildtools/wafsamba/symbols.py                     |   12 +-
 buildtools/wafsamba/tru64cc.py                     |    8 +-
 buildtools/wafsamba/wafsamba.py                    |  117 +-
 buildtools/wafsamba/wscript                        |   72 +-
 ctdb/wscript                                       |   71 +-
 docs-xml/wscript_build                             |    2 +-
 dynconfig/wscript                                  |   14 +-
 lib/audit_logging/wscript                          |    6 +-
 lib/crypto/wscript                                 |    2 +-
 lib/crypto/wscript_configure                       |    8 +-
 lib/ldb/wscript                                    |   45 +-
 lib/mscat/wscript                                  |    2 +-
 lib/replace/wscript                                |   22 +-
 lib/talloc/wscript                                 |   36 +-
 lib/tdb/wscript                                    |   37 +-
 lib/tevent/wscript                                 |   21 +-
 lib/util/wscript                                   |    2 +-
 lib/util/wscript_configure                         |    2 +-
 nsswitch/libwbclient/wscript                       |    2 +-
 nsswitch/wscript_build                             |    2 +-
 packaging/wscript                                  |    4 +-
 pidl/wscript                                       |    7 +-
 python/wscript                                     |    2 +-
 script/autobuild.py                                |   22 +-
 script/compare_cc_results.py                       |    3 +
 selftest/tests.py                                  |    2 +-
 selftest/wscript                                   |   22 +-
 source3/build/charset.py                           |    2 +-
 source3/libsmb/wscript                             |    2 -
 source3/modules/wscript_build                      |    2 +-
 source3/script/wscript_build                       |    2 +-
 source3/wscript                                    |   29 +-
 source3/wscript_build                              |    3 -
 source3/wscript_configure_system_ncurses           |    3 +-
 source4/dsdb/samdb/ldb_modules/wscript             |    5 +-
 source4/heimdal_build/wscript_build                |   47 +-
 source4/heimdal_build/wscript_configure            |   13 +-
 source4/lib/tls/wscript                            |    4 +-
 testsuite/headers/wscript_build                    |    2 +-
 third_party/aesni-intel/wscript                    |    4 +-
 third_party/cmocka/wscript                         |    2 +-
 third_party/nss_wrapper/wscript                    |    2 +-
 third_party/pam_wrapper/wscript                    |    2 +-
 third_party/popt/wscript                           |    2 +-
 third_party/resolv_wrapper/wscript                 |    2 +-
 third_party/socket_wrapper/wscript                 |    2 +-
 third_party/uid_wrapper/wscript                    |    4 +-
 third_party/waf/wafadmin/3rdparty/ParallelDebug.py |  297 ----
 third_party/waf/wafadmin/3rdparty/batched_cc.py    |  182 ---
 third_party/waf/wafadmin/3rdparty/boost.py         |  342 -----
 .../waf/wafadmin/3rdparty/build_file_tracker.py    |   53 -
 third_party/waf/wafadmin/3rdparty/fluid.py         |   26 -
 third_party/waf/wafadmin/3rdparty/gccdeps.py       |  127 --
 third_party/waf/wafadmin/3rdparty/go.py            |  110 --
 third_party/waf/wafadmin/3rdparty/lru_cache.py     |   96 --
 third_party/waf/wafadmin/3rdparty/paranoid.py      |   34 -
 third_party/waf/wafadmin/3rdparty/prefork.py       |  275 ----
 .../waf/wafadmin/3rdparty/print_commands.py        |   25 -
 third_party/waf/wafadmin/3rdparty/swig.py          |  189 ---
 third_party/waf/wafadmin/3rdparty/valadoc.py       |  112 --
 third_party/waf/wafadmin/Build.py                  | 1036 --------------
 third_party/waf/wafadmin/Configure.py              |  442 ------
 third_party/waf/wafadmin/Constants.py              |   75 -
 third_party/waf/wafadmin/Environment.py            |  209 ---
 third_party/waf/wafadmin/Logs.py                   |  133 --
 third_party/waf/wafadmin/Node.py                   |  701 ----------
 third_party/waf/wafadmin/Options.py                |  287 ----
 third_party/waf/wafadmin/Runner.py                 |  235 ----
 third_party/waf/wafadmin/Scripting.py              |  585 --------
 third_party/waf/wafadmin/Task.py                   | 1199 ----------------
 third_party/waf/wafadmin/TaskGen.py                |  614 --------
 third_party/waf/wafadmin/Tools/ar.py               |   34 -
 third_party/waf/wafadmin/Tools/bison.py            |   37 -
 third_party/waf/wafadmin/Tools/cc.py               |   99 --
 third_party/waf/wafadmin/Tools/ccroot.py           |  639 ---------
 third_party/waf/wafadmin/Tools/compiler_cc.py      |   66 -
 third_party/waf/wafadmin/Tools/compiler_cxx.py     |   61 -
 third_party/waf/wafadmin/Tools/compiler_d.py       |   32 -
 third_party/waf/wafadmin/Tools/config_c.py         |  754 ----------
 third_party/waf/wafadmin/Tools/cs.py               |   67 -
 third_party/waf/wafadmin/Tools/cxx.py              |  103 --
 third_party/waf/wafadmin/Tools/d.py                |  534 -------
 third_party/waf/wafadmin/Tools/dbus.py             |   33 -
 third_party/waf/wafadmin/Tools/dmd.py              |   63 -
 third_party/waf/wafadmin/Tools/flex.py             |   24 -
 third_party/waf/wafadmin/Tools/gas.py              |   37 -
 third_party/waf/wafadmin/Tools/gcc.py              |  138 --
 third_party/waf/wafadmin/Tools/gdc.py              |   51 -
 third_party/waf/wafadmin/Tools/glib2.py            |  163 ---
 third_party/waf/wafadmin/Tools/gnome.py            |  222 ---
 third_party/waf/wafadmin/Tools/gnu_dirs.py         |  110 --
 third_party/waf/wafadmin/Tools/gob2.py             |   17 -
 third_party/waf/wafadmin/Tools/gxx.py              |  136 --
 third_party/waf/wafadmin/Tools/icc.py              |   37 -
 third_party/waf/wafadmin/Tools/icpc.py             |   35 -
 third_party/waf/wafadmin/Tools/intltool.py         |  138 --
 third_party/waf/wafadmin/Tools/javaw.py            |  254 ----
 third_party/waf/wafadmin/Tools/kde4.py             |   73 -
 third_party/waf/wafadmin/Tools/libtool.py          |  329 -----
 third_party/waf/wafadmin/Tools/lua.py              |   24 -
 third_party/waf/wafadmin/Tools/misc.py             |  429 ------
 third_party/waf/wafadmin/Tools/msvc.py             |  796 -----------
 third_party/waf/wafadmin/Tools/nasm.py             |   48 -
 third_party/waf/wafadmin/Tools/osx.py              |  187 ---
 third_party/waf/wafadmin/Tools/perl.py             |  108 --
 third_party/waf/wafadmin/Tools/preproc.py          |  837 -----------
 third_party/waf/wafadmin/Tools/python.py           |  432 ------
 third_party/waf/wafadmin/Tools/qt4.py              |  504 -------
 third_party/waf/wafadmin/Tools/ruby.py             |  119 --
 third_party/waf/wafadmin/Tools/suncc.py            |   76 -
 third_party/waf/wafadmin/Tools/suncxx.py           |   75 -
 third_party/waf/wafadmin/Tools/tex.py              |  250 ----
 third_party/waf/wafadmin/Tools/unittestw.py        |  308 ----
 third_party/waf/wafadmin/Tools/vala.py             |  307 ----
 third_party/waf/wafadmin/Tools/winres.py           |   44 -
 third_party/waf/wafadmin/Tools/xlc.py              |   78 --
 third_party/waf/wafadmin/Tools/xlcxx.py            |   78 --
 third_party/waf/wafadmin/Utils.py                  |  747 ----------
 third_party/waf/wafadmin/ansiterm.py               |  235 ----
 third_party/waf/wafadmin/pproc.py                  |  619 --------
 third_party/waf/wafadmin/py3kfixes.py              |  129 --
 third_party/waf/waflib/Build.py                    | 1474 ++++++++++++++++++++
 third_party/waf/waflib/ConfigSet.py                |  361 +++++
 third_party/waf/waflib/Configure.py                |  638 +++++++++
 third_party/waf/waflib/Context.py                  |  737 ++++++++++
 third_party/waf/waflib/Errors.py                   |   68 +
 third_party/waf/waflib/Logs.py                     |  379 +++++
 third_party/waf/waflib/Node.py                     |  970 +++++++++++++
 third_party/waf/waflib/Options.py                  |  342 +++++
 third_party/waf/waflib/Runner.py                   |  586 ++++++++
 third_party/waf/waflib/Scripting.py                |  613 ++++++++
 third_party/waf/waflib/Task.py                     | 1281 +++++++++++++++++
 third_party/waf/waflib/TaskGen.py                  |  917 ++++++++++++
 .../waf/{wafadmin => waflib}/Tools/__init__.py     |    2 +-
 third_party/waf/waflib/Tools/ar.py                 |   24 +
 third_party/waf/waflib/Tools/asm.py                |   73 +
 third_party/waf/waflib/Tools/bison.py              |   49 +
 third_party/waf/waflib/Tools/c.py                  |   39 +
 third_party/waf/waflib/Tools/c_aliases.py          |  144 ++
 third_party/waf/waflib/Tools/c_config.py           | 1352 ++++++++++++++++++
 third_party/waf/waflib/Tools/c_osx.py              |  193 +++
 third_party/waf/waflib/Tools/c_preproc.py          | 1091 +++++++++++++++
 third_party/waf/waflib/Tools/c_tests.py            |  229 +++
 third_party/waf/waflib/Tools/ccroot.py             |  775 ++++++++++
 third_party/waf/waflib/Tools/clang.py              |   29 +
 third_party/waf/waflib/Tools/clangxx.py            |   30 +
 third_party/waf/waflib/Tools/compiler_c.py         |  110 ++
 third_party/waf/waflib/Tools/compiler_cxx.py       |  111 ++
 third_party/waf/waflib/Tools/compiler_d.py         |   85 ++
 third_party/waf/waflib/Tools/compiler_fc.py        |   73 +
 third_party/waf/waflib/Tools/cs.py                 |  211 +++
 third_party/waf/waflib/Tools/cxx.py                |   40 +
 third_party/waf/waflib/Tools/d.py                  |   97 ++
 third_party/waf/waflib/Tools/d_config.py           |   64 +
 third_party/waf/waflib/Tools/d_scan.py             |  211 +++
 third_party/waf/waflib/Tools/dbus.py               |   70 +
 third_party/waf/waflib/Tools/dmd.py                |   80 ++
 third_party/waf/waflib/Tools/errcheck.py           |  237 ++++
 third_party/waf/waflib/Tools/fc.py                 |  187 +++
 third_party/waf/waflib/Tools/fc_config.py          |  488 +++++++
 third_party/waf/waflib/Tools/fc_scan.py            |  114 ++
 third_party/waf/waflib/Tools/flex.py               |   62 +
 third_party/waf/waflib/Tools/g95.py                |   66 +
 third_party/waf/waflib/Tools/gas.py                |   18 +
 third_party/waf/waflib/Tools/gcc.py                |  156 +++
 third_party/waf/waflib/Tools/gdc.py                |   55 +
 third_party/waf/waflib/Tools/gfortran.py           |   93 ++
 third_party/waf/waflib/Tools/glib2.py              |  489 +++++++
 third_party/waf/waflib/Tools/gnu_dirs.py           |  131 ++
 third_party/waf/waflib/Tools/gxx.py                |  157 +++
 third_party/waf/waflib/Tools/icc.py                |   30 +
 third_party/waf/waflib/Tools/icpc.py               |   30 +
 third_party/waf/waflib/Tools/ifort.py              |  413 ++++++
 third_party/waf/waflib/Tools/intltool.py           |  231 +++
 third_party/waf/waflib/Tools/irixcc.py             |   66 +
 third_party/waf/waflib/Tools/javaw.py              |  464 ++++++
 third_party/waf/waflib/Tools/ldc2.py               |   56 +
 third_party/waf/waflib/Tools/lua.py                |   38 +
 third_party/waf/waflib/Tools/md5_tstamp.py         |   39 +
 third_party/waf/waflib/Tools/msvc.py               | 1020 ++++++++++++++
 third_party/waf/waflib/Tools/nasm.py               |   26 +
 third_party/waf/waflib/Tools/nobuild.py            |   24 +
 third_party/waf/waflib/Tools/perl.py               |  156 +++
 third_party/waf/waflib/Tools/python.py             |  627 +++++++++
 third_party/waf/waflib/Tools/qt5.py                |  796 +++++++++++
 third_party/waf/waflib/Tools/ruby.py               |  186 +++
 third_party/waf/waflib/Tools/suncc.py              |   67 +
 third_party/waf/waflib/Tools/suncxx.py             |   67 +
 third_party/waf/waflib/Tools/tex.py                |  543 +++++++
 third_party/waf/waflib/Tools/vala.py               |  355 +++++
 third_party/waf/waflib/Tools/waf_unit_test.py      |  296 ++++
 third_party/waf/waflib/Tools/winres.py             |   78 ++
 third_party/waf/waflib/Tools/xlc.py                |   65 +
 third_party/waf/waflib/Tools/xlcxx.py              |   65 +
 third_party/waf/waflib/Utils.py                    | 1021 ++++++++++++++
 third_party/waf/{wafadmin => waflib}/__init__.py   |    2 +-
 third_party/waf/waflib/ansiterm.py                 |  342 +++++
 .../{wafadmin/Tools => waflib/extras}/__init__.py  |    2 +-
 third_party/waf/waflib/extras/batched_cc.py        |  173 +++
 third_party/waf/waflib/extras/biber.py             |   58 +
 third_party/waf/waflib/extras/bjam.py              |  128 ++
 third_party/waf/waflib/extras/blender.py           |  108 ++
 third_party/waf/waflib/extras/boo.py               |   81 ++
 third_party/waf/waflib/extras/boost.py             |  525 +++++++
 .../waf/waflib/extras/build_file_tracker.py        |   28 +
 third_party/waf/waflib/extras/build_logs.py        |  110 ++
 third_party/waf/waflib/extras/buildcopy.py         |   82 ++
 third_party/waf/waflib/extras/c_bgxlc.py           |   32 +
 third_party/waf/waflib/extras/c_dumbpreproc.py     |   72 +
 third_party/waf/waflib/extras/c_emscripten.py      |   87 ++
 third_party/waf/waflib/extras/c_nec.py             |   74 +
 third_party/waf/waflib/extras/cabal.py             |  152 ++
 third_party/waf/waflib/extras/cfg_altoptions.py    |  110 ++
 .../waflib/extras/clang_compilation_database.py    |   85 ++
 third_party/waf/waflib/extras/codelite.py          |  875 ++++++++++++
 third_party/waf/waflib/extras/color_gcc.py         |   39 +
 third_party/waf/waflib/extras/color_rvct.py        |   51 +
 third_party/waf/waflib/extras/compat15.py          |  406 ++++++
 third_party/waf/waflib/extras/cppcheck.py          |  585 ++++++++
 third_party/waf/waflib/extras/cpplint.py           |  222 +++
 third_party/waf/waflib/extras/cross_gnu.py         |  227 +++
 third_party/waf/waflib/extras/cython.py            |  146 ++
 third_party/waf/waflib/extras/dcc.py               |   72 +
 third_party/waf/waflib/extras/distnet.py           |  430 ++++++
 third_party/waf/waflib/extras/doxygen.py           |  227 +++
 third_party/waf/waflib/extras/dpapi.py             |   87 ++
 third_party/waf/waflib/extras/eclipse.py           |  431 ++++++
 third_party/waf/waflib/extras/erlang.py            |  110 ++
 third_party/waf/waflib/extras/fast_partial.py      |  518 +++++++
 third_party/waf/waflib/extras/fc_bgxlf.py          |   32 +
 third_party/waf/waflib/extras/fc_cray.py           |   51 +
 third_party/waf/waflib/extras/fc_nag.py            |   61 +
 third_party/waf/waflib/extras/fc_nec.py            |   60 +
 third_party/waf/waflib/extras/fc_open64.py         |   58 +
 third_party/waf/waflib/extras/fc_pgfortran.py      |   68 +
 third_party/waf/waflib/extras/fc_solstudio.py      |   62 +
 third_party/waf/waflib/extras/fc_xlf.py            |   63 +
 third_party/waf/waflib/extras/file_to_object.py    |  137 ++
 third_party/waf/waflib/extras/fluid.py             |   30 +
 third_party/waf/waflib/extras/freeimage.py         |   74 +
 third_party/waf/waflib/extras/fsb.py               |   31 +
 third_party/waf/waflib/extras/fsc.py               |   64 +
 third_party/waf/waflib/extras/gccdeps.py           |  214 +++
 third_party/waf/waflib/extras/gdbus.py             |   87 ++
 third_party/waf/waflib/extras/gob2.py              |   17 +
 third_party/waf/waflib/extras/halide.py            |  151 ++
 third_party/waf/waflib/extras/javatest.py          |  118 ++
 third_party/waf/waflib/extras/kde4.py              |   93 ++
 third_party/waf/waflib/extras/local_rpath.py       |   19 +
 third_party/waf/waflib/extras/make.py              |  142 ++
 third_party/waf/waflib/extras/midl.py              |   69 +
 third_party/waf/waflib/extras/msvcdeps.py          |  256 ++++
 third_party/waf/waflib/extras/msvs.py              | 1048 ++++++++++++++
 third_party/waf/waflib/extras/netcache_client.py   |  390 ++++++
 third_party/waf/waflib/extras/objcopy.py           |   50 +
 .../waf/{wafadmin/Tools => waflib/extras}/ocaml.py |  233 ++--
 third_party/waf/waflib/extras/package.py           |   76 +
 third_party/waf/waflib/extras/parallel_debug.py    |  459 ++++++
 third_party/waf/waflib/extras/pch.py               |  148 ++
 third_party/waf/waflib/extras/pep8.py              |  106 ++
 third_party/waf/waflib/extras/pgicc.py             |   75 +
 third_party/waf/waflib/extras/pgicxx.py            |   20 +
 third_party/waf/waflib/extras/proc.py              |   54 +
 third_party/waf/waflib/extras/protoc.py            |  243 ++++
 third_party/waf/waflib/extras/pyqt5.py             |  241 ++++
 third_party/waf/waflib/extras/pytest.py            |  225 +++
 third_party/waf/waflib/extras/qnxnto.py            |   72 +
 third_party/waf/waflib/extras/qt4.py               |  695 +++++++++
 third_party/waf/waflib/extras/relocation.py        |   85 ++
 third_party/waf/waflib/extras/remote.py            |  327 +++++
 third_party/waf/waflib/extras/resx.py              |   35 +
 third_party/waf/waflib/extras/review.py            |  325 +++++
 third_party/waf/waflib/extras/rst.py               |  260 ++++
 third_party/waf/waflib/extras/run_do_script.py     |  139 ++
 third_party/waf/waflib/extras/run_m_script.py      |   88 ++
 third_party/waf/waflib/extras/run_py_script.py     |  104 ++
 third_party/waf/waflib/extras/run_r_script.py      |   86 ++
 third_party/waf/waflib/extras/sas.py               |   71 +
 .../waf/waflib/extras/satellite_assembly.py        |   57 +
 third_party/waf/waflib/extras/scala.py             |  128 ++
 third_party/waf/waflib/extras/slow_qt4.py          |   96 ++
 third_party/waf/waflib/extras/softlink_libs.py     |   76 +
 third_party/waf/waflib/extras/stale.py             |   98 ++
 third_party/waf/waflib/extras/stracedeps.py        |  174 +++
 third_party/waf/waflib/extras/swig.py              |  237 ++++
 third_party/waf/waflib/extras/syms.py              |   84 ++
 third_party/waf/waflib/extras/ticgt.py             |  300 ++++
 third_party/waf/waflib/extras/unity.py             |  108 ++
 third_party/waf/waflib/extras/use_config.py        |  185 +++
 third_party/waf/waflib/extras/valadoc.py           |  140 ++
 third_party/waf/waflib/extras/waf_xattr.py         |  150 ++
 third_party/waf/waflib/extras/why.py               |   78 ++
 third_party/waf/waflib/extras/win32_opts.py        |  170 +++
 third_party/waf/waflib/extras/wix.py               |   87 ++
 third_party/waf/waflib/extras/xcode6.py            |  727 ++++++++++
 third_party/waf/waflib/fixpy2.py                   |   64 +
 third_party/waf/waflib/processor.py                |   64 +
 third_party/wscript                                |    9 +-
 wscript                                            |   81 +-
 wscript_build                                      |    2 +-
 wscript_build_embedded_heimdal                     |    2 +-
 wscript_build_system_heimdal                       |    2 +-
 wscript_build_system_mitkrb5                       |    2 +-
 wscript_configure_system_mitkrb5                   |    9 +-
 335 files changed, 41206 insertions(+), 19181 deletions(-)
 create mode 100755 buildtools/bin/waf-1.9
 delete mode 100644 buildtools/wafsamba/samba_optimisation.py
 create mode 100644 buildtools/wafsamba/samba_waf18.py
 delete mode 100644 third_party/waf/wafadmin/3rdparty/ParallelDebug.py
 delete mode 100644 third_party/waf/wafadmin/3rdparty/batched_cc.py
 delete mode 100644 third_party/waf/wafadmin/3rdparty/boost.py
 delete mode 100644 third_party/waf/wafadmin/3rdparty/build_file_tracker.py
 delete mode 100644 third_party/waf/wafadmin/3rdparty/fluid.py
 delete mode 100644 third_party/waf/wafadmin/3rdparty/gccdeps.py
 delete mode 100644 third_party/waf/wafadmin/3rdparty/go.py
 delete mode 100644 third_party/waf/wafadmin/3rdparty/lru_cache.py
 delete mode 100644 third_party/waf/wafadmin/3rdparty/paranoid.py
 delete mode 100755 third_party/waf/wafadmin/3rdparty/prefork.py
 delete mode 100644 third_party/waf/wafadmin/3rdparty/print_commands.py
 delete mode 100644 third_party/waf/wafadmin/3rdparty/swig.py
 delete mode 100644 third_party/waf/wafadmin/3rdparty/valadoc.py
 delete mode 100644 third_party/waf/wafadmin/Build.py
 delete mode 100644 third_party/waf/wafadmin/Configure.py
 delete mode 100644 third_party/waf/wafadmin/Constants.py
 delete mode 100644 third_party/waf/wafadmin/Environment.py
 delete mode 100644 third_party/waf/wafadmin/Logs.py
 delete mode 100644 third_party/waf/wafadmin/Node.py
 delete mode 100644 third_party/waf/wafadmin/Options.py
 delete mode 100644 third_party/waf/wafadmin/Runner.py
 delete mode 100644 third_party/waf/wafadmin/Scripting.py
 delete mode 100644 third_party/waf/wafadmin/Task.py
 delete mode 100644 third_party/waf/wafadmin/TaskGen.py
 delete mode 100644 third_party/waf/wafadmin/Tools/ar.py
 delete mode 100644 third_party/waf/wafadmin/Tools/bison.py
 delete mode 100644 third_party/waf/wafadmin/Tools/cc.py
 delete mode 100644 third_party/waf/wafadmin/Tools/ccroot.py
 delete mode 100644 third_party/waf/wafadmin/Tools/compiler_cc.py
 delete mode 100644 third_party/waf/wafadmin/Tools/compiler_cxx.py
 delete mode 100644 third_party/waf/wafadmin/Tools/compiler_d.py
 delete mode 100644 third_party/waf/wafadmin/Tools/config_c.py
 delete mode 100644 third_party/waf/wafadmin/Tools/cs.py
 delete mode 100644 third_party/waf/wafadmin/Tools/cxx.py
 delete mode 100644 third_party/waf/wafadmin/Tools/d.py
 delete mode 100644 third_party/waf/wafadmin/Tools/dbus.py
 delete mode 100644 third_party/waf/wafadmin/Tools/dmd.py
 delete mode 100644 third_party/waf/wafadmin/Tools/flex.py
 delete mode 100644 third_party/waf/wafadmin/Tools/gas.py
 delete mode 100644 third_party/waf/wafadmin/Tools/gcc.py
 delete mode 100644 third_party/waf/wafadmin/Tools/gdc.py
 delete mode 100644 third_party/waf/wafadmin/Tools/glib2.py
 delete mode 100644 third_party/waf/wafadmin/Tools/gnome.py
 delete mode 100644 third_party/waf/wafadmin/Tools/gnu_dirs.py
 delete mode 100644 third_party/waf/wafadmin/Tools/gob2.py
 delete mode 100644 third_party/waf/wafadmin/Tools/gxx.py
 delete mode 100644 third_party/waf/wafadmin/Tools/icc.py
 delete mode 100644 third_party/waf/wafadmin/Tools/icpc.py
 delete mode 100644 third_party/waf/wafadmin/Tools/intltool.py
 delete mode 100644 third_party/waf/wafadmin/Tools/javaw.py
 delete mode 100644 third_party/waf/wafadmin/Tools/kde4.py
 delete mode 100644 third_party/waf/wafadmin/Tools/libtool.py
 delete mode 100644 third_party/waf/wafadmin/Tools/lua.py
 delete mode 100644 third_party/waf/wafadmin/Tools/misc.py
 delete mode 100644 third_party/waf/wafadmin/Tools/msvc.py
 delete mode 100644 third_party/waf/wafadmin/Tools/nasm.py
 delete mode 100644 third_party/waf/wafadmin/Tools/osx.py
 delete mode 100644 third_party/waf/wafadmin/Tools/perl.py
 delete mode 100644 third_party/waf/wafadmin/Tools/preproc.py
 delete mode 100644 third_party/waf/wafadmin/Tools/python.py
 delete mode 100644 third_party/waf/wafadmin/Tools/qt4.py
 delete mode 100644 third_party/waf/wafadmin/Tools/ruby.py
 delete mode 100644 third_party/waf/wafadmin/Tools/suncc.py
 delete mode 100644 third_party/waf/wafadmin/Tools/suncxx.py
 delete mode 100644 third_party/waf/wafadmin/Tools/tex.py
 delete mode 100644 third_party/waf/wafadmin/Tools/unittestw.py
 delete mode 100644 third_party/waf/wafadmin/Tools/vala.py
 delete mode 100644 third_party/waf/wafadmin/Tools/winres.py
 delete mode 100644 third_party/waf/wafadmin/Tools/xlc.py
 delete mode 100644 third_party/waf/wafadmin/Tools/xlcxx.py
 delete mode 100644 third_party/waf/wafadmin/Utils.py
 delete mode 100644 third_party/waf/wafadmin/ansiterm.py
 delete mode 100644 third_party/waf/wafadmin/pproc.py
 delete mode 100644 third_party/waf/wafadmin/py3kfixes.py
 create mode 100644 third_party/waf/waflib/Build.py
 create mode 100644 third_party/waf/waflib/ConfigSet.py
 create mode 100644 third_party/waf/waflib/Configure.py
 create mode 100644 third_party/waf/waflib/Context.py
 create mode 100644 third_party/waf/waflib/Errors.py
 create mode 100644 third_party/waf/waflib/Logs.py
 create mode 100644 third_party/waf/waflib/Node.py
 create mode 100644 third_party/waf/waflib/Options.py
 create mode 100644 third_party/waf/waflib/Runner.py
 create mode 100644 third_party/waf/waflib/Scripting.py
 create mode 100644 third_party/waf/waflib/Task.py
 create mode 100644 third_party/waf/waflib/TaskGen.py
 copy third_party/waf/{wafadmin => waflib}/Tools/__init__.py (56%)
 create mode 100644 third_party/waf/waflib/Tools/ar.py
 create mode 100644 third_party/waf/waflib/Tools/asm.py
 create mode 100644 third_party/waf/waflib/Tools/bison.py
 create mode 100644 third_party/waf/waflib/Tools/c.py
 create mode 100644 third_party/waf/waflib/Tools/c_aliases.py
 create mode 100644 third_party/waf/waflib/Tools/c_config.py
 create mode 100644 third_party/waf/waflib/Tools/c_osx.py
 create mode 100644 third_party/waf/waflib/Tools/c_preproc.py
 create mode 100644 third_party/waf/waflib/Tools/c_tests.py
 create mode 100644 third_party/waf/waflib/Tools/ccroot.py
 create mode 100644 third_party/waf/waflib/Tools/clang.py
 create mode 100644 third_party/waf/waflib/Tools/clangxx.py
 create mode 100644 third_party/waf/waflib/Tools/compiler_c.py
 create mode 100644 third_party/waf/waflib/Tools/compiler_cxx.py
 create mode 100644 third_party/waf/waflib/Tools/compiler_d.py
 create mode 100644 third_party/waf/waflib/Tools/compiler_fc.py
 create mode 100644 third_party/waf/waflib/Tools/cs.py
 create mode 100644 third_party/waf/waflib/Tools/cxx.py
 create mode 100644 third_party/waf/waflib/Tools/d.py
 create mode 100644 third_party/waf/waflib/Tools/d_config.py
 create mode 100644 third_party/waf/waflib/Tools/d_scan.py
 create mode 100644 third_party/waf/waflib/Tools/dbus.py
 create mode 100644 third_party/waf/waflib/Tools/dmd.py
 create mode 100644 third_party/waf/waflib/Tools/errcheck.py
 create mode 100644 third_party/waf/waflib/Tools/fc.py
 create mode 100644 third_party/waf/waflib/Tools/fc_config.py
 create mode 100644 third_party/waf/waflib/Tools/fc_scan.py
 create mode 100644 third_party/waf/waflib/Tools/flex.py
 create mode 100644 third_party/waf/waflib/Tools/g95.py
 create mode 100644 third_party/waf/waflib/Tools/gas.py
 create mode 100644 third_party/waf/waflib/Tools/gcc.py
 create mode 100644 third_party/waf/waflib/Tools/gdc.py
 create mode 100644 third_party/waf/waflib/Tools/gfortran.py
 create mode 100644 third_party/waf/waflib/Tools/glib2.py
 create mode 100644 third_party/waf/waflib/Tools/gnu_dirs.py
 create mode 100644 third_party/waf/waflib/Tools/gxx.py
 create mode 100644 third_party/waf/waflib/Tools/icc.py
 create mode 100644 third_party/waf/waflib/Tools/icpc.py
 create mode 100644 third_party/waf/waflib/Tools/ifort.py
 create mode 100644 third_party/waf/waflib/Tools/intltool.py
 create mode 100644 third_party/waf/waflib/Tools/irixcc.py
 create mode 100644 third_party/waf/waflib/Tools/javaw.py
 create mode 100644 third_party/waf/waflib/Tools/ldc2.py
 create mode 100644 third_party/waf/waflib/Tools/lua.py
 create mode 100644 third_party/waf/waflib/Tools/md5_tstamp.py
 create mode 100644 third_party/waf/waflib/Tools/msvc.py
 create mode 100644 third_party/waf/waflib/Tools/nasm.py
 create mode 100644 third_party/waf/waflib/Tools/nobuild.py
 create mode 100644 third_party/waf/waflib/Tools/perl.py
 create mode 100644 third_party/waf/waflib/Tools/python.py
 create mode 100644 third_party/waf/waflib/Tools/qt5.py
 create mode 100644 third_party/waf/waflib/Tools/ruby.py
 create mode 100644 third_party/waf/waflib/Tools/suncc.py
 create mode 100644 third_party/waf/waflib/Tools/suncxx.py
 create mode 100644 third_party/waf/waflib/Tools/tex.py
 create mode 100644 third_party/waf/waflib/Tools/vala.py
 create mode 100644 third_party/waf/waflib/Tools/waf_unit_test.py
 create mode 100644 third_party/waf/waflib/Tools/winres.py
 create mode 100644 third_party/waf/waflib/Tools/xlc.py
 create mode 100644 third_party/waf/waflib/Tools/xlcxx.py
 create mode 100644 third_party/waf/waflib/Utils.py
 rename third_party/waf/{wafadmin => waflib}/__init__.py (56%)
 create mode 100644 third_party/waf/waflib/ansiterm.py
 rename third_party/waf/{wafadmin/Tools => waflib/extras}/__init__.py (56%)
 create mode 100644 third_party/waf/waflib/extras/batched_cc.py
 create mode 100644 third_party/waf/waflib/extras/biber.py
 create mode 100644 third_party/waf/waflib/extras/bjam.py
 create mode 100644 third_party/waf/waflib/extras/blender.py
 create mode 100644 third_party/waf/waflib/extras/boo.py
 create mode 100644 third_party/waf/waflib/extras/boost.py
 create mode 100644 third_party/waf/waflib/extras/build_file_tracker.py
 create mode 100644 third_party/waf/waflib/extras/build_logs.py
 create mode 100644 third_party/waf/waflib/extras/buildcopy.py
 create mode 100644 third_party/waf/waflib/extras/c_bgxlc.py
 create mode 100644 third_party/waf/waflib/extras/c_dumbpreproc.py
 create mode 100644 third_party/waf/waflib/extras/c_emscripten.py
 create mode 100644 third_party/waf/waflib/extras/c_nec.py
 create mode 100644 third_party/waf/waflib/extras/cabal.py
 create mode 100644 third_party/waf/waflib/extras/cfg_altoptions.py
 create mode 100644 third_party/waf/waflib/extras/clang_compilation_database.py
 create mode 100644 third_party/waf/waflib/extras/codelite.py
 create mode 100644 third_party/waf/waflib/extras/color_gcc.py
 create mode 100644 third_party/waf/waflib/extras/color_rvct.py
 create mode 100644 third_party/waf/waflib/extras/compat15.py
 create mode 100644 third_party/waf/waflib/extras/cppcheck.py
 create mode 100644 third_party/waf/waflib/extras/cpplint.py
 create mode 100644 third_party/waf/waflib/extras/cross_gnu.py
 create mode 100644 third_party/waf/waflib/extras/cython.py
 create mode 100644 third_party/waf/waflib/extras/dcc.py
 create mode 100644 third_party/waf/waflib/extras/distnet.py
 create mode 100644 third_party/waf/waflib/extras/doxygen.py
 create mode 100644 third_party/waf/waflib/extras/dpapi.py
 create mode 100644 third_party/waf/waflib/extras/eclipse.py
 create mode 100644 third_party/waf/waflib/extras/erlang.py
 create mode 100644 third_party/waf/waflib/extras/fast_partial.py
 create mode 100644 third_party/waf/waflib/extras/fc_bgxlf.py
 create mode 100644 third_party/waf/waflib/extras/fc_cray.py
 create mode 100644 third_party/waf/waflib/extras/fc_nag.py
 create mode 100644 third_party/waf/waflib/extras/fc_nec.py
 create mode 100644 third_party/waf/waflib/extras/fc_open64.py
 create mode 100644 third_party/waf/waflib/extras/fc_pgfortran.py
 create mode 100644 third_party/waf/waflib/extras/fc_solstudio.py
 create mode 100644 third_party/waf/waflib/extras/fc_xlf.py
 create mode 100644 third_party/waf/waflib/extras/file_to_object.py
 create mode 100644 third_party/waf/waflib/extras/fluid.py
 create mode 100644 third_party/waf/waflib/extras/freeimage.py
 create mode 100644 third_party/waf/waflib/extras/fsb.py
 create mode 100644 third_party/waf/waflib/extras/fsc.py
 create mode 100644 third_party/waf/waflib/extras/gccdeps.py
 create mode 100644 third_party/waf/waflib/extras/gdbus.py
 create mode 100644 third_party/waf/waflib/extras/gob2.py
 create mode 100644 third_party/waf/waflib/extras/halide.py
 create mode 100755 third_party/waf/waflib/extras/javatest.py
 create mode 100644 third_party/waf/waflib/extras/kde4.py
 create mode 100644 third_party/waf/waflib/extras/local_rpath.py
 create mode 100644 third_party/waf/waflib/extras/make.py
 create mode 100644 third_party/waf/waflib/extras/midl.py
 create mode 100644 third_party/waf/waflib/extras/msvcdeps.py
 create mode 100644 third_party/waf/waflib/extras/msvs.py
 create mode 100644 third_party/waf/waflib/extras/netcache_client.py
 create mode 100644 third_party/waf/waflib/extras/objcopy.py
 rename third_party/waf/{wafadmin/Tools => waflib/extras}/ocaml.py (55%)
 create mode 100644 third_party/waf/waflib/extras/package.py
 create mode 100644 third_party/waf/waflib/extras/parallel_debug.py
 create mode 100644 third_party/waf/waflib/extras/pch.py
 create mode 100644 third_party/waf/waflib/extras/pep8.py
 create mode 100644 third_party/waf/waflib/extras/pgicc.py
 create mode 100644 third_party/waf/waflib/extras/pgicxx.py
 create mode 100644 third_party/waf/waflib/extras/proc.py
 create mode 100644 third_party/waf/waflib/extras/protoc.py
 create mode 100644 third_party/waf/waflib/extras/pyqt5.py
 create mode 100644 third_party/waf/waflib/extras/pytest.py
 create mode 100644 third_party/waf/waflib/extras/qnxnto.py
 create mode 100644 third_party/waf/waflib/extras/qt4.py
 create mode 100644 third_party/waf/waflib/extras/relocation.py
 create mode 100644 third_party/waf/waflib/extras/remote.py
 create mode 100644 third_party/waf/waflib/extras/resx.py
 create mode 100644 third_party/waf/waflib/extras/review.py
 create mode 100644 third_party/waf/waflib/extras/rst.py
 create mode 100644 third_party/waf/waflib/extras/run_do_script.py
 create mode 100644 third_party/waf/waflib/extras/run_m_script.py
 create mode 100644 third_party/waf/waflib/extras/run_py_script.py
 create mode 100644 third_party/waf/waflib/extras/run_r_script.py
 create mode 100644 third_party/waf/waflib/extras/sas.py
 create mode 100644 third_party/waf/waflib/extras/satellite_assembly.py
 create mode 100644 third_party/waf/waflib/extras/scala.py
 create mode 100644 third_party/waf/waflib/extras/slow_qt4.py
 create mode 100644 third_party/waf/waflib/extras/softlink_libs.py
 create mode 100644 third_party/waf/waflib/extras/stale.py
 create mode 100644 third_party/waf/waflib/extras/stracedeps.py
 create mode 100644 third_party/waf/waflib/extras/swig.py
 create mode 100644 third_party/waf/waflib/extras/syms.py
 create mode 100644 third_party/waf/waflib/extras/ticgt.py
 create mode 100644 third_party/waf/waflib/extras/unity.py
 create mode 100644 third_party/waf/waflib/extras/use_config.py
 create mode 100644 third_party/waf/waflib/extras/valadoc.py
 create mode 100644 third_party/waf/waflib/extras/waf_xattr.py
 create mode 100644 third_party/waf/waflib/extras/why.py
 create mode 100644 third_party/waf/waflib/extras/win32_opts.py
 create mode 100644 third_party/waf/waflib/extras/wix.py
 create mode 100644 third_party/waf/waflib/extras/xcode6.py
 create mode 100644 third_party/waf/waflib/fixpy2.py
 create mode 100755 third_party/waf/waflib/processor.py


Changeset truncated at 500 lines:

diff --git a/buildtools/bin/waf b/buildtools/bin/waf
index 1b0f466..e3c0cb5 100755
--- a/buildtools/bin/waf
+++ b/buildtools/bin/waf
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
-# encoding: ISO-8859-1
-# Thomas Nagy, 2005-2010
-
+# encoding: latin-1
+# Thomas Nagy, 2005-2018
+#
 """
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions
@@ -30,25 +30,24 @@ IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 """
 
-import os, sys
-if sys.hexversion<0x203000f: raise ImportError("Waf requires Python >= 2.3")
-
-if 'PSYCOWAF' in os.environ:
-	try:import psyco;psyco.full()
-	except:pass
+import os, sys, inspect
 
-VERSION="1.5.19"
+VERSION="2.0.8"
 REVISION="x"
+GIT="x"
 INSTALL="x"
 C1='x'
 C2='x'
+C3='x'
 cwd = os.getcwd()
 join = os.path.join
 
+if sys.hexversion<0x206000f:
+	raise ImportError('Python >= 2.6 is required to create the waf file')
+
 WAF='waf'
 def b(x):
 	return x
-
 if sys.hexversion>0x300000f:
 	WAF='waf3'
 	def b(x):
@@ -58,20 +57,111 @@ def err(m):
 	print(('\033[91mError: %s\033[0m' % m))
 	sys.exit(1)
 
-def test(dir):
-	try: os.stat(join(dir, 'wafadmin')); return os.path.abspath(dir)
+def unpack_wafdir(dir, src):
+	f = open(src,'rb')
+	c = 'corrupt archive (%d)'
+	while 1:
+		line = f.readline()
+		if not line: err('run waf-light from a folder containing waflib')
+		if line == b('#==>\n'):
+			txt = f.readline()
+			if not txt: err(c % 1)
+			if f.readline() != b('#<==\n'): err(c % 2)
+			break
+	if not txt: err(c % 3)
+	txt = txt[1:-1].replace(b(C1), b('\n')).replace(b(C2), b('\r')).replace(b(C3), b('\x00'))
+
+	import shutil, tarfile
+	try: shutil.rmtree(dir)
 	except OSError: pass
+	try:
+		for x in ('Tools', 'extras'):
+			os.makedirs(join(dir, 'waflib', x))
+	except OSError:
+		err("Cannot unpack waf lib into %s\nMove waf in a writable directory" % dir)
+
+	os.chdir(dir)
+	tmp = 't.bz2'
+	t = open(tmp,'wb')
+	try: t.write(txt)
+	finally: t.close()
+
+	try:
+		t = tarfile.open(tmp)
+	except:
+		try:
+			os.system('bunzip2 t.bz2')
+			t = tarfile.open('t')
+			tmp = 't'
+		except:
+			os.chdir(cwd)
+			try: shutil.rmtree(dir)
+			except OSError: pass
+			err("Waf cannot be unpacked, check that bzip2 support is present")
+
+	try:
+		for x in t: t.extract(x)
+	finally:
+		t.close()
+
+	for x in ('Tools', 'extras'):
+		os.chmod(join('waflib',x), 493)
+
+	if sys.hexversion<0x300000f:
+		sys.path = [join(dir, 'waflib')] + sys.path
+		import fixpy2
+		fixpy2.fixdir(dir)
+
+	os.remove(tmp)
+	os.chdir(cwd)
+
+	try: dir = unicode(dir, 'mbcs')
+	except: pass
+	try:
+		from ctypes import windll
+		windll.kernel32.SetFileAttributesW(dir, 2)
+	except:
+		pass
+
+def test(dir):
+	try:
+		os.stat(join(dir, 'waflib'))
+		return os.path.abspath(dir)
+	except OSError:
+		pass
 
 def find_lib():
-	return os.path.abspath(os.path.join(os.path.dirname(__file__), '../../third_party/waf'))
+	path = '../../third_party/waf'
+	paths = [path, path+'/waflib']
+	return [os.path.abspath(os.path.join(os.path.dirname(__file__), x)) for x in paths]
 
 wafdir = find_lib()
-w = join(wafdir, 'wafadmin')
-t = join(w, 'Tools')
-f = join(w, '3rdparty')
-sys.path = [w, t, f] + sys.path
+for p in wafdir:
+	sys.path.insert(0, p)
 
 if __name__ == '__main__':
-	import Scripting
-	Scripting.prepare(t, cwd, VERSION, wafdir)
+	#import extras.compat15#PRELUDE
+	import sys
+
+	from waflib.Tools import ccroot, c, ar, compiler_c, gcc
+	sys.modules['cc'] = c
+	sys.modules['ccroot'] = ccroot
+	sys.modules['ar'] = ar
+	sys.modules['compiler_cc'] = compiler_c
+	sys.modules['gcc'] = gcc
+
+	from waflib import Options
+	Options.lockfile = os.environ.get('WAFLOCK', '.lock-wscript')
+	if os.path.isfile(Options.lockfile) and os.stat(Options.lockfile).st_size == 0:
+		os.environ['NOCLIMB'] = "1"
+	# there is a single top-level, but libraries must build independently
+	os.environ['NO_LOCK_IN_TOP'] = "1"
+
+	from waflib import Task
+	class o(object):
+		display = None
+	Task.classes['cc_link'] = o
+
+	from waflib import Scripting
+	Scripting.waf_entry_point(cwd, VERSION, wafdir[0])
 
diff --git a/buildtools/bin/waf-1.9 b/buildtools/bin/waf-1.9
new file mode 100755
index 0000000..a83a243
--- /dev/null
+++ b/buildtools/bin/waf-1.9
@@ -0,0 +1,164 @@
+#!/usr/bin/env python
+# encoding: ISO8859-1
+# Thomas Nagy, 2005-2015
+
+"""
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+3. The name of the author may not be used to endorse or promote products
+   derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR
+IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
+INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+"""
+
+import os, sys, inspect
+
+VERSION="1.9.10"
+REVISION="x"
+GIT="x"
+INSTALL=''
+C1='#>'
+C2='#6'
+C3='#4'
+cwd = os.getcwd()
+join = os.path.join
+
+
+WAF='waf'
+def b(x):
+	return x
+if sys.hexversion>0x300000f:
+	WAF='waf3'
+	def b(x):
+		return x.encode()
+
+def err(m):
+	print(('\033[91mError: %s\033[0m' % m))
+	sys.exit(1)
+
+def unpack_wafdir(dir, src):
+	f = open(src,'rb')
+	c = 'corrupt archive (%d)'
+	while 1:
+		line = f.readline()
+		if not line: err('run waf-light from a folder containing waflib')
+		if line == b('#==>\n'):
+			txt = f.readline()
+			if not txt: err(c % 1)
+			if f.readline() != b('#<==\n'): err(c % 2)
+			break
+	if not txt: err(c % 3)
+	txt = txt[1:-1].replace(b(C1), b('\n')).replace(b(C2), b('\r')).replace(b(C3), b('\x00'))
+
+	import shutil, tarfile
+	try: shutil.rmtree(dir)
+	except OSError: pass
+	try:
+		for x in ('Tools', 'extras'):
+			os.makedirs(join(dir, 'waflib', x))
+	except OSError:
+		err("Cannot unpack waf lib into %s\nMove waf in a writable directory" % dir)
+
+	os.chdir(dir)
+	tmp = 't.bz2'
+	t = open(tmp,'wb')
+	try: t.write(txt)
+	finally: t.close()
+
+	try:
+		t = tarfile.open(tmp)
+	except:
+		try:
+			os.system('bunzip2 t.bz2')
+			t = tarfile.open('t')
+			tmp = 't'
+		except:
+			os.chdir(cwd)
+			try: shutil.rmtree(dir)
+			except OSError: pass
+			err("Waf cannot be unpacked, check that bzip2 support is present")
+
+	try:
+		for x in t: t.extract(x)
+	finally:
+		t.close()
+
+	for x in ('Tools', 'extras'):
+		os.chmod(join('waflib',x), 493)
+
+	if sys.hexversion<0x300000f:
+		sys.path = [join(dir, 'waflib')] + sys.path
+		import fixpy2
+		fixpy2.fixdir(dir)
+
+	os.remove(tmp)
+	os.chdir(cwd)
+
+	try: dir = unicode(dir, 'mbcs')
+	except: pass
+	try:
+		from ctypes import windll
+		windll.kernel32.SetFileAttributesW(dir, 2)
+	except:
+		pass
+
+def test(dir):
+	try:
+		os.stat(join(dir, 'waflib'))
+		return os.path.abspath(dir)
+	except OSError:
+		pass
+
+def find_lib():
+	return os.path.abspath(os.path.join(os.path.dirname(__file__), '../../third_party/waf'))
+
+wafdir = find_lib()
+sys.path.insert(0, wafdir)
+
+if __name__ == '__main__':
+
+	# TODO: remove these when possible
+	from waflib.extras import compat15
+	import sys
+
+	from waflib.Tools import ccroot, c, ar, compiler_c, gcc
+	sys.modules['cc'] = c
+	sys.modules['ccroot'] = ccroot
+	sys.modules['ar'] = ar
+	sys.modules['compiler_cc'] = compiler_c
+	sys.modules['gcc'] = gcc
+
+        from waflib import Options
+	Options.lockfile = os.environ.get('WAFLOCK', '.lock-wscript')
+	if os.path.isfile(Options.lockfile) and os.stat(Options.lockfile).st_size == 0:
+		os.environ['NOCLIMB'] = "1"
+	# there is a single top-level, but libraries must build independently
+	os.environ['NO_LOCK_IN_TOP'] = "1"
+
+	from waflib import Task
+	class o(object):
+		display = None
+	Task.classes['cc_link'] = o
+
+	from waflib import Scripting
+	Scripting.waf_entry_point(cwd, VERSION, wafdir)
+
diff --git a/buildtools/wafsamba/configure_file.py b/buildtools/wafsamba/configure_file.py
index e28282b..6ad4354 100644
--- a/buildtools/wafsamba/configure_file.py
+++ b/buildtools/wafsamba/configure_file.py
@@ -1,7 +1,9 @@
 # handle substitution of variables in .in files
 
-import re, os
-import Build, sys, Logs
+import sys
+import re
+import os
+from waflib import Build, Logs
 from samba_utils import SUBST_VARS_RECURSIVE
 
 def subst_at_vars(task):
diff --git a/buildtools/wafsamba/generic_cc.py b/buildtools/wafsamba/generic_cc.py
index 504e902..93a43ea 100644
--- a/buildtools/wafsamba/generic_cc.py
+++ b/buildtools/wafsamba/generic_cc.py
@@ -3,11 +3,11 @@
 # based on suncc.py from waf
 
 import os, optparse
-import Utils, Options, Configure
-import ccroot, ar
-from Configure import conftest
+from waflib import Utils, Options, Configure
+from waflib.Tools import ccroot, ar
+from waflib.Configure import conftest
 
-from compiler_cc import c_compiler
+from waflib.Tools.compiler_c import c_compiler
 
 c_compiler['default'] = ['gcc', 'generic_cc']
 c_compiler['hpux'] = ['gcc', 'generic_cc']
diff --git a/buildtools/wafsamba/hpuxcc.py b/buildtools/wafsamba/hpuxcc.py
index c263556..5938811 100644
--- a/buildtools/wafsamba/hpuxcc.py
+++ b/buildtools/wafsamba/hpuxcc.py
@@ -2,10 +2,10 @@
 # based on suncc.py from waf
 
 import os, optparse, sys
-import Utils, Options, Configure
-import ccroot, ar
-from Configure import conftest
-import gcc
+from waflib import Utils, Options, Configure
+from waflib.Tools import ccroot, ar
+from waflib.Configure import conftest
+from waflib.Tools import gcc
 
 
 @conftest
@@ -38,7 +38,7 @@ def gcc_modifier_hpux(conf):
 
 gcc.gcc_modifier_hpux = gcc_modifier_hpux
 
-from TaskGen import feature, after
+from waflib.TaskGen import feature, after
 @feature('cprogram', 'cshlib')
 @after('apply_link', 'apply_lib_vars', 'apply_obj_vars')
 def hpux_addfullpath(self):
diff --git a/buildtools/wafsamba/irixcc.py b/buildtools/wafsamba/irixcc.py
index f3cb451..c33c96b 100644
--- a/buildtools/wafsamba/irixcc.py
+++ b/buildtools/wafsamba/irixcc.py
@@ -3,11 +3,11 @@
 # based on suncc.py from waf
 
 import os, optparse
-import Utils, Options, Configure
-import ccroot, ar
-from Configure import conftest
+from waflib import Utils, Options, Configure
+from waflib.Tools import ccroot, ar
+from waflib.Configure import conftest
 
-from compiler_cc import c_compiler
+from waflib.Tools.compiler_c import c_compiler
 
 c_compiler['irix'] = ['gcc', 'irixcc']
 
diff --git a/buildtools/wafsamba/nothreads.py b/buildtools/wafsamba/nothreads.py
index 9bd33e8..f873d7d 100644
--- a/buildtools/wafsamba/nothreads.py
+++ b/buildtools/wafsamba/nothreads.py
@@ -13,8 +13,8 @@
 import sys, random, threading
 try: from Queue import Queue
 except ImportError: from queue import Queue
-import Utils, Options
-from Constants import EXCEPTION, CRASHED, MAXJOBS, ASK_LATER, SKIPPED, SKIP_ME, SUCCESS
+from waflib import Utils, Options, Errors
+from waflib.TaskGen import EXCEPTION, CRASHED, MAXJOBS, ASK_LATER, SKIPPED, SKIP_ME, SUCCESS
 
 GAP = 15
 
@@ -58,7 +58,7 @@ def process(tsk):
     else:
         try:
             tsk.post_run()
-        except Utils.WafError:
+        except Errors.WafError:
             pass
         except Exception:
             tsk.err_msg = Utils.ex_stack()
diff --git a/buildtools/wafsamba/pkgconfig.py b/buildtools/wafsamba/pkgconfig.py
index 999bad4..6094114 100644
--- a/buildtools/wafsamba/pkgconfig.py
+++ b/buildtools/wafsamba/pkgconfig.py
@@ -1,7 +1,7 @@
 # handle substitution of variables in pc files
 
 import os, re, sys
-import Build, Logs
+from waflib import Build, Logs
 from samba_utils import SUBST_VARS_RECURSIVE, TO_LIST
 
 def subst_at_vars(task):
diff --git a/buildtools/wafsamba/samba3.py b/buildtools/wafsamba/samba3.py
index 44daff9..5375679 100644
--- a/buildtools/wafsamba/samba3.py
+++ b/buildtools/wafsamba/samba3.py
@@ -1,11 +1,12 @@
 # a waf tool to add autoconf-like macros to the configure section
 # and for SAMBA_ macros for building libraries, binaries etc
 
-import Options, Build, os
-from samba_utils import os_path_relpath, TO_LIST, samba_add_onoff_option
+import os
+from waflib import Options, Build
+from samba_utils import os_path_relpath, TO_LIST
 from samba_autoconf import library_flags
 
-Options.Handler.SAMBA3_ADD_OPTION = samba_add_onoff_option
+Options.OptionsContext.SAMBA3_ADD_OPTION = Options.OptionsContext.samba_add_onoff_option
 
 def SAMBA3_IS_STATIC_MODULE(bld, module):
     '''Check whether module is in static list'''
@@ -32,7 +33,7 @@ def s3_fix_kwargs(bld, kwargs):
     '''fix the build arguments for s3 build rules to include the
     necessary includes, subdir and cflags options '''
     s3dir = os.path.join(bld.env.srcdir, 'source3')
-    s3reldir = os_path_relpath(s3dir, bld.curdir)
+    s3reldir = os_path_relpath(s3dir, bld.path.abspath())
 
     # the extra_includes list is relative to the source3 directory
     extra_includes = [ '.', 'include', 'lib' ]
diff --git a/buildtools/wafsamba/samba_abi.py b/buildtools/wafsamba/samba_abi.py
index 4603e76..8ddf209 100644
--- a/buildtools/wafsamba/samba_abi.py
+++ b/buildtools/wafsamba/samba_abi.py
@@ -1,7 +1,13 @@
 # functions for handling ABI checking of libraries
 
-import Options, Utils, os, Logs, samba_utils, sys, Task, fnmatch, re, Build
-from TaskGen import feature, before, after
+import os
+import sys


-- 
Samba Shared Repository



More information about the samba-cvs mailing list