From 844acb226086e55de9a2442396a4e002471295e8 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Wed, 17 Mar 2010 20:12:16 +1100 Subject: build: waf quicktest nearly works Rewrote wafsamba using a new dependency handling system, and started adding the waf test code --- source4/wscript_build | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) (limited to 'source4/wscript_build') diff --git a/source4/wscript_build b/source4/wscript_build index a924dad2ee..8d3b670e02 100644 --- a/source4/wscript_build +++ b/source4/wscript_build @@ -3,8 +3,6 @@ import os srcdir = ".." -bld.env.TOPDIR = os.path.normpath(os.path.join(os.environ.get('PWD'), srcdir)) - # create separate build groups for building the asn1 and et compiler, then # building the C from ASN1 and IDL, and finally the main build process bld.SETUP_BUILD_GROUPS() @@ -16,29 +14,25 @@ bld.SAMBA_MKVERSION('version.h') bld.TARGET_ALIAS('attr', 'XATTR') bld.TARGET_ALIAS('execinfo', 'EXECINFO') bld.TARGET_ALIAS('popt', 'LIBPOPT') +bld.TARGET_ALIAS('tevent', 'LIBTEVENT_EXT') +bld.TARGET_ALIAS('z', 'ZLIB') +bld.TARGET_ALIAS('pam', 'PAM') +bld.TARGET_ALIAS('sasl2', 'SASL') +bld.TARGET_ALIAS('crypt', 'CRYPT') # missing subsystems bld.SAMBA_SUBSYSTEM('pyldb_util', '') -bld.SAMBA_SUBSYSTEM('pyldb', '') bld.SAMBA_SUBSYSTEM('dcerpc_mgmt', '') bld.SAMBA_SUBSYSTEM('TORTURE_LDB_MODULE', '') bld.SAMBA_SUBSYSTEM('INTL', '') bld.SAMBA_SUBSYSTEM('NDR_SAMR', '') -bld.SAMBA_SUBSYSTEM('LIBLDB_CMDLINE', '') bld.SAMBA_SUBSYSTEM('NETAPI', '') bld.SAMBA_SUBSYSTEM('HDB_LDB', '') -bld.SAMBA_SUBSYSTEM('SMBREADLINE', '') bld.SAMBA_SUBSYSTEM('OPENPTY', '') bld.SAMBA_SUBSYSTEM('SMBCLIENT', '') bld.SAMBA_SUBSYSTEM('BLKID', '') -bld.SAMBA_SUBSYSTEM('LIBTEVENT_EXT', '') -bld.SAMBA_SUBSYSTEM('PTHREAD', '') -bld.SAMBA_SUBSYSTEM('CRYPT', '') -bld.SAMBA_SUBSYSTEM('PAM', '') -bld.SAMBA_SUBSYSTEM('SASL', '') bld.SAMBA_SUBSYSTEM('smbcalls', '') bld.SAMBA_SUBSYSTEM('SETPROCTITLE', '') -bld.SAMBA_SUBSYSTEM('ZLIB', '') bld.SAMBA_SUBSYSTEM('NDR_SRVSVC', '') bld.SAMBA_SUBSYSTEM('ICONV', '') bld.SAMBA_SUBSYSTEM('NDR_MISC', '') @@ -54,6 +48,7 @@ bld.BUILD_SUBDIR('lib/ldb') bld.BUILD_SUBDIR('dynconfig') bld.BUILD_SUBDIR('../lib/util/charset') bld.BUILD_SUBDIR('scripting/python') +bld.BUILD_SUBDIR('../lib/subunit/python') bld.BUILD_SUBDIR('param') bld.BUILD_SUBDIR('librpc') bld.BUILD_SUBDIR('dsdb') @@ -114,6 +109,7 @@ bld.BUILD_SUBDIR('../libcli/samsync') bld.BUILD_SUBDIR('../libgpo') bld.BUILD_SUBDIR('../libcli/named_pipe_auth') bld.BUILD_SUBDIR('heimdal_build') +bld.BUILD_SUBDIR('lib/smbreadline') bld.ENFORCE_GROUP_ORDERING() -bld.CHECK_ORPANED_TARGETS() + -- cgit