X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/519c8de16f8bc738f1b10178b7b2f68ffb4bb8bb..a01e3b490eb36ccf9e704840e1b6683dab867550:/packaging/release-rsync diff --git a/packaging/release-rsync b/packaging/release-rsync index 28bd8c85..939e5b9b 100755 --- a/packaging/release-rsync +++ b/packaging/release-rsync @@ -1,277 +1,421 @@ #!/usr/bin/perl -use strict; - -# 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. If it is run -# in test mode, it instead expects a dir named ~/tmp/samba-rsync-ftp -# (e.g. copy ~/samba-rsync-ftp into ~/tmp and you can do a trial-run of -# a release without affecting the files in the ~/samba-rsync-ftp dir). -# -# Run this as "release-rsync live" to affect ~/samba-rsync-ftp instead -# of ~/tmp/samba-rsync-ftp. +# 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. When the script is done, +# 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. +use strict; +use warnings; +use Cwd; +use Getopt::Long; +use Term::ReadKey; use Date::Format; my $dest = $ENV{HOME} . '/samba-rsync-ftp'; -my $releasedir = $ENV{HOME} . '/release'; -my $cvsroot = $ENV{CVSROOT} = 'samba.org:/data/cvs'; +my $passfile = $ENV{HOME} . '/.rsyncpass'; +my $path = $ENV{PATH}; +my $make_gen_cmd = 'make -f prepare-source.mak conf && ./config.status && make gen'; + +&Getopt::Long::Configure('bundling'); +&usage if !&GetOptions( + 'branch|b=s' => \( my $master_branch = 'master' ), + 'help|h' => \( my $help_opt ), +); +&usage if $help_opt; + +my $now = time; +my $cl_today = time2str('* %a %b %d %Y', $now); +my $year = time2str('%Y', $now); +my $ztoday = time2str('%d %b %Y', $now); +(my $today = $ztoday) =~ s/^0//; + +my $curdir = Cwd::cwd; + +END { + unlink($passfile); +} -my $ztoday = time2str('%d %b %Y', time); -my $today = $ztoday; -$today =~ s/^0//; +my @extra_files; +open(IN, '<', 'Makefile.in') or die "Couldn't open Makefile.in: $!\n"; +while () { + if (s/^GENFILES=//) { + while (s/\\$//) { + $_ .= ; + } + @extra_files = split(' ', $_); + last; + } +} +close IN; -my $dots = <) { + if (/^RSYNC_VERSION=(.*)/) { + $confversion = $1; + last; + } +} +close IN; +die "Unable to find RSYNC_VERSION in configure.in\n" unless defined $confversion; -chdir('rsync') or die $!; +open(IN, '<', 'OLDNEWS') or die $!; +$_ = ; +my($lastversion) = /(\d+\.\d+\.\d+)/; +my($last_protocol_version, %pdate); +while () { + 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+)$/) { + $pdate{$ver} = $pdate if defined $pdate; + $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($version, $lastversion); -open(IN, 'configure.in') or die $!; +my $protocol_version; +open(IN, '<', 'rsync.h') or die $!; while () { - if (/^RSYNC_VERSION=(.*)/) { - $version = $lastversion = $1; + if (/^#define\s+PROTOCOL_VERSION\s+(\d+)/) { + $protocol_version = $1; last; } } close IN; +die "Unable to determine the current PROTOCOL_VERSION.\n" unless defined $protocol_version; -$lastversion =~ s/(\d+)cvs$/ $1 - 1 /e; -$version =~ s/cvs/pre1/ || $version =~ s/pre(\d+)/ 'pre' . ($1 + 1) /e; +my $version = $confversion; +$version =~ s/dev/pre1/ || $version =~ s/pre(\d+)/ 'pre' . ($1 + 1) /e; -print "\nPlease enter the version number of this release: [$version] "; +print "Please enter the version number of this release: [$version] "; chomp($_ = ); if ($_ eq '.') { $version =~ s/pre\d+//; } elsif ($_ ne '') { $version = $_; } -$version =~ s/[-.]*pre[-.]*/pre/; +die "Invalid version: `$version'\n" unless $version =~ /^[\d.]+(pre\d+)?$/; -$lastversion =~ s/(\d+)pre\d+$/ $1 - 1 /e unless $version =~ /pre/; +if (`git tag -l v$version` ne '') { + print "Tag v$version already exists.\n\nDelete tag or quit? [q/del] "; + $_ = ; + exit 1 unless /^del/i; + system "git tag -d v$version"; +} -my $cvstag = "release-$version"; -$cvstag =~ s/[.]/-/g; -$cvstag =~ s/pre/-pre/; +if ($version =~ s/[-.]*pre[-.]*/pre/ && $confversion !~ /dev$/) { + $lastversion = $confversion; +} print "Enter the previous version to produce a patch against: [$lastversion] "; chomp($_ = ); $lastversion = $_ if $_ ne ''; $lastversion =~ s/[-.]*pre[-.]*/pre/; -my $release = 1; +my $pre = $version =~ /(pre\d+)/ ? $1 : ''; + +my $release = $pre ? '0.1' : '1'; print "Please enter the RPM release number of this release: [$release] "; chomp($_ = ); $release = $_ if $_ ne ''; +$release .= ".$pre" if $pre; -my $diffdir; +(my $finalversion = $version) =~ s/pre\d+//; +my($proto_changed,$proto_change_date); +if ($protocol_version eq $last_protocol_version) { + $proto_changed = 'unchanged'; + $proto_change_date = "\t\t"; +} else { + $proto_changed = 'changed'; + if (!defined($proto_change_date = $pdate{$finalversion})) { + while (1) { + print "On what date did the protocol change to $protocol_version get checked in? (dd Mmm yyyy) "; + chomp($_ = ); + last if /^\d\d \w\w\w \d\d\d\d$/; + } + $proto_change_date = "$_\t"; + } +} + +my($srcdir,$srcdiffdir,$lastsrcdir,$skipping); if ($lastversion =~ /pre/) { - if ($version !~ /pre/) { + if (!$pre) { die "You should not diff a release version against a pre-release version.\n"; } - $diffdir = "$dest/old-previews"; -} elsif ($version =~ /pre/) { - $diffdir = $dest; + $srcdir = $srcdiffdir = $lastsrcdir = 'src-previews'; + $skipping = ' ** SKIPPING **'; +} elsif ($pre) { + $srcdir = $srcdiffdir = 'src-previews'; + $lastsrcdir = 'src'; + $skipping = ' ** SKIPPING **'; } else { - $diffdir = "$dest/old-versions"; + $srcdir = $lastsrcdir = 'src'; + $srcdiffdir = 'src-diffs'; + $skipping = ''; } -my $tarfile = "$dest/rsync-$version.tar.gz"; - -print < "; $_ = ; -print $dots; +my %specvars = ( 'Version:' => $finalversion, 'Release:' => $release, + '%define fullversion' => "\%{version}$pre", 'Released' => "$version.", + '%define srcdir' => $srcdir ); +my @tweak_files = ( glob('packaging/*.spec'), glob('packaging/*/*.spec'), glob('*.yo'), + qw( configure.in rsync.h NEWS OLDNEWS options.c ) ); -system "./prepare-source && touch proto.h"; - -my @tweak_files = ( glob('packaging/*.spec'), glob('packaging/*/*.spec'), - glob('*.yo'), qw( configure.in configure ) ); -if ($version !~ /pre/) { - push(@tweak_files, qw( NEWS OLDNEWS )); -} foreach my $fn (@tweak_files) { open(IN, '<', $fn) or die $!; undef $/; $_ = ; $/ = "\n"; close IN; if ($fn =~ /configure/) { - s/^RSYNC_VERSION.*/RSYNC_VERSION=$version/m; + s/^RSYNC_VERSION=.*/RSYNC_VERSION=$version/m + or die "Unable to update RSYNC_VERSION in $fn\n"; } elsif ($fn =~ /\.spec/) { - s/^(Version:) .*/$1 $version/m; - s/^(Release:) .*/$1 $release/m; + while (my($str, $val) = each %specvars) { + s/^\Q$str\E .*/$str $val/m + or die "Unable to update $str in $fn\n"; + } + s/^\* \w\w\w \w\w\w \d\d \d\d\d\d (.*)/$cl_today $1/m + or die "Unable to update ChangeLog header in $fn\n"; } elsif ($fn =~ /\.yo/) { - s/^(manpage\([^)]+\)\(\d+\)\()[^)]+(\).*)/$1$today$2/m; - s/^(This man ?page is current for version) \S+ (of rsync)/$1 $version $2/m; + s/^(manpage\([^)]+\)\(\d+\)\()[^)]+(\).*)/$1$today$2/m + or die "Unable to update date in manpage() header in $fn\n"; + s/^(This man ?page is current for version) \S+ (of rsync)/$1 $version $2/m + or die "Unable to update current version info in $fn\n"; + } elsif ($fn eq 'rsync.h') { + s{(#define\s+SUBPROTOCOL_VERSION)\s+(\d+)} + { $1 . ' ' . get_subprotocol_version($2) }e + or die "Unable to find SUBPROTOCOL_VERSION define in $fn\n"; + } elsif ($fn eq 'NEWS') { + s{^(NEWS for rsync \Q$finalversion\E )(\(UNRELEASED\))\s*(\nProtocol: )(\d+) (\([^)]+\))\n} + { $1 . ($pre ? $2 : "($today)") . "$3$protocol_version ($proto_changed)\n" }ei + or die "The first 2 lines of $fn are not in the right format. They must be:\n" + . "NEWS for rsync $finalversion (UNRELEASED)\n" + . "Protocol: $protocol_version ($proto_changed)\n"; + } elsif ($fn eq 'OLDNEWS') { + s{^(\t\S\S\s\S\S\S\s\d\d\d\d)(\t\Q$finalversion\E\t).*} + { ($pre ? $1 : "\t$ztoday") . $2 . $proto_change_date . $protocol_version }em + or die "Unable to find \"?? ??? $year\t$finalversion\" line in $fn\n"; + } elsif ($fn eq 'options.c') { + if (s/(Copyright \(C\) 2002-)(\d+)( Wayne Davison)/$1$year$3/ + && $2 ne $year) { + die "Copyright comments need to be updated to $year in all files!\n"; + } + # Adjust the year in the --version output. + s/(rprintf\(f, "Copyright \(C\) 1996-)(\d+)/$1$year/ + or die "Unable to find Copyright string in --version output of $fn\n"; + next if $2 eq $year; } else { - s/^(NEWS for rsync \Q$version\E) \(UNRELEASED\)\s*$/$1 ($today)\n/m; - s/^\t\S\S\s\S\S\S\s\d\d\d\d(\t\Q$version\E)/\t$ztoday$1/m; + die "Unrecognized file in \@tweak_files: $fn\n"; } open(OUT, '>', $fn) or die $!; print OUT $_; close OUT; } -system "yodl2man -o rsync.1 rsync.yo"; -system "yodl2man -o rsyncd.conf.5 rsyncd.conf.yo"; -#system "perl -pi -e \"s/\\\\\\'/\\\\&'/g\" rsync.1 rsyncd.conf.5"; +print $break; +system "git diff --color | less -p '^diff .*'"; -mkdir('patches/tmp') or die $!; -system "rsync -a --exclude=patches/ --exclude-from=.cvsignore . patches/tmp/cvsdir/"; +my $srctar_name = "rsync-$version.tar.gz"; +my $pattar_name = "rsync-patches-$version.tar.gz"; +my $diff_name = "rsync-$lastversion-$version.diffs.gz"; +my $srctar_file = "$dest/$srcdir/$srctar_name"; +my $pattar_file = "$dest/$srcdir/$pattar_name"; +my $diff_file = "$dest/$srcdiffdir/$diff_name"; +my $news_file = "$dest/$srcdir/rsync-$version-NEWS"; +my $lasttar_file = "$dest/$lastsrcdir/rsync-$lastversion.tar.gz"; -print $dots, $note; +print $break, < "; +my $ans = ; -print < "; - $_ = ; +if ($ans =~ /^y/i) { + print "\nVisiting all \"patch/$master_branch/*\" branches ...\n"; + system "packaging/patch-update --branch=$master_branch --shell"; +} - system "cvs commit -m 'Preparing for release of $version'"; - system "cvs tag -F $cvstag ."; -} else { - print "**** Skipping cvs commit and tagging in TESTMODE ****\n"; +if (-d 'patches/.git') { + system "cd patches && git commit -a -m 'The patches for $version.'" and exit 1; } -print < "; $_ = ; -print $note; - -system "patches/verify-patches -pun -an"; - -chdir($releasedir) or die $!; +# We want to use our passphrase-providing "gpg" script, so modify the PATH. +$ENV{PATH} = "$curdir/packaging/bin:$path"; + +my $passphrase; +while (1) { + ReadMode('noecho'); + print "\nEnter your GPG pass-phrase: "; + chomp($passphrase = ); + ReadMode(0); + print "\n"; + + # Briefly create a temp file with the passphrase for git's tagging use. + my $oldmask = umask 077; + unlink($passfile); + open(OUT, '>', $passfile) or die $!; + print OUT $passphrase, "\n"; + close OUT; + umask $oldmask; + $ENV{'GPG_PASSFILE'} = $passfile; + + $_ = `git tag -s -m 'Version $version.' v$version 2>&1`; + print $_; + next if /bad passphrase/; + exit 1 if /failed/; + + if (-d 'patches/.git') { + $_ = `cd patches && git tag -s -m 'Version $version.' v$version 2>&1`; + print $_; + exit 1 if /bad passphrase|failed/; + } -print $dots; + unlink($passfile); + last; +} -mkdir("rsync-$version", 0755) or die $!; -system "rsync -aC --exclude=.cvsignore rsync/ rsync-$version"; +$ENV{PATH} = $path; + +# Extract the generated files from the old tar. +@_ = @extra_files; +map { s#^#rsync-$lastversion/# } @_; +system "tar xzf $lasttar_file @_"; +rename("rsync-$lastversion", 'a'); + +print "Creating $diff_file ...\n"; +system "$make_gen_cmd && rsync -a @extra_files b/" and exit 1; +my $sed_script = 's:^((---|\+\+\+) [ab]/[^\t]+)\t.*:\1:'; +system "(git diff v$lastversion v$version; diff -upN a b | sed -r '$sed_script') | gzip -9 >$diff_file"; +system "rm -rf a"; +rename('b', "rsync-$version"); + +print "Creating $srctar_file ...\n"; +system "git archive --format=tar --prefix=rsync-$version/ v$version | tar xf -"; +system "support/git-set-file-times --prefix=rsync-$version/"; +system "fakeroot tar czf $srctar_file rsync-$version; rm -rf rsync-$version"; + +print "Updating files in \"rsync-$version/patches\" dir ...\n"; +mkdir("rsync-$version", 0755); +mkdir("rsync-$version/patches", 0755); +system "packaging/patch-update --skip-check --branch=$master_branch --gen=rsync-$version/patches"; + +print "Creating $pattar_file ...\n"; +system "fakeroot tar chzf $pattar_file rsync-$version/patches; rm -rf rsync-$version"; + +print "Updating the other files in $dest ...\n"; +system "rsync -a README NEWS OLDNEWS TODO $dest"; +unlink($news_file); +link("$dest/NEWS", $news_file); +system "git log --name-status | gzip -9 >$dest/ChangeLog.gz"; + +system "yodl2html -o $dest/rsync.html rsync.yo"; +system "yodl2html -o $dest/rsyncd.conf.html rsyncd.conf.yo"; + +foreach my $fn ($srctar_file, $pattar_file, $diff_file) { + unlink("$fn.asc"); + open(GPG, '|-', "gpg --batch --passphrase-fd=0 -ba $fn") or die $!; + print GPG $passphrase, "\n"; + close GPG; +} -# When creating a pre-release after a normal release, there's nothing to move. -if ($diffdir ne $dest) { - chdir($dest) or die $!; +if (!$pre) { + system "rm $dest/rsync-*.gz $dest/rsync-*.asc $dest/rsync-*-NEWS $dest/src-previews/rsync-*diffs.gz*"; - # We need to run this regardless of $lastversion's "pre"ness. - my @moved_files; - foreach my $fn (glob('rsync*pre*.tar.gz*'), glob('rsync*pre*-NEWS')) { - link($fn, "old-previews/$fn") or die $!; - push(@moved_files, $fn); + foreach my $fn ($srctar_file, "$srctar_file.asc", + $pattar_file, "$pattar_file.asc", + $diff_file, "$diff_file.asc", $news_file) { + (my $top_fn = $fn) =~ s#/src(-\w+)?/#/#; + link($fn, $top_fn); } +} - if ($version !~ /pre/) { - foreach my $fn (glob('rsync*.tar.gz*'), glob('rsync*-NEWS')) { - link($fn, "old-versions/$fn") or die $!; - push(@moved_files, $fn); - } +print $break, <<'EOT'; - foreach my $fn (glob('rsync*.diffs.gz*')) { - link($fn, "old-patches/$fn") or die $!; - push(@moved_files, $fn); - } - } +Local changes are done. When you're satisfied, push the git repository +and rsync the release files. Remember to announce the release on *BOTH* +rsync-announce@lists.samba.org and rsync@lists.samba.org (and the web)! +EOT - # Optimize our future upload (in the absence of --detect-renamed) by - # uploading the above hard-linked files that we are about to delete. - if ($live) { - system "rsync -avHC --include='rsync*.gz*' --include='old-*/' --exclude='*' . samba.org:/home/ftp/pub/rsync"; - } - foreach (@moved_files, glob("rsync*pre*.diffs.gz*")) { - unlink($_); - } +exit; - chdir($releasedir) or die $!; -} -system "fakeroot tar czf $tarfile rsync-$version"; - -system "tar xzf $diffdir/rsync-$lastversion.tar.gz"; -## TWEAK THE VERSIONS AS DESIRED HERE ## -#mkdir("rsync-$lastversion/support", 0755) or die $!; -#rename("rsync-$lastversion/rsyncstats", "rsync-$lastversion/support/rsyncstats"); -## END ## -system "diff -urN --exclude=patches rsync-$lastversion rsync-$version" - . "| gzip -9 >$dest/rsync-$lastversion-$version.diffs.gz"; - -system "rsync -a rsync/{README,NEWS,OLDNEWS,TODO} $dest"; -unlink("$dest/rsync-$version-NEWS"); -link("$dest/NEWS", "$dest/rsync-$version-NEWS"); -system "rsync -a $cvsroot/CVSROOT/rsync.updates $dest/cvs.log"; - -system "yodl2html -o $dest/rsync.html rsync/rsync.yo"; -system "yodl2html -o $dest/rsyncd.conf.html rsync/rsyncd.conf.yo"; - -system "rm -rf rsync rsync-$version rsync-$lastversion"; - -if ($live) { - chdir($dest) or die $!; - system "gpg -ba rsync-$version.tar.gz"; - system "gpg -ba rsync-$lastversion-$version.diffs.gz"; +sub get_subprotocol_version +{ + my($subver) = @_; + if ($pre && $proto_changed eq 'changed') { + return $subver == 0 ? 1 : $subver; + } + 0; } -print <