Author: jelmer Date: 2005-09-19 19:19:10 +0000 (Mon, 19 Sep 2005) New Revision: 10323
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=10323 Log: Add first bits required for getting compile with scons working. This does not work yet and can exist parallel with the existing build system. Added: branches/SAMBA_4_0/source/SConstruct branches/SAMBA_4_0/source/build/scons/ branches/SAMBA_4_0/source/lib/SConscript branches/SAMBA_4_0/source/lib/charset/SConscript branches/SAMBA_4_0/source/lib/cmdline/SConscript branches/SAMBA_4_0/source/lib/popt/SConscript branches/SAMBA_4_0/source/lib/registry/SConscript branches/SAMBA_4_0/source/lib/talloc/SConscript branches/SAMBA_4_0/source/param/SConscript Changeset: Added: branches/SAMBA_4_0/source/SConstruct =================================================================== --- branches/SAMBA_4_0/source/SConstruct 2005-09-19 18:49:21 UTC (rev 10322) +++ branches/SAMBA_4_0/source/SConstruct 2005-09-19 19:19:10 UTC (rev 10323) @@ -0,0 +1,34 @@ +# This is the experimental scons build script for Samba 4. For a proper +# build use the old build system (configure + make). scons will +# eventually replace this system. + +hostenv = Environment(CCFLAGS='-Iinclude -I. -Ilib ') +hostenv.Append(CCFLAGS=' -Iheimdal_build -Iheimdal/lib/krb5 -Iheimdal/lib/hdb -Iheimdal/lib/gssapi -Iheimdal/lib/asn1 -Iheimdal/lib/des -Iheimdal/kdc -Iheimdal/lib/roken -Iheimdal/lib/com_err') +buildenv = hostenv.Copy() + +SConscript('param/SConscript','hostenv') +SConscript('lib/SConscript','hostenv') + +dynenv = hostenv.Copy() + +paths = { + 'BINDIR': "bin", + 'SBINDIR': "sbin", + 'CONFIGFILE': "cfg", + 'LOGFILEBASE': "lfb", + 'NCALRPCDIR': "ncalrpc", + 'LMHOSTSFILE': "lmhosts", + 'LIBDIR': "libdir", + 'SHLIBEXT': "ext", + 'LOCKDIR': "lockdir", + 'PIDDIR': "piddir", + 'SMB_PASSWD_FILE': "smbpasswd", + 'PRIVATE_DIR': 'private', + 'SWATDIR': "swat" +} + +for i in paths: + dynenv.Append(CCFLAGS=' -D'+i+'=\\"'+paths[i]+'\\"') + +dynconfig = dynenv.Object('dynconfig.c') +Export('dynconfig') Added: branches/SAMBA_4_0/source/lib/SConscript =================================================================== --- branches/SAMBA_4_0/source/lib/SConscript 2005-09-19 18:49:21 UTC (rev 10322) +++ branches/SAMBA_4_0/source/lib/SConscript 2005-09-19 19:19:10 UTC (rev 10323) @@ -0,0 +1,25 @@ +Import('hostenv') +basic = hostenv.StaticLibrary('basic', + ['version.c', 'xfile.c', 'debug.c', 'fault.c', 'pidfile.c', + 'signal.c', 'system.c', 'time.c', 'genrand.c', 'dprintf.c', + 'util_str.c', 'util_strlist.c', 'util_unistr.c', 'util_file.c', + 'data_blob.c', 'util.c', 'util_sock.c', 'substitute.c', + 'fsusage.c', 'ms_fnmatch.c', 'select.c', 'mutex.c', 'idtree.c', + 'unix_privs.c', 'db_wrap.c', 'gendb.c', 'credentials.c']) +Export('basic') + +hostenv.StaticLibrary('netif', ['netif/interface.c', 'netif/netif.c']) +hostenv.StaticLibrary('tdr', ['tdr/tdr.c']) +hostenv.StaticLibrary('crypto', + ['crypto/crc32.c','crypto/md5.c','crypto/hmacmd5.c', + 'crypto/md4.c','crypto/arcfour.c']) +hostenv.StaticLibrary('compression', ['compression/mszip.c']) +hostenv.StaticLibrary('gencache',['gencache.c']) +hostenv.StaticLibrary('pidfile',['pidfile.c']) +hostenv.StaticLibrary('unix_privs',['unix_privs.c']) + +SConscript('popt/SConscript','hostenv') +SConscript('cmdline/SConscript','hostenv') +SConscript('talloc/SConscript','hostenv') +SConscript('registry/SConscript','hostenv') +SConscript('charset/SConscript', 'hostenv') Added: branches/SAMBA_4_0/source/lib/charset/SConscript =================================================================== --- branches/SAMBA_4_0/source/lib/charset/SConscript 2005-09-19 18:49:21 UTC (rev 10322) +++ branches/SAMBA_4_0/source/lib/charset/SConscript 2005-09-19 19:19:10 UTC (rev 10323) @@ -0,0 +1,3 @@ +Import('hostenv') +charset = hostenv.StaticLibrary('charset',['iconv.c','charcnv.c']) +Export('charset') Added: branches/SAMBA_4_0/source/lib/cmdline/SConscript =================================================================== --- branches/SAMBA_4_0/source/lib/cmdline/SConscript 2005-09-19 18:49:21 UTC (rev 10322) +++ branches/SAMBA_4_0/source/lib/cmdline/SConscript 2005-09-19 19:19:10 UTC (rev 10323) @@ -0,0 +1,4 @@ +Import('hostenv') +Import('basic param') +popt_common = hostenv.StaticLibrary('popt_common',['popt_common.c',basic,param]) +Export('popt_common') Added: branches/SAMBA_4_0/source/lib/popt/SConscript =================================================================== --- branches/SAMBA_4_0/source/lib/popt/SConscript 2005-09-19 18:49:21 UTC (rev 10322) +++ branches/SAMBA_4_0/source/lib/popt/SConscript 2005-09-19 19:19:10 UTC (rev 10323) @@ -0,0 +1,3 @@ +Import('hostenv') +popt = hostenv.StaticLibrary('popt', ['findme.c','popt.c','poptconfig.c','popthelp.c','poptparse.c']) +Export('popt') Added: branches/SAMBA_4_0/source/lib/registry/SConscript =================================================================== --- branches/SAMBA_4_0/source/lib/registry/SConscript 2005-09-19 18:49:21 UTC (rev 10322) +++ branches/SAMBA_4_0/source/lib/registry/SConscript 2005-09-19 19:19:10 UTC (rev 10323) @@ -0,0 +1,5 @@ +Import('hostenv') +Import('talloc basic popt_common popt param') +registry = hostenv.StaticLibrary('registry', + [basic,talloc,'common/reg_interface.c','common/reg_util.c']) +hostenv.Program('regtree', ['tools/regtree.c',registry,talloc,basic,popt_common,popt,param]) Added: branches/SAMBA_4_0/source/lib/talloc/SConscript =================================================================== --- branches/SAMBA_4_0/source/lib/talloc/SConscript 2005-09-19 18:49:21 UTC (rev 10322) +++ branches/SAMBA_4_0/source/lib/talloc/SConscript 2005-09-19 19:19:10 UTC (rev 10323) @@ -0,0 +1,3 @@ +Import('hostenv') +talloc = hostenv.StaticLibrary('talloc',['talloc.c']) +Export('talloc') Added: branches/SAMBA_4_0/source/param/SConscript =================================================================== --- branches/SAMBA_4_0/source/param/SConscript 2005-09-19 18:49:21 UTC (rev 10322) +++ branches/SAMBA_4_0/source/param/SConscript 2005-09-19 19:19:10 UTC (rev 10323) @@ -0,0 +1,5 @@ +Import('hostenv') +param = hostenv.StaticLibrary('loadparm',['loadparm.c','params.c']) +Export('param') +generic = hostenv.StaticLibrary('generic',['generic.c']) +Export('generic')
