X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/67b9b26ff3687a3b43358c7608d6b1981495ab88..37077bd3393d04af810a04b122cf96bdf8fde076:/packaging/nightly-rsync

diff --git a/packaging/nightly-rsync b/packaging/nightly-rsync
index 03006e5f..af9f53a3 100755
--- a/packaging/nightly-rsync
+++ b/packaging/nightly-rsync
@@ -14,8 +14,8 @@ use strict;
 use Getopt::Long;
 use Date::Format;
 
-# Where the local copy of /home/ftp/pub/rsync/nightly should be updated.
-our $dest = $ENV{HOME} . '/samba-rsync-ftp/nightly';
+# Where the local copy of /home/ftp/pub/rsync/dev/nightly should be updated.
+our $dest = $ENV{HOME} . '/samba-rsync-ftp/dev/nightly';
 our $nightly_symlink = "$dest/rsync-HEAD.tar.gz";
 
 our($make_tar, $upload, $help_opt);
@@ -29,17 +29,19 @@ our($make_tar, $upload, $help_opt);
 our $name = time2str('rsync-HEAD-%Y%m%d-%H%M%Z', time, 'GMT');
 our $ztoday = time2str('%d %b %Y', time);
 our $today = $ztoday;
+our $gen_target = $upload ? 'gensend' : 'gen';
 
 die "$dest does not exist\n" unless -d $dest;
 die "There is no .git dir in the current directory.\n" unless -d '.git';
 die "There is no rsync checkout in the current directory.\n" unless -f 'rsyncd.conf.yo';
 
 if ($make_tar) {
-    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/;
+    system "make $gen_target" and die "make $gen_target failed!\n";
 
     my @extra_files;
     open(IN, '<', 'Makefile.in') or die "Couldn't open Makefile.in: $!\n";
@@ -53,14 +55,13 @@ if ($make_tar) {
 	}
     }
     close IN;
-    map { s#^#$name/# } @extra_files;
 
     print "Creating $name.tar.gz\n";
-    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";
-    unlink($name);
+    system "rsync -a @extra_files $name/";
+    system "git archive --format=tar --prefix=$name/ HEAD | tar xf -";
+    system "support/git-set-file-times --prefix=$name/";
+    system "fakeroot tar czf $dest/$name.tar.gz $name; rm -rf $name";
+
     unlink($nightly_symlink);
     symlink("$name.tar.gz", $nightly_symlink);
 }
@@ -103,7 +104,7 @@ if ($upload) {
     if (defined $ENV{RSYNC_PARTIAL_DIR}) {
 	$opt = " -f 'R $ENV{RSYNC_PARTIAL_DIR}'";
     }
-    system "rsync$opt -aviHP --delete-after . samba.org:/home/ftp/pub/rsync/nightly";
+    system "rsync$opt -aviHP --delete-after . samba.org:/home/ftp/pub/rsync/dev/nightly";
 }
 
 exit;