Lindsay has proposed merging lp:~fmouse/mailman/mailman-config into
lp:mailman/2.1.
Requested reviews:
Mailman Coders (mailman-coders)
For more details, see:
https://code.launchpad.net/~fmouse/mailman/mailman-config/+merge/335799
mailman-config.py is added to the build/contrib directory when
configure is run, and when executed, emits, to stdout, a number of
useful configuration options, including the option string provided to
configure at build time. This is useful when updating Mailman 2, or
when trying to synchronize a manual install of Mailman with a
distribution's FHS.
--
Your team Mailman Coders is requested to review the proposed merge of
lp:~fmouse/mailman/mailman-config into lp:mailman/2.1.
=== modified file 'configure'
--- configure 2014-04-25 07:34:08 +0000
+++ configure 2018-01-06 23:58:47 +0000
@@ -651,8 +651,11 @@
KOCODECSPKG
JACODECSPKG
EMAILPKG
+MM_VERSION
PYTHON
with_python
+BUILD_DATE
+CONFIGURE_OPTS
target_alias
host_alias
build_alias
@@ -2127,6 +2130,10 @@
# /usr/local/mailman is the default installation directory
+CONFIGURE_OPTS=`echo $@`
+
+BUILD_DATE=`date`
+
# Check for Python! Better be found on $PATH
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-python" >&5
@@ -2292,6 +2299,17 @@
needemailpkg=`cat conftest.out`
rm -f conftest.out conftest.py
+cat > getver.py <<EOF
+from Mailman.Version import VERSION
+fp = open("getver.out", "w")
+fp.write("%s\n" % VERSION)
+fp.close()
+EOF
+$PYTHON getver.py
+MM_VERSION=`cat getver.out`
+rm -f getver.out getver.py
+
+
# Should we rely on Python's own email package or use the pre-packaged version?
if test "$needemailpkg" = "ok"
@@ -4548,6 +4566,7 @@
build/contrib/qmail-to-mailman.py:contrib/qmail-to-mailman.py \
build/contrib/courier-to-mailman.py:contrib/courier-to-mailman.py \
build/contrib/rotatelogs.py:contrib/rotatelogs.py \
+build/contrib/mailman-config.py:contrib/mailman-config.py \
build/cron/bumpdigests:cron/bumpdigests \
build/cron/checkdbs:cron/checkdbs \
build/cron/cull_bad_shunt:cron/cull_bad_shunt \
=== modified file 'configure.in'
--- configure.in 2014-04-25 07:34:08 +0000
+++ configure.in 2018-01-06 23:58:47 +0000
@@ -23,6 +23,10 @@
# /usr/local/mailman is the default installation directory
AC_PREFIX_DEFAULT(/usr/local/mailman)
+CONFIGURE_OPTS=`echo $@`
+AC_SUBST(CONFIGURE_OPTS)
+BUILD_DATE=`date`
+AC_SUBST(BUILD_DATE)
# Check for Python! Better be found on $PATH
AC_MSG_CHECKING(for --with-python)
@@ -135,6 +139,17 @@
needemailpkg=`cat conftest.out`
rm -f conftest.out conftest.py
+cat > getver.py <<EOF
+from Mailman.Version import VERSION
+fp = open("getver.out", "w")
+fp.write("%s\n" % VERSION)
+fp.close()
+EOF
+$PYTHON getver.py
+MM_VERSION=`cat getver.out`
+rm -f getver.out getver.py
+AC_SUBST(MM_VERSION)
+
# Should we rely on Python's own email package or use the pre-packaged version?
AC_SUBST(EMAILPKG)
if test "$needemailpkg" = "ok"
@@ -711,6 +726,7 @@
contrib/qmail-to-mailman.py \
contrib/courier-to-mailman.py \
contrib/rotatelogs.py \
+contrib/mailman-config.py \
cron/bumpdigests \
cron/checkdbs \
cron/cull_bad_shunt \
=== added file 'contrib/README.mailman-config'
--- contrib/README.mailman-config 1970-01-01 00:00:00 +0000
+++ contrib/README.mailman-config 2018-01-06 23:58:47 +0000
@@ -0,0 +1,7 @@
+The mailman-config.py script simply displays a few build-time option choices,
+along with the option string provided to the configure script on the command
+line. The latter is convenient when updating to a new version of Mailman 2, or
+when trying to synchronize a manual Mailman installation with a the FHS of a
+distribution.
+
+Currently the script requires python 2.x.
=== added file 'contrib/mailman-config.py'
--- contrib/mailman-config.py 1970-01-01 00:00:00 +0000
+++ contrib/mailman-config.py 2018-01-06 23:58:47 +0000
@@ -0,0 +1,22 @@
+#! @PYTHON@
+
+# Show build-time configuration options
+# This is free software under the GNU General Public License.
+# Send bug reports or suggestions to Lindsay Haisley <[email protected]>
+
+print """Configuration and build information for Mailman\n"""
+
+print "Mailman version: %s" % "@MM_VERSION@"
+print "Build Date: %s" % "@BUILD_DATE@"
+print ""
+print "prefix: %s" % "@prefix@"
+print "var_prefix: %s" % "@VAR_PREFIX@"
+print "mailman_user: %s" % "@MAILMAN_USER@"
+print "mailman_group: %s" % "@MAILMAN_GROUP@"
+print "mail_group: %s" % "@MAIL_GROUP@"
+print "cgi_group: %s" % "@CGI_GROUP@"
+print ""
+
+
+print "configure_opts: \"%s\"" % "@CONFIGURE_OPTS@"
+
_______________________________________________
Mailman-coders mailing list
[email protected]
https://mail.python.org/mailman/listinfo/mailman-coders
