my $releasedir = $ENV{HOME} . '/release';
my $cvsroot = $ENV{CVSROOT} = 'samba.org:/data/cvs';
+my $cl_today = time2str('* %a %b %d %Y', time);
my $ztoday = time2str('%d %b %Y', time);
-my $today = $ztoday;
-$today =~ s/^0//;
+(my $today = $ztoday) =~ s/^0//;
my $break = <<EOT;
==========================================================================
chdir('rsync') or die $!;
my($version, $lastversion);
-open(IN, 'configure.in') or die $!;
+open(IN, '<', 'configure.in') or die $!;
while (<IN>) {
if (/^RSYNC_VERSION=(.*)/) {
$version = $lastversion = $1;
}
close IN;
-$lastversion =~ s/(\d+)cvs$/ $1 - 1 /e;
+if ($lastversion =~ /cvs$/) {
+ open(IN, '<', 'OLDNEWS') or die $!;
+ $_ = <IN>;
+ close IN;
+ ($lastversion) = /(\d+\.\d+\.\d+)/;
+}
+
$version =~ s/cvs/pre1/ || $version =~ s/pre(\d+)/ 'pre' . ($1 + 1) /e;
print $break, "\nPlease enter the version number of this release: [$version] ";
\$release is "$release"
About to:
- - make sure that configure, config.h.in, and proto.h are updated
+ - make sure that SUBPROTOCOL_VERSION is 0$skipping2
- tweak the version in configure.in, configure, and the spec files
+ - make sure that configure, config.h.in, and proto.h are updated
- tweak NEWS and OLDNEWS to update the release date$skipping2
- tweak the date in the *.yo files and re-generate the man pages
- make sure that the patches dir has been updated
my @tweak_files = ( glob('packaging/*.spec'), glob('packaging/*/*.spec'),
glob('*.yo'), qw( configure.in configure ) );
if ($version !~ /pre/) {
- push(@tweak_files, qw( NEWS OLDNEWS ));
+ push(@tweak_files, qw( rsync.h NEWS OLDNEWS ));
}
foreach my $fn (@tweak_files) {
open(IN, '<', $fn) or die $!;
undef $/; $_ = <IN>; $/ = "\n";
close IN;
if ($fn =~ /configure/) {
- s/^RSYNC_VERSION.*/RSYNC_VERSION=$version/m;
+ s/^RSYNC_VERSION=.*/RSYNC_VERSION=$version/m;
} 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;
} 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";
+ } elsif ($fn eq 'rsync.h') {
+ s/(#define\s+SUBPROTOCOL_VERSION)\s+\d+/$1 0/;
+ } 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";
} 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";
+system "yodl2man -o rsync.1 rsync.yo; ./tweak_manpage rsync.1";
+system "yodl2man -o rsyncd.conf.5 rsyncd.conf.yo; ./tweak_manpage rsyncd.conf.5";
mkdir('patches/tmp') or die $!;
system "rsync -a --exclude=patches/ --exclude-from=.cvsignore . patches/tmp/cvsdir/";
system "patches/verify-patches -pun -an";
}
-my $tar_file = "$dest/rsync-$version.tar.gz";
-my $diff_file = "$dest/rsync-$lastversion-$version.diffs.gz";
+my $tar_name = "rsync-$version.tar.gz";
+my $diff_name = "rsync-$lastversion-$version.diffs.gz";
+my $tar_file = "$dest/$tar_name";
+my $diff_file = "$dest/$diff_name";
print $break, <<EOT;
About to do the following in the samba-rsync-ftp dir:
- move the old tar/diff files into the appropriate old-* dirs
- - hard-link moved tar/diff files to old files on samba.org$skipping
- - create release tar, "$tar_file"
- - create release diffs, "$diff_file"
+ - hard-link the moved tar/diff files on samba.org$skipping
+ - create release tar, "$tar_name"
+ - create release diffs, "$diff_name"
- update README, *NEWS, TODO, and cvs.log
- update rsync*.html man pages
+ - gpg-sign the release files$skipping
EOT
print "<Press Enter to continue> ";
# 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')) {
- my $new_fn = "old-previews/$fn";
- rename($fn, $new_fn) or die $!;
- push(@moved_files, $new_fn);
+ 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/;
- my $new_fn = "old-versions/$fn";
- rename($fn, $new_fn) or die $!;
- push(@moved_files, $new_fn);
+ 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*')) {
- next if $fn =~ /^rsync.*pre/;
- my $new_fn = "old-patches/$fn";
- rename($fn, $new_fn) or die $!;
- push(@moved_files, $new_fn);
+ link($fn, "old-patches/$fn") or die $!;
+ push(@moved_files, $fn);
}
}
# Optimize our future upload (in the absence of --detect-renamed) by
- # hard-linking the above moved files on the remote server.
+ # using rsync to hard-link the above files on samba.org.
if ($live) {
- my $remote_cmd = '';
- foreach (@moved_files) {
- my($path, $fn) = m#(.*)/([^/]+)$#;
- $remote_cmd .= "ln -f /home/ftp/pub/rsync/{$fn,$path};";
- }
- system "ssh samba.org '$remote_cmd'";
+ system "rsync -avHOC --include='rsync*.gz*' --include='old-*/' --exclude='*' . samba.org:/home/ftp/pub/rsync";
}
- foreach (glob("rsync*pre*.diffs.gz*")) {
+ foreach (@moved_files) {
unlink($_);
}
## TWEAK THE VERSIONS AS DESIRED HERE ##
#mkdir("rsync-$lastversion/support", 0755) or die $!;
#rename("rsync-$lastversion/rsyncstats", "rsync-$lastversion/support/rsyncstats");
-unlink("rsync-$lastversion/.ignore");
+#unlink("rsync-$lastversion/.ignore");
## END ##
system "diff -urN --exclude=patches rsync-$lastversion rsync-$version| gzip -9 >$diff_file";
if ($live) {
chdir($dest) or die $!;
- system "gpg -ba rsync-$version.tar.gz";
- system "gpg -ba rsync-$lastversion-$version.diffs.gz";
-}
-
-print $break, <<EOT;
+ system "gpg -ba $tar_name; gpg -ba $diff_name";
+ print $break, <<EOT;
All done. Remember to announce the release on *BOTH*
rsync-announce\@lists.samba.org and rsync\@lists.samba.org!
EOT
+} else {
+ print $break, "All done.\n";
+}
Matt McCutchen's Web Site / rsync / rsync.git / blobdiff