X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/86eb9f95955d3957c2dfdcbc36492076385c96fd..fede378577ba1b8adbac90cba42026ba828f1a1f:/packaging/release-rsync

diff --git a/packaging/release-rsync b/packaging/release-rsync
index 8e2a9810..a3af5ff8 100755
--- a/packaging/release-rsync
+++ b/packaging/release-rsync
@@ -11,18 +11,27 @@ 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;
 
-open(IN, '<', 'prepare-source.mak') or die "Couldn't open prepare-source.mak: $!\n";
-$_ = join('', <IN>);
+my @extra_files;
+open(IN, '<', 'Makefile.in') or die "Couldn't open Makefile.in: $!\n";
+while (<IN>) {
+    if (s/^GENFILES=//) {
+	while (s/\\$//) {
+	    $_ .= <IN>;
+	}
+	@extra_files = split(' ', $_);
+	last;
+    }
+}
 close IN;
 
-my @extra_files = m{\n([^\s:]+):.*\n\t\S}g;
-
 my $break = <<EOT;
 ==========================================================================
 EOT
@@ -36,29 +45,29 @@ die "There is no .git dir in the current directory.\n" unless -d '.git';
 die "'a' must not exist in the current directory.\n" if -e 'a';
 die "'b' must not exist in the current directory.\n" if -e 'b';
 
-open(IN, '-|', 'git-status') or die $!;
+open(IN, '-|', 'git status') or die $!;
 my $status = join('', <IN>);
 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 (<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] ";
@@ -68,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($_ = <STDIN>);
@@ -116,10 +128,8 @@ EOT
 print "<Press Enter to continue> ";
 $_ = <STDIN>;
 
-print $break;
-
 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 ));
@@ -146,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 '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";
     }
@@ -154,10 +167,8 @@ foreach my $fn (@tweak_files) {
     close OUT;
 }
 
-system "./prepare-source && touch proto.h";
-
 print $break;
-system "git-diff --color |less -p '^diff .*'";
+system "git diff --color | less -p '^diff .*'";
 
 my $srctar_name = "rsync-$version.tar.gz";
 my $pattar_name = "rsync-patches-$version.tar.gz";
@@ -178,7 +189,7 @@ About to:
     - create patches tar, "$pattar_name"
     - create release diffs, "$diff_name"
     - update patch branches and generate patch/* files
-    - update README, *NEWS, TODO, and changelog
+    - update README, *NEWS, TODO, and ChangeLog
     - update rsync*.html man pages
     - gpg-sign the release files
 
@@ -186,16 +197,15 @@ EOT
 print "<Press Enter to continue> ";
 $_ = <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.
 @_ = @extra_files;
-map { s#^#a/# } @_;
-$_[0] =~ s/configure\.sh/configure/; # XXX remove soon
+map { s#^#rsync-$lastversion/# } @_;
 system "tar xzf $lasttar_file @_";
-rename("a/configure", "a/configure.sh"); # XXX remove soon
-
-system "rsync -a @extra_files rsync-$version/";
-
-system "git-commit -a -m 'Preparing for release of $version'" and exit 1;
-system "git-tag -s -m 'Version $version.' v$version" and exit 1;
+rename("rsync-$lastversion", 'a');
 
 # When creating a pre-release after a normal release, there's nothing to move.
 if ($diffdir ne $dest) {
@@ -237,36 +247,41 @@ if ($diffdir ne $dest) {
     chdir($curdir) or die $!;
 }
 
-print "Creating $srctar_file ...\n";
-system "git-archive --format=tar --prefix=rsync-$version/ v$version >$dest/srctmp.tar";
-system "fakeroot tar rf $dest/srctmp.tar rsync-$version/*; gzip -9 <$dest/srctmp.tar >$srctar_file";
-unlink("$dest/srctmp.tar");
-
 print "Creating $diff_file ...\n";
-rename("rsync-$version", 'b');
-my $sed_script = 's/^((---|\+\+\+) [^\t]+)\t.*/\1/';
-system "(diff -up a b | sed -r '$sed_script'; git-diff v$lastversion v$version) | gzip -9 >$diff_file";
-system "rm -rf a 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 -upN a b | sed -r '$sed_script') | gzip -9 >$diff_file";
+system "rm -rf a";
+rename('b', "rsync-$version");
 
-system "support/patch-update --gen";
+print "Creating $srctar_file ...\n";
+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";
 
-symlink('.', "rsync-$version");
-system "tar czf $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";
+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, <<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