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/Makefile.waf | 20 ++++++ source4/auth/gensec/wscript_build | 6 +- source4/auth/ntlm/wscript_build | 6 +- source4/auth/ntlmssp/wscript_build | 2 +- source4/auth/wscript_build | 2 +- source4/autogen-waf.sh | 10 +++ source4/client/wscript_build | 4 -- source4/configure.waf | 9 +++ source4/dsdb/samdb/ldb_modules/wscript_build | 86 +++++++++++------------ source4/dsdb/wscript_build | 4 +- source4/heimdal_build/wscript_build | 100 +++++++++++++++------------ source4/kdc/wscript_build | 11 +-- source4/lib/ldb/wscript | 82 +++++++++++++++++++--- source4/lib/registry/wscript_build | 2 +- source4/lib/smbreadline/wscript_build | 6 ++ source4/lib/smbreadline/wscript_configure | 12 ++++ source4/lib/socket/wscript_build | 4 +- source4/libcli/security/wscript_build | 2 +- source4/libcli/wscript_build | 6 +- source4/librpc/wscript_build | 16 ++--- source4/nbt_server/wscript_build | 2 +- source4/ntvfs/posix/wscript_build | 8 +-- source4/ntvfs/wscript_build | 4 +- source4/param/wscript_build | 6 +- source4/rpc_server/wscript_build | 6 +- source4/scripting/python/wscript_build | 8 ++- source4/selftest/wscript | 6 +- source4/smb_server/wscript_build | 2 +- source4/smbd/wscript_build | 10 +-- source4/torture/drs/wscript_build | 2 +- source4/torture/libnetapi/wscript_build | 2 +- source4/torture/libsmbclient/wscript_build | 2 +- source4/torture/local/wscript_build | 4 +- source4/torture/smb2/wscript_build | 2 +- source4/torture/winbind/wscript_build | 2 +- source4/torture/wscript_build | 42 +++++------ source4/utils/net/wscript_build | 6 +- source4/utils/wscript_build | 3 +- source4/winbind/wscript_build | 2 +- source4/wscript | 6 +- source4/wscript_build | 20 +++--- 41 files changed, 322 insertions(+), 213 deletions(-) create mode 100644 source4/Makefile.waf create mode 100755 source4/autogen-waf.sh create mode 100755 source4/configure.waf create mode 100644 source4/lib/smbreadline/wscript_build create mode 100644 source4/lib/smbreadline/wscript_configure (limited to 'source4') diff --git a/source4/Makefile.waf b/source4/Makefile.waf new file mode 100644 index 0000000000..50a55ab84f --- /dev/null +++ b/source4/Makefile.waf @@ -0,0 +1,20 @@ +# very crude Makefile to run waf +WAF=WAFCACHE=$(HOME)/.wafcache ../buildtools/waf + +all: + $(WAF) build -v + +install: + $(WAF) install + +uninstall: + $(WAF) uninstall + +clean: + $(WAF) clean + +distclean: + rm -rf bin + +*: + echo "target not implemented" diff --git a/source4/auth/gensec/wscript_build b/source4/auth/gensec/wscript_build index a504e38689..444608d644 100644 --- a/source4/auth/gensec/wscript_build +++ b/source4/auth/gensec/wscript_build @@ -1,7 +1,3 @@ -# AUTOGENERATED by mktowscript.pl from ../../source4/auth/gensec/config.mk -# Please remove this notice if hand editing - - bld.SAMBA_LIBRARY('gensec', source='gensec.c socket.c', # PC_FILES='gensec.pc', @@ -49,7 +45,7 @@ bld.SAMBA_MODULE('gensec_schannel', source='schannel.c ../../../libcli/auth/schannel_sign.c', subsystem='gensec', deps='COMMON_SCHANNELDB NDR_SCHANNEL CREDENTIALS LIBNDR auth_session', - output_type='MERGED_OBJ', + internal_module=True, autoproto='schannel_proto.h', init_function='gensec_schannel_init' ) diff --git a/source4/auth/ntlm/wscript_build b/source4/auth/ntlm/wscript_build index 2632e25a8f..dde33c6077 100644 --- a/source4/auth/ntlm/wscript_build +++ b/source4/auth/ntlm/wscript_build @@ -1,7 +1,3 @@ -# AUTOGENERATED by mktowscript.pl from ../../source4/auth/ntlm/config.mk -# Please remove this notice if hand editing - - bld.SAMBA_MODULE('auth_sam_module', source='auth_sam.c', subsystem='auth', @@ -59,6 +55,6 @@ bld.SAMBA_MODULE('auth', subsystem='service', init_function='server_service_auth_init', deps='LIBSAMBA-UTIL LIBSECURITY SAMDB CREDENTIALS UTIL_TEVENT', - output_type='MERGED_OBJ' + internal_module=True ) diff --git a/source4/auth/ntlmssp/wscript_build b/source4/auth/ntlmssp/wscript_build index 625762029d..3fbf254515 100644 --- a/source4/auth/ntlmssp/wscript_build +++ b/source4/auth/ntlmssp/wscript_build @@ -8,6 +8,6 @@ bld.SAMBA_MODULE('gensec_ntlmssp', subsystem='gensec', init_function='gensec_ntlmssp_init', deps='MSRPC_PARSE CREDENTIALS', - output_type='MERGED_OBJ' + internal_module=True ) diff --git a/source4/auth/wscript_build b/source4/auth/wscript_build index 5985551511..ddfb046bad 100644 --- a/source4/auth/wscript_build +++ b/source4/auth/wscript_build @@ -33,7 +33,7 @@ bld.SAMBA_SUBSYSTEM('auth_system_session', bld.SAMBA_SUBSYSTEM('auth_sam', source='sam.c', autoproto='auth_sam.h', - public_deps='SAMDB UTIL_LDB LIBSECURITY', + public_deps='SAMDB UTIL_LDB LIBSECURITY ldb', deps='' ) diff --git a/source4/autogen-waf.sh b/source4/autogen-waf.sh new file mode 100755 index 0000000000..f168e69676 --- /dev/null +++ b/source4/autogen-waf.sh @@ -0,0 +1,10 @@ +#!/bin/sh + +echo "Setting up for waf build" +rm -f configure Makefile +cp configure.waf configure + +# this relies on the fact that make looks for 'makefile' before 'Makefile' +cp Makefile.waf makefile + +echo "done ... now run ./configure or ./configure.developer" diff --git a/source4/client/wscript_build b/source4/client/wscript_build index 12b609b82e..6f5df10b58 100644 --- a/source4/client/wscript_build +++ b/source4/client/wscript_build @@ -1,7 +1,3 @@ -# AUTOGENERATED by mktowscript.pl from ../../source4/client/config.mk -# Please remove this notice if hand editing - - bld.SAMBA_BINARY('smbclient', source='client.c', installdir='BINDIR', diff --git a/source4/configure.waf b/source4/configure.waf new file mode 100755 index 0000000000..cf45177c20 --- /dev/null +++ b/source4/configure.waf @@ -0,0 +1,9 @@ +#!/bin/bash + +echo "Using waf based build" + +WAF=../buildtools/waf +export WAFCACHE=$HOME/.wafcache +mkdir -p $WAFCACHE + +$WAF configure $* diff --git a/source4/dsdb/samdb/ldb_modules/wscript_build b/source4/dsdb/samdb/ldb_modules/wscript_build index 7a01ecec9b..76503ef82b 100644 --- a/source4/dsdb/samdb/ldb_modules/wscript_build +++ b/source4/dsdb/samdb/ldb_modules/wscript_build @@ -1,7 +1,3 @@ -# AUTOGENERATED by mktowscript.pl from ../../source4/dsdb/samdb/ldb_modules/config.mk -# Please remove this notice if hand editing - - bld.SAMBA_SUBSYSTEM('DSDB_MODULE_HELPERS', source='util.c ridalloc.c', autoproto='util_proto.h', @@ -11,7 +7,7 @@ bld.SAMBA_SUBSYSTEM('DSDB_MODULE_HELPERS', bld.SAMBA_MODULE('ldb_samba_dsdb', source='samba_dsdb.c', - subsystem='ldb', + subsystem='LIBLDB', init_function='LDB_MODULE(samba_dsdb)', deps='SAMDB talloc LIBEVENTS LIBNDR DSDB_MODULE_HELPERS' ) @@ -19,7 +15,7 @@ bld.SAMBA_MODULE('ldb_samba_dsdb', bld.SAMBA_MODULE('ldb_samba_secrets', source='samba_secrets.c', - subsystem='ldb', + subsystem='LIBLDB', init_function='LDB_MODULE(samba_secrets)', deps='SAMDB talloc LIBEVENTS LIBNDR' ) @@ -27,7 +23,7 @@ bld.SAMBA_MODULE('ldb_samba_secrets', bld.SAMBA_MODULE('ldb_objectguid', source='objectguid.c', - subsystem='ldb', + subsystem='LIBLDB', init_function='LDB_MODULE(objectguid)', deps='SAMDB talloc LIBEVENTS LIBNDR' ) @@ -35,7 +31,7 @@ bld.SAMBA_MODULE('ldb_objectguid', bld.SAMBA_MODULE('ldb_repl_meta_data', source='repl_meta_data.c', - subsystem='ldb', + subsystem='LIBLDB', init_function='LDB_MODULE(repl_meta_data)', deps='SAMDB talloc LIBEVENTS LIBNDR NDR_DRSUAPI NDR_DRSBLOBS LIBNDR DSDB_MODULE_HELPERS' ) @@ -43,7 +39,7 @@ bld.SAMBA_MODULE('ldb_repl_meta_data', bld.SAMBA_MODULE('ldb_dsdb_cache', source='dsdb_cache.c', - subsystem='ldb', + subsystem='LIBLDB', init_function='LDB_MODULE(dsdb_cache)', deps='SAMDB talloc LIBEVENTS' ) @@ -51,7 +47,7 @@ bld.SAMBA_MODULE('ldb_dsdb_cache', bld.SAMBA_MODULE('ldb_schema_load', source='schema_load.c', - subsystem='ldb', + subsystem='LIBLDB', init_function='LDB_MODULE(schema_load)', deps='SAMDB talloc LIBEVENTS DSDB_MODULE_HELPERS' ) @@ -59,7 +55,7 @@ bld.SAMBA_MODULE('ldb_schema_load', bld.SAMBA_MODULE('ldb_schema_data', source='schema_data.c', - subsystem='ldb', + subsystem='LIBLDB', init_function='LDB_MODULE(schema_data)', deps='SAMDB talloc LIBEVENTS DSDB_MODULE_HELPERS' ) @@ -67,7 +63,7 @@ bld.SAMBA_MODULE('ldb_schema_data', bld.SAMBA_MODULE('ldb_naming_fsmo', source='naming_fsmo.c', - subsystem='ldb', + subsystem='LIBLDB', init_function='LDB_MODULE(naming_fsmo)', deps='SAMDB talloc LIBEVENTS DSDB_MODULE_HELPERS' ) @@ -75,7 +71,7 @@ bld.SAMBA_MODULE('ldb_naming_fsmo', bld.SAMBA_MODULE('ldb_pdc_fsmo', source='pdc_fsmo.c', - subsystem='ldb', + subsystem='LIBLDB', init_function='LDB_MODULE(pdc_fsmo)', deps='SAMDB talloc LIBEVENTS DSDB_MODULE_HELPERS' ) @@ -83,7 +79,7 @@ bld.SAMBA_MODULE('ldb_pdc_fsmo', bld.SAMBA_MODULE('ldb_samldb', source='samldb.c', - subsystem='ldb', + subsystem='LIBLDB', init_function='LDB_MODULE(samldb)', deps='talloc LIBEVENTS SAMDB DSDB_MODULE_HELPERS' ) @@ -91,7 +87,7 @@ bld.SAMBA_MODULE('ldb_samldb', bld.SAMBA_MODULE('ldb_samba3sam', source='samba3sam.c', - subsystem='ldb', + subsystem='LIBLDB', init_function='LDB_MODULE(samba3sam)', deps='talloc LIBEVENTS ldb SMBPASSWD NSS_WRAPPER LIBSECURITY NDR_SECURITY' ) @@ -99,7 +95,7 @@ bld.SAMBA_MODULE('ldb_samba3sam', bld.SAMBA_MODULE('ldb_samba3sid', source='samba3sid.c', - subsystem='ldb', + subsystem='LIBLDB', init_function='LDB_MODULE(samba3sid)', deps='talloc LIBEVENTS ldb SMBPASSWD NSS_WRAPPER LIBSECURITY NDR_SECURITY' ) @@ -108,7 +104,7 @@ bld.SAMBA_MODULE('ldb_samba3sid', bld.SAMBA_MODULE('ldb_simple_ldap_map', source='simple_ldap_map.c', aliases='entryuuid nsuniqueid', - subsystem='ldb', + subsystem='LIBLDB', init_function='LDB_MODULE(entryuuid),LDB_MODULE(nsuniqueid)', deps='talloc LIBEVENTS ldb LIBNDR' ) @@ -116,7 +112,7 @@ bld.SAMBA_MODULE('ldb_simple_ldap_map', bld.SAMBA_MODULE('ldb_rootdse', source='rootdse.c', - subsystem='ldb', + subsystem='LIBLDB', init_function='LDB_MODULE(rootdse)', deps='talloc LIBEVENTS SAMDB' ) @@ -124,7 +120,7 @@ bld.SAMBA_MODULE('ldb_rootdse', bld.SAMBA_MODULE('ldb_password_hash', source='password_hash.c', - subsystem='ldb', + subsystem='LIBLDB', init_function='LDB_MODULE(password_hash)', deps='talloc LIBEVENTS SAMDB LIBCLI_AUTH NDR_DRSBLOBS KERBEROS HEIMDAL_HDB_KEYS HEIMDAL_KRB5' ) @@ -132,7 +128,7 @@ bld.SAMBA_MODULE('ldb_password_hash', bld.SAMBA_MODULE('ldb_local_password', source='local_password.c', - subsystem='ldb', + subsystem='LIBLDB', init_function='LDB_MODULE(local_password)', deps='talloc LIBEVENTS LIBNDR SAMDB' ) @@ -140,7 +136,7 @@ bld.SAMBA_MODULE('ldb_local_password', bld.SAMBA_MODULE('ldb_kludge_acl', source='kludge_acl.c', - subsystem='ldb', + subsystem='LIBLDB', init_function='LDB_MODULE(kludge_acl)', deps='talloc LIBEVENTS LIBSECURITY SAMDB' ) @@ -148,7 +144,7 @@ bld.SAMBA_MODULE('ldb_kludge_acl', bld.SAMBA_MODULE('ldb_extended_dn_in', source='extended_dn_in.c', - subsystem='ldb', + subsystem='LIBLDB', init_function='LDB_MODULE(extended_dn_in)', deps='talloc LIBEVENTS LIBSAMBA-UTIL' ) @@ -157,7 +153,7 @@ bld.SAMBA_MODULE('ldb_extended_dn_in', bld.SAMBA_MODULE('ldb_extended_dn_out', source='extended_dn_out.c', aliases='extended_dn_out_ldb extended_dn_out_openldap extended_dn_out_fds', - subsystem='ldb', + subsystem='LIBLDB', deps='talloc LIBEVENTS LIBNDR LIBSAMBA-UTIL SAMDB', init_function='LDB_MODULE(extended_dn_out_ldb),LDB_MODULE(extended_dn_out_openldap),LDB_MODULE(extended_dn_out_fds)' ) @@ -165,7 +161,7 @@ bld.SAMBA_MODULE('ldb_extended_dn_out', bld.SAMBA_MODULE('ldb_extended_dn_store', source='extended_dn_store.c', - subsystem='ldb', + subsystem='LIBLDB', init_function='LDB_MODULE(extended_dn_store)', deps='talloc LIBEVENTS LIBSAMBA-UTIL SAMDB DSDB_MODULE_HELPERS' ) @@ -173,7 +169,7 @@ bld.SAMBA_MODULE('ldb_extended_dn_store', bld.SAMBA_MODULE('ldb_show_deleted', source='show_deleted.c', - subsystem='ldb', + subsystem='LIBLDB', init_function='LDB_MODULE(show_deleted)', deps='talloc LIBEVENTS LIBSAMBA-UTIL' ) @@ -182,7 +178,7 @@ bld.SAMBA_MODULE('ldb_show_deleted', bld.SAMBA_MODULE('ldb_partition', source='partition.c partition_init.c', autoproto='partition_proto.h', - subsystem='ldb', + subsystem='LIBLDB', init_function='LDB_MODULE(partition)', deps='talloc LIBEVENTS SAMDB DSDB_MODULE_HELPERS' ) @@ -190,7 +186,7 @@ bld.SAMBA_MODULE('ldb_partition', bld.SAMBA_MODULE('ldb_new_partition', source='new_partition.c', - subsystem='ldb', + subsystem='LIBLDB', init_function='LDB_MODULE(new_partition)', deps='talloc LIBEVENTS SAMDB DSDB_MODULE_HELPERS' ) @@ -198,15 +194,15 @@ bld.SAMBA_MODULE('ldb_new_partition', bld.SAMBA_MODULE('ldb_update_keytab', source='update_keytab.c', - subsystem='ldb', + subsystem='LIBLDB', init_function='LDB_MODULE(update_keytab)', - deps='talloc LIBEVENTS CREDENTIALS' + deps='talloc LIBEVENTS CREDENTIALS ldb' ) bld.SAMBA_MODULE('ldb_objectclass', source='objectclass.c', - subsystem='ldb', + subsystem='LIBLDB', init_function='LDB_MODULE(objectclass)', deps='talloc LIBEVENTS LIBSECURITY NDR_SECURITY SAMDB DSDB_MODULE_HELPERS LIBSAMBA-UTIL' ) @@ -214,15 +210,15 @@ bld.SAMBA_MODULE('ldb_objectclass', bld.SAMBA_MODULE('ldb_subtree_rename', source='subtree_rename.c', - subsystem='ldb', + subsystem='LIBLDB', init_function='LDB_MODULE(subtree_rename)', - deps='talloc LIBEVENTS LIBSAMBA-UTIL' + deps='talloc LIBEVENTS LIBSAMBA-UTIL ldb' ) bld.SAMBA_MODULE('ldb_subtree_delete', source='subtree_delete.c', - subsystem='ldb', + subsystem='LIBLDB', init_function='LDB_MODULE(subtree_delete)', deps='talloc LIBEVENTS LIBSAMBA-UTIL DSDB_MODULE_HELPERS' ) @@ -230,7 +226,7 @@ bld.SAMBA_MODULE('ldb_subtree_delete', bld.SAMBA_MODULE('ldb_linked_attributes', source='linked_attributes.c', - subsystem='ldb', + subsystem='LIBLDB', init_function='LDB_MODULE(linked_attributes)', deps='talloc LIBEVENTS SAMDB DSDB_MODULE_HELPERS' ) @@ -238,15 +234,15 @@ bld.SAMBA_MODULE('ldb_linked_attributes', bld.SAMBA_MODULE('ldb_ranged_results', source='ranged_results.c', - subsystem='ldb', + subsystem='LIBLDB', init_function='LDB_MODULE(ranged_results)', - deps='talloc LIBEVENTS LIBSAMBA-UTIL' + deps='talloc LIBEVENTS LIBSAMBA-UTIL ldb' ) bld.SAMBA_MODULE('ldb_anr', source='anr.c', - subsystem='ldb', + subsystem='LIBLDB', init_function='LDB_MODULE(anr)', deps='talloc LIBEVENTS LIBSAMBA-UTIL SAMDB' ) @@ -254,7 +250,7 @@ bld.SAMBA_MODULE('ldb_anr', bld.SAMBA_MODULE('ldb_instancetype', source='instancetype.c', - subsystem='ldb', + subsystem='LIBLDB', init_function='LDB_MODULE(instancetype)', deps='talloc LIBEVENTS LIBSAMBA-UTIL SAMDB' ) @@ -262,15 +258,15 @@ bld.SAMBA_MODULE('ldb_instancetype', bld.SAMBA_MODULE('ldb_operational', source='operational.c', - subsystem='ldb', + subsystem='LIBLDB', init_function='LDB_MODULE(operational)', - deps='talloc tevent LIBSAMBA-UTIL SAMDB_COMMON DSDB_MODULE_HELPERS' + deps='talloc tevent LIBSAMBA-UTIL SAMDB_COMMON DSDB_MODULE_HELPERS auth_sam' ) bld.SAMBA_MODULE('ldb_descriptor', source='descriptor.c', - subsystem='ldb', + subsystem='LIBLDB', init_function='LDB_MODULE(descriptor)', deps='talloc LIBEVENTS LIBSECURITY NDR_SECURITY SAMDB DSDB_MODULE_HELPERS' ) @@ -278,7 +274,7 @@ bld.SAMBA_MODULE('ldb_descriptor', bld.SAMBA_MODULE('ldb_resolve_oids', source='resolve_oids.c', - subsystem='ldb', + subsystem='LIBLDB', init_function='LDB_MODULE(resolve_oids)', deps='SAMDB talloc LIBEVENTS LIBNDR' ) @@ -286,7 +282,7 @@ bld.SAMBA_MODULE('ldb_resolve_oids', bld.SAMBA_MODULE('ldb_acl', source='acl.c', - subsystem='ldb', + subsystem='LIBLDB', init_function='LDB_MODULE(acl)', deps='talloc LIBEVENTS LIBSECURITY SAMDB' ) @@ -294,7 +290,7 @@ bld.SAMBA_MODULE('ldb_acl', bld.SAMBA_MODULE('ldb_lazy_commit', source='lazy_commit.c', - subsystem='ldb', + subsystem='LIBLDB', init_function='LDB_MODULE(lazy_commit)', deps='SAMDB' ) @@ -302,7 +298,7 @@ bld.SAMBA_MODULE('ldb_lazy_commit', bld.SAMBA_MODULE('ldb_validate_update', source='validate_update.c', - subsystem='ldb', + subsystem='LIBLDB', init_function='LDB_MODULE(validate_update)', deps='talloc LIBEVENTS LIBSECURITY SAMDB' ) diff --git a/source4/dsdb/wscript_build b/source4/dsdb/wscript_build index 3d3a35768f..0699dfdd28 100644 --- a/source4/dsdb/wscript_build +++ b/source4/dsdb/wscript_build @@ -12,9 +12,9 @@ bld.SAMBA_SUBSYSTEM('SAMDB', bld.SAMBA_SUBSYSTEM('SAMDB_COMMON', - source='common/util.c ./samdb/ldb_modules/util.c common/dsdb_dn.c ../../libds/common/flag_mapping.c', + source='common/util.c common/dsdb_dn.c common/dsdb_access.c ../../libds/common/flag_mapping.c', autoproto='common/proto.h', - deps='ldb NDR_DRSBLOBS LIBCLI_LDAP_NDR UTIL_LDB LIBCLI_AUTH' + deps='ldb NDR_DRSBLOBS LIBCLI_LDAP_NDR UTIL_LDB LIBCLI_AUTH DSDB_MODULE_HELPERS' ) diff --git a/source4/heimdal_build/wscript_build b/source4/heimdal_build/wscript_build index 3117095824..6b0b951eba 100644 --- a/source4/heimdal_build/wscript_build +++ b/source4/heimdal_build/wscript_build @@ -126,68 +126,48 @@ bld.SAMBA_ASN1('HEIMDAL_PKCS10_ASN1', bld.SAMBA_ASN1('HEIMDAL_HDB_ASN1', '../heimdal/lib/hdb/hdb.asn1', - includes='../heimdal/lib/asn1', - directory='lib/hdb' - ) + includes='../heimdal/lib/asn1') bld.SAMBA_ERRTABLE('HEIMDAL_ASN1_ERR_ET', - '../heimdal/lib/asn1/asn1_err.et', - directory='lib/asn1' - ) + '../heimdal/lib/asn1/asn1_err.et') bld.SAMBA_ERRTABLE('HEIMDAL_HDB_ERR_ET', - '../heimdal/lib/hdb/hdb_err.et', - directory='lib/hdb' - ) + '../heimdal/lib/hdb/hdb_err.et') bld.SAMBA_ERRTABLE('HEIMDAL_HEIM_ERR_ET', - '../heimdal/lib/krb5/heim_err.et', - directory='lib/krb5' - ) + '../heimdal/lib/krb5/heim_err.et') bld.SAMBA_ERRTABLE('HEIMDAL_K524_ERR_ET', - '../heimdal/lib/krb5/k524_err.et', - directory='lib/krb5' - ) + '../heimdal/lib/krb5/k524_err.et') bld.SAMBA_ERRTABLE('HEIMDAL_KRB_ERR_ET', - '../heimdal/lib/krb5/krb_err.et', - directory='lib/krb5' - ) + '../heimdal/lib/krb5/krb_err.et') bld.SAMBA_ERRTABLE('HEIMDAL_KRB5_ERR_ET', - '../heimdal/lib/krb5/krb5_err.et', - directory='lib/krb5' - ) + '../heimdal/lib/krb5/krb5_err.et') bld.SAMBA_ERRTABLE('HEIMDAL_GKRB5_ERR_ET', - '../heimdal/lib/gssapi/krb5/gkrb5_err.et', - directory='lib/gssapi' - ) + '../heimdal/lib/gssapi/krb5/gkrb5_err.et') bld.SAMBA_ERRTABLE('HEIMDAL_HX509_ERR_ET', - '../heimdal/lib/hx509/hx509_err.et', - directory='lib/hx509' - ) + '../heimdal/lib/hx509/hx509_err.et') bld.SAMBA_ERRTABLE('HEIMDAL_WIND_ERR_ET', - '../heimdal/lib/wind/wind_err.et', - directory='lib/wind' - ) + '../heimdal/lib/wind/wind_err.et') bld.SAMBA_SUBSYSTEM('HEIMDAL_ROKEN', '../heimdal/lib/roken/base64.c ../heimdal/lib/roken/ct.c ../heimdal/lib/roken/hex.c ../heimdal/lib/roken/bswap.c ../heimdal/lib/roken/dumpdata.c ../heimdal/lib/roken/emalloc.c ../heimdal/lib/roken/ecalloc.c ../heimdal/lib/roken/getarg.c ../heimdal/lib/roken/get_window_size.c ../heimdal/lib/roken/getdtablesize.c ../heimdal/lib/roken/h_errno.c ../heimdal/lib/roken/issuid.c ../heimdal/lib/roken/net_read.c ../heimdal/lib/roken/net_write.c ../heimdal/lib/roken/socket.c ../heimdal/lib/roken/parse_time.c ../heimdal/lib/roken/parse_units.c ../heimdal/lib/roken/resolve.c ../heimdal/lib/roken/roken_gethostby.c ../heimdal/lib/roken/signal.c ../heimdal/lib/roken/vis.c ../heimdal/lib/roken/strlwr.c ../heimdal/lib/roken/strsep_copy.c ../heimdal/lib/roken/strsep.c ../heimdal/lib/roken/strupr.c ../heimdal/lib/roken/strpool.c ../heimdal/lib/roken/estrdup.c ../heimdal/lib/roken/erealloc.c ../heimdal/lib/roken/simple_exec.c ../heimdal/lib/roken/strcollect.c ../heimdal/lib/roken/rtbl.c ../heimdal/lib/roken/cloexec.c ../heimdal/lib/roken/xfree.c replace.c', includes='../heimdal/lib/roken ../heimdal/include ../../lib/socket_wrapper', - deps='HEIMDAL_ROKEN_PROGNAME HEIMDAL_ROKEN_CLOSEFROM resolv LIBREPLACE_NETWORK UID_WRAPPER' + deps='HEIMDAL_ROKEN_PROGNAME HEIMDAL_ROKEN_CLOSEFROM resolv LIBREPLACE_NETWORK UID_WRAPPER util' ) @@ -218,7 +198,7 @@ bld.SAMBA_SUBSYSTEM('HEIMDAL_HDB_KEYS', bld.SAMBA_SUBSYSTEM('HEIMDAL_HDB', source='''../heimdal/lib/hdb/db.c ../heimdal/lib/hdb/dbinfo.c ../heimdal/lib/hdb/hdb.c ../heimdal/lib/hdb/ext.c ../heimdal/lib/hdb/keytab.c ../heimdal/lib/hdb/mkey.c ../heimdal/lib/hdb/ndbm.c ../heimdal/lib/hdb/hdb_err.c hdb-glue.c''', - includes='../heimdal/lib/hdb', + includes='../heimdal/lib/hdb ../heimdal/lib/com_err', heimdal_autoproto='../heimdal/lib/hdb/hdb-protos.h', heimdal_autoproto_private='../heimdal/lib/hdb/hdb-private.h', deps='HDB_LDB HEIMDAL_KRB5 HEIMDAL_HDB_KEYS HEIMDAL_ROKEN HEIMDAL_HCRYPTO HEIMDAL_COM_ERR HEIMDAL_HDB_ASN1' @@ -272,14 +252,44 @@ bld.SAMBA_SUBSYSTEM('HEIMDAL_GSSAPI', bld.SAMBA_SUBSYSTEM('HEIMDAL_KRB5', - '../heimdal/lib/krb5/acache.c ../heimdal/lib/krb5/add_et_list.c ../heimdal/lib/krb5/addr_families.c ../heimdal/lib/krb5/appdefault.c ../heimdal/lib/krb5/asn1_glue.c ../heimdal/lib/krb5/auth_context.c ../heimdal/lib/krb5/build_ap_req.c ../heimdal/lib/krb5/build_auth.c ../heimdal/lib/krb5/cache.c ../heimdal/lib/krb5/changepw.c ../heimdal/lib/krb5/codec.c ../heimdal/lib/krb5/config_file.c ../heimdal/lib/krb5/constants.c ../heimdal/lib/krb5/context.c ../heimdal/lib/krb5/convert_creds.c ../heimdal/lib/krb5/copy_host_realm.c ../heimdal/lib/krb5/crc.c ../heimdal/lib/krb5/creds.c ../heimdal/lib/krb5/crypto.c ../heimdal/lib/krb5/data.c ../heimdal/lib/krb5/eai_to_heim_errno.c ../heimdal/lib/krb5/error_string.c ../heimdal/lib/krb5/expand_hostname.c ../heimdal/lib/krb5/fcache.c ../heimdal/lib/krb5/free.c ../heimdal/lib/krb5/free_host_realm.c ../heimdal/lib/krb5/generate_seq_number.c ../heimdal/lib/krb5/generate_subkey.c ../heimdal/lib/krb5/get_addrs.c ../heimdal/lib/krb5/get_cred.c ../heimdal/lib/krb5/get_default_principal.c ../heimdal/lib/krb5/get_default_realm.c ../heimdal/lib/krb5/get_for_creds.c ../heimdal/lib/krb5/get_host_realm.c ../heimdal/lib/krb5/get_in_tkt.c ../heimdal/lib/krb5/get_port.c ../heimdal/lib/krb5/init_creds.c ../heimdal/lib/krb5/init_creds_pw.c ../heimdal/lib/krb5/kcm.c ../heimdal/lib/krb5/keyblock.c ../heimdal/lib/krb5/keytab.c ../heimdal/lib/krb5/keytab_any.c ../heimdal/lib/krb5/keytab_file.c ../heimdal/lib/krb5/keytab_memory.c ../heimdal/lib/krb5/keytab_keyfile.c ../heimdal/lib/krb5/krbhst.c ../heimdal/lib/krb5/log.c ../heimdal/lib/krb5/mcache.c ../heimdal/lib/krb5/misc.c ../heimdal/lib/krb5/mk_error.c ../heimdal/lib/krb5/mk_priv.c ../heimdal/lib/krb5/mk_rep.c ../heimdal/lib/krb5/mk_req.c ../heimdal/lib/krb5/mk_req_ext.c ../heimdal/lib/krb5/mit_glue.c ../heimdal/lib/krb5/n-fold.c ../heimdal/lib/krb5/padata.c ../heimdal/lib/krb5/pkinit.c ../heimdal/lib/krb5/plugin.c ../heimdal/lib/krb5/principal.c ../heimdal/lib/krb5/prog_setup.c ../heimdal/lib/krb5/pac.c ../heimdal/lib/krb5/prompter_posix.c ../heimdal/lib/krb5/rd_cred.c ../heimdal/lib/krb5/rd_error.c ../heimdal/lib/krb5/rd_priv.c ../heimdal/lib/krb5/rd_rep.c ../heimdal/lib/krb5/rd_req.c ../heimdal/lib/krb5/replay.c ../heimdal/lib/krb5/send_to_kdc.c ../heimdal/lib/krb5/set_default_realm.c ../heimdal/lib/krb5/store.c ../heimdal/lib/krb5/store_emem.c ../heimdal/lib/krb5/store_fd.c ../heimdal/lib/krb5/store_mem.c ../heimdal/lib/krb5/ticket.c ../heimdal/lib/krb5/time.c ../heimdal/lib/krb5/transited.c ../heimdal/lib/krb5/v4_glue.c ../heimdal/lib/krb5/version.c ../heimdal/lib/krb5/warn.c ../heimdal/lib/krb5/krb5_err.c ../heimdal/lib/krb5/heim_err.c ../heimdal/lib/krb5/k524_err.c krb5-glue.c', - includes='../heimdal/lib/krb5 ../heimdal/lib/asn1 ../heimdal/lib/com_err', - public_deps='HEIMDAL_COM_ERR', - heimdal_autoproto='../heimdal/lib/krb5/krb5-protos.h', - heimdal_autoproto_options='-E KRB5_LIB -q -P comment -o', - heimdal_autoproto_private='../heimdal/lib/krb5/krb5-private.h', - deps='HEIMDAL_ROKEN HEIMDAL_PKINIT_ASN1 HEIMDAL_WIND HEIMDAL_KRB5_ASN1 HEIMDAL_HX509 HEIMDAL_HCRYPTO LIBNETIF LIBSAMBA-HOSTCONFIG INTL' - ) + bld.SUBDIR('../heimdal/lib/krb5/', + '''acache.c add_et_list.c + addr_families.c appdefault.c + asn1_glue.c auth_context.c + build_ap_req.c build_auth.c cache.c + changepw.c codec.c config_file.c + constants.c context.c convert_creds.c + copy_host_realm.c crc.c creds.c + crypto.c data.c eai_to_heim_errno.c + error_string.c expand_hostname.c + fcache.c free.c free_host_realm.c + generate_seq_number.c generate_subkey.c + get_addrs.c get_cred.c + get_default_principal.c + get_default_realm.c get_for_creds.c + get_host_realm.c get_in_tkt.c + get_port.c init_creds.c init_creds_pw.c + kcm.c keyblock.c keytab.c keytab_any.c + keytab_file.c keytab_memory.c + keytab_keyfile.c krbhst.c log.c + mcache.c misc.c mk_error.c mk_priv.c + mk_rep.c mk_req.c mk_req_ext.c + mit_glue.c n-fold.c padata.c pkinit.c + plugin.c principal.c prog_setup.c pac.c + prompter_posix.c rd_cred.c rd_error.c + rd_priv.c rd_rep.c rd_req.c replay.c + send_to_kdc.c set_default_realm.c + store.c store_emem.c store_fd.c + store_mem.c ticket.c time.c transited.c + v4_glue.c version.c warn.c krb5_err.c + heim_err.c k524_err.c krb_err.c''') + ' krb5-glue.c', + includes='../heimdal/lib/krb5 ../heimdal/lib/asn1 ../heimdal/lib/com_err', + public_deps='HEIMDAL_COM_ERR', + heimdal_autoproto='../heimdal/lib/krb5/krb5-protos.h', + heimdal_autoproto_options='-E KRB5_LIB -q -P comment -o', + heimdal_autoproto_private='../heimdal/lib/krb5/krb5-private.h', + deps='HEIMDAL_ROKEN HEIMDAL_PKINIT_ASN1 HEIMDAL_WIND HEIMDAL_KRB5_ASN1 HEIMDAL_HX509 HEIMDAL_HCRYPTO LIBNETIF LIBSAMBA-HOSTCONFIG INTL' + ) bld.SAMBA_SUBSYSTEM('HEIMDAL_HEIM_ASN1', @@ -320,14 +330,14 @@ bld.SAMBA_SUBSYSTEM('HEIMDAL_WIND', bld.SAMBA_SUBSYSTEM('HEIMDAL_ROKEN_PROGNAME', '../heimdal/lib/roken/getprogname.c ../heimdal/lib/roken/setprogname.c', includes='../heimdal/lib/roken', - config_option='HAVE_GETPROGNAME' + enabled=not bld.CONFIG_SET('HAVE_GETPROGNAME') ) bld.SAMBA_SUBSYSTEM('HEIMDAL_ROKEN_CLOSEFROM', '../heimdal/lib/roken/closefrom.c', includes='../heimdal/lib/roken', - config_option='HAVE_CLOSEFROM' + enabled=not bld.CONFIG_SET('HAVE_CLOSEFROM') ) @@ -335,7 +345,7 @@ bld.SAMBA_SUBSYSTEM('HEIMDAL_ROKEN_PROGNAME_H', '../heimdal/lib/roken/getprogname.c ../heimdal/lib/roken/setprogname.c', cflags='-DSOCKET_WRAPPER_DISABLE=1 -DNSS_WRAPPER_DISABLE=1', includes='../heimdal/lib/roken', - config_option='HAVE_GETPROGNAME' + enabled=not bld.CONFIG_SET('HAVE_GETPROGNAME') ) @@ -343,7 +353,7 @@ bld.SAMBA_SUBSYSTEM('HEIMDAL_ROKEN_CLOSEFROM_H', '../heimdal/lib/roken/closefrom.c', cflags='-DSOCKET_WRAPPER_DISABLE=1 -DNSS_WRAPPER_DISABLE=1', includes='../heimdal/lib/roken', - config_option='HAVE_CLOSEFROM' + enabled=not bld.CONFIG_SET('HAVE_CLOSEFROM') ) @@ -359,7 +369,7 @@ bld.SAMBA_SUBSYSTEM('HEIMDAL_COM_ERR', '../heimdal/lib/com_err/com_err.c ../heimdal/lib/com_err/error.c', includes='../heimdal/lib/com_err', deps='HEIMDAL_ROKEN', - config_option='HAVE_COM_ERR' + enabled=not bld.CONFIG_SET('HAVE_COM_ERR') ) diff --git a/source4/kdc/wscript_build b/source4/kdc/wscript_build index 27272f81a5..6e35e72262 100644 --- a/source4/kdc/wscript_build +++ b/source4/kdc/wscript_build @@ -45,9 +45,10 @@ bld.SAMBA_SUBSYSTEM('MIT_SAMBA', ) -bld.SAMBA_LIBRARY('mit_samba',source='', - deps='MIT_SAMBA', - output_type='SHARED_LIBRARY', - realname='mit_samba.so' - ) +bld.SAMBA_LIBRARY('mit_samba', + source='', + deps='MIT_SAMBA', + external_library=True, + realname='mit_samba.so' + ) diff --git a/source4/lib/ldb/wscript b/source4/lib/ldb/wscript index bc5ffdbc9e..43947b4af5 100644 --- a/source4/lib/ldb/wscript +++ b/source4/lib/ldb/wscript @@ -26,29 +26,89 @@ def build(bld): bld.BUILD_SUBDIR(LIBTDB_DIR) bld.BUILD_SUBDIR(LIBTEVENT_DIR) - LDB_TDB_SRC = bld.SUBDIR('ldb_tdb', - '''ldb_tdb.c ldb_pack.c ldb_search.c ldb_index.c - ldb_cache.c ldb_tdb_wrap.c''') + # in Samba4 we build some extra modules, and add extra + # capabilities to the ldb cmdline tools + s4_build = getattr(bld.env, '_SAMBA_BUILD_', 0) == 4 LDB_MAP_SRC = bld.SUBDIR('ldb_map', 'ldb_map.c ldb_map_inbound.c ldb_map_outbound.c') COMMON_SRC = bld.SUBDIR('common', '''ldb.c ldb_ldif.c ldb_parse.c ldb_msg.c ldb_utf8.c - ldb_debug.c ldb_modules.c ldb_dn.c ldb_match.c + ldb_debug.c ldb_dn.c ldb_match.c ldb_attributes.c attrib_handlers.c ldb_controls.c qsort.c''') - MODULES_SRC = bld.SUBDIR('modules', - 'rdn_name.c asq.c paged_results.c sort.c') + bld.SAMBA_SUBSYSTEM('LIBLDB', + includes='include', + deps='tevent', + source='common/ldb_modules.c') + + bld.SAMBA_MODULE('ldb_asq', + 'modules/asq.c', + init_function='LDB_MODULE(asq)', + subsystem='LIBLDB') + + bld.SAMBA_MODULE('ldb_server_sort', + 'modules/sort.c', + init_function='LDB_MODULE(server_sort)', + subsystem='LIBLDB') + + bld.SAMBA_MODULE('ldb_paged_results', + 'modules/paged_results.c', + init_function='LDB_MODULE(paged_results)', + subsystem='LIBLDB') + + bld.SAMBA_MODULE('ldb_paged_searches', + 'modules/paged_searches.c', + init_function='LDB_MODULE(paged_searches)', + enabled = s4_build, + subsystem='LIBLDB') + + bld.SAMBA_MODULE('ldb_rdn_name', + 'modules/rdn_name.c', + init_function='LDB_MODULE(rdn_name)', + subsystem='LIBLDB') + + bld.SAMBA_MODULE('ldb_sqlite3', + 'sqlite3/ldb_sqlite3.c', + init_function='LDB_BACKEND(sqlite3)', + enabled=False, + subsystem='LIBLDB') + + bld.SAMBA_MODULE('ldb_tdb', + bld.SUBDIR('ldb_tdb', + '''ldb_tdb.c ldb_pack.c ldb_search.c ldb_index.c + ldb_cache.c ldb_tdb_wrap.c'''), + init_function='LDB_BACKEND(tdb)', + deps='tdb', + subsystem='LIBLDB') + + bld.SAMBA_MODULE('ldb_ildap', 'ldb_ildap/ldb_ildap.c', + init_function='LDB_BACKEND(ldapi),LDB_BACKEND(ldaps),LDB_BACKEND(ldap)', + deps='talloc LIBCLI_LDAP CREDENTIALS', + enabled=s4_build, + subsystem='LIBLDB') + + ldb_deps = 'tevent LIBLDB' + if s4_build: + ldb_deps += ' LDBSAMBA POPT_CREDENTIALS POPT_SAMBA LIBCMDLINE_CREDENTIALS gensec' bld.SAMBA_LIBRARY('ldb', - LDB_TDB_SRC + ' ' + COMMON_SRC + ' ' + MODULES_SRC, - deps='tdb tevent', + COMMON_SRC + ' ' + LDB_MAP_SRC, + deps=ldb_deps, includes='include', vnum=VERSION) + bld.SAMBA_SUBSYSTEM('LIBLDB_CMDLINE', + 'tools/ldbutil.c tools/cmdline.c', + 'ldb dl popt') + LDB_TOOLS='ldbadd ldbsearch ldbdel ldbmodify ldbedit ldbrename ldbtest' for t in LDB_TOOLS.split(): - bld.SAMBA_BINARY(t, - 'tools/%s.c tools/ldbutil.c tools/cmdline.c' % t, - deps='ldb dl popt') + bld.SAMBA_BINARY(t, 'tools/%s.c' % t, deps='LIBLDB_CMDLINE') + + if s4_build: + bld.SAMBA_PYTHON('pyldb', 'pyldb.c', + deps='ldb', + realname='ldb.so') + diff --git a/source4/lib/registry/wscript_build b/source4/lib/registry/wscript_build index 72478b0d7f..cd2b508144 100644 --- a/source4/lib/registry/wscript_build +++ b/source4/lib/registry/wscript_build @@ -57,7 +57,7 @@ bld.SAMBA_BINARY('regtree', bld.SAMBA_SUBSYSTEM('torture_registry', - source='tests/generic.c hive.c tests/diff.c tests/registry.c', + source='tests/generic.c tests/hive.c tests/diff.c tests/registry.c', autoproto='tests/proto.h', deps='torture registry' ) diff --git a/source4/lib/smbreadline/wscript_build b/source4/lib/smbreadline/wscript_build new file mode 100644 index 0000000000..15a746060c --- /dev/null +++ b/source4/lib/smbreadline/wscript_build @@ -0,0 +1,6 @@ + +termlib=bld.env.READLINE_TERMLIB or '' + +bld.SAMBA_SUBSYSTEM('SMBREADLINE', + source='smbreadline.c', + deps=termlib + ' readline') diff --git a/source4/lib/smbreadline/wscript_configure b/source4/lib/smbreadline/wscript_configure new file mode 100644 index 0000000000..d89c357cec --- /dev/null +++ b/source4/lib/smbreadline/wscript_configure @@ -0,0 +1,12 @@ + +conf.CHECK_HEADERS('readline.h history.h readline/readline.h readline/history.h') +for termlib in ['ncurses', 'curses', 'termcap', 'terminfo', 'termlib', 'tinfo']: + if conf.CHECK_FUNCS_IN('tgetent', termlib): + conf.env['READLINE_TERMLIB'] = termlib + break + +if conf.CHECK_FUNCS_IN('rl_completion_matches', 'readline'): + conf.DEFINE('HAVE_NEW_LIBREADLINE', 1) + +if conf.CHECK_FUNCS_IN('rl_event_hook', 'readline'): + conf.DEFINE('HAVE_HISTORY_LIST', 1) diff --git a/source4/lib/socket/wscript_build b/source4/lib/socket/wscript_build index cf75d82206..7e456a8391 100644 --- a/source4/lib/socket/wscript_build +++ b/source4/lib/socket/wscript_build @@ -13,7 +13,7 @@ bld.SAMBA_MODULE('socket_ip', source='socket_ip.c', subsystem='samba_socket', deps='LIBSAMBA-ERRORS LIBREPLACE_NETWORK', - output_type='MERGED_OBJ' + internal_module=True ) @@ -21,7 +21,7 @@ bld.SAMBA_MODULE('socket_unix', source='socket_unix.c', subsystem='samba_socket', deps='LIBREPLACE_NETWORK', - output_type='MERGED_OBJ' + internal_module=True ) diff --git a/source4/libcli/security/wscript_build b/source4/libcli/security/wscript_build index 1b5ef77184..f2236a4a9c 100644 --- a/source4/libcli/security/wscript_build +++ b/source4/libcli/security/wscript_build @@ -3,7 +3,7 @@ bld.SAMBA_SUBSYSTEM('LIBSECURITY', - source='security_token.c access_check.c privilege.c sddl.c create_descriptor.c object_tree.c', + source='security_token.c access_check.c privilege.c create_descriptor.c object_tree.c', autoproto='proto.h', public_deps='LIBNDR LIBSECURITY_COMMON' ) diff --git a/source4/libcli/wscript_build b/source4/libcli/wscript_build index b20c52155f..bded7da4ca 100644 --- a/source4/libcli/wscript_build +++ b/source4/libcli/wscript_build @@ -54,19 +54,19 @@ bld.SAMBA_SUBSYSTEM('LIBCLI_DGRAM', bld.SAMBA_SUBSYSTEM('LIBCLI_WREPL', source='wrepl/winsrepl.c', autoproto='wrepl/winsrepl_proto.h', - public_deps='NDR_WINSREPL samba_socket LIBEVENTS LIBPACKET' + public_deps='NDR_WINSREPL samba_socket LIBEVENTS LIBPACKET LIBSAMBA_TSOCKET' ) bld.SAMBA_SUBSYSTEM('LIBCLI_RESOLVE', source='resolve/resolve.c', autoproto='resolve/proto.h', - public_deps='NDR_NBT' + public_deps='NDR_NBT LIBTSOCKET' ) bld.SAMBA_SUBSYSTEM('LP_RESOLVE', - source='resolve/bcast.c resolve/nbtlist.c resolve/wins.c resolve/dns_ex.c resolve/host.c resolve/resolve_lp.c', + source='resolve/bcast.c resolve/nbtlist.c resolve/wins.c resolve/dns_ex.c resolve/file.c resolve/host.c resolve/resolve_lp.c', autoproto='resolve/lp_proto.h', deps='LIBCLI_NBT LIBSAMBA-HOSTCONFIG LIBNETIF' ) diff --git a/source4/librpc/wscript_build b/source4/librpc/wscript_build index 225a7f172b..66d00ca544 100644 --- a/source4/librpc/wscript_build +++ b/source4/librpc/wscript_build @@ -1,5 +1,3 @@ -#! /usr/bin/env python - bld.BUILD_SUBDIR('../../librpc/idl') bld.BUILD_SUBDIR('idl') @@ -623,9 +621,8 @@ bld.SAMBA_PYTHON('python_winreg', bld.SAMBA_PYTHON('python_dcerpc_misc', - source='ndr/py_misc.c', + source='../../librpc/gen_ndr/py_misc.c', deps='PYTALLOC python_dcerpc NDR_MISC NDR_KRB5PAC', - enabled=False, realname='samba/dcerpc/misc.so' ) @@ -722,18 +719,19 @@ bld.SAMBA_PYTHON('python_drsuapi', bld.SAMBA_PYTHON('python_dcerpc_security', - source='ndr/py_security.c', + source='../../librpc/gen_ndr/py_security.c', deps='PYTALLOC python_dcerpc_misc python_dcerpc NDR_SECURITY', - enabled=False, realname='samba/dcerpc/security.so' ) bld.SAMBA_PYTHON('python_dcerpc_xattr', - source='ndr/py_xattr.c', + source='../../librpc/gen_ndr/py_xattr.c', deps='PYTALLOC python_dcerpc_misc python_dcerpc python_dcerpc_security NDR_XATTR RPC_NDR_XATTR', - enabled=False, realname='samba/dcerpc/xattr.so' ) - +bld.SAMBA_SCRIPT('python_dcerpc_init', + pattern='rpc/dcerpc.py', + installdir='python/samba/dcerpc', + installname='__init__.py') diff --git a/source4/nbt_server/wscript_build b/source4/nbt_server/wscript_build index 49e0000a13..d1928203c4 100644 --- a/source4/nbt_server/wscript_build +++ b/source4/nbt_server/wscript_build @@ -11,7 +11,7 @@ bld.SAMBA_SUBSYSTEM('WINSDB', bld.SAMBA_MODULE('ldb_wins_ldb', source='wins/wins_ldb.c', - subsystem='ldb', + subsystem='LIBLDB', init_function='LDB_MODULE(wins_ldb)', deps='ldb LIBNETIF LIBSAMBA-HOSTCONFIG LIBSAMBA-UTIL' ) diff --git a/source4/ntvfs/posix/wscript_build b/source4/ntvfs/posix/wscript_build index 3336950974..070c2fb8f6 100644 --- a/source4/ntvfs/posix/wscript_build +++ b/source4/ntvfs/posix/wscript_build @@ -28,25 +28,25 @@ bld.SAMBA_SUBSYSTEM('pvfs_aio', bld.SAMBA_MODULE('ntvfs_posix', - source='vfs_posix.c pvfs_util.c pvfs_search.c pvfs_dirlist.c pvfs_fileinfo.c pvfs_unlink.c pvfs_mkdir.c pvfs_open.c pvfs_read.c pvfs_flush.c pvfs_write.c pvfs_fsinfo.c pvfs_qfileinfo.c pvfs_setfileinfo.c pvfs_rename.c pvfs_resolve.c pvfs_shortname.c pvfs_lock.c pvfs_oplock.c pvfs_wait.c pvfs_seek.c pvfs_ioctl.c pvfs_xattr.c pvfs_streams.c pvfs_notify.c xattr_system.c xattr_tdb.c', + source='vfs_posix.c pvfs_util.c pvfs_search.c pvfs_dirlist.c pvfs_fileinfo.c pvfs_unlink.c pvfs_mkdir.c pvfs_open.c pvfs_read.c pvfs_flush.c pvfs_write.c pvfs_fsinfo.c pvfs_qfileinfo.c pvfs_setfileinfo.c pvfs_rename.c pvfs_resolve.c pvfs_shortname.c pvfs_lock.c pvfs_oplock.c pvfs_wait.c pvfs_seek.c pvfs_ioctl.c pvfs_xattr.c pvfs_streams.c pvfs_notify.c pvfs_sys.c xattr_system.c xattr_tdb.c', autoproto='vfs_posix_proto.h', subsystem='ntvfs', init_function='ntvfs_posix_init', deps='NDR_XATTR WRAP_XATTR BLKID ntvfs_common MESSAGING LIBWBCLIENT_OLD pvfs_acl pvfs_aio', - output_type='MERGED_OBJ' + internal_module=True ) bld.SAMBA_PYTHON('python_xattr_native', source='python/pyxattr_native.c', - deps='LIBNDR ldb SAMDB CREDENTIALS python_dcerpc_security pyparam_util WRAP_XATTR', + deps='LIBNDR ldb SAMDB CREDENTIALS python_dcerpc_security pyparam_util WRAP_XATTR attr', realname='samba/xattr_native.so' ) bld.SAMBA_PYTHON('python_xattr_tdb', source='python/pyxattr_tdb.c xattr_tdb.c', - deps='LIBNDR ldb python_dcerpc_security pyparam_util share', + deps='LIBNDR ldb python_dcerpc_security pyparam_util share attr', realname='samba/xattr_tdb.so' ) diff --git a/source4/ntvfs/wscript_build b/source4/ntvfs/wscript_build index c806720860..7b4c10d8cc 100644 --- a/source4/ntvfs/wscript_build +++ b/source4/ntvfs/wscript_build @@ -23,7 +23,7 @@ bld.SAMBA_MODULE('ntvfs_smb2', bld.SAMBA_MODULE('ntvfs_simple', - source='simple/vfs_simple.c cifs_posix_cli/svfs_util.c ./simple/svfs_util.c', + source='simple/vfs_simple.c simple/svfs_util.c', autoproto='simple/proto.h', subsystem='ntvfs', init_function='ntvfs_simple_init' @@ -31,7 +31,7 @@ bld.SAMBA_MODULE('ntvfs_simple', bld.SAMBA_MODULE('ntvfs_cifsposix', - source='cifs_posix_cli/vfs_cifs_posix.c cifs_posix_cli/svfs_util.c ./simple/svfs_util.c', + source='cifs_posix_cli/vfs_cifs_posix.c cifs_posix_cli/svfs_util.c', autoproto='cifs_posix_cli/proto.h', subsystem='ntvfs', init_function='ntvfs_cifs_posix_init' diff --git a/source4/param/wscript_build b/source4/param/wscript_build index 7e653f35d0..ea1bfc6e3e 100644 --- a/source4/param/wscript_build +++ b/source4/param/wscript_build @@ -1,12 +1,8 @@ -# AUTOGENERATED by mktowscript.pl from ../../source4/param/config.mk -# Please remove this notice if hand editing - - bld.SAMBA_LIBRARY('LIBSAMBA-HOSTCONFIG', source='loadparm.c generic.c util.c', # PC_FILES='samba-hostconfig.pc', vnum='0.0.1', - deps='DYNCONFIG LIBREPLACE_EXT CHARSET', + deps='DYNCONFIG LIBREPLACE_EXT CHARSET dl', public_deps='LIBSAMBA-UTIL', public_headers='param.h' ) diff --git a/source4/rpc_server/wscript_build b/source4/rpc_server/wscript_build index fc1d43d549..6a871ab903 100644 --- a/source4/rpc_server/wscript_build +++ b/source4/rpc_server/wscript_build @@ -73,7 +73,7 @@ bld.SAMBA_MODULE('dcerpc_winreg', subsystem='dcerpc_server', init_function='dcerpc_server_winreg_init', deps='registry NDR_STANDARD', - output_type='MERGED_OBJ' + internal_module=True ) @@ -99,7 +99,7 @@ bld.SAMBA_MODULE('dcerpc_spoolss', subsystem='dcerpc_server', init_function='dcerpc_server_spoolss_init', deps='DCERPC_COMMON NDR_SPOOLSS ntptr RPC_NDR_SPOOLSS', - output_type='MERGED_OBJ' + internal_module=True ) @@ -132,7 +132,7 @@ bld.SAMBA_MODULE('DCESRV', autoproto='service_rpc.h', subsystem='service', init_function='server_service_rpc_init', - output_type='MERGED_OBJ', + internal_module=True, deps='dcerpc_server' ) diff --git a/source4/scripting/python/wscript_build b/source4/scripting/python/wscript_build index 91bd516408..cfa028f4a4 100644 --- a/source4/scripting/python/wscript_build +++ b/source4/scripting/python/wscript_build @@ -15,7 +15,7 @@ bld.SAMBA_PYTHON('PYTALLOC', bld.SAMBA_PYTHON('python_uuid', source='uuidmodule.c', deps='LIBNDR', - realname='uuid' + realname='uuid.so' ) @@ -30,3 +30,9 @@ bld.SAMBA_PYTHON('python_glue', # create a dummy subsystem for EXT_LIB_PYTHON bld.SAMBA_SUBSYSTEM('EXT_LIB_PYTHON', '') + + +# install out various python scripts for use by make test +bld.SAMBA_SCRIPT('samba_python', + pattern='samba/**/*.py', + installdir='python') diff --git a/source4/selftest/wscript b/source4/selftest/wscript index 8327838366..d271ce783c 100644 --- a/source4/selftest/wscript +++ b/source4/selftest/wscript @@ -1,5 +1,7 @@ # selftest main code. +import Scripting, os + ######################################################################## # main test entry point def cmd_test(opt): @@ -11,8 +13,10 @@ def cmd_test(opt): def cmd_quicktest(opt): '''Run the quick test suite''' print "Starting quick test" + #Scripting.commands += ['build'] + SELFTEST = 'PYTHON=/usr/bin/python perl -W ../selftest/selftest.pl --prefix=./st --builddir=. --srcdir=. --exclude=./selftest/skip --testlist="./selftest/tests.sh|" --exclude=./selftest/slow --quick --include=./selftest/quick --socket-wrapper | perl -W ../selftest/filter-subunit.pl --expected-failures=./selftest/knownfail | /usr/bin/perl -W ../selftest/format-subunit.pl --prefix=./st --format=plain --immediate' + ret = os.system(SELFTEST) def set_options(opt): opt.ADD_COMMAND('test', cmd_test) opt.ADD_COMMAND('quicktest', cmd_quicktest) - diff --git a/source4/smb_server/wscript_build b/source4/smb_server/wscript_build index cccb285b5d..689ff94f20 100644 --- a/source4/smb_server/wscript_build +++ b/source4/smb_server/wscript_build @@ -8,7 +8,7 @@ bld.SAMBA_MODULE('SERVICE_SMB', subsystem='service', init_function='server_service_smb_init', deps='SMB_SERVER', - output_type='MERGED_OBJ' + internal_module=True ) diff --git a/source4/smbd/wscript_build b/source4/smbd/wscript_build index ba2f081678..89362c8892 100644 --- a/source4/smbd/wscript_build +++ b/source4/smbd/wscript_build @@ -19,9 +19,10 @@ bld.SAMBA_BINARY('samba', source='server.c', manpages='samba.8', installdir='SBINDIR', - subsystem='service', + subsystem_name='service', deps='''LIBEVENTS process_model service LIBSAMBA-HOSTCONFIG LIBSAMBA-UTIL POPT_SAMBA PIDFILE - LIBPOPT gensec registry ntptr ntvfs share CLUSTER DCESRV''' + LIBPOPT gensec registry ntptr ntvfs share CLUSTER DCESRV''', + needs_python=True ) @@ -35,7 +36,7 @@ bld.SAMBA_MODULE('process_model_single', source='process_single.c', subsystem='process_model', init_function='process_model_single_init', - output_type='MERGED_OBJ' + internal_module=True ) @@ -51,7 +52,8 @@ bld.SAMBA_MODULE('process_model_thread', source='process_thread.c', subsystem='process_model', init_function='process_model_thread_init', - deps='PTHREAD' + enabled=False, + deps='pthread' ) diff --git a/source4/torture/drs/wscript_build b/source4/torture/drs/wscript_build index 2743b7c2ad..4008ac9a41 100644 --- a/source4/torture/drs/wscript_build +++ b/source4/torture/drs/wscript_build @@ -8,6 +8,6 @@ bld.SAMBA_MODULE('TORTURE_DRS', subsystem='smbtorture', init_function='torture_drs_init', deps='NDR_TABLE RPC_NDR_UNIXINFO dcerpc_samr RPC_NDR_WINREG RPC_NDR_INITSHUTDOWN RPC_NDR_OXIDRESOLVER RPC_NDR_EVENTLOG RPC_NDR_ECHO RPC_NDR_SVCCTL RPC_NDR_NETLOGON dcerpc_atsvc dcerpc_mgmt RPC_NDR_DRSUAPI RPC_NDR_LSA RPC_NDR_EPMAPPER RPC_NDR_DFS RPC_NDR_FRSAPI RPC_NDR_SPOOLSS RPC_NDR_SRVSVC RPC_NDR_WKSSVC RPC_NDR_ROT RPC_NDR_DSSETUP RPC_NDR_REMACT RPC_NDR_OXIDRESOLVER RPC_NDR_NTSVCS WB_HELPER LIBSAMBA-NET LIBCLI_AUTH POPT_CREDENTIALS TORTURE_LDAP TORTURE_UTIL TORTURE_RAP dcerpc_server service process_model ntvfs SERVICE_SMB RPC_NDR_BROWSER LIBCLI_DRSUAPI TORTURE_LDB_MODULE', - output_type='MERGED_OBJ' + internal_module=True ) diff --git a/source4/torture/libnetapi/wscript_build b/source4/torture/libnetapi/wscript_build index 5110cf54ce..bea5f06f9e 100644 --- a/source4/torture/libnetapi/wscript_build +++ b/source4/torture/libnetapi/wscript_build @@ -8,7 +8,7 @@ bld.SAMBA_MODULE('TORTURE_LIBNETAPI', subsystem='smbtorture', init_function='torture_libnetapi_init', deps='POPT_CREDENTIALS NETAPI', - output_type='MERGED_OBJ', + internal_module=True, enabled=False ) diff --git a/source4/torture/libsmbclient/wscript_build b/source4/torture/libsmbclient/wscript_build index 688e0a9533..6fd5e8d7a3 100644 --- a/source4/torture/libsmbclient/wscript_build +++ b/source4/torture/libsmbclient/wscript_build @@ -8,7 +8,7 @@ bld.SAMBA_MODULE('TORTURE_LIBSMBCLIENT', subsystem='smbtorture', init_function='torture_libsmbclient_init', deps='POPT_CREDENTIALS SMBCLIENT', - output_type='MERGED_OBJ', + internal_module=True, enabled=False ) diff --git a/source4/torture/local/wscript_build b/source4/torture/local/wscript_build index f930a432cb..785101ed79 100644 --- a/source4/torture/local/wscript_build +++ b/source4/torture/local/wscript_build @@ -3,6 +3,6 @@ bld.SAMBA_MODULE('TORTURE_LOCAL', autoproto='proto.h', subsystem='smbtorture', init_function='torture_local_init', - deps='RPC_NDR_ECHO TDR LIBCLI_SMB MESSAGING ICONV POPT_CREDENTIALS TORTURE_AUTH TORTURE_UTIL TORTURE_NDR TORTURE_LIBCRYPTO share torture_registry PROVISION NSS_WRAPPER ldb SAMDB', - output_type='MERGED_OBJ' + deps='RPC_NDR_ECHO TDR LIBCLI_SMB MESSAGING ICONV POPT_CREDENTIALS TORTURE_AUTH TORTURE_UTIL TORTURE_NDR TORTURE_LIBCRYPTO share torture_registry PROVISION NSS_WRAPPER ldb SAMDB SOCKET_WRAPPER', + internal_module=True ) diff --git a/source4/torture/smb2/wscript_build b/source4/torture/smb2/wscript_build index 542ebf4f4a..7d4f48813c 100644 --- a/source4/torture/smb2/wscript_build +++ b/source4/torture/smb2/wscript_build @@ -6,7 +6,7 @@ bld.SAMBA_MODULE('TORTURE_SMB2', source='connect.c scan.c util.c getinfo.c setinfo.c lock.c notify.c smb2.c durable_open.c oplock.c dir.c lease.c create.c acls.c read.c compound.c streams.c', subsystem='smbtorture', deps='LIBCLI_SMB2 POPT_CREDENTIALS torture', - output_type='MERGED_OBJ', + internal_module=True, autoproto='proto.h', init_function='torture_smb2_init' ) diff --git a/source4/torture/winbind/wscript_build b/source4/torture/winbind/wscript_build index 82bf44fb2a..4345b7bd0b 100644 --- a/source4/torture/winbind/wscript_build +++ b/source4/torture/winbind/wscript_build @@ -4,5 +4,5 @@ bld.SAMBA_MODULE('TORTURE_WINBIND', subsystem='smbtorture', init_function='torture_winbind_init', deps='LIBWBCLIENT LIBWBCLIENT_ASYNC LIBWINBIND-CLIENT torture PAM_ERRORS', - output_type='MERGED_OBJ' + internal_module=True ) diff --git a/source4/torture/wscript_build b/source4/torture/wscript_build index 5be7385e5d..489d3300ae 100644 --- a/source4/torture/wscript_build +++ b/source4/torture/wscript_build @@ -10,22 +10,22 @@ bld.SAMBA_SUBSYSTEM('TORTURE_UTIL', bld.SAMBA_MODULE('TORTURE_BASIC', - source='basic/base.c basic/misc.c basic/scanner.c ./rpc/scanner.c basic/utable.c basic/charset.c basic/mangle_test.c basic/denytest.c basic/aliases.c basic/locking.c basic/secleak.c raw/rename.c ./basic/rename.c basic/dir.c ./smb2/dir.c basic/delete.c raw/unlink.c ./basic/unlink.c basic/disconnect.c basic/delaywrite.c basic/attr.c basic/properties.c', + source='basic/base.c basic/misc.c basic/scanner.c basic/utable.c basic/charset.c basic/mangle_test.c basic/denytest.c basic/aliases.c basic/locking.c basic/secleak.c basic/rename.c basic/dir.c basic/delete.c basic/unlink.c basic/disconnect.c basic/delaywrite.c basic/attr.c basic/properties.c', subsystem='smbtorture', deps='LIBCLI_SMB POPT_CREDENTIALS TORTURE_UTIL LIBCLI_RAW TORTURE_RAW', - output_type='MERGED_OBJ', + internal_module=True, autoproto='basic/proto.h', init_function='torture_base_init' ) bld.SAMBA_MODULE('TORTURE_RAW', - source='raw/qfsinfo.c raw/qfileinfo.c raw/setfileinfo.c raw/search.c raw/close.c raw/open.c raw/mkdir.c raw/oplock.c ./smb2/oplock.c raw/notify.c ./smb2/notify.c raw/mux.c raw/ioctl.c raw/chkpath.c raw/unlink.c ./basic/unlink.c raw/read.c ./smb2/read.c raw/context.c raw/write.c raw/lock.c ./smb2/lock.c raw/pingpong.c raw/lockbench.c raw/lookuprate.c raw/tconrate.c raw/openbench.c raw/rename.c ./basic/rename.c raw/eas.c raw/streams.c ./smb2/streams.c raw/acls.c ./smb2/acls.c raw/seek.c raw/samba3hide.c raw/samba3misc.c raw/composite.c raw/raw.c raw/offline.c', + source='raw/qfsinfo.c raw/qfileinfo.c raw/setfileinfo.c raw/search.c raw/close.c raw/open.c raw/mkdir.c raw/oplock.c raw/notify.c raw/mux.c raw/ioctl.c raw/chkpath.c raw/unlink.c raw/read.c raw/context.c raw/write.c raw/lock.c raw/pingpong.c raw/lockbench.c raw/lookuprate.c raw/tconrate.c raw/openbench.c raw/rename.c raw/eas.c raw/streams.c raw/acls.c raw/seek.c raw/samba3hide.c raw/samba3misc.c raw/composite.c raw/raw.c raw/offline.c', autoproto='raw/proto.h', subsystem='smbtorture', init_function='torture_raw_init', deps='LIBCLI_SMB LIBCLI_LSA LIBCLI_SMB_COMPOSITE POPT_CREDENTIALS TORTURE_UTIL', - output_type='MERGED_OBJ' + internal_module=True ) bld.BUILD_SUBDIR('smb2') @@ -34,19 +34,19 @@ bld.BUILD_SUBDIR('libnetapi') bld.BUILD_SUBDIR('libsmbclient') bld.SAMBA_SUBSYSTEM('TORTURE_NDR', - source='ndr/ndr.c ndr/winreg.c ./rpc/winreg.c ndr/atsvc.c ./rpc/atsvc.c ndr/lsa.c ./rpc/lsa.c ndr/epmap.c ndr/dfs.c ./rpc/dfs.c ndr/netlogon.c ./rpc/netlogon.c ndr/drsuapi.c ./rpc/drsuapi.c ndr/spoolss.c ./rpc/spoolss.c ndr/samr.c ./rpc/samr.c ndr/dfsblob.c', + source='ndr/ndr.c ndr/winreg.c ndr/atsvc.c ndr/lsa.c ndr/epmap.c ndr/dfs.c ndr/netlogon.c ndr/drsuapi.c ndr/spoolss.c ndr/samr.c ndr/dfsblob.c', autoproto='ndr/proto.h', deps='torture SERVICE_SMB' ) bld.SAMBA_MODULE('torture_rpc', - source='rpc/join.c ndr/lsa.c ./rpc/lsa.c rpc/lsa_lookup.c rpc/session_key.c rpc/echo.c ndr/dfs.c ./rpc/dfs.c ndr/drsuapi.c ./rpc/drsuapi.c rpc/drsuapi_cracknames.c rpc/dssync.c rpc/dsgetinfo.c ndr/spoolss.c ./rpc/spoolss.c rpc/spoolss_notify.c rpc/spoolss_win.c rpc/unixinfo.c ndr/samr.c ./rpc/samr.c rpc/samr_accessmask.c rpc/wkssvc.c rpc/srvsvc.c rpc/svcctl.c ndr/atsvc.c ./rpc/atsvc.c rpc/eventlog.c rpc/epmapper.c ndr/winreg.c ./rpc/winreg.c rpc/initshutdown.c rpc/oxidresolve.c rpc/remact.c rpc/mgmt.c basic/scanner.c ./rpc/scanner.c rpc/autoidl.c rpc/countcalls.c rpc/testjoin.c rpc/schannel.c ndr/netlogon.c ./rpc/netlogon.c rpc/remote_pac.c rpc/samlogon.c rpc/samsync.c rpc/bind.c rpc/dssetup.c rpc/alter_context.c rpc/bench.c rpc/samba3rpc.c rpc/rpc.c rpc/async_bind.c rpc/handles.c rpc/frsapi.c rpc/object_uuid.c rpc/ntsvcs.c rpc/browser.c', + source='rpc/join.c rpc/lsa.c rpc/lsa_lookup.c rpc/session_key.c rpc/echo.c rpc/dfs.c rpc/drsuapi.c rpc/drsuapi_cracknames.c rpc/dssync.c rpc/dsgetinfo.c rpc/spoolss.c rpc/spoolss_notify.c rpc/spoolss_win.c rpc/unixinfo.c rpc/samr.c rpc/samr_accessmask.c rpc/wkssvc.c rpc/srvsvc.c rpc/svcctl.c rpc/atsvc.c rpc/eventlog.c rpc/epmapper.c rpc/winreg.c rpc/initshutdown.c rpc/oxidresolve.c rpc/remact.c rpc/mgmt.c rpc/scanner.c rpc/autoidl.c rpc/countcalls.c rpc/testjoin.c rpc/schannel.c rpc/netlogon.c rpc/remote_pac.c rpc/samlogon.c rpc/samsync.c rpc/bind.c rpc/dssetup.c rpc/alter_context.c rpc/bench.c rpc/samba3rpc.c rpc/rpc.c rpc/async_bind.c rpc/handles.c rpc/frsapi.c rpc/object_uuid.c rpc/ntsvcs.c rpc/browser.c', autoproto='rpc/proto.h', subsystem='smbtorture', init_function='torture_rpc_init', deps='NDR_TABLE RPC_NDR_UNIXINFO dcerpc_samr RPC_NDR_WINREG RPC_NDR_INITSHUTDOWN RPC_NDR_OXIDRESOLVER RPC_NDR_EVENTLOG RPC_NDR_ECHO RPC_NDR_SVCCTL RPC_NDR_NETLOGON dcerpc_atsvc dcerpc_mgmt RPC_NDR_DRSUAPI RPC_NDR_LSA RPC_NDR_EPMAPPER RPC_NDR_DFS RPC_NDR_FRSAPI RPC_NDR_SPOOLSS RPC_NDR_SRVSVC RPC_NDR_WKSSVC RPC_NDR_ROT RPC_NDR_DSSETUP RPC_NDR_REMACT RPC_NDR_OXIDRESOLVER RPC_NDR_NTSVCS WB_HELPER LIBSAMBA-NET LIBCLI_AUTH POPT_CREDENTIALS TORTURE_LDAP TORTURE_UTIL TORTURE_RAP dcerpc_server service process_model ntvfs SERVICE_SMB RPC_NDR_BROWSER LIBCLI_DRSUAPI TORTURE_LDB_MODULE', - output_type='MERGED_OBJ' + internal_module=True ) bld.BUILD_SUBDIR('drs') @@ -57,7 +57,7 @@ bld.SAMBA_MODULE('TORTURE_RAP', subsystem='smbtorture', init_function='torture_rap_init', deps='TORTURE_UTIL LIBCLI_SMB', - output_type='MERGED_OBJ' + internal_module=True ) @@ -66,7 +66,7 @@ bld.SAMBA_MODULE('TORTURE_AUTH', autoproto='auth/proto.h', subsystem='smbtorture', deps='LIBCLI_SMB gensec auth KERBEROS POPT_CREDENTIALS SMBPASSWD torture', - output_type='MERGED_OBJ' + internal_module=True ) bld.BUILD_SUBDIR('local') @@ -77,7 +77,7 @@ bld.SAMBA_MODULE('TORTURE_NBENCH', subsystem='smbtorture', init_function='torture_nbench_init', deps='TORTURE_UTIL', - output_type='MERGED_OBJ' + internal_module=True ) @@ -87,7 +87,7 @@ bld.SAMBA_MODULE('TORTURE_UNIX', subsystem='smbtorture', init_function='torture_unix_init', deps='TORTURE_UTIL', - output_type='MERGED_OBJ' + internal_module=True ) @@ -95,7 +95,7 @@ bld.SAMBA_MODULE('TORTURE_LDAP', source='ldap/common.c ldap/basic.c ldap/schema.c ldap/uptodatevector.c ldap/cldap.c ldap/cldapbench.c ldap/ldap_sort.c ldap/nested_search.c', subsystem='smbtorture', deps='LIBCLI_LDAP LIBCLI_CLDAP SAMDB POPT_CREDENTIALS torture LDB_WRAP', - output_type='MERGED_OBJ', + internal_module=True, autoproto='ldap/proto.h', init_function='torture_ldap_init' ) @@ -107,7 +107,7 @@ bld.SAMBA_MODULE('TORTURE_NBT', subsystem='smbtorture', init_function='torture_nbt_init', deps='LIBCLI_SMB LIBCLI_NBT LIBCLI_DGRAM LIBCLI_WREPL torture_rpc', - output_type='MERGED_OBJ' + internal_module=True ) @@ -117,7 +117,7 @@ bld.SAMBA_MODULE('TORTURE_NET', subsystem='smbtorture', init_function='torture_net_init', deps='LIBSAMBA-NET POPT_CREDENTIALS torture_rpc PROVISION', - output_type='MERGED_OBJ' + internal_module=True ) @@ -127,18 +127,18 @@ bld.SAMBA_MODULE('TORTURE_NTP', subsystem='smbtorture', init_function='torture_ntp_init', deps='POPT_CREDENTIALS torture_rpc', - output_type='MERGED_OBJ' + internal_module=True ) -TORTURE_MODULES = 'TORTURE_BASIC TORTURE_RAW torture_rpc TORTURE_RAP TORTURE_AUTH TORTURE_NBENCH TORTURE_UNIX TORTURE_LDAP TORTURE_NBT TORTURE_NET TORTURE_NTP' +TORTURE_MODULES = 'TORTURE_BASIC TORTURE_RAW torture_rpc TORTURE_RAP TORTURE_AUTH TORTURE_NBENCH TORTURE_UNIX TORTURE_LDAP TORTURE_NBT TORTURE_NET TORTURE_NTP torture_registry' bld.SAMBA_BINARY('smbtorture', source='smbtorture.c torture.c', manpages='man/smbtorture.1', public_headers='smbtorture.h', installdir='BINDIR', - subsystem='smbtorture', - deps='torture LIBPOPT POPT_SAMBA POPT_CREDENTIALS dcerpc LIBCLI_SMB SMBREADLINE ' + TORTURE_MODULES + deps='torture LIBPOPT POPT_SAMBA POPT_CREDENTIALS dcerpc LIBCLI_SMB SMBREADLINE ' + TORTURE_MODULES, + needs_python=True ) @@ -161,11 +161,11 @@ bld.SAMBA_BINARY('masktest', bld.SAMBA_BINARY('locktest', source='locktest.c', # COV_TARGET='test', - ldflags='--coverage', - manpages='man/locktest.1', + #ldflags='--coverage', + #cflags='--coverage', # GCOV='1', + manpages='man/locktest.1', deps='LIBPOPT POPT_SAMBA POPT_CREDENTIALS LIBSAMBA-UTIL LIBCLI_SMB LIBSAMBA-HOSTCONFIG', - cflags='--coverage', installdir='BINDIR' ) diff --git a/source4/utils/net/wscript_build b/source4/utils/net/wscript_build index 47b0f21425..ef31d0c3d3 100644 --- a/source4/utils/net/wscript_build +++ b/source4/utils/net/wscript_build @@ -1,13 +1,9 @@ -# AUTOGENERATED by mktowscript.pl from ../../source4/utils/net/config.mk -# Please remove this notice if hand editing - - bld.SAMBA_MODULE('net_drs', source='drs/net_drs.c drs/net_drs_bind.c drs/net_drs_kcc.c drs/net_drs_replicate.c drs/net_drs_showrepl.c', autoproto='drs/net_drs_proto.h', subsystem='net', deps='LIBCLI_DRSUAPI ldb', - output_type='MERGED_OBJ' + internal_module=True ) diff --git a/source4/utils/wscript_build b/source4/utils/wscript_build index c11c49abc3..4dde99e2f7 100644 --- a/source4/utils/wscript_build +++ b/source4/utils/wscript_build @@ -6,7 +6,8 @@ bld.SAMBA_BINARY('ntlm_auth', source='ntlm_auth.c', manpages='man/ntlm_auth.1', installdir='BINDIR', - deps='LIBSAMBA-HOSTCONFIG LIBSAMBA-UTIL LIBPOPT POPT_SAMBA POPT_CREDENTIALS gensec LIBCLI_RESOLVE auth ntlm_check MESSAGING LIBEVENTS' + deps='LIBSAMBA-HOSTCONFIG LIBSAMBA-UTIL LIBPOPT POPT_SAMBA POPT_CREDENTIALS gensec LIBCLI_RESOLVE auth ntlm_check MESSAGING LIBEVENTS service', + needs_python=True ) diff --git a/source4/winbind/wscript_build b/source4/winbind/wscript_build index 3a62c13ea4..e0c44c35d1 100644 --- a/source4/winbind/wscript_build +++ b/source4/winbind/wscript_build @@ -3,7 +3,7 @@ bld.SAMBA_MODULE('WINBIND', - source='wb_server.c wb_irpc.c wb_samba3_protocol.c wb_samba3_cmd.c wb_init_domain.c wb_dom_info.c wb_dom_info_trusted.c wb_sid2domain.c wb_name2domain.c wb_sids2xids.c wb_xids2sids.c wb_gid2sid.c wb_sid2uid.c wb_sid2gid.c wb_uid2sid.c wb_connect_lsa.c wb_connect_sam.c wb_cmd_lookupname.c wb_cmd_lookupsid.c wb_cmd_getdcname.c wb_cmd_getgrnam.c wb_cmd_getgrgid.c wb_cmd_getpwnam.c wb_cmd_getpwuid.c wb_cmd_userdomgroups.c wb_cmd_usersids.c wb_cmd_list_groups.c wb_cmd_list_trustdom.c wb_cmd_list_users.c wb_cmd_setpwent.c wb_cmd_getpwent.c wb_pam_auth.c wb_sam_logon.c', + source='wb_server.c wb_irpc.c wb_samba3_protocol.c wb_samba3_cmd.c wb_init_domain.c wb_dom_info.c wb_dom_info_trusted.c wb_sid2domain.c wb_name2domain.c wb_sids2xids.c wb_xids2sids.c wb_gid2sid.c wb_sid2uid.c wb_sid2gid.c wb_uid2sid.c wb_connect_lsa.c wb_connect_sam.c wb_cmd_lookupname.c wb_cmd_lookupsid.c wb_cmd_getdcname.c wb_cmd_getgrnam.c wb_cmd_getgrgid.c wb_cmd_getpwnam.c wb_cmd_getpwuid.c wb_cmd_userdomgroups.c wb_cmd_usersids.c wb_cmd_list_groups.c wb_cmd_list_trustdom.c wb_cmd_list_users.c wb_cmd_setpwent.c wb_cmd_getpwent.c wb_cmd_getgrent.c wb_cmd_setgrent.c wb_cmd_getgroups.c wb_pam_auth.c wb_sam_logon.c', autoproto='wb_proto.h', subsystem='service', init_function='server_service_winbind_init', diff --git a/source4/wscript b/source4/wscript index 31bc3070d0..aecea2df5f 100644 --- a/source4/wscript +++ b/source4/wscript @@ -35,10 +35,7 @@ def configure(conf): # set a lower limit on recursing in waf preprocessor conf.env.preprocessor_recursion_limit = 10 - # we should use the PIC options in waf instead - conf.ADD_CFLAGS('-fPIC') - - conf.ADD_EXTRA_INCLUDES('#source4 #lib #source4/lib #source4/include #lib/replace #lib/talloc') + conf.ADD_EXTRA_INCLUDES('#source4 #lib #source4/lib #source4/include #lib/replace #lib/talloc #lib/tevent') conf.sub_config('../lib/replace') @@ -63,5 +60,6 @@ def configure(conf): conf.sub_config('../lib/nss_wrapper') conf.sub_config('../lib/socket_wrapper') conf.sub_config('../lib/uid_wrapper') + conf.sub_config('lib/smbreadline') conf.SAMBA_CONFIG_H('include/config.h') 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