Modified the discovery of the generated files & use "make gen".

[rsync/rsync.git] / packaging / release-rsync

diff --git a/packaging/release-rsync b/packaging/release-rsync
index 8e2a981..f879b89 100755 (executable)
--- a/packaging/release-rsync
+++ b/packaging/release-rsync
@@ -17,12 +17,19 @@ my $ztoday = time2str('%d %b %Y', time);
 
 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
@@ -154,7 +161,7 @@ foreach my $fn (@tweak_files) {
     close OUT;
 }
 
-system "./prepare-source && touch proto.h";
+system "make gen";
 
 print $break;
 system "git-diff --color |less -p '^diff .*'";
@@ -238,14 +245,14 @@ if ($diffdir ne $dest) {
 }
 
 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");
+(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');
-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";
+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 "support/patch-update --gen";