From f4d590662effeb80c2b55ae5ad869b4b7810cf08 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Thu, 20 Oct 2005 10:04:57 +0000 Subject: r11214: Remove scons files (see http://lists.samba.org/archive/samba-technical/2005-October/043443.html) (This used to be commit 7fffc5c9178158249be632ac0ca179c13bd1f98f) --- source4/lib/SConscript | 44 ---------------------- source4/lib/appweb/SConscript | 5 --- source4/lib/charset/SConscript | 66 -------------------------------- source4/lib/cmdline/SConscript | 6 --- source4/lib/com/SConscript | 4 -- source4/lib/events/SConscript | 3 -- source4/lib/ldb/SConscript | 63 ------------------------------- source4/lib/messaging/SConscript | 2 - source4/lib/netif/SConscript | 22 ----------- source4/lib/popt/SConscript | 11 ------ source4/lib/registry/SConscript | 20 ---------- source4/lib/replace/SConscript | 71 ----------------------------------- source4/lib/replace/win32/SConscript | 22 ----------- source4/lib/samba3/SConscript | 4 -- source4/lib/socket/SConscript | 64 ------------------------------- source4/lib/socket_wrapper/SConscript | 14 ------- source4/lib/talloc/SConscript | 5 --- source4/lib/tdb/SConscript | 15 -------- source4/lib/tls/SConscript | 7 ---- 19 files changed, 448 deletions(-) delete mode 100644 source4/lib/SConscript delete mode 100644 source4/lib/appweb/SConscript delete mode 100644 source4/lib/charset/SConscript delete mode 100644 source4/lib/cmdline/SConscript delete mode 100644 source4/lib/com/SConscript delete mode 100644 source4/lib/events/SConscript delete mode 100644 source4/lib/ldb/SConscript delete mode 100644 source4/lib/messaging/SConscript delete mode 100644 source4/lib/netif/SConscript delete mode 100644 source4/lib/popt/SConscript delete mode 100644 source4/lib/registry/SConscript delete mode 100644 source4/lib/replace/SConscript delete mode 100644 source4/lib/replace/win32/SConscript delete mode 100644 source4/lib/samba3/SConscript delete mode 100644 source4/lib/socket/SConscript delete mode 100644 source4/lib/socket_wrapper/SConscript delete mode 100644 source4/lib/talloc/SConscript delete mode 100644 source4/lib/tdb/SConscript delete mode 100644 source4/lib/tls/SConscript (limited to 'source4/lib') diff --git a/source4/lib/SConscript b/source4/lib/SConscript deleted file mode 100644 index be77e8621d..0000000000 --- a/source4/lib/SConscript +++ /dev/null @@ -1,44 +0,0 @@ -Import('hostenv') -# tastes like -*- python -*- - -SConscript(dirs=['talloc','charset']) -Import('talloc', 'dynconfig', 'charset') - -basic_files = ['version.c', 'xfile.c', 'debug.c', 'fault.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', - 'db_wrap.c'] - -proto_files = basic_files - -basic = hostenv.Library('basic', [dynconfig,charset,talloc,basic_files]) -Export('basic') - -hostenv.Library('tdr', ['tdr/tdr.c']) -hostenv.Library('crypto', - ['crypto/crc32.c','crypto/md5.c','crypto/hmacmd5.c', - 'crypto/md4.c','crypto/arcfour.c']) -hostenv.Library('compression', ['compression/mszip.c']) -hostenv.Library('gencache',['gencache.c']) -hostenv.Library('pidfile',['pidfile.c']) -hostenv.Library('unix_privs',['unix_privs.c']) - -SConscript(dirs=['ldb']) - -Import('ldb') -gendb_files = ['gendb.c'] -proto_files += gendb_files -gendb = hostenv.Library('gendb', [gendb_files,ldb]) -Export('gendb') - -credentials_files = ['credentials.c'] -proto_files += credentials_files -credentials = hostenv.Library('credentials',[credentials_files,basic,gendb]) -Export('credentials') - -hostenv.proto_headers += hostenv.CProtoHeader('proto.h', proto_files) - -SConscript(dirs=['../param/','replace','tdb','popt','cmdline','registry', 'tls','samba3','socket','socket_wrapper','messaging','com','events', 'appweb', 'netif']) - diff --git a/source4/lib/appweb/SConscript b/source4/lib/appweb/SConscript deleted file mode 100644 index 6ffcaa23ec..0000000000 --- a/source4/lib/appweb/SConscript +++ /dev/null @@ -1,5 +0,0 @@ -Import('hostenv') - -hostenv.Library('mpr',['mpr/miniMpr.c','mpr/var.c']) -hostenv.Library('ejs',['ejs/ejsLib.c','ejs/ejsLex.c','ejs/ejsParser.c','ejs/ejsProcs.c']) -hostenv.Library('esp',['esp/esp.c','esp/espProcs.c']) diff --git a/source4/lib/charset/SConscript b/source4/lib/charset/SConscript deleted file mode 100644 index 9bc474ff48..0000000000 --- a/source4/lib/charset/SConscript +++ /dev/null @@ -1,66 +0,0 @@ -#!/usr/bin/env python -# tastes like -*- python -*- - -Import('hostenv') - -def _CheckIconvPath(context,path): - # Some systems have iconv in libc, some have it in libiconv (OSF/1 and - # those with the standalone portable libiconv installed). - if path: - context.Message("checking for iconv in " + path + " ... ") - context.env.Append(LIBPATH=path) - else: - context.Message("checking for iconv in default path ... ") - - for l in [None,'giconv','iconv']: - for h in ['giconv.h','iconv.h']: - if l: - context.env['LIBS'] = [l] - if context.TryLink(""" -#include -#include <%s> - -int main() -{ - iconv_t cd = iconv_open("",""); - iconv(cd,NULL,NULL,NULL,NULL); - iconv_close(cd); - return 0; -}""" % h, '.c'): - context.Result(1) - return True - - context.Result(0) - return False - -def CheckIconv(context): - look_dirs = [None, '/usr','/usr/local','/sw'] - - for p in look_dirs: - if _CheckIconvPath(context,p): - break - - if context.TryRun(""" -#include -main() { - iconv_t cd = iconv_open("ASCII", "UCS-2LE"); - if (cd == 0 || cd == (iconv_t)-1) return -1; - return 0; -} -""", '.c'): - return (1,[]) - - return (0,[]) - -if hostenv['configure']: - conf = hostenv.Configure( custom_tests = { 'CheckIconv' : CheckIconv }) - (have_iconv,iconv) = conf.CheckIconv() - conf.Finish() - - if not have_iconv: - print "Install iconv for better charset compatibility" -else: - iconv = [] # FIXME - -charset = hostenv.Library('charset',['iconv.c','charcnv.c',iconv]) -Export('charset') diff --git a/source4/lib/cmdline/SConscript b/source4/lib/cmdline/SConscript deleted file mode 100644 index 4a2047f071..0000000000 --- a/source4/lib/cmdline/SConscript +++ /dev/null @@ -1,6 +0,0 @@ -Import('hostenv') -# tastes like -*- python -*- - -Import('basic param credentials') -popt_common = hostenv.Library('popt_common',['popt_common.c',basic,param,credentials]) -Export('popt_common') diff --git a/source4/lib/com/SConscript b/source4/lib/com/SConscript deleted file mode 100644 index 797cd37620..0000000000 --- a/source4/lib/com/SConscript +++ /dev/null @@ -1,4 +0,0 @@ -Import('hostenv') -hostenv.Library('com', [ 'tables.c','rot.c','main.c']) -hostenv.Library('dcom', [ 'dcom/tables.c','dcom/main.c']) -hostenv.Library('com_simple', ['classes/simple.c']) diff --git a/source4/lib/events/SConscript b/source4/lib/events/SConscript deleted file mode 100644 index a8a6c08657..0000000000 --- a/source4/lib/events/SConscript +++ /dev/null @@ -1,3 +0,0 @@ -Import('hostenv') - -hostenv.Library('events',['events.c','events_standard.c']) diff --git a/source4/lib/ldb/SConscript b/source4/lib/ldb/SConscript deleted file mode 100644 index 8e246d1961..0000000000 --- a/source4/lib/ldb/SConscript +++ /dev/null @@ -1,63 +0,0 @@ -# tastes like -*- python -*- - -Import('hostenv', 'talloc', 'defines', 'basic', 'cli_ldap') - -# Configure stuff - -if hostenv['configure']: - conf = Configure(hostenv) - if conf.CheckLibWithHeader('sqlite3','sqlite3.h','c','sqlite3_open()'): - defines['HAVE_SQLITE3'] = 1 - conf.CheckLibWithHeader('popt','popt.h','c','poptGetArgs(NULL);') - conf.Finish() - -if defines.has_key('HAVE_SQLITE3'): - hostenv.Library('ldb_sqlite3/ldb_sqlite3.c') - -# LDB modules - -modules = [] - -modules.append(hostenv.Library('modules/timestamps.c')) -modules.append(hostenv.Library('modules/rdn_name.c')) -modules.append(hostenv.Library('modules/schema.c')) -modules.append(hostenv.Library('ldb_ildap/ldb_ildap.c')) -#modules.append(hostenv.Library('modules/ldb_map.c')) - -Import('dsdb_ldb_modules') -modules += dsdb_ldb_modules - -modules.append(hostenv.Library( - 'ldb_tdb', - ['ldb_tdb/ldb_tdb.c', 'ldb_tdb/ldb_search.c', 'ldb_tdb/ldb_pack.c', - 'ldb_tdb/ldb_index.c', 'ldb_tdb/ldb_cache.c', 'ldb_tdb/ldb_tdb_wrap.c'])) - -#modules.append(hostenv.Library('ldb_ildap', ['ldb_ildap/ldb_ildap.c'])) - -# Export the ldb base plus modules for other parts of the build system -# to enjoy. - -ldb = hostenv.Library( - 'ldb', - ['common/ldb.c', 'common/ldb_ldif.c', 'common/ldb_parse.c', - 'common/ldb_parse.c', 'common/ldb_msg.c', 'common/ldb_utf8.c', - 'common/ldb_debug.c', 'common/ldb_modules.c', 'common/ldb_match.c', - 'common/ldb_attributes.c', 'common/attrib_handlers.c', 'common/ldb_dn.c']) - -Export('ldb') - -hostenv.Library('samba/ldif_handlers.c') -ldb_cmdline = hostenv.Library('ldb_cmdline', 'tools/cmdline.c') - -# Tools - -ldbenv = hostenv.Copy() -ldbenv.Append(LIBS = ['popt']) - -ldbenv.Program('ldbadd',['tools/ldbadd.c',ldb,modules,ldb_cmdline,cli_ldap,talloc,basic]) -ldbenv.Program('ldbdel',['tools/ldbdel.c',ldb,ldb_cmdline,basic]) -ldbenv.Program('ldbmodify',['tools/ldbmodify.c',ldb,ldb_cmdline]) -ldbenv.Program('ldbsearch',['tools/ldbsearch.c',ldb,ldb_cmdline]) -ldbenv.Program('ldbrename',['tools/ldbrename.c',ldb,ldb_cmdline]) -ldbenv.Program('ldbtest',['tools/ldbtest.c',ldb,ldb_cmdline]) -ldbenv.Program('oLschema2ldif',['tools/oLschema2ldif.c',ldb]) diff --git a/source4/lib/messaging/SConscript b/source4/lib/messaging/SConscript deleted file mode 100644 index 7e060f0851..0000000000 --- a/source4/lib/messaging/SConscript +++ /dev/null @@ -1,2 +0,0 @@ -Import('hostenv') -hostenv.Library('messaging','messaging.c') diff --git a/source4/lib/netif/SConscript b/source4/lib/netif/SConscript deleted file mode 100644 index 7630d13236..0000000000 --- a/source4/lib/netif/SConscript +++ /dev/null @@ -1,22 +0,0 @@ -Import('hostenv defines') - -if hostenv['configure']: - conf = Configure(hostenv) - - for h in ['arpa/inet.h','net/if.h','netdb.h','netinet/in.h','netinet/ip.h','netinet/tcp.h','netinet/in_systm.h','netinet/in_ip.h']: - if conf.CheckCHeader(h): - defines['HAVE_' + h.upper().replace('.','_').replace('/','_')] = 1 - - for d in ['HAVE_IFACE_IFCONF','HAVE_IFACE_AIX','HAVE_IFACE_IFREQ']: - if conf.TryRun(""" -#define %s 1 -#define AUTOCONF_TEST 1 -#include "confdefs.h" -#include "netif.c" -""" % d, '.c'): - defines[d] = 1 - break - - conf.Finish() - -hostenv.Library('netif', ['interface.c', 'netif.c']) diff --git a/source4/lib/popt/SConscript b/source4/lib/popt/SConscript deleted file mode 100644 index d9a576a031..0000000000 --- a/source4/lib/popt/SConscript +++ /dev/null @@ -1,11 +0,0 @@ -# tastes like -*- python -*- -Import('hostenv') - - -if hostenv['configure']: - conf = hostenv.Configure() - conf.env['HAVE_EXTERNAL_POPT'] = conf.CheckLibWithHeader('popt', 'popt.h', 'c', 'poptGetArgs(NULL);') - conf.Finish() - -popt = hostenv.Library('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 deleted file mode 100644 index f2fa526a67..0000000000 --- a/source4/lib/registry/SConscript +++ /dev/null @@ -1,20 +0,0 @@ -Import('hostenv paths') -# tastes like -*- python -*- - -Import('talloc basic popt_common popt param') -registry = hostenv.Library('registry', - [basic,talloc,'common/reg_interface.c','common/reg_util.c']) -regtree = hostenv.Program('regtree', ['tools/regtree.c',registry,talloc,basic,popt_common,popt,param]) -regshell = hostenv.Program('regshell', ['tools/regshell.c',registry,talloc,basic,popt_common,popt,param]) -regpatch = hostenv.Program('regpatch', ['tools/regpatch.c',registry,talloc,basic,popt_common,popt,param]) -regdiff = hostenv.Program('regdiff', ['tools/regdiff.c',registry,talloc,basic,popt_common,popt,param]) - -hostenv.Library('reg_backend_dir.c') -hostenv.Library('reg_backend_gconf.c') -hostenv.Library('reg_backend_ldb.c') -hostenv.Library('reg_backend_nt4', ['reg_backend_nt4.c',hostenv.TdrMarshaller('regf.idl')]) -hostenv.Library('reg_backend_rpc.c') -hostenv.Library('reg_backend_w95.c') -hostenv.Library('reg_backend_wine.c') - -hostenv.Install(paths['BINDIR'], [regtree,regshell,regpatch,regdiff]) diff --git a/source4/lib/replace/SConscript b/source4/lib/replace/SConscript deleted file mode 100644 index cf28102175..0000000000 --- a/source4/lib/replace/SConscript +++ /dev/null @@ -1,71 +0,0 @@ -#!/usr/bin/env python -Import('hostenv defines') - -rep_files = ['replace.c', 'snprintf.c','dlfcn.c'] - -if hostenv['configure']: - conf = Configure(hostenv) - for f in ['memset','syslog','setnetgrent','getnetgrent','endnetgrent', \ - 'mktemp', 'memcpy']: - if not conf.CheckFunc(f,'c'): - print "Required function `%s' not found" % f - exit(1) - - for f in ['strtoull','__strtoull','strtouq','strtoll','__strtoll','strtoq', - 'seteuid','setresuid','setegid','setresgid','dlsym','dlopen', - 'dlerror','dlclose','waitpid','getcwd','strdup','strndup', - 'strnlen','strerror','bzero','chroot','strlcpy','strlcat', - 'memmove','vsnprintf','asprintf','snprintf','vasprintf', - 'innetgr','mktime','rename','ftruncate','chsize','setlinebuf', - 'setenv','vsyslog','pread','pwrite']: - if conf.CheckFunc(f,'c'): - defines['HAVE_' + f.upper()] = 1 - - # Check for errno declaration - if conf.TryCompile(""" -#include - -int main() { - int i = (int)errno; - return 0; -}""", '.c'): - defines['HAVE_ERRNO_DECL'] = 1 - - for h in ['dlfcn.h']: - if conf.CheckCHeader('dlfcn.h'): - defines['HAVE_' + h.upper().replace('.','_').replace('/','_')] = 1 - - if not conf.CheckType('socklen_t', "#include "): - defines['socklen_t'] = 'int' - - needed_types = { - 'uint_t': 'unsigned int', - 'int8_t': 'signed char', - 'uint8_t': 'unsigned char', - 'u_int8_t': 'unsigned char', - 'int16_t': 'short', - 'uint16_t': 'unsigned short', - 'u_int16_t': 'unsigned short', - 'int32_t': 'long', - 'uint32_t': 'unsigned long', - 'u_int32_t': 'unsigned long', - 'int64_t': 'long long', - 'uint64_t': 'unsigned long long', - 'ssize_t': 'int' - } - - type_headers = """ -#include -#include -""" - for t in needed_types: - if not conf.CheckType(t,type_headers): - defines[t] = needed_types[t] - - if not conf.TryRun(open("../../build/tests/os2_delete.c").read(), '.c'): - rep_files += ['repdir/repdir.c'] - - conf.Finish() - -hostenv.Library('replace', rep_files) -SConscript(dirs=['win32']) diff --git a/source4/lib/replace/win32/SConscript b/source4/lib/replace/win32/SConscript deleted file mode 100644 index a23fb6a878..0000000000 --- a/source4/lib/replace/win32/SConscript +++ /dev/null @@ -1,22 +0,0 @@ -Import('hostenv defines') - -if hostenv['configure']: - conf = Configure(hostenv) - for h in ['direct.h','windows.h','winsock2.h','ws2tcpip.h']: - if conf.CheckCHeader(h): - defines['HAVE_' + h.upper().replace('.','_')] = 1 - conf.TryCompile(""" -#include -#ifdef HAVE_DIRECT_H -#include -#endif - -int main() -{ - mkdir("foo",0777); - return 0; -} -""", '.c') - - conf.Finish() - diff --git a/source4/lib/samba3/SConscript b/source4/lib/samba3/SConscript deleted file mode 100644 index 3fa9ea947b..0000000000 --- a/source4/lib/samba3/SConscript +++ /dev/null @@ -1,4 +0,0 @@ -Import('hostenv') -hostenv.Library('samba3', - ['smbpasswd.c','tdbsam.c','policy.c','idmap.c','winsdb.c','samba3.c', - 'group.c','registry.c','secrets.c','share_info.c']) diff --git a/source4/lib/socket/SConscript b/source4/lib/socket/SConscript deleted file mode 100644 index 73c7eeeeac..0000000000 --- a/source4/lib/socket/SConscript +++ /dev/null @@ -1,64 +0,0 @@ -#!/usr/bin/env python -Import('hostenv defines') - -if hostenv['configure']: - conf = hostenv.Configure() - for h in ['sys/socket.h','sys/sockio.h','sys/un.h']: - if conf.CheckCHeader(h): - defines['HAVE_' + h.upper().replace('/','_').replace('.','_')] = 1 - #HAVE_SOCK_SIN_LEN - conf.TryCompile(""" -#include -#include -#include - -int main(void) -{ - struct sockaddr_in sock; sock.sin_len = sizeof(sock); - return 0; -}""", '.c') - - #HAVE_UNIXSOCKET - conf.TryCompile(""" -#include -#include -#include -#include -#include ], - -int main(void) -{ - struct sockaddr_un sunaddr; - sunaddr.sun_family = AF_UNIX; - return 0; -}""", '.c') - - # HAVE_IPV6 - conf.CheckFunc('gethostbyname2') - - # The following test taken from the cvs sources - # If we can't find connect, try looking in -lsocket, -lnsl, and -linet. - # The Irix 5 libc.so has connect and gethostbyname, but Irix 5 also has - # libsocket.so which has a bad implementation of gethostbyname (it - # only looks in /etc/hosts), so we only look for -lsocket if we need - # it. - - connect_libs = [] - - if not conf.CheckFunc('connect'): - for l in ['nsl_s','nsl','socket','inet']: - if conf.CheckLib(l, 'connect'): - connect_libs.append(l) - break - - # HAVE_WORKING_AF_LOCAL - # FIXME: Try compiling build/tests/unixsock.c - - - conf.Finish() - -hostenv.Library('socket_ipv4.c') -hostenv.Library('socket_ipv6.c') -hostenv.Library('socket_unix.c') -hostenv.Library('socket', ['socket.c','access.c','connect.c']) - diff --git a/source4/lib/socket_wrapper/SConscript b/source4/lib/socket_wrapper/SConscript deleted file mode 100644 index 248922bcd7..0000000000 --- a/source4/lib/socket_wrapper/SConscript +++ /dev/null @@ -1,14 +0,0 @@ -Import('hostenv') - -opts = Options(None, ARGUMENTS) -opts.AddOptions( - BoolOption('socket_wrapper','enable socket wrapper',0) -) - -opts.Update(hostenv) - -if hostenv['socket_wrapper']: - hostenv.Append(CPPDEFINES = {'HAVE_SOCKET_WRAPPER': 1}) - socket_wrapper = hostenv.Library('socket_wrapper',['socket_wrapper.c']) -else: - socket_wrapper = [] diff --git a/source4/lib/talloc/SConscript b/source4/lib/talloc/SConscript deleted file mode 100644 index 222a00e001..0000000000 --- a/source4/lib/talloc/SConscript +++ /dev/null @@ -1,5 +0,0 @@ -Import('hostenv') -# tastes like -*- python -*- - -talloc = hostenv.Library('talloc',['talloc.c']) -Export('talloc') diff --git a/source4/lib/tdb/SConscript b/source4/lib/tdb/SConscript deleted file mode 100644 index 9eb347f3ac..0000000000 --- a/source4/lib/tdb/SConscript +++ /dev/null @@ -1,15 +0,0 @@ -Import('hostenv') - -tdbenv = hostenv.Copy() -tdbenv.Append(CPPPATH=['include']) - -tdb_source = ['common/tdb.c','common/dump.c','common/io.c','common/lock.c', - 'common/open.c','common/traverse.c','common/freelist.c', - 'common/error.c','common/transaction.c', 'common/tdbutil.c'] - -tdb = tdbenv.Library('tdb', tdb_source) - -tdbtool = tdbenv.Program('bin/tdbtool', ['tools/tdbtool.c',tdb]) -tdbtorture = tdbenv.Program('bin/tdbtorture', ['tools/tdbtorture.c',tdb]) -tdbdump = tdbenv.Program('bin/tdbdump', ['tools/tdbdump.c',tdb]) -#tdbbackup = tdbenv.Program('bin/tdbbackup', ['tools/tdbbackup.c',tdb]) diff --git a/source4/lib/tls/SConscript b/source4/lib/tls/SConscript deleted file mode 100644 index 452eaeeddc..0000000000 --- a/source4/lib/tls/SConscript +++ /dev/null @@ -1,7 +0,0 @@ -Import('hostenv') -hostenv.Library('tls', ['tls.c', 'tlscert.c']) - -if hostenv['configure']: - conf = hostenv.Configure() - conf.CheckLibWithHeader('gnutls', 'gnutls/gnutls.h', 'c', 'gnutls_global_init()') - conf.Finish() -- cgit