[SCM] Samba Shared Repository - branch master updated
Stefan Metzmacher
metze at samba.org
Wed Jul 13 01:34:01 MDT 2011
The branch, master has been updated
via c6ece60 dynconfig: rework the logic to support --enable-fhs
via 08a5b51 dynconfig: add SambaIndentedHelpFormatter in order to support
in option help text
via 9f0a705 dynconfig: remember which options still have their default value
via d89947e dynconfig: use an option group for the samba specific options
via 008757d Revert "s4-build Change default paths and --with flags for a 4.0 release"
via 1960939 Revert "build: Put lockdir and cachedir in FHS-like locations by default"
from f97e4f6 ldb-tdb: Introduce a flag on ltdb_add_internal to indicate whether unique value test should be performed or not
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit c6ece60405e48ea2f62f9ae92eef551e041226c2
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Jun 21 17:49:06 2011 +0200
dynconfig: rework the logic to support --enable-fhs
This reorders the data structure which represents the options
to build a more useful hierachy. This makes it more obvious
which defaults values are used in the 'STD' and 'FHS' flavors.
metze
Autobuild-User: Stefan Metzmacher <metze at samba.org>
Autobuild-Date: Wed Jul 13 09:33:21 CEST 2011 on sn-devel-104
commit 08a5b515a7e3a6385229a71d433a947811c8cc46
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Jun 21 17:46:36 2011 +0200
dynconfig: add SambaIndentedHelpFormatter in order to support \n in option help text
metze
commit 9f0a70535c4cd3a06edfddbd330738b4d5d7e541
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Jun 21 12:09:40 2011 +0200
dynconfig: remember which options still have their default value
If the values are explicit specified on the command line, we need to
keep them.
metze
commit d89947ef125fe9e8837db0a9f376d068d62ae66e
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Jun 21 12:07:17 2011 +0200
dynconfig: use an option group for the samba specific options
metze
commit 008757de43873c5c17839e29e39acc455002c689
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Jun 20 18:02:04 2011 +0200
Revert "s4-build Change default paths and --with flags for a 4.0 release"
This reverts commit edd3e8b03aa0bca85d4a9a62b35471e76a1f9390.
commit 196093930fed9923fbbcb51bd4869c6dd697c13d
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Jun 20 18:02:00 2011 +0200
Revert "build: Put lockdir and cachedir in FHS-like locations by default"
This reverts commit 6c9a78074a429773cefd1a3c798b7e3ad7d4c325.
-----------------------------------------------------------------------
Summary of changes:
dynconfig/wscript | 411 +++++++++++++++++++++++++++++++++++++++++++----------
wscript_build | 3 -
2 files changed, 334 insertions(+), 80 deletions(-)
Changeset truncated at 500 lines:
diff --git a/dynconfig/wscript b/dynconfig/wscript
index d6b07ef..f0a468e 100755
--- a/dynconfig/wscript
+++ b/dynconfig/wscript
@@ -1,88 +1,337 @@
#!/usr/bin/env python
-import string, Utils, Options, sys, Build, os, intltool
+import string, Logs, Utils, Options, sys, Build, os, intltool, optparse, textwrap
from samba_utils import EXPAND_VARIABLES, os_path_relpath
-# list of directory options to offer in configure
-dir_options = {
- 'with-piddir' : [ '${LOCALSTATEDIR}/run', 'where to put pid files' ],
- 'with-privatedir' : [ '${PREFIX}/private', 'Where to put sam.ldb and other private files' ],
- 'with-sockets-dir' : [ '${LOCALSTATEDIR}/run', 'sockets directory' ],
- 'with-winbindd-privileged-socket-dir' : [ '${LOCALSTATEDIR}/lib/winbindd_privileged', 'winbind privileged socket directory'],
- 'with-lockdir' : [ '${LOCALSTATEDIR}/lock', 'where to put short term disposable state files' ],
- 'with-cachedir' : [ '${LOCALSTATEDIR}/cache', 'where to put cache files' ],
- 'with-logfilebase' : [ '${LOCALSTATEDIR}', 'Where to put log files' ],
- 'with-pammodulesdir' : [ '${LIBDIR}', 'Which directory to use for PAM modules' ],
- 'with-statedir' : [ '${LOCALSTATEDIR}/locks', 'where to put persistent state files' ],
- }
-
-# list of cflags to use for dynconfig.c
-dyn_cflags = {
- 'BINDIR' : '${BINDIR}',
- 'SBINDIR' : '${SBINDIR}',
- 'SCRIPTSBINDIR' : '${SBINDIR}',
- 'CONFIGDIR' : '${SYSCONFDIR}',
- 'CONFIGFILE' : '${SYSCONFDIR}/smb.conf',
- 'LMHOSTSFILE' : '${SYSCONFDIR}/lmhosts',
- 'PRIVATE_DIR' : '${PRIVATEDIR}',
- 'LOGFILEBASE' : '${LOGFILEBASE}',
- 'LOCKDIR' : '${LOCKDIR}',
- 'PIDDIR' : '${PIDDIR}',
- 'DATADIR' : '${DATADIR}',
- 'LOCALEDIR' : '${LOCALEDIR}',
- 'SETUPDIR' : '${DATADIR}/setup',
- 'WINBINDD_SOCKET_DIR' : '${SOCKETS_DIR}/winbindd',
- 'WINBINDD_PRIVILEGED_SOCKET_DIR' : '${WINBINDD_PRIVILEGED_SOCKET_DIR}',
- 'NTP_SIGND_SOCKET_DIR' : '${SOCKETS_DIR}/ntp_signd',
- 'NCALRPCDIR' : '${SOCKETS_DIR}/ncalrpc',
- 'PYTHONDIR' : '${PYTHONDIR}',
- 'PYTHONARCHDIR' : '${PYTHONARCHDIR}',
- 'MODULESDIR' : '${PREFIX}/modules',
- 'INCLUDEDIR' : '${PREFIX}/include',
- 'PKGCONFIGDIR' : '${LIBDIR}/pkgconfig',
- 'SWATDIR' : '${DATADIR}/swat',
- 'CODEPAGEDIR' : '${DATADIR}/codepages',
- 'LIBDIR' : '${LIBDIR}',
- 'LIBEXECDIR' : '${LIBEXECDIR}',
- 'STATEDIR' : '${STATEDIR}',
- 'CACHEDIR' : '${CACHEDIR}',
- 'SMB_PASSWD_FILE' : '${PRIVATEDIR}/smbpasswd',
- 'NMBDSOCKETDIR' : '${SOCKETS_DIR}/nmbd',
- 'PAMMODULESDIR' : '${PAMMODULESDIR}',
- }
-
-def get_varname(v):
- '''work out a variable name from a configure option name'''
- if v.startswith('with-'):
- v = v[5:]
- v = v.upper()
- v = v.replace('-', '_')
- return v
+class SambaIndentedHelpFormatter (optparse.IndentedHelpFormatter):
+ """Format help with indented section bodies.
+ """
+
+ def __init__(self,
+ indent_increment=2,
+ max_help_position=12,
+ width=None,
+ short_first=1):
+ optparse.IndentedHelpFormatter.__init__(
+ self, indent_increment, max_help_position, width, short_first)
+ def format_option(self, option):
+ # The help for each option consists of two parts:
+ # * the opt strings and metavars
+ # eg. ("-x", or "-fFILENAME, --file=FILENAME")
+ # * the user-supplied help string
+ # eg. ("turn on expert mode", "read data from FILENAME")
+ #
+ # If possible, we write both of these on the same line:
+ # -x turn on expert mode
+ #
+ # But if the opt string list is too long, we put the help
+ # string on a second line, indented to the same column it would
+ # start in if it fit on the first line.
+ # -fFILENAME, --file=FILENAME
+ # read data from FILENAME
+ result = []
+ opts = self.option_strings[option]
+ opt_width = self.help_position - self.current_indent - 2
+ if len(opts) > opt_width:
+ opts = "%*s%s\n" % (self.current_indent, "", opts)
+ indent_first = self.help_position
+ else: # start help on same line as opts
+ opts = "%*s%-*s " % (self.current_indent, "", opt_width, opts)
+ indent_first = 0
+ result.append(opts)
+ if option.help:
+ help_text = self.expand_default(option)
+ if string.find(help_text, '\n') == -1:
+ help_lines = textwrap.wrap(help_text, self.help_width)
+ else:
+ help_lines = help_text.splitlines()
+ result.append("%*s%s\n" % (indent_first, "", help_lines[0]))
+ result.extend(["%*s%s\n" % (self.help_position, "", line)
+ for line in help_lines[1:]])
+ elif opts[-1] != "\n":
+ result.append("\n")
+ return "".join(result)
+
+
+# list of directory options to offer in configure
+#
+# 'STD-PATH' - the default path without --enable-fhs
+# 'FHS-PATH' - the default path with --enable-fhs
+#
+# 'OPTION' - the configure option to overwrite the default (optional)
+# 'HELPTEXT' - the help text of the configure option (optional)
+#
+# 'OVERWRITE' - The option referrs to itself and was already from
+# the basic GNU options from the gnu_dirs tool.
+# We may overwrite the related path. (Default: False)
+#
+# 'DELAY' - The option referrs to other options in the dynconfig list.
+# We delay the intialization into a later stage. This
+# makes sure the recursion works. (Default: False)
+#
+dynconfig = {
+ 'BINDIR' : {
+ 'STD-PATH': '${BINDIR}',
+ 'FHS-PATH': '${BINDIR}',
+ 'OVERWRITE': True,
+ },
+ 'SBINDIR' : {
+ 'STD-PATH': '${SBINDIR}',
+ 'FHS-PATH': '${SBINDIR}',
+ 'OVERWRITE': True,
+ },
+ 'LIBDIR' : {
+ 'STD-PATH': '${LIBDIR}',
+ 'FHS-PATH': '${LIBDIR}',
+ 'OVERWRITE': True,
+ },
+ 'LIBEXECDIR' : {
+ 'STD-PATH': '${LIBEXECDIR}',
+ 'FHS-PATH': '${LIBEXECDIR}',
+ 'OVERWRITE': True,
+ },
+ 'DATADIR' : {
+ 'STD-PATH': '${DATADIR}',
+ 'FHS-PATH': '${DATADIR}',
+ 'OVERWRITE': True,
+ },
+ 'LOCALEDIR' : {
+ 'STD-PATH': '${LOCALEDIR}',
+ 'FHS-PATH': '${LOCALEDIR}',
+ 'OVERWRITE': True,
+ },
+ 'PYTHONDIR' : {
+ 'STD-PATH': '${PYTHONDIR}',
+ 'FHS-PATH': '${PYTHONDIR}',
+ 'OVERWRITE': True,
+ },
+ 'PYTHONARCHDIR' : {
+ 'STD-PATH': '${PYTHONARCHDIR}',
+ 'FHS-PATH': '${PYTHONARCHDIR}',
+ 'OVERWRITE': True,
+ },
+ 'MODULESDIR' : {
+ 'STD-PATH': '${MODULESDIR}',
+ 'FHS-PATH': '${MODULESDIR}/samba',
+ 'OVERWRITE': True,
+ },
+ 'INCLUDEDIR' : {
+ 'STD-PATH': '${INCLUDEDIR}',
+ 'FHS-PATH': '${INCLUDEDIR}/samba-4.0',
+ 'OVERWRITE': True,
+ },
+ 'SCRIPTSBINDIR' : {
+ 'STD-PATH': '${SBINDIR}',
+ 'FHS-PATH': '${SBINDIR}',
+ },
+ 'SETUPDIR' : {
+ 'STD-PATH': '${DATADIR}/setup',
+ 'FHS-PATH': '${DATADIR}/samba/setup',
+ },
+ 'PKGCONFIGDIR' : {
+ 'STD-PATH': '${LIBDIR}/pkgconfig',
+ 'FHS-PATH': '${LIBDIR}/pkgconfig',
+ },
+ 'SWATDIR' : {
+ 'STD-PATH': '${DATADIR}/swat',
+ 'FHS-PATH': '${DATADIR}/samba/swat',
+ },
+ 'CODEPAGEDIR' : {
+ 'STD-PATH': '${DATADIR}/codepages',
+ 'FHS-PATH': '${DATADIR}/samba/codepages',
+ },
+ 'PAMMODULESDIR' : {
+ 'STD-PATH': '${LIBDIR}',
+ 'FHS-PATH': '${LIBDIR}',
+ 'OPTION': '--with-pammodulesdir',
+ 'HELPTEXT': 'Which directory to use for PAM modules',
+ },
+ 'CONFIGDIR' : {
+ 'STD-PATH': '${SYSCONFDIR}',
+ 'FHS-PATH': '${SYSCONFDIR}/samba',
+ 'OPTION': '--with-configdir',
+ 'HELPTEXT': 'Where to put configuration files',
+ },
+ 'PRIVATE_DIR' : {
+ 'STD-PATH': '${PREFIX}/private',
+ 'FHS-PATH': '${LOCALSTATEDIR}/lib/samba/private',
+ 'OPTION': '--with-privatedir',
+ 'HELPTEXT': 'Where to put sam.ldb and other private files',
+ },
+ 'LOCKDIR' : {
+ 'STD-PATH': '${LOCALSTATEDIR}/lock',
+ 'FHS-PATH': '${LOCALSTATEDIR}/lock/samba',
+ 'OPTION': '--with-lockdir',
+ 'HELPTEXT': 'Where to put short term disposable state files',
+ },
+ 'PIDDIR' : {
+ 'STD-PATH': '${LOCALSTATEDIR}/run',
+ 'FHS-PATH': '${LOCALSTATEDIR}/run/samba',
+ 'OPTION': '--with-piddir',
+ 'HELPTEXT': 'Where to put pid files',
+ },
+ 'STATEDIR' : {
+ 'STD-PATH': '${LOCALSTATEDIR}/locks',
+ 'FHS-PATH': '${LOCALSTATEDIR}/lib/samba/',
+ 'OPTION': '--with-statedir',
+ 'HELPTEXT': 'Where to put persistent state files',
+ },
+ 'CACHEDIR' : {
+ 'STD-PATH': '${LOCALSTATEDIR}/cache',
+ 'FHS-PATH': '${LOCALSTATEDIR}/cache/samba',
+ 'OPTION': '--with-cachedir',
+ 'HELPTEXT': 'Where to put temporary cache files',
+ },
+ 'LOGFILEBASE' : {
+ 'STD-PATH': '${LOCALSTATEDIR}',
+ 'FHS-PATH': '${LOCALSTATEDIR}/log/samba',
+ 'OPTION': '--with-logfilebase',
+ 'HELPTEXT': 'Where to put log files',
+ },
+ 'SOCKET_DIR' : {
+ 'STD-PATH': '${LOCALSTATEDIR}/run',
+ 'FHS-PATH': '${LOCALSTATEDIR}/run/samba',
+ 'OPTION': '--with-sockets-dir',
+ 'HELPTEXT': 'socket directory',
+ },
+ 'PRIVILEGED_SOCKET_DIR' : {
+ 'STD-PATH': '${LOCALSTATEDIR}/lib',
+ 'FHS-PATH': '${LOCALSTATEDIR}/lib/samba',
+ 'OPTION': '--with-privileged-socket-dir',
+ 'HELPTEXT': 'privileged socket directory',
+ },
+ 'WINBINDD_SOCKET_DIR' : {
+ 'STD-PATH': '${SOCKET_DIR}/winbindd',
+ 'FHS-PATH': '${SOCKET_DIR}/winbindd',
+ 'DELAY': True,
+ },
+ 'WINBINDD_PRIVILEGED_SOCKET_DIR' : {
+ 'STD-PATH': '${PRIVILEGED_SOCKET_DIR}/winbindd_privileged',
+ 'FHS-PATH': '${PRIVILEGED_SOCKET_DIR}/winbindd_privileged',
+ 'DELAY': True,
+ },
+ 'NMBDSOCKETDIR' : {
+ 'STD-PATH': '${SOCKET_DIR}/nmbd',
+ 'FHS-PATH': '${SOCKET_DIR}/nmbd',
+ 'DELAY': True,
+ },
+ 'NTP_SIGND_SOCKET_DIR' : {
+ 'STD-PATH': '${SOCKET_DIR}/ntp_signd',
+ 'FHS-PATH': '${SOCKET_DIR}/ntp_signd',
+ 'DELAY': True,
+ },
+ 'NCALRPCDIR' : {
+ 'STD-PATH': '${SOCKET_DIR}/ncalrpc',
+ 'FHS-PATH': '${SOCKET_DIR}/ncalrpc',
+ 'DELAY': True,
+ },
+ 'CONFIGFILE' : {
+ 'STD-PATH': '${CONFIGDIR}/smb.conf',
+ 'FHS-PATH': '${CONFIGDIR}/smb.conf',
+ 'DELAY': True,
+ },
+ 'LMHOSTSFILE' : {
+ 'STD-PATH': '${CONFIGDIR}/lmhosts',
+ 'FHS-PATH': '${CONFIGDIR}/lmhosts',
+ 'DELAY': True,
+ },
+ 'SMB_PASSWD_FILE' : {
+ 'STD-PATH': '${PRIVATE_DIR}/smbpasswd',
+ 'FHS-PATH': '${PRIVATE_DIR}/smbpasswd',
+ 'DELAY': True,
+ },
+}
def set_options(opt):
+ opt.parser.formatter = SambaIndentedHelpFormatter()
+ opt.parser.formatter.width=Utils.get_term_cols()
+
# get all the basic GNU options from the gnu_dirs tool
- for option in dir_options.keys():
- default = dir_options[option][0]
- help = dir_options[option][1]
- varname = get_varname(option)
- opt.add_option('--%s' % option,
- help=(help + ' [%s]' % default),
- action="store", dest=varname, default=default)
+
+ opt_group=opt.add_option_group('Samba-specific directory layout','')
+
+ fhs_help = "Use FHS-compliant paths (default no)\n"
+ fhs_help += "You should consider using this together with:\n"
+ fhs_help += "--prefix=/usr --sysconfdir=/etc --locatestatedir=/var"
+ opt_group.add_option('--enable-fhs', help=fhs_help,
+ action="store_true", dest='ENABLE_FHS', default=False)
+
+ for varname in dynconfig.keys():
+ if 'OPTION' not in dynconfig[varname]:
+ continue
+ opt = dynconfig[varname]['OPTION']
+ if 'HELPTEXT' in dynconfig[varname]:
+ txt = dynconfig[varname]['HELPTEXT']
+ else:
+ txt = "dynconfig path %s" % (varname)
+ def_std = dynconfig[varname]['STD-PATH']
+ def_fhs = dynconfig[varname]['FHS-PATH']
+
+ help = "%s\n[STD-Default: %s]\n[FHS-Default: %s]" % (txt, def_std, def_fhs)
+ opt_group.add_option(opt, help=help, dest=varname, action="store")
def configure(conf):
# get all the basic GNU options from the gnu_dirs tool
- for option in dir_options.keys():
- varname = get_varname(option)
- value = getattr(Options.options, varname, None)
- conf.ASSERT(value is not None, "Missing configure option %s" % varname)
+
+ if Options.options.ENABLE_FHS:
+ flavor = 'FHS-PATH'
+ else:
+ flavor = 'STD-PATH'
+ if conf.env.PREFIX == '/usr' or conf.env.PREFIX == '/usr/local':
+ Logs.error("Don't install directly under /usr or /usr/local without using the FHS option (--enable-fhs)")
+ raise Utils.WafError("ERROR: invalid --prefix=%s value" % (conf.env.PREFIX))
+
+ explicit_set ={}
+
+ dyn_vars = {}
+ for varname in dynconfig.keys():
+ dyn_vars[varname] = dynconfig[varname][flavor]
+ if 'OVERWRITE' in dynconfig[varname] and dynconfig[varname]['OVERWRITE']:
+ # we may overwrite this option
+ continue
conf.ASSERT(varname not in conf.env, "Variable %s already defined" % varname)
+
+ # the explicit block
+ for varname in dynconfig.keys():
+ if 'OPTION' not in dynconfig[varname]:
+ continue
+ value = getattr(Options.options, varname, None)
+ if value is None:
+ continue
+ conf.ASSERT(value != '', "Empty dynconfig value for %s" % varname)
conf.env[varname] = value
+ # mark it as explicit from the command line
+ explicit_set[varname] = value
- for f in dyn_cflags.keys():
- v = EXPAND_VARIABLES(conf, dyn_cflags[f])
- conf.ASSERT(v != '', "Empty dynconfig value for %s" % f)
- conf.env[f] = v
+ # defaults stage 1 after the explicit block
+ for varname in dynconfig.keys():
+ if 'DELAY' in dynconfig[varname] and dynconfig[varname]['DELAY']:
+ # this option referrs to other options,
+ # so it needs to wait for stage 2.
+ continue
+ value = EXPAND_VARIABLES(conf, dyn_vars[varname])
+ conf.ASSERT(value != '', "Empty dynconfig value for %s" % varname)
+ if varname not in explicit_set:
+ # only overwrite if not specified explicitly on the command line
+ conf.env[varname] = value
+
+ # defaults stage 2 after the explicit block
+ for varname in dynconfig.keys():
+ if 'DELAY' not in dynconfig[varname] or not dynconfig[varname]['DELAY']:
+ # this option was already handled in stage 1.
+ continue
+ value = EXPAND_VARIABLES(conf, dyn_vars[varname])
+ conf.ASSERT(value != '', "Empty dynconfig value for %s" % varname)
+ if varname not in explicit_set:
+ # only overwrite if not specified explicitly on the command line
+ conf.env[varname] = value
+
+ # display the expanded pathes for the user
+ for varname in dynconfig.keys():
+ value = conf.env[varname]
+ conf.start_msg("Dynconfig[%s]: " % (varname))
+ conf.end_msg("'%s'" % (value), 'GREEN')
def dynconfig_cflags(bld, list=None):
'''work out the extra CFLAGS for dynconfig.c'''
@@ -94,14 +343,14 @@ def dynconfig_cflags(bld, list=None):
'CODEPAGEDIR' : os.path.join(bld.env.srcdir, 'codepages'),
'SCRIPTSBINDIR' : os.path.join(bld.env.srcdir, 'source4/scripting/bin'),
'SETUPDIR' : os.path.join(bld.env.srcdir, 'source4/setup') }
- for f in dyn_cflags.keys():
- if list and not f in list:
+ for varname in dynconfig.keys():
+ if list and not varname in list:
continue
- value = bld.env[f]
+ value = bld.env[varname]
if not Options.is_install:
- if f in override:
- value = os.path.join(os.getcwd(), override[f])
- cflags.append('-D%s="%s"' % (f, value))
+ if varname in override:
+ value = os.path.join(os.getcwd(), override[varname])
+ cflags.append('-D%s="%s"' % (varname, value))
return cflags
Build.BuildContext.dynconfig_cflags = dynconfig_cflags
@@ -116,3 +365,11 @@ def build(bld):
public_headers=os_path_relpath(os.path.join(Options.launch_dir, version_header), bld.curdir),
header_path='samba',
cflags=cflags)
+
+ # install some extra empty directories
+ bld.INSTALL_DIRS("", "${CONFIGDIR} ${PRIVATE_DIR} ${LOGFILEBASE}");
+ bld.INSTALL_DIRS("", "${PRIVATE_DIR} ${PRIVILEGED_SOCKET_DIR}")
+ bld.INSTALL_DIRS("", "${STATEDIR} ${CACHEDIR}");
+
+ # these might be on non persistent storage
+ bld.INSTALL_DIRS("", "${LOCKDIR} ${PIDDIR} ${SOCKET_DIR}")
diff --git a/wscript_build b/wscript_build
index bfbbafb..f5ae5f2 100644
--- a/wscript_build
+++ b/wscript_build
@@ -123,7 +123,4 @@ bld.RECURSE('source3')
bld.RECURSE('testsuite/headers')
-# install some extra empty directories
-bld.INSTALL_DIRS("", "${LOCKDIR} ${STATEDIR} ${CACHEDIR} ${SWATDIR} ${SYSCONFDIR} ${PIDDIR} ${LOCALSTATEDIR}/lib ${PRIVATEDIR}/smbd.tmp/messaging ${CODEPAGEDIR} ${LOGFILEBASE} ${SETUPDIR}")
-
bld.SYMBOL_CHECK()
--
Samba Shared Repository
More information about the samba-cvs
mailing list