X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/67b9b26ff3687a3b43358c7608d6b1981495ab88..4da9fcd41d30e8a089a0d64f5e6c44e80531942a:/packaging/release-rsync

diff --git a/packaging/release-rsync b/packaging/release-rsync
index f879b89d..b3a25032 100755
--- a/packaging/release-rsync
+++ b/packaging/release-rsync
@@ -43,7 +43,7 @@ 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\)/;
@@ -123,8 +123,6 @@ EOT
 print "<Press Enter to continue> ";
 $_ = <STDIN>;
 
-print $break;
-
 my @tweak_files = ( glob('packaging/*.spec'), glob('packaging/*/*.spec'),
 		    glob('*.yo'), qw( configure.in ) );
 
@@ -161,10 +159,8 @@ foreach my $fn (@tweak_files) {
     close OUT;
 }
 
-system "make gen";
-
 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";
@@ -193,16 +189,14 @@ EOT
 print "<Press Enter to continue> ";
 $_ = <STDIN>;
 
+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;
+
+# 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) {
@@ -244,28 +238,28 @@ if ($diffdir ne $dest) {
     chdir($curdir) or die $!;
 }
 
-print "Creating $srctar_file ...\n";
-(my $srctar_tmp = $srctar_file) =~ s/\.gz$//;
-system "git-archive --format=tar --prefix=rsync-$version/ v$version >$srctar_tmp";
-system "fakeroot tar rf $srctar_tmp rsync-$version/*; gzip -9 $srctar_tmp";
-
 print "Creating $diff_file ...\n";
-rename("rsync-$version", '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 -up a b | sed -r '$sed_script') | gzip -9 >$diff_file";
-system "rm -rf a b";
+system "(git diff v$lastversion v$version; diff -up 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 --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";