X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/13e4914826df2ded6dfe46e73ae0ebcd10aff231..eaa28e654fe46ae3a2c0d2cb83866d341b38ce71:/packaging/release-rsync diff --git a/packaging/release-rsync b/packaging/release-rsync index 5ceda93e..3711c4c3 100755 --- a/packaging/release-rsync +++ b/packaging/release-rsync @@ -123,8 +123,6 @@ EOT print " "; $_ = ; -print $break; - my @tweak_files = ( glob('packaging/*.spec'), glob('packaging/*/*.spec'), glob('*.yo'), qw( configure.in ) ); @@ -161,8 +159,6 @@ foreach my $fn (@tweak_files) { close OUT; } -system 'make gen'; - print $break; system "git diff --color | less -p '^diff .*'"; @@ -185,7 +181,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 @@ -193,17 +189,14 @@ EOT print " "; $_ = ; +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#^#rsync-$lastversion/# } @_; -$_[0] =~ s/configure\.sh/configure/; # XXX remove soon system "tar xzf $lasttar_file @_"; rename("rsync-$lastversion", 'a'); -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; # When creating a pre-release after a normal release, there's nothing to move. if ($diffdir ne $dest) { @@ -245,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 "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";