From 523034b9fbc1841ed63137e3d8965d52997af4e6 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Mon, 19 Sep 2005 19:19:10 +0000 Subject: r10323: Add first bits required for getting compile with scons working. This does not work yet and can exist parallel with the existing build system. (This used to be commit 829568d75985e875e3363d76fb44270a0298c7f8) --- source4/SConstruct | 34 ++++++++++++++++++++++++++++++++++ source4/lib/SConscript | 25 +++++++++++++++++++++++++ source4/lib/charset/SConscript | 3 +++ source4/lib/cmdline/SConscript | 4 ++++ source4/lib/popt/SConscript | 3 +++ source4/lib/registry/SConscript | 5 +++++ source4/lib/talloc/SConscript | 3 +++ source4/param/SConscript | 5 +++++ 8 files changed, 82 insertions(+) create mode 100644 source4/SConstruct create mode 100644 source4/lib/SConscript create mode 100644 source4/lib/charset/SConscript create mode 100644 source4/lib/cmdline/SConscript create mode 100644 source4/lib/popt/SConscript create mode 100644 source4/lib/registry/SConscript create mode 100644 source4/lib/talloc/SConscript create mode 100644 source4/param/SConscript diff --git a/source4/SConstruct b/source4/SConstruct new file mode 100644 index 0000000000..3c8a54e04a --- /dev/null +++ b/source4/SConstruct @@ -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') diff --git a/source4/lib/SConscript b/source4/lib/SConscript new file mode 100644 index 0000000000..57427feb71 --- /dev/null +++ b/source4/lib/SConscript @@ -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') diff --git a/source4/lib/charset/SConscript b/source4/lib/charset/SConscript new file mode 100644 index 0000000000..0b67bedb0f --- /dev/null +++ b/source4/lib/charset/SConscript @@ -0,0 +1,3 @@ +Import('hostenv') +charset = hostenv.StaticLibrary('charset',['iconv.c','charcnv.c']) +Export('charset') diff --git a/source4/lib/cmdline/SConscript b/source4/lib/cmdline/SConscript new file mode 100644 index 0000000000..7b5c14db87 --- /dev/null +++ b/source4/lib/cmdline/SConscript @@ -0,0 +1,4 @@ +Import('hostenv') +Import('basic param') +popt_common = hostenv.StaticLibrary('popt_common',['popt_common.c',basic,param]) +Export('popt_common') diff --git a/source4/lib/popt/SConscript b/source4/lib/popt/SConscript new file mode 100644 index 0000000000..90801ffb6f --- /dev/null +++ b/source4/lib/popt/SConscript @@ -0,0 +1,3 @@ +Import('hostenv') +popt = hostenv.StaticLibrary('popt', ['findme.c','popt.c','poptconfig.c','popthelp.c','poptparse.c']) +Export('popt') diff --git a/source4/lib/registry/SConscript b/source4/lib/registry/SConscript new file mode 100644 index 0000000000..f63179283a --- /dev/null +++ b/source4/lib/registry/SConscript @@ -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]) diff --git a/source4/lib/talloc/SConscript b/source4/lib/talloc/SConscript new file mode 100644 index 0000000000..e3851afa4e --- /dev/null +++ b/source4/lib/talloc/SConscript @@ -0,0 +1,3 @@ +Import('hostenv') +talloc = hostenv.StaticLibrary('talloc',['talloc.c']) +Export('talloc') diff --git a/source4/param/SConscript b/source4/param/SConscript new file mode 100644 index 0000000000..42d3d9cc75 --- /dev/null +++ b/source4/param/SConscript @@ -0,0 +1,5 @@ +Import('hostenv') +param = hostenv.StaticLibrary('loadparm',['loadparm.c','params.c']) +Export('param') +generic = hostenv.StaticLibrary('generic',['generic.c']) +Export('generic') -- cgit