aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.cvsignore7
-rw-r--r--Mailman/.cvsignore3
-rw-r--r--Mailman/Archiver/.cvsignore1
-rw-r--r--Mailman/Bouncers/.cvsignore1
-rw-r--r--Mailman/Cgi/.cvsignore1
-rw-r--r--Mailman/Commands/.cvsignore1
-rw-r--r--Mailman/Gui/.cvsignore1
-rw-r--r--Mailman/Handlers/.cvsignore1
-rw-r--r--Mailman/Logging/.cvsignore1
-rw-r--r--Mailman/MTA/.cvsignore1
-rw-r--r--Mailman/Queue/.cvsignore1
-rwxr-xr-xadmin/bin/Release.py240
-rwxr-xr-xadmin/bin/release236
-rw-r--r--bin/.cvsignore2
-rw-r--r--cron/.cvsignore2
-rw-r--r--messages/.cvsignore1
-rw-r--r--misc/.cvsignore6
-rw-r--r--scripts/.cvsignore1
-rw-r--r--src/.cvsignore15
-rw-r--r--templates/.cvsignore1
-rw-r--r--tests/.cvsignore1
-rw-r--r--tests/bounces/.cvsignore1
-rw-r--r--tests/msgs/.cvsignore1
23 files changed, 236 insertions, 290 deletions
diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644
index d55a6906..00000000
--- a/.cvsignore
+++ /dev/null
@@ -1,7 +0,0 @@
-adm.pw
-config.log
-config.cache
-config.status
-Makefile
-update.log
-build
diff --git a/Mailman/.cvsignore b/Mailman/.cvsignore
deleted file mode 100644
index 4ef7207b..00000000
--- a/Mailman/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-Makefile
-mm_cfg.py.dist
-Defaults.py
diff --git a/Mailman/Archiver/.cvsignore b/Mailman/Archiver/.cvsignore
deleted file mode 100644
index f3c7a7c5..00000000
--- a/Mailman/Archiver/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/Mailman/Bouncers/.cvsignore b/Mailman/Bouncers/.cvsignore
deleted file mode 100644
index f3c7a7c5..00000000
--- a/Mailman/Bouncers/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/Mailman/Cgi/.cvsignore b/Mailman/Cgi/.cvsignore
deleted file mode 100644
index f3c7a7c5..00000000
--- a/Mailman/Cgi/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/Mailman/Commands/.cvsignore b/Mailman/Commands/.cvsignore
deleted file mode 100644
index f3c7a7c5..00000000
--- a/Mailman/Commands/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/Mailman/Gui/.cvsignore b/Mailman/Gui/.cvsignore
deleted file mode 100644
index f3c7a7c5..00000000
--- a/Mailman/Gui/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/Mailman/Handlers/.cvsignore b/Mailman/Handlers/.cvsignore
deleted file mode 100644
index f3c7a7c5..00000000
--- a/Mailman/Handlers/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/Mailman/Logging/.cvsignore b/Mailman/Logging/.cvsignore
deleted file mode 100644
index f3c7a7c5..00000000
--- a/Mailman/Logging/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/Mailman/MTA/.cvsignore b/Mailman/MTA/.cvsignore
deleted file mode 100644
index f3c7a7c5..00000000
--- a/Mailman/MTA/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/Mailman/Queue/.cvsignore b/Mailman/Queue/.cvsignore
deleted file mode 100644
index f3c7a7c5..00000000
--- a/Mailman/Queue/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/admin/bin/Release.py b/admin/bin/Release.py
deleted file mode 100755
index 6f84c5b3..00000000
--- a/admin/bin/Release.py
+++ /dev/null
@@ -1,240 +0,0 @@
-#! /usr/bin/env python
-#
-# Copyright (C) 1998-2003 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.
-
-"""Manage releases of Mailman.
-
-Usage: %(program)s [options] tagname
-
-Where `options' are:
-
- --tag
- -t
- Tag all release files with tagname.
-
- --TAG
- -T
- Like --tag, but relocates any existing tag. See `cvs tag -F'. Only
- one of --tag or --TAG can be given on the command line.
-
- --package
- -p
- create the distribution package
-
- --bump
- -b
- Bump the revision number in key files to tagname. This is done by
- textual substitution.
-
- --help
- -h
- Print this help message.
-
- tagname is used in the various commands above. It should essentially be
- the version number for the release, and is required.
-"""
-
-import os
-import re
-import sys
-import time
-import errno
-import getopt
-import tempfile
-
-program = sys.argv[0]
-
-def usage(code, msg=''):
- print >> sys.stderr, __doc__ % globals()
- if msg:
- print >> sys.stderr, msg
- sys.exit(code)
-
-
-
-_releasedir = None
-def releasedir(tagname=None):
- global _releasedir
- if not _releasedir:
- tmpdir = tempfile.gettempdir()
- _releasedir = os.path.join(tmpdir, 'mailman-' + tagname)
- return _releasedir
-
-
-
-# CVS related commands
-
-def tag2rel(tagname):
- return '"Release_%s"' % tagname.replace('.', '_')
-
-def cvsdo(cvscmd):
- # I don't know why -d is suddenly required -- $CVSROOT used to work just
- # fine but now (RH7.3) doesn't at all.
- cmd = 'cvs -d %s %s' % (os.environ['CVSROOT'], cvscmd)
- os.system(cmd)
-
-def tag_release(tagname, retag):
- # Convert dots in tagname to underscores
- relname = tag2rel(tagname)
- print 'Tagging release with', relname, '...'
- option = ''
- if retag:
- option = '-F'
- cvsdo('tag %s %s' % (option, relname))
-
-def checkout(tagname, tail):
- print 'checking out...',
- relname = tag2rel(tagname)
- cvsdo('export -k kv -r %s -d %s mailman' % (relname, tail))
- os.rename('%s/doc' % tail, 'mailman-doc')
- print 'cleaning...'
- # Remove the .mo's that cvs insists on checking out from the attic
- mos = []
- def visit(arg, dirname, names):
- for file in names:
- if file.endswith('.mo'):
- mos.append(os.path.join(dirname, file))
- os.path.walk(tail, visit, None)
- for file in mos:
- print 'removing:', file
- os.unlink(file)
-
-
-
-def make_pkg(tagname):
- dir = releasedir(tagname)
- print 'Exporting release dir', dir, '...'
- head, tail = os.path.split(dir)
- # this can't be done from a working directory
- curdir = os.getcwd()
- try:
- os.chdir(head)
- checkout(tagname, tail)
- print 'making tarball...'
- relname = 'mailman-' + tagname
- os.system('tar cvzf %s --exclude .cvsignore %s' %
- (relname + '.tgz', relname))
- os.system('tar cvzf mailman-doc.tgz --exclude .cvsignore mailman-doc')
- finally:
- os.chdir(curdir)
-
-
-VERSIONMARK = '<!-VERSION--->'
-DATEMARK = '<!-DATE--->'
-
-
-def do_bump(newvers):
- print 'doing bump...',
- # hack some files
- for file in ('index.ht', 'version.ht'):
- print '%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] = time.strftime('%d-%b-%Y', time.localtime(time.time()))
- 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<ws>[ \t]*)=')
- while True:
- line = infp.readline()
- if not line:
- if not matched:
- print 'Error! VERSION line not found'
- break
- mo = cre.search(line)
- if matched or not mo:
- outfp.write(line)
- else:
- outfp.write('VERSION%s= "%s"\n' % (mo.group('ws'), newvers))
- matched = True
- infp.close()
- outfp.close()
- os.rename('Mailman/Version.py.new', 'Mailman/Version.py')
-
-
-
-def main():
- try:
- opts, args = getopt.getopt(sys.argv[1:], 'btTph',
- ['bump', 'tag', 'TAG', 'package', 'help'])
- except getopt.error, msg:
- usage(1, msg)
-
- # required minor rev number
- if len(args) <> 1:
- usage(1, 'tagname argument is required')
-
- tagname = args[0]
-
- # We need a $CVSROOT
- if not os.environ.get('CVSROOT'):
- try:
- fp = open('CVS/Root')
- os.environ['CVSROOT'] = fp.read().strip()
- fp.close()
- except IOError, e:
- if e.errno <> errno.ENOENT: raise
- usage(1, 'CVSROOT is not set and could not be guessed')
- print 'Using CVSROOT:', os.environ['CVSROOT']
-
- # default options
- tag = False
- retag = False
- package = False
- bump = False
-
- for opt, arg in opts:
- if opt in ('-h', '--help'):
- usage(0)
- elif opt in ('-t', '--tag'):
- tag = True
- elif opt in ('-T', '--TAG'):
- tag = True
- retag = True
- elif opt in ('-p', '--package'):
- package = True
- elif opt in ('-b', '--bump'):
- bump = True
-
- # very important!!!
- omask = os.umask(0)
- try:
- if tag:
- tag_release(tagname, retag)
-
- if package:
- make_pkg(tagname)
-
- if bump:
- do_bump(tagname)
- finally:
- os.umask(omask)
-
-
-
-if __name__ == '__main__':
- main()
diff --git a/admin/bin/release b/admin/bin/release
new file mode 100755
index 00000000..754dca18
--- /dev/null
+++ b/admin/bin/release
@@ -0,0 +1,236 @@
+#! /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: 8006 $'
+
+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 = '<!-VERSION--->'
+DATEMARK = '<!-DATE--->'
+
+
+def do_bump(newvers):
+ print 'Doing bump...',
+ for file in ('index.ht', 'version.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<ws>[ \t]*)=')
+ for line in infp:
+ mo = cre.search(line)
+ if matched or not mo:
+ outfp.write(line)
+ else:
+ outfp.write('VERSION%s= "%s"\n' % (mo.group('ws'), newvers))
+ matched = True
+ if not matched:
+ print >> sys.stderr, 'Error! VERSION line not found'
+ infp.close()
+ outfp.close()
+ os.rename('Mailman/Version.py.new', 'Mailman/Version.py')
+
+
+
+def parseargs():
+ parser = optparse.OptionParser(version=__version__,
+ usage="""\
+%prog [options] tagname
+
+Manage releases of Mailman. tagname is used in the various commands above.
+It should essentially be the version number for the release, and is
+required.""")
+ parser.add_option('-t', '--tag',
+ default=False, action='store_true', help="""\
+Tag all release files with tagname.""")
+ parser.add_option('-p', '--package',
+ default=False, action='store_true',
+ help='Create the distribution package.')
+ parser.add_option('-b', '--bump',
+ default=False, action='store_true', help="""\
+Bump the revision number in key files to tagname. This is done by textual
+substitution.""")
+ parser.add_option('-s', '--sign',
+ default=False, action='store_true', help="""\
+Sign the release. gpg will prompt you for your passphrase.""")
+ opts, args = parser.parse_args()
+ if len(args) > 1:
+ print >> sys.stderr, 'Unexpected arguments:', SPACE(args[1:])
+ sys.exit(1)
+ if len(args) < 1:
+ print >> sys.stderr, 'Required tagname argument is missing'
+ sys.exit(1)
+ return parser, opts, args[0]
+
+
+
+def main():
+ parser, opts, tagname = parseargs()
+
+ # Very important!!!
+ omask = os.umask(0)
+ try:
+ if opts.bump:
+ do_bump(tagname)
+ if opts.tag:
+ tag_release(tagname)
+ if opts.package:
+ make_pkg(tagname, opts.sign)
+ finally:
+ os.umask(omask)
+
+
+
+if __name__ == '__main__':
+ main()
diff --git a/bin/.cvsignore b/bin/.cvsignore
deleted file mode 100644
index 7bda5c8c..00000000
--- a/bin/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-.cvsignore
-Makefile
diff --git a/cron/.cvsignore b/cron/.cvsignore
deleted file mode 100644
index d2278ab6..00000000
--- a/cron/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-crontab.in
-Makefile
diff --git a/messages/.cvsignore b/messages/.cvsignore
deleted file mode 100644
index f3c7a7c5..00000000
--- a/messages/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/misc/.cvsignore b/misc/.cvsignore
deleted file mode 100644
index da2a6730..00000000
--- a/misc/.cvsignore
+++ /dev/null
@@ -1,6 +0,0 @@
-Makefile
-paths.py
-mailman
-email-2.5.4
-JapaneseCodecs-1.4.10
-KoreanCodecs-2.0.5
diff --git a/scripts/.cvsignore b/scripts/.cvsignore
deleted file mode 100644
index f3c7a7c5..00000000
--- a/scripts/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/src/.cvsignore b/src/.cvsignore
deleted file mode 100644
index 34054773..00000000
--- a/src/.cvsignore
+++ /dev/null
@@ -1,15 +0,0 @@
-Makefile
-admin
-admindb
-archives
-confirm
-create
-edithtml
-handle_opts
-listinfo
-mailman
-options
-private
-rmlist
-roster
-subscribe
diff --git a/templates/.cvsignore b/templates/.cvsignore
deleted file mode 100644
index f3c7a7c5..00000000
--- a/templates/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/tests/.cvsignore b/tests/.cvsignore
deleted file mode 100644
index f3c7a7c5..00000000
--- a/tests/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/tests/bounces/.cvsignore b/tests/bounces/.cvsignore
deleted file mode 100644
index f3c7a7c5..00000000
--- a/tests/bounces/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/tests/msgs/.cvsignore b/tests/msgs/.cvsignore
deleted file mode 100644
index f3c7a7c5..00000000
--- a/tests/msgs/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-21 22:53:20 +0000