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;
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 (<IN>) {
if (/^RSYNC_VERSION=(.*)/) {
- $lastversion = $1;
+ $confversion = $1;
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 = $lastversion;
+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] ";
} 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>);
$_ = <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 ));
} 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";
}
$_ = <STDIN>;
system "git commit -a -m 'Preparing for release of $version'" and exit 1;
-print "Sign the tag:\n";
+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.
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 -upN a b | sed -r '$sed_script') | gzip -9 >$diff_file";
system "rm -rf a";
rename('b', "rsync-$version");