From 34d6ece8a454e5d1d027ed106ba039a0a88db36d Mon Sep 17 00:00:00 2001 From: bwarsaw <> Date: Sun, 17 Sep 2006 18:16:07 +0000 Subject: Copy the mm21 admin directory out of the mm21 branch. We'll svn external the latter to get that back into the release, but I really don't want to maintain multiple copies of the web pages. --- admin/bin/faq2ht.py | 102 ----------------------- admin/bin/mm2do | 76 ----------------- admin/bin/release | 236 ---------------------------------------------------- 3 files changed, 414 deletions(-) delete mode 100755 admin/bin/faq2ht.py delete mode 100755 admin/bin/mm2do delete mode 100755 admin/bin/release (limited to 'admin/bin') diff --git a/admin/bin/faq2ht.py b/admin/bin/faq2ht.py deleted file mode 100755 index 29db9ea7..00000000 --- a/admin/bin/faq2ht.py +++ /dev/null @@ -1,102 +0,0 @@ -#! /usr/bin/env python - -"""Convert the plain text FAQ file to its .ht template. -""" - -import sys -import os -import re - - - -def main(): - faqfile = sys.argv[1] - fp = open(faqfile) - lines = fp.readlines() - fp.close() - - outfile = sys.argv[2] - if outfile == '-': - closep = 0 - out = sys.stdout - else: - closep = 1 - out = open(outfile, 'w') - - # skip over cruft in FAQ file - lineno = 0 - while not lines[lineno].startswith('FREQUENTLY'): - lineno += 1 - lineno += 1 - - # skip blanks - while not lines[lineno].strip(): - lineno += 1 - - # first print out standard .ht boilerplate - print >> out, '''\ -Title: Mailman Frequently Asked Questions - -See also the Mailman -FAQ Wizard for more information. - -
', - else: - print >> out, line - - if closep: - out.close() - - - -if __name__ == '__main__': - main() diff --git a/admin/bin/mm2do b/admin/bin/mm2do deleted file mode 100755 index e6b7a534..00000000 --- a/admin/bin/mm2do +++ /dev/null @@ -1,76 +0,0 @@ -#! /usr/bin/env python -# -# Copyright (C) 1998,1999,2000,2001,2002 by the Free Software Foundation, Inc. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - -"""Generate the todo.ht file from the plain-text TODO file.""" - -import sys - -infp = open(sys.argv[1]) -outfp = open(sys.argv[2], 'w') - -SPACE = ' ' - -print >> outfp, 'Title: The Mailman Wishlist\n' - -def dumpsection(header, items, hasitems): - # We're looking at a header - if header: - # output the previous section - print >> outfp, '
'
-
-
-
-header = ''
-items = [['']]
-hasitems = False
-inpreamble = True
-while True:
- line = infp.readline()
- if not line or line[0] == '\f':
- break
- # Skip the legalese preamble
- if inpreamble:
- if line.strip():
- continue
- else:
- inpreamble = False
- if not line[0].isspace():
- dumpsection(header, items, hasitems)
- header = line
- items = [[]]
- continue
- # find out what the first non-ws character on the line is
- line = line.lstrip()
- if line and line[0] == '-':
- items.append([line[2:-1]])
- hasitems = True
- else:
- if not line:
- continue
- items[-1].append(line)
-
-dumpsection(header, items, hasitems)
diff --git a/admin/bin/release b/admin/bin/release
deleted file mode 100755
index 9aae5298..00000000
--- a/admin/bin/release
+++ /dev/null
@@ -1,236 +0,0 @@
-#! /usr/bin/env python
-#
-# Copyright (C) 1998-2006 by the Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
-# USA.
-
-# XXX This file does not need to be compatible with Python 2.1. It is only
-# used by the release manager.
-
-import os
-import re
-import sys
-import time
-import errno
-import optparse
-import tempfile
-
-from subprocess import Popen, PIPE
-from urlparse import urlparse
-
-
-__revision__ = '$Revision: 8022 $'
-
-parts = __revision__.split()
-if len(parts) == 3:
- __version__ = parts[1]
-else:
- __version__ = parts[0]
-
-
-SLASH = '/'
-SPACE = ' '
-
-
-
-def calculate_urls(relname):
- srcurl = None
- stdout, stderr = do('svn info')
- for line in stdout.splitlines():
- key, val = line.split(':', 1)
- if key.lower() == 'url':
- srcurl = val
- break
- else:
- print >> sys.stderr, 'No source url found'
- sys.exit(1)
- scheme, netloc, path, params, query, frag = urlparse(srcurl)
- if params or query or frag:
- print >> sys.stderr, 'src url has params, query and/or frag'
- sys.exit(1)
- parts = path.split(SLASH)
- # XXX Fix this to work on the trunk too
- for i, part in enumerate(parts):
- if part == 'branches':
- break
- else:
- print >> sys.stderr, 'No branches directory found in src url'
- sys.exit(1)
- del parts[i:]
- parts.extend(['tags', relname])
- dsturl = SLASH.join(parts)
- return srcurl, dsturl
-
-
-def do(cmd):
- proc = Popen(cmd.split(), stdout=PIPE, stderr=PIPE)
- stdout, stderr = proc.communicate()
- return stdout, stderr
-
-
-def now():
- return time.strftime('%d-%b-%Y', time.localtime(time.time()))
-
-
-def releasedir(tagname=None):
- tmpdir = tempfile.gettempdir()
- return os.path.join(tmpdir, 'mailman-' + tagname)
-
-
-def tag2rel(tagname):
- return 'Release_' + tagname.replace('.', '_')
-
-
-
-def tag_release(tagname):
- # Convert dots in tagname to underscores
- relname = tag2rel(tagname)
- # Calculate the 'tags' directory, which should be a sibling of the
- # 'branches' directory.
- srcurl, dsturl = calculate_urls(relname)
- print 'Tag url:', dsturl
- fd, msgfile = tempfile.mkstemp(text=True)
- try:
- os.close(fd)
- fp = open(msgfile, 'w')
- try:
- print >> fp, 'Tagging release', tagname
- finally:
- fp.close()
- do('svn cp %s %s -F %s' % (srcurl, dsturl, msgfile))
- finally:
- os.remove(msgfile)
-
-
-
-def make_pkg(tagname, sign):
- reldir = releasedir(tagname)
- if os.path.exists(reldir):
- print >> sys.stderr, 'Release directory already exists:', reldir
- sys.exit(1)
- relname = tag2rel(tagname)
- srcurl, dsturl = calculate_urls(relname)
- print 'Exporting to release dir', reldir, '...'
- do('svn export %s %s' % (dsturl, reldir))
- if not os.path.exists(reldir):
- print >> sys.stderr, 'svn export failed:', dsturl
- sys.exit(1)
- curdir = os.getcwd()
- try:
- os.chdir(os.path.dirname(reldir))
- print 'Making tarball...'
- relname = 'mailman-' + tagname
- tarfile = relname + '.tgz'
- do('tar cvzf %s --exclude .svn %s' % (tarfile, relname))
- do('tar cvzf mailman-doc.tgz --exclude .svn mailman-doc')
- if sign:
- do('gpg -bas %s' % tarfile)
- finally:
- os.chdir(curdir)
-
-
-
-VERSIONMARK = ''
-DATEMARK = ''
-
-
-def do_bump(newvers):
- print 'Doing bump...',
- for file in ('index.ht',):
- print '\t%s...' % file,
- fp = open(os.path.join('admin', 'www', file), 'r+')
- text = fp.read()
- parts = text.split(VERSIONMARK)
- parts[1] = newvers
- text = VERSIONMARK.join(parts)
- parts = text.split(DATEMARK)
- parts[1] = now()
- text = DATEMARK.join(parts)
- fp.seek(0)
- fp.write(text)
- fp.close()
- # hack the configure.in file
- print 'Version.py...',
- infp = open('Mailman/Version.py')
- outfp = open('Mailman/Version.py.new', 'w')
- matched = False
- cre = re.compile(r'^VERSION(?P