From: Wayne Davison <wayned@samba.org>
Date: Sun, 25 Nov 2007 22:36:30 +0000 (-0800)
Subject: Modified the discovery of the generated files & use "make gen".
X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/commitdiff_plain/67b9b26ff3687a3b43358c7608d6b1981495ab88

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

diff --git a/packaging/nightly-rsync b/packaging/nightly-rsync
index 1a5d0d00..03006e5f 100755
--- a/packaging/nightly-rsync
+++ b/packaging/nightly-rsync
@@ -41,15 +41,22 @@ if ($make_tar) {
     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/;
 
-    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;
     map { s#^#$name/# } @extra_files;
 
     print "Creating $name.tar.gz\n";
-    system "./prepare-source && touch proto.h";
+    system "make gen";
     symlink('.', $name);
     system "git-archive --format=tar --prefix=$name/ HEAD >$dest/$name.tar";
     system "fakeroot tar rf $dest/$name.tar @extra_files; gzip -9 $dest/$name.tar";
diff --git a/packaging/release-rsync b/packaging/release-rsync
index 932def5a..f879b89d 100755
--- 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 .*'";
diff --git a/support/patch-update b/support/patch-update
index c4289820..e37cf7c9 100755
--- a/support/patch-update
+++ b/support/patch-update
@@ -10,18 +10,26 @@ use strict;
 die "No 'patches' directory present in the current dir.\n" unless -d 'patches';
 die "No '.git' directory present in the current dir.\n" unless -d '.git';
 
-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 $incl_generated_files = shift if @ARGV && $ARGV[0] eq '--gen';
 
 system "git-checkout master" and exit 1;
 if ($incl_generated_files) {
     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';
-    system "./prepare-source && rsync -a @extra_files a/" and exit 1;
+    system "make gen && rsync -a @extra_files a/" and exit 1;
 }
 my $last_touch = time;
 
@@ -74,10 +82,6 @@ if ($incl_generated_files) {
     system "rm -rf a b";
 }
 
-print "-------- master --------\n";
-sleep 1 if $last_touch == time;
-system "git-checkout master && ./prepare-source";
-
 exit;
 
 
@@ -114,7 +118,7 @@ sub update_patch
     }
 
     if ($incl_generated_files) {
-	system "./prepare-source && rsync -a @extra_files b/" and exit 1;
+	system "make gen && rsync -a @extra_files b/" and exit 1;
     }
     $last_touch = time;