X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/e63d3a29e24f8b4a5046b0caaa6f19dde99c036a..c9604e2115c28e7c0cf649f15f332e2911a47931:/packaging/release-rsync diff --git a/packaging/release-rsync b/packaging/release-rsync index 7021c57e..6fa42137 100755 --- a/packaging/release-rsync +++ b/packaging/release-rsync @@ -7,9 +7,20 @@ use strict; # ~/samba-rsync-ftp dir will be ready to be rsynced to samba.org. use Cwd; +use Getopt::Long; +use Term::ReadKey; use Date::Format; my $dest = $ENV{HOME} . '/samba-rsync-ftp'; +my $passfile = $ENV{HOME} . '/.rsyncpass'; +my $path = $ENV{PATH}; + +&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); @@ -19,6 +30,10 @@ my $ztoday = time2str('%d %b %Y', $now); my $curdir = Cwd::cwd; +END { + unlink($passfile); +} + my @extra_files; open(IN, '<', 'Makefile.in') or die "Couldn't open Makefile.in: $!\n"; while () { @@ -49,7 +64,7 @@ open(IN, '-|', 'git status') or die $!; my $status = join('', ); close IN; die "The checkout is not clean:\n", $status unless $status =~ /\nnothing to commit \(working directory clean\)/; -die "The checkout is not on the master branch.\n" unless $status =~ /^# On branch master\n/; +die "The checkout is not on the $master_branch branch.\n" unless $status =~ /^# On branch $master_branch\n/; my $confversion; open(IN, '<', 'configure.in') or die $!; @@ -77,6 +92,14 @@ if ($_ eq '.') { } elsif ($_ ne '') { $version = $_; } +die "Invalid version: `$version'\n" unless $version =~ /^[\d.]+(pre\d+)?$/; + +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"; +} if ($version =~ s/[-.]*pre[-.]*/pre/ && $confversion !~ /dev$/) { $lastversion = $confversion; @@ -87,19 +110,22 @@ 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($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"; } $srcdir = $srcdiffdir = $lastsrcdir = 'src-previews'; $skipping = ' ** SKIPPING **'; -} elsif ($version =~ /pre/) { +} elsif ($pre) { $srcdir = $srcdiffdir = 'src-previews'; $lastsrcdir = 'src'; $skipping = ' ** SKIPPING **'; @@ -123,7 +149,7 @@ About to: - make sure that SUBPROTOCOL_VERSION is 0$skipping - tweak the version in configure.in and the spec files - tweak NEWS and OLDNEWS to update the release date$skipping - - tweak the date in the *.yo files and generate the man pages + - tweak the date in the *.yo files and generate the manpages - generate configure.sh, config.h.in, and proto.h - page through the differences @@ -132,8 +158,9 @@ print " "; $_ = ; (my $finalversion = $version) =~ s/pre\d+//; -my %specvars = ( 'Version:' => $version, 'Release:' => $release, - 'Released' => "$version." ); +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 ) ); @@ -159,16 +186,16 @@ foreach my $fn (@tweak_files) { } elsif ($fn eq 'rsync.h') { s/(#define\s+SUBPROTOCOL_VERSION)\s+\d+/$1 0/ or die "Unable to find SUBPROTOCOL_VERSION define in $fn\n"; - next if $version =~ /pre/; + next if $pre; } elsif ($fn eq 'NEWS') { s/^(NEWS for rsync \Q$finalversion\E) \(UNRELEASED\)\s*\n/$1 ($today)\n/mi or die "The first line of $fn is not in the right format. It must be:\n" . "NEWS for rsync $finalversion (UNRELEASED)\n"; - next if $version =~ /pre/; + next if $pre; } elsif ($fn eq 'OLDNEWS') { s/^\t\S\S\s\S\S\S\s\d\d\d\d(\t\Q$finalversion\E)/\t$ztoday$1/m or die "Unable to find \"?? ??? $year\t$finalversion\" line in $fn\n"; - next if $version =~ /pre/; + next if $pre; } elsif ($fn eq 'options.c') { if (s/(Copyright \(C\) 2002-)(\d+)( Wayne Davison)/$1$year$3/ && $2 ne $year) { @@ -201,25 +228,69 @@ my $lasttar_file = "$dest/$lastsrcdir/rsync-$lastversion.tar.gz"; print $break, < "; +my $ans = ; + +system "git commit -a -m 'Preparing for release of $version'" and exit 1; + +print "Updating files in \"patches\" dir ...\n"; +system "packaging/patch-update --branch=$master_branch"; + +if ($ans =~ /^y/i) { + print "\nVisiting all \"patch/*\" branches ...\n"; + system "packaging/patch-update --branch=$master_branch --shell"; +} + +print $break, < "; $_ = ; -system "git commit -a -m 'Preparing for release of $version'" and exit 1; -print "\nSign the tag:"; -system "git tag -s -m 'Version $version.' v$version" and exit 1; +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; + + # We want to use our passphrase-providing "gpg" script, so modify the PATH. + $ENV{PATH} = "packaging/bin:$path"; + $_ = `git tag -s -m 'Version $version.' v$version 2>&1`; + $ENV{PATH} = $path; + unlink($passfile); + print $_; + next if /bad passphrase/; + last unless /failed/; + exit 1; +} # Extract the generated files from the old tar. @_ = @extra_files; @@ -239,9 +310,12 @@ 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 "support/patch-update --skip-check --gen=rsync-$version/patches"; +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"; @@ -253,15 +327,15 @@ 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"; -my $cnt = 0; -print "\n"; foreach my $fn ($srctar_file, $pattar_file, $diff_file) { - print ++$cnt, ". Sign file \"$fn\":"; - system "gpg -ba $fn"; + unlink("$fn.asc"); + open(GPG, '|-', "gpg --batch --passphrase-fd=0 -ba $fn") or die $!; + print GPG $passphrase, "\n"; + close GPG; } -if ($version !~ /pre/) { - system "rm $dest/rsync-*{.tar.gz,.asc,-NEWS} $dest/src-preview/rsync-*diffs.gz"; +if (!$pre) { + system "rm $dest/rsync-*.gz $dest/rsync-*.asc $dest/rsync-*-NEWS $dest/src-previews/rsync-*diffs.gz*"; foreach my $fn ($srctar_file, "$srctar_file.asc", $pattar_file, "$pattar_file.asc", @@ -277,3 +351,15 @@ 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 + +exit; + +sub usage +{ + die <