X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/e3915dac764208a166d87b6ef964c875b435d143..af6241f7adda9fa90fb47b857a5269f2cbcc0319:/packaging/release-rsync diff --git a/packaging/release-rsync b/packaging/release-rsync index 7dc38ca7..f412a902 100755 --- a/packaging/release-rsync +++ b/packaging/release-rsync @@ -11,8 +11,10 @@ use Date::Format; my $dest = $ENV{HOME} . '/samba-rsync-ftp'; -my $cl_today = time2str('* %a %b %d %Y', time); -my $ztoday = time2str('%d %b %Y', time); +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; @@ -49,23 +51,23 @@ 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/; -my $lastversion; +my $confversion; open(IN, '<', 'configure.in') or die $!; while () { if (/^RSYNC_VERSION=(.*)/) { - $lastversion = $1; + $confversion = $1; last; } } close IN; -if ($lastversion =~ /dev$/) { - open(IN, '<', 'OLDNEWS') or die $!; - $_ = ; - close IN; - ($lastversion) = /(\d+\.\d+\.\d+)/; -} +die "Unable to find RSYNC_VERSION in configure.in\n" unless defined $confversion; -my $version = $lastversion; +open(IN, '<', 'OLDNEWS') or die $!; +$_ = ; +close IN; +my($lastversion) = /(\d+\.\d+\.\d+)/; + +my $version = $confversion; $version =~ s/dev/pre1/ || $version =~ s/pre(\d+)/ 'pre' . ($1 + 1) /e; print "Please enter the version number of this release: [$version] "; @@ -75,7 +77,10 @@ if ($_ eq '.') { } elsif ($_ ne '') { $version = $_; } -$version =~ s/[-.]*pre[-.]*/pre/; + +if ($version =~ s/[-.]*pre[-.]*/pre/ && $confversion !~ /dev$/) { + $lastversion = $confversion; +} print "Enter the previous version to produce a patch against: [$lastversion] "; chomp($_ = ); @@ -87,19 +92,20 @@ print "Please enter the RPM release number of this release: [$release] "; chomp($_ = ); $release = $_ if $_ ne ''; -my $diffdir; -my $skipping; +my($srcdir,$srcdiffdir,$lastsrcdir,$skipping); if ($lastversion =~ /pre/) { if ($version !~ /pre/) { die "You should not diff a release version against a pre-release version.\n"; } - $diffdir = "$dest/old-previews"; + $srcdir = $srcdiffdir = $lastsrcdir = 'src-previews'; $skipping = ' ** SKIPPING **'; } elsif ($version =~ /pre/) { - $diffdir = $dest; + $srcdir = $srcdiffdir = 'src-previews'; + $lastsrcdir = 'src'; $skipping = ' ** SKIPPING **'; } else { - $diffdir = "$dest/old-versions"; + $srcdir = $lastsrcdir = 'src'; + $srcdiffdir = 'src-diffs'; $skipping = ''; } @@ -108,7 +114,9 @@ print "\n", $break, < "; $_ = ; -my @tweak_files = ( glob('packaging/*.spec'), glob('packaging/*/*.spec'), - glob('*.yo'), qw( configure.in ) ); +(my $finalversion = $version) =~ s/pre\d+//; +my %specvars = ( 'Version:' => $version, 'Release:' => $release, + 'Released' => "$version." ); +my @tweak_files = ( glob('packaging/*.spec'), glob('packaging/*/*.spec'), glob('*.yo'), + qw( configure.in rsync.h NEWS OLDNEWS options.c ) ); -if ($version !~ /pre/) { - push(@tweak_files, qw( rsync.h 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; - s/^(Released) .*/$1 $version./m; - s/^\* \w\w\w \w\w\w \d\d \d\d\d\d (.*)/$cl_today $1/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; - } elsif ($fn eq 'NEWS') { - s/^(NEWS for rsync \Q$version\E) \(UNRELEASED\)\s*\n/$1 ($today)\n/mi - or die "Couldn't update NEWS file with release date!\n"; + 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 0/; + s/(#define\s+SUBPROTOCOL_VERSION)\s+\d+/$1 0/ + or die "Unable to find SUBPROTOCOL_VERSION define in $fn\n"; + next if $version =~ /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/; } elsif ($fn eq 'OLDNEWS') { - s/^\t\S\S\s\S\S\S\s\d\d\d\d(\t\Q$version\E)/\t$ztoday$1/m - or die "Couldn't update OLDNEWS file with release date!\n"; + 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/; + } 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 { die "Unrecognized file in \@tweak_files: $fn\n"; } @@ -165,23 +192,23 @@ system "git diff --color | less -p '^diff .*'"; 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/$srctar_name"; -my $pattar_file = "$dest/$pattar_name"; -my $diff_file = "$dest/$diff_name"; -my $lasttar_file = "$dest/rsync-$lastversion.tar.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 $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; -# Extract some files from the old tar before we do the shuffle. +# Extract the generated files from the old tar. @_ = @extra_files; map { s#^#rsync-$lastversion/# } @_; system "tar xzf $lasttar_file @_"; rename("rsync-$lastversion", 'a'); -# When creating a pre-release after a normal release, there's nothing to move. -if ($diffdir ne $dest) { - chdir($dest) or die $!; - - print "Shuffling old files ...\n"; - - # 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); - } - - if ($version !~ /pre/) { - foreach my $fn (glob('rsync*.tar.gz*'), glob('rsync*-NEWS')) { - next if $fn =~ /^rsync.*pre/; - link($fn, "old-versions/$fn") or die $!; - push(@moved_files, $fn); - } - - foreach my $fn (glob('rsync*pre*.diffs.gz*')) { - unlink($fn); - } - - foreach my $fn (glob('rsync*.diffs.gz*')) { - link($fn, "old-patches/$fn") or die $!; - push(@moved_files, $fn); - } - } - - # Optimize our future upload (in the absence of --detect-renamed) by - # using rsync to hard-link the above files on samba.org. - system "rsync -avHOC --include='rsync*.gz*' --include='old-*/' --exclude='*' . samba.org:/home/ftp/pub/rsync"; - foreach (@moved_files) { - unlink($_); - } - - chdir($curdir) or die $!; -} - print "Creating $diff_file ...\n"; -system "make gen; rsync -a @extra_files b/"; +system "./config.status Makefile; make gen; rsync -a @extra_files b/"; my $sed_script = 's:^((---|\+\+\+) [ab]/[^\t]+)\t.*:\1:'; -system "(git diff v$lastversion v$version; diff -up a b | sed -r '$sed_script') | gzip -9 >$diff_file"; +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"); @@ -250,25 +238,41 @@ 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"; -system "support/patch-update --gen"; - -symlink('.', "rsync-$version"); -system "fakeroot tar chzf $pattar_file rsync-$version/patches"; -unlink("rsync-$version"); +mkdir("rsync-$version", 0755); +mkdir("rsync-$version/patches", 0755); +system "support/patch-update --skip-check --gen=rsync-$version/patches"; +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("$dest/rsync-$version-NEWS"); -link("$dest/NEWS", "$dest/rsync-$version-NEWS"); -system "git log --name-status | gzip -9 >$dest/changelog.gz"; +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"; -chdir($dest) or die $!; -system "gpg -ba $srctar_name; gpg -ba $pattar_name; gpg -ba $diff_name"; -print $break, <