From afdc7fa4d45d65a1d6192405cae3826d80db4f72 Mon Sep 17 00:00:00 2001 From: bwarsaw Date: Fri, 15 Jan 1999 04:22:16 +0000 Subject: VERSION is no longer set in configure because it's too hard to propagate version string changes to the public (you have to autoreconf, then reconfigure and reinstall). Now, VERSION is set directory in Defaults.py.in and the Release.py script updates that file directly. Now we just need to run ./config.status and do a re-install. I hope this will make things easier. I'm also bumping the version to 1.0b8, so I can do a release tomorrow. --- Mailman/Archiver/Makefile.in | 2 - Mailman/Cgi/Makefile.in | 2 - Mailman/Defaults.py.in | 13 +-- Mailman/Logging/Makefile.in | 2 - Mailman/pythonlib/Makefile.in | 2 - Makefile.in | 1 - admin/bin/Release.py | 22 ++-- admin/www/index.html | 4 +- admin/www/todo.html | 13 ++- bin/Makefile.in | 2 - configure | 260 +++++++++++++++++++++++++++--------------- configure.in | 7 +- cron/Makefile.in | 2 - filters/Makefile.in | 2 - mail/Makefile.in | 2 - misc/Makefile.in | 2 - scripts/Makefile.in | 2 - src/Makefile.in | 2 - templates/Makefile.in | 2 - 19 files changed, 197 insertions(+), 147 deletions(-) diff --git a/Mailman/Archiver/Makefile.in b/Mailman/Archiver/Makefile.in index 214700d94..7bf39fd68 100644 --- a/Mailman/Archiver/Makefile.in +++ b/Mailman/Archiver/Makefile.in @@ -20,8 +20,6 @@ # Variables set by configure -VERSION= @VERSION@ - VPATH= @srcdir@ srcdir= @srcdir@ bindir= @bindir@ diff --git a/Mailman/Cgi/Makefile.in b/Mailman/Cgi/Makefile.in index 16c18cb98..290d57719 100644 --- a/Mailman/Cgi/Makefile.in +++ b/Mailman/Cgi/Makefile.in @@ -20,8 +20,6 @@ # Variables set by configure -VERSION= @VERSION@ - VPATH= @srcdir@ srcdir= @srcdir@ bindir= @bindir@ diff --git a/Mailman/Defaults.py.in b/Mailman/Defaults.py.in index 518e0dfca..4d0d22b9d 100644 --- a/Mailman/Defaults.py.in +++ b/Mailman/Defaults.py.in @@ -278,18 +278,7 @@ PUBLIC_ARCHIVE_FILE_DIR = os.path.join(PREFIX, 'archives/public') PRIVATE_ARCHIVE_FILE_DIR = os.path.join(PREFIX, 'archives/private') # The Mailman version, also set by configure -VERSION = '@VERSION@' +VERSION = "1.0b8" # Data file version number DATA_FILE_VERSION = 13 - - - - - - - - - - - diff --git a/Mailman/Logging/Makefile.in b/Mailman/Logging/Makefile.in index 80a2859c9..39d3ddf6b 100644 --- a/Mailman/Logging/Makefile.in +++ b/Mailman/Logging/Makefile.in @@ -20,8 +20,6 @@ # Variables set by configure -VERSION= @VERSION@ - VPATH= @srcdir@ srcdir= @srcdir@ bindir= @bindir@ diff --git a/Mailman/pythonlib/Makefile.in b/Mailman/pythonlib/Makefile.in index 15bcf63b5..ccf178991 100644 --- a/Mailman/pythonlib/Makefile.in +++ b/Mailman/pythonlib/Makefile.in @@ -20,8 +20,6 @@ # Variables set by configure -VERSION= @VERSION@ - VPATH= @srcdir@ srcdir= @srcdir@ bindir= @bindir@ diff --git a/Makefile.in b/Makefile.in index a2fdafd45..e528849f4 100644 --- a/Makefile.in +++ b/Makefile.in @@ -21,7 +21,6 @@ # Variables set by configure SHELL= /bin/sh -VERSION= @VERSION@ VPATH= @srcdir@ srcdir= @srcdir@ diff --git a/admin/bin/Release.py b/admin/bin/Release.py index 1ffa9a106..19974e515 100755 --- a/admin/bin/Release.py +++ b/admin/bin/Release.py @@ -36,6 +36,7 @@ Where: import sys import os import string +import re import time import tempfile import getopt @@ -117,23 +118,26 @@ def do_bump(newvers): fp.write(text) fp.close() # hack the configure.in file - print 'configure.in...', - fp_in = open('configure.in') - fp_out = open('configure.in.new', 'w') + print 'Defaults.py.in...', + fp_in = open('Mailman/Defaults.py.in') + fp_out = open('Mailman/Defaults.py.in.new', 'w') matched = 0 + cre = re.compile(r'^VERSION(?P[ \t]*)=') while 1: line = fp_in.readline() if not line: + if not matched: + print 'Error! VERSION line not found' break - if not matched and line[:8] == 'VERSION=': - fp_out.write('VERSION=' + newvers + '\n') - matched = 1 - else: + mo = cre.search(line) + if matched or not mo: fp_out.write(line) + else: + fp_out.write('VERSION%s= "%s"\n' % (mo.group('ws'), newvers)) + matched = 1 fp_in.close() fp_out.close() - os.rename('configure.in.new', 'configure.in') - os.system('autoreconf') + os.rename('Mailman/Defaults.py.in.new', 'Mailman/Defaults.py.in') # update the TODO file print 'TODO...' os.system('admin/bin/mm2do') diff --git a/admin/www/index.html b/admin/www/index.html index 3b77606eb..fd75d2473 100644 --- a/admin/www/index.html +++ b/admin/www/index.html @@ -52,8 +52,8 @@ Before you can run Mailman, you need to download and install the

The first GNU release is not out yet. For now, you can get the last pre-GNU beta release -(1.0b7, -released Dec 31 1998) +(1.0b8, +released Jan 14 1999) here. diff --git a/admin/www/todo.html b/admin/www/todo.html index 124cbe4f4..97b7c8674 100644 --- a/admin/www/todo.html +++ b/admin/www/todo.html @@ -47,19 +47,23 @@

  • A web UI to the -urgent address.
  • Better options for the policy on bundling digests (periodic w/ arbitrary periods, size based, a combo of the two, etc).
  • A button that will bundle a digest right now (tm).
    • +
  • Ability to set the next digest volume and issue number from the Web
  • A generic error template page.
  • An option for setting the precedence header.
  • Make the MM-tags accept useful options where appropriate.
  • Revamp the admindb user interface, it's fairly clunky (include a decent cataloging mechanism based on the file system).
  • Be able to edit ALL the web pages, as well as the mail messages.
    • -
  • Use templates from the templates dir until the list owner changes the page, so the site admin can change them...
    • +
  • Use templates from the templates dir until the list owner changes the page, so the site admin can change them...
    • +
  • All the list-admin to require approvals for unsubs
    • +
  • Allow the admin to disable option settings by users

    • List Member UI

    Site Administrator's UI