The branch, master has been updated via adcfda9 s3-waf: implement LIBMSRPC_GEN as tiny wrapper of 'NDR_STANDARD NDR_DSSETUP NDR_SPOOLSS' via 9802183 s3-waf: use NDR_NETLOGON for ntlm_auth via baf4c4d s3-waf: use NDR_SCHANNEL via 5b9a3a7 s3-waf: use NDR_NTLMSSP subsystem via ffbe1c0 s3-waf: add NDR_STANDARD dependencies to fix the build via 2b74cea s3-waf: use git to calculate the version if available via 8ea6f41 s4-waf: don't generate PACKAGE_* defines in config.h via e54d58d autobuild: add some comments via 47e2371 autobuild: run ldb tests with TDB_NO_FSYNC=1 from db73b4a waf: moved the -Wl,-no-undefined flags to source4 and ldb
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit adcfda92439f90c5c05fc80495dff53d9baa219f Author: Stefan Metzmacher <me...@samba.org> Date: Mon Oct 25 06:07:46 2010 +0000 s3-waf: implement LIBMSRPC_GEN as tiny wrapper of 'NDR_STANDARD NDR_DSSETUP NDR_SPOOLSS' metze Autobuild-User: Stefan Metzmacher <me...@samba.org> Autobuild-Date: Mon Oct 25 08:58:49 UTC 2010 on sn-devel-104 commit 98021831d768ebeea0f216f3ad65738c0ea45f37 Author: Stefan Metzmacher <me...@samba.org> Date: Mon Oct 25 06:06:32 2010 +0000 s3-waf: use NDR_NETLOGON for ntlm_auth metze commit baf4c4d3070a7e710fab890fdfebc89e34d15147 Author: Stefan Metzmacher <me...@samba.org> Date: Mon Oct 25 06:05:37 2010 +0000 s3-waf: use NDR_SCHANNEL metze commit 5b9a3a79f72f8df7e6d2d10cc48286a35afe0e85 Author: Stefan Metzmacher <me...@samba.org> Date: Mon Oct 25 06:03:22 2010 +0000 s3-waf: use NDR_NTLMSSP subsystem metze commit ffbe1c0723595e538b518335bde862627107a317 Author: Stefan Metzmacher <me...@samba.org> Date: Mon Oct 25 07:47:35 2010 +0200 s3-waf: add NDR_STANDARD dependencies to fix the build metze commit 2b74cea5f0f3bdfc51f03cfb7641010c7954f222 Author: Stefan Metzmacher <me...@samba.org> Date: Mon Oct 25 06:33:39 2010 +0000 s3-waf: use git to calculate the version if available metze commit 8ea6f41ec9d3e2577432a8d9be100f1f42775787 Author: Stefan Metzmacher <me...@samba.org> Date: Mon Oct 25 06:49:46 2010 +0000 s4-waf: don't generate PACKAGE_* defines in config.h - We don't use them anywhere (heimdal has special rules) - They calculate the version at configure time and may contain the wrong git hash while building - If we really need them in future we should add them to version.h and not config.h, as the changing git hash will trigger a full rebuild if config.h changes. metze commit e54d58d11388d0ff4afe3d08e0b19b0dd43835ad Author: Stefan Metzmacher <me...@samba.org> Date: Mon Oct 25 08:16:04 2010 +0000 autobuild: add some comments metze commit 47e2371598846271fcdd8b4bb43869acce1de8ed Author: Stefan Metzmacher <me...@samba.org> Date: Mon Oct 25 07:01:28 2010 +0000 autobuild: run ldb tests with TDB_NO_FSYNC=1 Only the tdb tests should not have this. metze ----------------------------------------------------------------------- Summary of changes: script/autobuild.py | 4 ++- source3/wscript | 24 +++++++++------ source3/wscript_build | 54 +++++++++------------------------- source4/heimdal_build/config.h | 8 +++++ source4/heimdal_build/roken.h | 4 -- source4/heimdal_build/wscript_build | 1 - source4/wscript | 7 ---- 7 files changed, 41 insertions(+), 61 deletions(-) Changeset truncated at 500 lines: diff --git a/script/autobuild.py b/script/autobuild.py index 357cb16..a124ddf 100755 --- a/script/autobuild.py +++ b/script/autobuild.py @@ -24,6 +24,7 @@ tasks = { ("install", "make install", "text/plain"), ("test", "TDB_NO_FSYNC=1 make test FAIL_IMMEDIATELY=1", "text/plain") ], + # We have 'test' before 'install' because, 'test' should work without 'install' "source4" : [ ("configure", "./configure.developer ${PREFIX}", "text/plain"), ("make", "make -j", "text/plain"), ("test", "TDB_NO_FSYNC=1 make test FAIL_IMMEDIATELY=1", "text/plain"), @@ -32,8 +33,9 @@ tasks = { "source4/lib/ldb" : [ ("configure", "./configure --enable-developer -C ${PREFIX}", "text/plain"), ("make", "make -j", "text/plain"), ("install", "make install", "text/plain"), - ("test", "make test", "text/plain") ], + ("test", "TDB_NO_FSYNC=1 make test", "text/plain") ], + # We don't use TDB_NO_FSYNC=1 here, because we want to test the transaction code "lib/tdb" : [ ("autogen", "./autogen-waf.sh", "text/plain"), ("configure", "./configure --enable-developer -C ${PREFIX}", "text/plain"), ("make", "make -j", "text/plain"), diff --git a/source3/wscript b/source3/wscript index 20975f7..9657174 100644 --- a/source3/wscript +++ b/source3/wscript @@ -3,6 +3,9 @@ srcdir = '..' blddir = 'bin' +APPNAME='samba' +VERSION=None + import sys, os from optparse import SUPPRESS_HELP sys.path.insert(0, srcdir+"/buildtools/wafsamba") @@ -11,9 +14,16 @@ import build.charset import samba_utils import samba3 -version = wafsamba.samba_version_file("./VERSION") - -VERSION=version.STRING +def load_version(have_git=False): + '''load samba versions either from ./VERSION or git + return a version object for detailed breakdown''' + import samba_utils, Utils + if not have_git: + env = samba_utils.LOAD_ENVIRONMENT() + have_git = 'GIT' in env + version = wafsamba.samba_version_file("./VERSION", have_git=have_git) + Utils.g_module.VERSION = version.STRING + return version def set_options(opt): opt.BUILTIN_DEFAULT('NONE') @@ -57,16 +67,12 @@ def set_options(opt): def configure(conf): from samba_utils import TO_LIST - conf.DEFINE('PACKAGE_NAME', 'Samba', quote=True) - conf.DEFINE('PACKAGE_STRING', 'Samba %s' % version.MAJOR, quote=True) - conf.DEFINE('PACKAGE_TARNAME', 'samba', quote=True) - conf.DEFINE('PACKAGE_URL', "", quote=True) - conf.DEFINE('PACKAGE_VERSION', "%s" % version.MAJOR, quote=True) - conf.DEFINE('PACKAGE_BUGREPORT', 'samba-techni...@samba.org', quote=True) + version = load_version(have_git=True) conf.DEFINE('CONFIG_H_IS_FROM_SAMBA', 1) conf.DEFINE('_SAMBA_BUILD_', version.MAJOR, add_to_cflags=True) conf.DEFINE('HAVE_CONFIG_H', 1, add_to_cflags=True) + if Options.options.developer: conf.ADD_CFLAGS('-DDEVELOPER -DDEBUG_PASSWORD') conf.env['developer'] = True diff --git a/source3/wscript_build b/source3/wscript_build index 3abcd17..6a30e83 100644 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -40,9 +40,6 @@ COMPRESSION_SRC = '../lib/compression/mszip.c ../lib/compression/lzxpress.c' DRSUAPI_SRC = '''${LIBNDR_DRSUAPI_SRC} ${COMPRESSION_SRC}''' -LIBNDR_NTLMSSP_SRC = '''../librpc/gen_ndr/ndr_ntlmssp.c - ../librpc/ndr/ndr_ntlmssp.c''' - LIBNDR_SRC = '''../librpc/ndr/ndr_basic.c ../librpc/ndr/ndr.c ../librpc/ndr/ndr_misc.c @@ -51,17 +48,6 @@ LIBNDR_SRC = '''../librpc/ndr/ndr_basic.c ../librpc/ndr/uuid.c librpc/ndr/util.c''' -LIBNDR_GEN_SRC0 = '''../librpc/gen_ndr/ndr_samr.c''' - -LIBNDR_NETLOGON_SRC = '''../librpc/gen_ndr/ndr_netlogon.c - ../librpc/ndr/ndr_netlogon.c''' - -LIBNDR_SCHANNEL_SRC = '''../librpc/gen_ndr/ndr_schannel.c - ../librpc/ndr/ndr_schannel.c''' - -LIBNDR_SPOOLSS_SRC = '''../librpc/gen_ndr/ndr_spoolss.c - ../librpc/ndr/ndr_spoolss_buf.c''' - LIBCLI_SPOOLSS_SRC = ''' ../librpc/gen_ndr/cli_spoolss.c ../librpc/gen_ndr/ndr_spoolss_c.c @@ -124,18 +110,6 @@ LIBCLI_EPMAPPER_SRC = ''' ../librpc/gen_ndr/cli_epmapper.c ../librpc/gen_ndr/ndr_epmapper_c.c''' -LIBNDR_GEN_SRC = '''../librpc/gen_ndr/ndr_wkssvc.c - ${LIBNDR_GEN_SRC0} - ../librpc/gen_ndr/ndr_dfs.c - ../librpc/gen_ndr/ndr_winreg.c - ../librpc/gen_ndr/ndr_initshutdown.c - ../librpc/gen_ndr/ndr_srvsvc.c - ${LIBNDR_NETLOGON_SRC} - ../librpc/gen_ndr/ndr_dssetup.c - ../librpc/gen_ndr/ndr_epmapper.c - ../librpc/gen_ndr/ndr_ntsvcs.c - ${LIBNDR_SPOOLSS_SRC}''' - # this includes only the low level parse code, not stuff # that requires knowledge of security contexts REG_PARSE_PRS_SRC = '''registry/reg_parse_prs.c''' @@ -264,7 +238,6 @@ LIBSMB_SRC0 = ''' libsmb/ntlmssp_wrap.c ../libcli/auth/ntlmssp.c ../libcli/auth/ntlmssp_sign.c - ${LIBNDR_NTLMSSP_SRC} ../libcli/auth/ntlmssp_ndr.c ../libcli/auth/ntlmssp_server.c''' @@ -281,8 +254,7 @@ TLDAP_SRC = '''lib/tldap.c lib/tldap_util.c lib/util_tsock.c''' SCHANNEL_SRC = '''../libcli/auth/credentials.c ../libcli/auth/schannel_sign.c - ../libcli/auth/schannel_state_tdb.c - ${LIBNDR_SCHANNEL_SRC}''' + ../libcli/auth/schannel_state_tdb.c''' LIBSMB_SRC = '''libsmb/clientgen.c libsmb/cliconnect.c libsmb/clifile.c libsmb/clikrb5.c libsmb/clispnego.c @@ -869,8 +841,7 @@ NTLM_AUTH_SRC1 = '''utils/ntlm_auth.c utils/ntlm_auth_diagnostics.c''' NTLM_AUTH_SRC = '''${NTLM_AUTH_SRC1} ../libcli/auth/spnego_parse.c libsmb/clikrb5.c libads/kerberos.c libsmb/samlogon_cache.c - ${LIBNMB_SRC} - ${LIBNDR_NETLOGON_SRC}''' + ${LIBNMB_SRC}''' VLP_SRC = '''printing/tests/vlp.c @@ -904,6 +875,8 @@ t.env.BUILDDIR = bld.path.abspath() bld.SETUP_BUILD_GROUPS() +bld.SAMBA_MKVERSION('include/version.h') + bld.RECURSE('../lib/replace') bld.RECURSE('../libcli/smbreadline') print "SBINDIR=%s" % bld.env.SBINDIR @@ -914,8 +887,6 @@ bld.RECURSE('librpc/idl') bld.RECURSE('librpc') bld.RECURSE('../libcli/security') -bld.SAMBA_MKVERSION('include/version.h') - ######################## SUBSYSTEMS ################################# bld.SAMBA_SUBSYSTEM('WBCOMMON', @@ -966,13 +937,12 @@ bld.SAMBA_LIBRARY('libaddns', bld.SAMBA_SUBSYSTEM('LIBMSRPC', source='${LIBMSRPC_SRC}', - deps='LIBNDR NDR_SECURITY NDR_DCERPC', + deps='LIBNDR NDR_SECURITY NDR_DCERPC NDR_SCHANNEL', vars=locals()) bld.SAMBA_SUBSYSTEM('LIBMSRPC_GEN', - source='${LIBNDR_GEN_SRC}', - deps='''LIBNDR NDR_SECURITY NDR_DCERPC NDR_EVENTLOG NDR_LSA - NDR_ECHO''', + source='', + deps='''NDR_STANDARD NDR_DSSETUP NDR_SPOOLSS''', vars=locals()) bld.SAMBA_SUBSYSTEM('LIBGPO', @@ -1064,7 +1034,7 @@ bld.SAMBA_SUBSYSTEM('LIBSMB_ERR', bld.SAMBA_SUBSYSTEM('LIBSAMBA', source=LIBSAMBA_SRC, - deps='LIBSMB_ERR', + deps='LIBSMB_ERR NDR_NTLMSSP', vars=locals()) bld.SAMBA_SUBSYSTEM('LIBSMB', @@ -1195,6 +1165,12 @@ bld.SAMBA_SUBSYSTEM('LIBNDR', #FIXME bld.SAMBA_SUBSYSTEM('NDR_STANDARD', source='', + deps=''' + NDR_SECURITY NDR_LSA NDR_SAMR NDR_NETLOGON NDR_EVENTLOG NDR_DFS + NDR_NTSVCS NDR_SVCCTL NDR_INITSHUTDOWN NDR_WKSSVC NDR_SRVSVC NDR_WINREG + NDR_ECHO libsecurity NDR_DNS + ''', + public_deps='LIBNDR', vars=locals()) #FIXME @@ -1475,7 +1451,7 @@ bld.SAMBA_BINARY('ntlm_auth', deps='''tdb talloc cap resolv krb5 k5crypto com_err libwbclient PARAM LIB_NONSMBD LIBS LIBSAMBA POPT_SAMBA ASN1_UTIL LIBTSOCKET PASSDB GROUPDB SMBLDAP WBCOMMON LIBINIPARSER LIBADS_SERVER - NDR_SAMR NDR_LSA LIBCLI_LDAP_NDR''', + NDR_SAMR NDR_LSA NDR_NETLOGON LIBCLI_LDAP_NDR''', vars=locals()) bld.SAMBA_BINARY('timelimit', diff --git a/source4/heimdal_build/config.h b/source4/heimdal_build/config.h index b816579..611bf2f 100644 --- a/source4/heimdal_build/config.h +++ b/source4/heimdal_build/config.h @@ -9,6 +9,14 @@ #include "include/config.h" #include "../replace/replace.h" +#define VERSIONLIST {"Lorikeet-Heimdal, Modified for Samba4"} + +#define VERSION "Samba" + +#define PACKAGE VERSION +#define PACKAGE_BUGREPORT "https://bugzilla.samba.org/" +#define PACKAGE_VERSION VERSION + #define RCSID(msg) struct __rcsid { int __rcsdi; } #define KRB5 diff --git a/source4/heimdal_build/roken.h b/source4/heimdal_build/roken.h index 1398914..10d085c 100644 --- a/source4/heimdal_build/roken.h +++ b/source4/heimdal_build/roken.h @@ -21,10 +21,6 @@ /* We want PKINIT */ #define PKINIT 1 -#define VERSIONLIST {"Lorikeet-Heimdal, Modified for Samba4"} - -#define VERSION "Samba" - #define ROKEN_LIB_FUNCTION #define ROKEN_LIB_CALL #define GETHOSTBYADDR_PROTO_COMPATIBLE diff --git a/source4/heimdal_build/wscript_build b/source4/heimdal_build/wscript_build index e08186a..574a3e6 100644 --- a/source4/heimdal_build/wscript_build +++ b/source4/heimdal_build/wscript_build @@ -483,7 +483,6 @@ if not bld.CONFIG_SET('USING_SYSTEM_ROKEN'): HEIMDAL_BINARY('rkpty', 'lib/roken/rkpty.c', deps='roken', - cflags='-DPACKAGE="Samba"', install=False ) diff --git a/source4/wscript b/source4/wscript index c419c16..deb5a9e 100644 --- a/source4/wscript +++ b/source4/wscript @@ -63,13 +63,6 @@ def set_options(opt): def configure(conf): version = load_version(have_git=True) - conf.DEFINE('PACKAGE_NAME', 'samba', quote=True) - conf.DEFINE('PACKAGE_STRING', 'Samba ' + version.STRING, quote=True) - conf.DEFINE('PACKAGE_TARNAME', 'samba', quote=True) - conf.DEFINE('PACKAGE_URL', "http://www.samba.org/", quote=True) - conf.DEFINE('PACKAGE_VERSION', version.STRING, quote=True) - conf.DEFINE('PACKAGE_BUGREPORT', 'http://bugzilla.samba.org/', quote=True) - conf.DEFINE('CONFIG_H_IS_FROM_SAMBA', 1) conf.DEFINE('_SAMBA_BUILD_', version.MAJOR, add_to_cflags=True) conf.DEFINE('HAVE_CONFIG_H', 1, add_to_cflags=True) -- Samba Shared Repository