Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed the lastversion default when changing from a pre-release
[rsync/rsync.git]
/
packaging
/
release-rsync
diff --git
a/packaging/release-rsync
b/packaging/release-rsync
index
3711c4c
..
f76a51b
100755
(executable)
--- a/
packaging/release-rsync
+++ b/
packaging/release-rsync
@@
-58,13
+58,13
@@
while (<IN>) {
}
}
close IN;
}
}
close IN;
-if ($lastversion =~ /dev$/) {
- open(IN, '<', 'OLDNEWS') or die $!;
- $_ = <IN>;
- close IN;
- ($lastversion) = /(\d+\.\d+\.\d+)/;
-}
+open(IN, '<', 'OLDNEWS') or die $!;
+$_ = <IN>;
+close IN;
+my($lastrelease) = /(\d+\.\d+\.\d+)/;
+
+$lastversion = $lastrelease if $lastversion =~ /dev$/;
my $version = $lastversion;
$version =~ s/dev/pre1/ || $version =~ s/pre(\d+)/ 'pre' . ($1 + 1) /e;
my $version = $lastversion;
$version =~ s/dev/pre1/ || $version =~ s/pre(\d+)/ 'pre' . ($1 + 1) /e;
@@
-75,7
+75,7
@@
if ($_ eq '.') {
} elsif ($_ ne '') {
$version = $_;
}
} elsif ($_ ne '') {
$version = $_;
}
-$version =~ s/[-.]*pre[-.]*/pre/;
+$
lastversion = $lastrelease unless $
version =~ s/[-.]*pre[-.]*/pre/;
print "Enter the previous version to produce a patch against: [$lastversion] ";
chomp($_ = <STDIN>);
print "Enter the previous version to produce a patch against: [$lastversion] ";
chomp($_ = <STDIN>);
@@
-190,6
+190,7
@@
print "<Press Enter to continue> ";
$_ = <STDIN>;
system "git commit -a -m 'Preparing for release of $version'" and exit 1;
$_ = <STDIN>;
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.
system "git tag -s -m 'Version $version.' v$version" and exit 1;
# Extract some files from the old tar before we do the shuffle.
@@
-241,7
+242,7
@@
if ($diffdir ne $dest) {
print "Creating $diff_file ...\n";
system "./config.status Makefile; make gen; rsync -a @extra_files b/";
my $sed_script = 's:^((---|\+\+\+) [ab]/[^\t]+)\t.*:\1:';
print "Creating $diff_file ...\n";
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 -up
N
a b | sed -r '$sed_script') | gzip -9 >$diff_file";
system "rm -rf a";
rename('b', "rsync-$version");
system "rm -rf a";
rename('b', "rsync-$version");
@@
-265,9
+266,14
@@
system "yodl2html -o $dest/rsync.html rsync.yo";
system "yodl2html -o $dest/rsyncd.conf.html rsyncd.conf.yo";
chdir($dest) or die $!;
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, <<EOT;
+my $cnt = 0;
+foreach my $fn ($srctar_name, $pattar_name, $diff_name) {
+ print ++$cnt, ". Sign file \"$fn\":";
+ system "gpg -ba $fn";
+}
+print $break, <<'EOT';
-All done. Remember to announce the release on *BOTH*
-rsync-announce\@lists.samba.org and rsync\@lists.samba.org!
+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
EOT