Turn nightly-rsync into a python script.

diff --git a/packaging/nightly-rsync b/packaging/nightly-rsync
index 9959952fa3565a5569ed740411edc2fcd0456609..3e8895b90ae153285271e456c6ca0d3f6efa95c4 100755 (executable)
--- a/packaging/nightly-rsync
+++ b/packaging/nightly-rsync
@@ -1,174 +1,117 @@
-#!/usr/bin/perl
-use strict;
+#!/usr/bin/python3 -B
 
 # This script expects the directory ~/samba-rsync-ftp to exist and to be a
 # copy of the /home/ftp/pub/rsync dir on samba.org.  It also requires a
 # git checkout of rsync (feel free to use your normal rsync build dir as
 # long as it doesn't have any uncommitted changes).
 #
-# If this is run with -ctu, it will make an updated "nightly" tar file in
+# If this is run with -tu, it will make an updated "nightly" tar file in
 # the nightly dir.  It will also remove any old tar files, regenerate the
 # HTML man pages in the nightly dir, and then rsync the changes to the
 # samba.org server.
 
-use Getopt::Long;
-use Date::Format;
+import os, sys, re, argparse, glob
+from datetime import datetime, timezone
+from getpass import getpass
+
+sys.path = ['packaging'] + sys.path
+
+from pkglib import *
 
 # Where the local copy of /home/ftp/pub/rsync/dev/nightly should be updated.
-our $dest = $ENV{HOME} . '/samba-rsync-ftp/dev/nightly';
-our $samba_host = $ENV{SAMBA_HOST} || 'samba.org';
-our $nightly_symlink = "$dest/rsync-HEAD.tar.gz";
-
-our($make_tar, $upload, $help_opt);
-&Getopt::Long::Configure('bundling');
-&usage if !&GetOptions(
-    'make-tar|t' => \$make_tar,
-    'upload|u' => \$upload,
-    'help|h' => \$help_opt,
-) || $help_opt;
-
-our $name = time2str('rsync-HEAD-%Y%m%d-%H%M%Z', time, 'GMT');
-our $ztoday = time2str('%d %b %Y', time);
-our $today = $ztoday;
-our $gen_target = $upload ? 'gensend' : 'gen';
-
-die "$dest does not exist\n" unless -d $dest;
-die "There is no .git dir in the current directory.\n" unless -d '.git';
-die "There is no rsync checkout in the current directory.\n" unless -f 'rsyncd.conf.yo';
-
-if ($make_tar) {
-    open(IN, '-|', 'git status') or die $!;
-    my $status = join('', <IN>);
-    close IN;
-    die "The checkout is not clean:\n", $status unless $status =~ /\nnothing to commit.+working (directory|tree) clean/;
-    die "The checkout is not on the master branch.\n" unless $status =~ /^(?:# )?On branch master\n/;
-    system "make $gen_target" and die "make $gen_target failed!\n";
-
-    my @extra_files;
-    open(IN, '<', 'Makefile.in') or die "Couldn't open Makefile.in: $!\n";
-    while (<IN>) {
-       if (s/^GENFILES=//) {
-           while (s/\\$//) {
-               $_ .= <IN>;
-           }
-           @extra_files = split(' ', $_);
-           last;
-       }
-    }
-    close IN;
-
-    my $confversion;
-    open(IN, '<', 'configure.ac') or die "Unable to open configure.ac: $!\n";
-    while (<IN>) {
-       if (/^AC_INIT\(\[rsync\],\s*\[(\d.+?)\]/) {
-           $confversion = $1;
-           last;
-       }
-    }
-    close IN;
-    die "Unable to find AC_INIT with version in configure.ac\n" unless defined $confversion;
-
-    open(IN, '<', 'OLDNEWS') or die "Unable to open OLDNEWS: $!\n";
-    $_ = <IN>;
-    my($lastversion) = /(\d+\.\d+\.\d+)/;
-    my $last_protocol_version;
-    while (<IN>) {
-       if (my($ver,$pdate,$pver) = /^\s+\S\S\s\S\S\S\s\d\d\d\d\s+(\d+\.\d+\.\d+)\s+(\d\d \w\w\w \d\d\d\d\s+)?(\d+)$/) {
-           $last_protocol_version = $pver if $ver eq $lastversion;
-       }
-    }
-    close IN;
-    die "Unable to determine protocol_version for $lastversion.\n" unless defined $last_protocol_version;
-
-    my($protocol_version,$subprotocol_version);
-    open(IN, '<', 'rsync.h') or die "Unable to open rsync.h: $!\n";
-    while (<IN>) {
-       if (/^#define\s+PROTOCOL_VERSION\s+(\d+)/) {
-           $protocol_version = $1;
-       } elsif (/^#define\s+SUBPROTOCOL_VERSION\s+(\d+)/) {
-           $subprotocol_version = $1;
-       }
-    }
-    close IN;
-    die "Unable to determine the current PROTOCOL_VERSION.\n" unless defined $protocol_version;
-    die "Unable to determine the current SUBPROTOCOL_VERSION.\n" unless defined $subprotocol_version;
-
-    if ($confversion =~ /dev|pre/) {
-       if ($last_protocol_version ne $protocol_version) {
-           if ($subprotocol_version == 0) {
-               die "SUBPROTOCOL_VERSION must not be 0 for a non-final release with a changed PROTOCOL_VERSION.\n";
-           }
-       } else {
-           if ($subprotocol_version != 0) {
-               die "SUBPROTOCOL_VERSION must be 0 when the PROTOCOL_VERSION hasn't changed from the last release.\n";
-           }
-       }
-    } else {
-       if ($subprotocol_version != 0) {
-           die "SUBPROTOCOL_VERSION must be 0 for a final release.\n";
-       }
-    }
-
-    print "Creating $name.tar.gz\n";
-    system "rsync -a @extra_files $name/";
-    system "git archive --format=tar --prefix=$name/ HEAD | tar xf -";
-    system "support/git-set-file-times --quiet --prefix=$name/";
-    system "fakeroot tar czf $dest/$name.tar.gz $name; rm -rf $name";
-
-    unlink($nightly_symlink);
-    symlink("$name.tar.gz", $nightly_symlink);
-}
-
-foreach my $fn (qw( rsync.yo rsync-ssl.yo rsyncd.conf.yo )) {
-    my $yo_tmp = "$dest/$fn";
-    (my $html_fn = "$dest/$fn") =~ s/\.yo/.html/;
-
-    open(IN, '<', $fn) or die $!;
-    undef $/; $_ = <IN>; $/ = "\n";
-    close IN;
-
-    s/^(manpage\([^)]+\)\(\d+\)\()[^)]+(\).*)/$1$today$2/m;
-    #s/^(This man ?page is current for version) \S+ (of rsync)/$1 $version $2/m;
-
-    open(OUT, '>', $yo_tmp) or die $!;
-    print OUT $_;
-    close OUT;
-
-    system 'yodl2html', '-o', $html_fn, $yo_tmp;
-
-    unlink($yo_tmp);
-}
-
-chdir($dest) or die $!;
-
-my $cnt = 0;
-open(PIPE, '-|', 'ls -1t rsync-HEAD-*') or die $!;
-while (<PIPE>) {
-    chomp;
-    next if $cnt++ < 10;
-    unlink($_);
-}
-close PIPE;
-
-system 'ls -ltr';
-
-if ($upload) {
-    my $opt = '';
-    if (defined $ENV{RSYNC_PARTIAL_DIR}) {
-       $opt = " -f 'R $ENV{RSYNC_PARTIAL_DIR}'";
-    }
-    system "rsync$opt -aviHP --delete-after . $samba_host\:/home/ftp/pub/rsync/dev/nightly";
-}
-
-exit;
-
-sub usage
-{
-    die <<EOT;
-Usage: nightly-rsync [OPTIONS]
-
- -t, --make-tar    create a new tar file in $dest
- -u, --upload      upload the revised nightly dir to samba.org
- -h, --help        display this help
-EOT
-}
+dest = os.environ['HOME'] + '/samba-rsync-ftp/dev/nightly'
+samba_host = os.environ['SAMBA_HOST']
+nightly_symlink = f"{dest}/rsync-HEAD.tar.gz"
+
+def main():
+    now = datetime.now(timezone.utc)
+    name = now.strftime('rsync-HEAD-%Y%m%d-%H%MGMT')
+    ztoday = now.strftime('%d %b %Y')
+    today = ztoday.lstrip('0')
+    gen_target = 'gensend' if args.upload else 'gen'
+
+    if not os.path.isdir(dest):
+        die("$dest does not exist")
+    if not os.path.isdir('.git'):
+        die("There is no .git dir in the current directory.")
+    if not os.path.exists('rsyncd.conf.yo'):
+        die("There is no rsync checkout in the current directory.")
+
+    if args.make_tar:
+        check_git_state('master')
+        cmd_chk(['make', gen_target])
+
+        extra_files = get_extra_files()
+
+        confversion = get_configure_version()
+
+        # All version values are strings!
+        last_version, last_protocol_version = get_OLDNEWS_version_info()
+        protocol_version, subprotocol_version = get_protocol_versions()
+
+        if 'dev' in confversion or 'pre' in confversion:
+            if last_protocol_version != protocol_version:
+                if subprotocol_version == '0':
+                    die("SUBPROTOCOL_VERSION must not be 0 for a non-final release with a changed PROTOCOL_VERSION.")
+            elif subprotocol_version != '0':
+                die("SUBPROTOCOL_VERSION must be 0 when the PROTOCOL_VERSION hasn't changed from the last release.")
+        elif subprotocol_version != '0':
+            die("SUBPROTOCOL_VERSION must be 0 for a final release.")
+
+        name_slash = name + '/'
+        tar_name = f"{name}.tar.gz"
+
+        print('Creating', tar_name)
+
+        cmd_chk(['rsync', '-a', *extra_files, name_slash])
+        cmd_chk(f"git archive --format=tar --prefix={name}/ HEAD | tar xf -")
+        cmd_chk(['support/git-set-file-times', '--quiet', '--prefix', name_slash])
+        cmd_chk(['fakeroot', 'tar', 'czf', os.path.join(dest, tar_name), name])
+        cmd_chk(['rm', '-rf', name])
+
+        if os.path.lexists(nightly_symlink):
+            os.unlink(nightly_symlink)
+        os.symlink(tar_name, nightly_symlink)
+
+    for fn in sorted(glob.glob('*.yo')):
+        yo_tmp = os.path.join(dest, fn)
+        html_fn = yo_tmp.replace('.yo', '.html')
+
+        with open(fn, 'r', encoding='utf-8') as fh:
+            txt = fh.read()
+
+        txt = re.sub(r'^(manpage\([^)]+\)\(\d+\)\()[^)]+(\).*)', r'\1%s\2' % today, txt, flags=re.M)
+
+        with open(yo_tmp, 'w', encoding='utf-8') as fh:
+            fh.write(txt)
+
+        cmd_chk(['yodl2html', '-o', html_fn, yo_tmp])
+        os.unlink(yo_tmp)
+
+    os.chdir(dest)
+
+    tar_files = list(reversed(sorted(glob.glob('rsync-HEAD-*'))))
+    if len(tar_files) > 10:
+        for fn in tar_files[10:]:
+            print('Removing', fn)
+            os.unlink(fn)
+
+    cmd_run('ls -ltr'.split())
+
+    if args.upload:
+        cmd = 'rsync -aivHP --delete-after'.split()
+        partial_dir = os.environ.get('RSYNC_PARTIAL_DIR', None)
+        if partial_dir:
+            cmd.append('-fR ' + partial_dir)
+        cmd_chk([*cmd, '.', f"{samba_host}:/home/ftp/pub/rsync/dev/nightly"])
+
+
+if __name__ == '__main__':
+    parser = argparse.ArgumentParser(description='A helper script for "nightly" tar files.', add_help=False)
+    parser.add_argument('--make-tar', '-t', action='store_true', help=f"Create a new tar file in {dest}.")
+    parser.add_argument('--upload', '-u', action='store_true', help="Upload the revised nightly dir to {samba_host}.")
+    parser.add_argument("--help", "-h", action="help", help="Output this help message and exit.")
+    args = parser.parse_args()
+    main()
+
+# vim: sw=4 et

diff --git a/packaging/pkglib.py b/packaging/pkglib.py
index fd6359e4a3018d91f7545780ea17d7a7280b92e4..cf50f1a9f2c0d861d5579a88de737a3f41a46ab4 100644 (file)
--- a/packaging/pkglib.py
+++ b/packaging/pkglib.py
@@ -157,4 +157,61 @@ def get_extra_files():
 
     return extras
 
+
+def get_configure_version():
+    with open('configure.ac', 'r', encoding='utf-8') as fh:
+        for line in fh:
+            m = re.match(r'^AC_INIT\(\[rsync\],\s*\[(\d.+?)\]', line)
+            if m:
+                return m[1]
+    die("Unable to find AC_INIT with version in configure.ac")
+
+
+def get_OLDNEWS_version_info():
+    rel_re = re.compile(r'^\s+\S{2}\s\S{3}\s\d{4}\s+(?P<ver>\d+\.\d+\.\d+)\s+(?P<pdate>\d{2} \w{3} \d{4}\s+)?(?P<pver>\d+)$')
+    last_version = last_protocol_version = None
+    pdate = { }
+
+    with open('OLDNEWS', 'r', encoding='utf-8') as fh:
+        for line in fh:
+            if not last_version:
+                m = re.search(r'(\d+\.\d+\.\d+)', line)
+                if m:
+                    last_version = m[1]
+            m = rel_re.match(line)
+            if m:
+                if m['pdate']:
+                    pdate[m['ver']] = m['pdate']
+                if m['ver'] == last_version:
+                    last_protocol_version = m['pver']
+                    break
+
+    if not last_protocol_version:
+        die(f"Unable to determine protocol_version for {last_version}.")
+
+    return last_version, last_protocol_version
+
+
+def get_protocol_versions():
+    protocol_version = subprotocol_version = None
+
+    with open('rsync.h', 'r', encoding='utf-8') as fh:
+        for line in fh:
+            m = re.match(r'^#define\s+PROTOCOL_VERSION\s+(\d+)', line)
+            if m:
+                protocol_version = m[1]
+                continue
+            m = re.match(r'^#define\s+SUBPROTOCOL_VERSION\s+(\d+)', line)
+            if m:
+                subprotocol_version = m[1]
+                break
+
+    if not protocol_version:
+        die("Unable to determine the current PROTOCOL_VERSION.")
+
+    if not subprotocol_version:
+        die("Unable to determine the current SUBPROTOCOL_VERSION.")
+
+    return protocol_version, subprotocol_version
+
 # vim: sw=4 et

diff --git a/packaging/release-rsync b/packaging/release-rsync
index cc4c28f7def838d0fcec9419aba7c19098cb0bf0..b0e55387b5de53f316db8b95d92d9ce3e7d1ffee 100755 (executable)
--- a/packaging/release-rsync
+++ b/packaging/release-rsync
@@ -5,7 +5,7 @@
 # the git repository in the current directory will be updated, and the local
 # ~/samba-rsync-ftp dir will be ready to be rsynced to samba.org.
 
-import os, sys, re, argparse, glob, time, shutil, atexit, signal
+import os, sys, re, argparse, glob, shutil, atexit, signal
 from datetime import datetime
 from getpass import getpass
 
@@ -21,7 +21,6 @@ MAKE_GEN_CMDS = [
         './config.status'.split(),
         'make gen'.split(),
         ]
-REL_RE = re.compile(r'^\s+\S{2}\s\S{3}\s\d{4}\s+(?P<ver>\d+\.\d+\.\d+)\s+(?P<pdate>\d{2} \w{3} \d{4}\s+)?(?P<pver>\d+)$')
 
 def main():
     now = datetime.now()
@@ -58,42 +57,11 @@ def main():
 
     check_git_state(args.master_branch, True, 'patches')
 
-    confversion = None
-    with open('configure.ac', 'r', encoding='utf-8') as fh:
-        for line in fh:
-            m = re.match(r'^AC_INIT\(\[rsync\],\s*\[(\d.+?)\]', line)
-            if m:
-                confversion = m[1]
-                break
-    if not confversion:
-        die("Unable to find AC_INIT with version in configure.ac")
-
-    lastversion = last_protocol_version = None
-    pdate = { }
-    with open('OLDNEWS', 'r', encoding='utf-8') as fh:
-        for line in fh:
-            if not lastversion:
-                m = re.search(r'(\d+\.\d+\.\d+)', line)
-                if m:
-                    lastversion = m[1]
-            m = REL_RE.match(line)
-            if m:
-                if m['pdate']:
-                    pdate[m['ver']] = m['pdate']
-                if m['ver'] == lastversion:
-                    last_protocol_version = m['pver']
-    if not last_protocol_version:
-        die(f"Unable to determine protocol_version for {lastversion}.")
-
-    protocol_version = None
-    with open('rsync.h', 'r', encoding='utf-8') as fh:
-        for line in fh:
-            m = re.match(r'^#define\s+PROTOCOL_VERSION\s+(\d+)', line)
-            if m:
-                protocol_version = m[1]
-                break
-    if not protocol_version:
-        die("Unable to determine the current PROTOCOL_VERSION.")
+    confversion = get_configure_version()
+
+    # All version values are strings!
+    last_version, last_protocol_version = get_OLDNEWS_version_info()
+    protocol_version, subprotocol_version = get_protocol_versions()
 
     version = confversion
     m = re.search(r'pre(\d+)', version)
@@ -387,7 +355,7 @@ About to:
 
     for yo_fn in glob.glob('*.yo'):
         html_fn = yo_fn.replace('.yo', '.html')
-        cmd_chk(['yodl2html', '-o', dest +'/'+ html_fn, yo_fn])
+        cmd_chk(['yodl2html', '-o', os.path.join(dest, html_fn), yo_fn])
 
     for fn in (srctar_file, pattar_file, diff_file):
         asc_fn = fn + '.asc'