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
Updated copyright year in --version output and improved the release
[rsync/rsync.git]
/
packaging
/
release-rsync
diff --git
a/packaging/release-rsync
b/packaging/release-rsync
index
3711c4c
..
a3af5ff
100755
(executable)
--- a/
packaging/release-rsync
+++ b/
packaging/release-rsync
@@
-11,8
+11,10
@@
use Date::Format;
my $dest = $ENV{HOME} . '/samba-rsync-ftp';
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;
(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/;
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 $
last
version;
+my $
conf
version;
open(IN, '<', 'configure.in') or die $!;
while (<IN>) {
if (/^RSYNC_VERSION=(.*)/) {
open(IN, '<', 'configure.in') or die $!;
while (<IN>) {
if (/^RSYNC_VERSION=(.*)/) {
- $
last
version = $1;
+ $
conf
version = $1;
last;
}
}
close IN;
last;
}
}
close IN;
-if ($lastversion =~ /dev$/) {
- open(IN, '<', 'OLDNEWS') or die $!;
-
$_ = <IN>
;
-
close IN
;
-
($lastversion) = /(\d+\.\d+\.\d+)/
;
-}
+die "Unable to find RSYNC_VERSION in configure.in\n" unless defined $confversion;
+
+
open(IN, '<', 'OLDNEWS') or die $!
;
+
$_ = <IN>
;
+
close IN
;
+my($lastversion) = /(\d+\.\d+\.\d+)/;
-my $version = $
last
version;
+my $version = $
conf
version;
$version =~ s/dev/pre1/ || $version =~ s/pre(\d+)/ 'pre' . ($1 + 1) /e;
print "Please enter the version number of this release: [$version] ";
$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 = $_;
}
} 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($_ = <STDIN>);
print "Enter the previous version to produce a patch against: [$lastversion] ";
chomp($_ = <STDIN>);
@@
-124,7
+129,7
@@
print "<Press Enter to continue> ";
$_ = <STDIN>;
my @tweak_files = ( glob('packaging/*.spec'), glob('packaging/*/*.spec'),
$_ = <STDIN>;
my @tweak_files = ( glob('packaging/*.spec'), glob('packaging/*/*.spec'),
- glob('*.yo'), qw( configure.in ) );
+ glob('*.yo'), qw( configure.in
options.c
) );
if ($version !~ /pre/) {
push(@tweak_files, qw( rsync.h NEWS OLDNEWS ));
if ($version !~ /pre/) {
push(@tweak_files, qw( rsync.h NEWS OLDNEWS ));
@@
-151,6
+156,9
@@
foreach my $fn (@tweak_files) {
} 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";
} 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";
+ } elsif ($fn eq 'options.c') {
+ s/(rprintf\(f, "Copyright \(C\) 1996-)\d+/$1$year/;
+ s/(Copyright \(C\) 2002-)\d+( Wayne Davison)/$1$year$2/;
} else {
die "Unrecognized file in \@tweak_files: $fn\n";
}
} else {
die "Unrecognized file in \@tweak_files: $fn\n";
}
@@
-190,6
+198,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
+250,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
+274,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