Handle check-in and tagging of patches dir.
[rsync/rsync.git] / packaging / release-rsync
... / ...
CommitLineData
1#!/usr/bin/perl
2# This script expects the directory ~/samba-rsync-ftp to exist and to be a
3# copy of the /home/ftp/pub/rsync dir on samba.org. When the script is done,
4# the git repository in the current directory will be updated, and the local
5# ~/samba-rsync-ftp dir will be ready to be rsynced to samba.org.
6
7use strict;
8use warnings;
9use Cwd;
10use Getopt::Long;
11use Term::ReadKey;
12use Date::Format;
13
14my $dest = $ENV{HOME} . '/samba-rsync-ftp';
15my $passfile = $ENV{HOME} . '/.rsyncpass';
16my $path = $ENV{PATH};
17my $make_gen_cmd = 'make -f prepare-source.mak conf && ./config.status && make gen';
18
19&Getopt::Long::Configure('bundling');
20&usage if !&GetOptions(
21 'branch|b=s' => \( my $master_branch = 'master' ),
22 'help|h' => \( my $help_opt ),
23);
24&usage if $help_opt;
25
26my $now = time;
27my $cl_today = time2str('* %a %b %d %Y', $now);
28my $year = time2str('%Y', $now);
29my $ztoday = time2str('%d %b %Y', $now);
30(my $today = $ztoday) =~ s/^0//;
31
32my $curdir = Cwd::cwd;
33
34END {
35 unlink($passfile);
36}
37
38my @extra_files;
39open(IN, '<', 'Makefile.in') or die "Couldn't open Makefile.in: $!\n";
40while (<IN>) {
41 if (s/^GENFILES=//) {
42 while (s/\\$//) {
43 $_ .= <IN>;
44 }
45 @extra_files = split(' ', $_);
46 last;
47 }
48}
49close IN;
50
51my $break = <<EOT;
52==========================================================================
53EOT
54
55print $break, <<EOT, $break, "\n";
56== This will release a new version of rsync onto an unsuspecting world. ==
57EOT
58
59die "$dest does not exist\n" unless -d $dest;
60die "There is no .git dir in the current directory.\n" unless -d '.git';
61die "'a' must not exist in the current directory.\n" if -e 'a';
62die "'b' must not exist in the current directory.\n" if -e 'b';
63
64my $status = `git status`;
65die "The checkout is not clean:\n", $status unless $status =~ /\nnothing to commit \(working directory clean\)/;
66my($cur_branch) = $status =~ /^# On branch (.+)\n/;
67if ($cur_branch ne $master_branch) {
68 print "The checkout is not on the $master_branch branch.\n";
69 exit 1 if $master_branch ne 'master';
70 print "Do you want to release branch $cur_branch? [n] ";
71 $_ = <STDIN>;
72 exit 1 unless /^y/i;
73 $master_branch = $cur_branch;
74}
75
76if (-d 'patches/.git') {
77 $status = `cd patches && git status`;
78 die "The *patches* checkout is not clean:\n", $status unless $status =~ /\nnothing to commit \(working directory clean\)/;
79 ($cur_branch) = $status =~ /^# On branch (.+)\n/;
80 if ($cur_branch ne $master_branch) {
81 print "The *patches* checkout is on branch $cur_branch, not branch $master_branch.\n";
82 print "Do you want to change it to branch $master_branch? [n] ";
83 $_ = <STDIN>;
84 exit 1 unless /^y/i;
85 system "cd patches && git checkout '$master_branch'";
86 }
87}
88
89my $confversion;
90open(IN, '<', 'configure.in') or die $!;
91while (<IN>) {
92 if (/^RSYNC_VERSION=(.*)/) {
93 $confversion = $1;
94 last;
95 }
96}
97close IN;
98die "Unable to find RSYNC_VERSION in configure.in\n" unless defined $confversion;
99
100open(IN, '<', 'OLDNEWS') or die $!;
101$_ = <IN>;
102my($lastversion) = /(\d+\.\d+\.\d+)/;
103my($last_protocol_version, %pdate);
104while (<IN>) {
105 if (my($ver,$pdate,$pver) = /^\s+\S\S\s\S\S\S\s\d\d\d\d\s+(\d+\.\d+\.\d+)\s+(\d\d \w\w\w \d\d\d\d\s+)?(\d+)$/) {
106 $pdate{$ver} = $pdate if defined $pdate;
107 $last_protocol_version = $pver if $ver eq $lastversion;
108 }
109}
110close IN;
111die "Unable to determine protocol_version for $lastversion.\n" unless defined $last_protocol_version;
112
113my $protocol_version;
114open(IN, '<', 'rsync.h') or die $!;
115while (<IN>) {
116 if (/^#define\s+PROTOCOL_VERSION\s+(\d+)/) {
117 $protocol_version = $1;
118 last;
119 }
120}
121close IN;
122die "Unable to determine the current PROTOCOL_VERSION.\n" unless defined $protocol_version;
123
124my $version = $confversion;
125$version =~ s/dev/pre1/ || $version =~ s/pre(\d+)/ 'pre' . ($1 + 1) /e;
126
127print "Please enter the version number of this release: [$version] ";
128chomp($_ = <STDIN>);
129if ($_ eq '.') {
130 $version =~ s/pre\d+//;
131} elsif ($_ ne '') {
132 $version = $_;
133}
134die "Invalid version: `$version'\n" unless $version =~ /^[\d.]+(pre\d+)?$/;
135
136if (`git tag -l v$version` ne '') {
137 print "Tag v$version already exists.\n\nDelete tag or quit? [q/del] ";
138 $_ = <STDIN>;
139 exit 1 unless /^del/i;
140 system "git tag -d v$version";
141}
142
143if ($version =~ s/[-.]*pre[-.]*/pre/ && $confversion !~ /dev$/) {
144 $lastversion = $confversion;
145}
146
147print "Enter the previous version to produce a patch against: [$lastversion] ";
148chomp($_ = <STDIN>);
149$lastversion = $_ if $_ ne '';
150$lastversion =~ s/[-.]*pre[-.]*/pre/;
151
152my $pre = $version =~ /(pre\d+)/ ? $1 : '';
153
154my $release = $pre ? '0.1' : '1';
155print "Please enter the RPM release number of this release: [$release] ";
156chomp($_ = <STDIN>);
157$release = $_ if $_ ne '';
158$release .= ".$pre" if $pre;
159
160(my $finalversion = $version) =~ s/pre\d+//;
161my($proto_changed,$proto_change_date);
162if ($protocol_version eq $last_protocol_version) {
163 $proto_changed = 'unchanged';
164 $proto_change_date = "\t\t";
165} else {
166 $proto_changed = 'changed';
167 if (!defined($proto_change_date = $pdate{$finalversion})) {
168 while (1) {
169 print "On what date did the protocol change to $protocol_version get checked in? (dd Mmm yyyy) ";
170 chomp($_ = <STDIN>);
171 last if /^\d\d \w\w\w \d\d\d\d$/;
172 }
173 $proto_change_date = "$_\t";
174 }
175}
176
177my($srcdir,$srcdiffdir,$lastsrcdir,$skipping);
178if ($lastversion =~ /pre/) {
179 if (!$pre) {
180 die "You should not diff a release version against a pre-release version.\n";
181 }
182 $srcdir = $srcdiffdir = $lastsrcdir = 'src-previews';
183 $skipping = ' ** SKIPPING **';
184} elsif ($pre) {
185 $srcdir = $srcdiffdir = 'src-previews';
186 $lastsrcdir = 'src';
187 $skipping = ' ** SKIPPING **';
188} else {
189 $srcdir = $lastsrcdir = 'src';
190 $srcdiffdir = 'src-diffs';
191 $skipping = '';
192}
193
194print "\n", $break, <<EOT;
195\$version is "$version"
196\$lastversion is "$lastversion"
197\$dest is "$dest"
198\$curdir is "$curdir"
199\$srcdir is "$srcdir"
200\$srcdiffdir is "$srcdiffdir"
201\$lastsrcdir is "$lastsrcdir"
202\$release is "$release"
203
204About to:
205 - tweak SUBPROTOCOL_VERSION in rsync.h, if needed
206 - tweak the version in configure.in and the spec files
207 - tweak NEWS and OLDNEWS to ensure header values are correct
208 - tweak the date in the *.yo files and generate the manpages
209 - generate configure.sh, config.h.in, and proto.h
210 - page through the differences
211
212EOT
213print "<Press Enter to continue> ";
214$_ = <STDIN>;
215
216my %specvars = ( 'Version:' => $finalversion, 'Release:' => $release,
217 '%define fullversion' => "\%{version}$pre", 'Released' => "$version.",
218 '%define srcdir' => $srcdir );
219my @tweak_files = ( glob('packaging/*.spec'), glob('packaging/*/*.spec'), glob('*.yo'),
220 qw( configure.in rsync.h NEWS OLDNEWS options.c ) );
221
222foreach my $fn (@tweak_files) {
223 open(IN, '<', $fn) or die $!;
224 undef $/; $_ = <IN>; $/ = "\n";
225 close IN;
226 if ($fn =~ /configure/) {
227 s/^RSYNC_VERSION=.*/RSYNC_VERSION=$version/m
228 or die "Unable to update RSYNC_VERSION in $fn\n";
229 } elsif ($fn =~ /\.spec/) {
230 while (my($str, $val) = each %specvars) {
231 s/^\Q$str\E .*/$str $val/m
232 or die "Unable to update $str in $fn\n";
233 }
234 s/^\* \w\w\w \w\w\w \d\d \d\d\d\d (.*)/$cl_today $1/m
235 or die "Unable to update ChangeLog header in $fn\n";
236 } elsif ($fn =~ /\.yo/) {
237 s/^(manpage\([^)]+\)\(\d+\)\()[^)]+(\).*)/$1$today$2/m
238 or die "Unable to update date in manpage() header in $fn\n";
239 s/^(This man ?page is current for version) \S+ (of rsync)/$1 $version $2/m
240 or die "Unable to update current version info in $fn\n";
241 } elsif ($fn eq 'rsync.h') {
242 s{(#define\s+SUBPROTOCOL_VERSION)\s+(\d+)}
243 { $1 . ' ' . get_subprotocol_version($2) }e
244 or die "Unable to find SUBPROTOCOL_VERSION define in $fn\n";
245 } elsif ($fn eq 'NEWS') {
246 s{^(NEWS for rsync \Q$finalversion\E )(\(UNRELEASED\))\s*(\nProtocol: )(\d+) (\([^)]+\))\n}
247 { $1 . ($pre ? $2 : "($today)") . "$3$protocol_version ($proto_changed)\n" }ei
248 or die "The first 2 lines of $fn are not in the right format. They must be:\n"
249 . "NEWS for rsync $finalversion (UNRELEASED)\n"
250 . "Protocol: $protocol_version ($proto_changed)\n";
251 } elsif ($fn eq 'OLDNEWS') {
252 s{^(\t\S\S\s\S\S\S\s\d\d\d\d)(\t\Q$finalversion\E\t).*}
253 { ($pre ? $1 : "\t$ztoday") . $2 . $proto_change_date . $protocol_version }em
254 or die "Unable to find \"?? ??? $year\t$finalversion\" line in $fn\n";
255 } elsif ($fn eq 'options.c') {
256 if (s/(Copyright \(C\) 2002-)(\d+)( Wayne Davison)/$1$year$3/
257 && $2 ne $year) {
258 die "Copyright comments need to be updated to $year in all files!\n";
259 }
260 # Adjust the year in the --version output.
261 s/(rprintf\(f, "Copyright \(C\) 1996-)(\d+)/$1$year/
262 or die "Unable to find Copyright string in --version output of $fn\n";
263 next if $2 eq $year;
264 } else {
265 die "Unrecognized file in \@tweak_files: $fn\n";
266 }
267 open(OUT, '>', $fn) or die $!;
268 print OUT $_;
269 close OUT;
270}
271
272print $break;
273system "git diff --color | less -p '^diff .*'";
274
275my $srctar_name = "rsync-$version.tar.gz";
276my $pattar_name = "rsync-patches-$version.tar.gz";
277my $diff_name = "rsync-$lastversion-$version.diffs.gz";
278my $srctar_file = "$dest/$srcdir/$srctar_name";
279my $pattar_file = "$dest/$srcdir/$pattar_name";
280my $diff_file = "$dest/$srcdiffdir/$diff_name";
281my $news_file = "$dest/$srcdir/rsync-$version-NEWS";
282my $lasttar_file = "$dest/$lastsrcdir/rsync-$lastversion.tar.gz";
283
284print $break, <<EOT;
285
286About to:
287 - commit all version changes
288 - merge the $master_branch branch into the patch/* branches
289 - update the files in the "patches" dir and OPTIONALLY
290 (if you type 'y') to launch a shell for each patch
291
292EOT
293print "<Press Enter OR 'y' to continue> ";
294my $ans = <STDIN>;
295
296system "git commit -a -m 'Preparing for release of $version'" and exit 1;
297
298print "Updating files in \"patches\" dir ...\n";
299system "packaging/patch-update --branch=$master_branch";
300
301if ($ans =~ /^y/i) {
302 print "\nVisiting all \"patch/*\" branches ...\n";
303 system "packaging/patch-update --branch=$master_branch --shell";
304}
305
306if (-d 'patches/.git') {
307 system "cd patches && git commit -a -m 'The patches for $version.'" and exit 1;
308}
309
310print $break, <<EOT;
311
312About to:
313 - create signed tag for this release: v$version
314 - create release diffs, "$diff_name"
315 - create release tar, "$srctar_name"
316 - generate rsync-$version/patches/* files
317 - create patches tar, "$pattar_name"
318 - update top-level README, *NEWS, TODO, and ChangeLog
319 - update top-level rsync*.html manpages
320 - gpg-sign the release files
321 - update hard-linked top-level release files$skipping
322
323EOT
324print "<Press Enter to continue> ";
325$_ = <STDIN>;
326
327# We want to use our passphrase-providing "gpg" script, so modify the PATH.
328$ENV{PATH} = "$curdir/packaging/bin:$path";
329
330my $passphrase;
331while (1) {
332 ReadMode('noecho');
333 print "\nEnter your GPG pass-phrase: ";
334 chomp($passphrase = <STDIN>);
335 ReadMode(0);
336 print "\n";
337
338 # Briefly create a temp file with the passphrase for git's tagging use.
339 my $oldmask = umask 077;
340 unlink($passfile);
341 open(OUT, '>', $passfile) or die $!;
342 print OUT $passphrase, "\n";
343 close OUT;
344 umask $oldmask;
345 $ENV{'GPG_PASSFILE'} = $passfile;
346
347 $_ = `git tag -s -m 'Version $version.' v$version 2>&1`;
348 print $_;
349 next if /bad passphrase/;
350 exit 1 if /failed/;
351
352 if (-d 'patches/.git') {
353 $_ = `cd patches && git tag -s -m 'Version $version.' v$version 2>&1`;
354 print $_;
355 exit 1 if /bad passphrase|failed/;
356 }
357
358 unlink($passfile);
359 last;
360}
361
362$ENV{PATH} = $path;
363
364# Extract the generated files from the old tar.
365@_ = @extra_files;
366map { s#^#rsync-$lastversion/# } @_;
367system "tar xzf $lasttar_file @_";
368rename("rsync-$lastversion", 'a');
369
370print "Creating $diff_file ...\n";
371system "$make_gen_cmd && rsync -a @extra_files b/" and exit 1;
372my $sed_script = 's:^((---|\+\+\+) [ab]/[^\t]+)\t.*:\1:';
373system "(git diff v$lastversion v$version; diff -upN a b | sed -r '$sed_script') | gzip -9 >$diff_file";
374system "rm -rf a";
375rename('b', "rsync-$version");
376
377print "Creating $srctar_file ...\n";
378system "git archive --format=tar --prefix=rsync-$version/ v$version | tar xf -";
379system "support/git-set-file-times --prefix=rsync-$version/";
380system "fakeroot tar czf $srctar_file rsync-$version; rm -rf rsync-$version";
381
382print "Updating files in \"rsync-$version/patches\" dir ...\n";
383mkdir("rsync-$version", 0755);
384mkdir("rsync-$version/patches", 0755);
385system "packaging/patch-update --skip-check --branch=$master_branch --gen=rsync-$version/patches";
386
387print "Creating $pattar_file ...\n";
388system "fakeroot tar chzf $pattar_file rsync-$version/patches; rm -rf rsync-$version";
389
390print "Updating the other files in $dest ...\n";
391system "rsync -a README NEWS OLDNEWS TODO $dest";
392unlink($news_file);
393link("$dest/NEWS", $news_file);
394system "git log --name-status | gzip -9 >$dest/ChangeLog.gz";
395
396system "yodl2html -o $dest/rsync.html rsync.yo";
397system "yodl2html -o $dest/rsyncd.conf.html rsyncd.conf.yo";
398
399foreach my $fn ($srctar_file, $pattar_file, $diff_file) {
400 unlink("$fn.asc");
401 open(GPG, '|-', "gpg --batch --passphrase-fd=0 -ba $fn") or die $!;
402 print GPG $passphrase, "\n";
403 close GPG;
404}
405
406if (!$pre) {
407 system "rm $dest/rsync-*.gz $dest/rsync-*.asc $dest/rsync-*-NEWS $dest/src-previews/rsync-*diffs.gz*";
408
409 foreach my $fn ($srctar_file, "$srctar_file.asc",
410 $pattar_file, "$pattar_file.asc",
411 $diff_file, "$diff_file.asc", $news_file) {
412 (my $top_fn = $fn) =~ s#/src(-\w+)?/#/#;
413 link($fn, $top_fn);
414 }
415}
416
417print $break, <<'EOT';
418
419Local changes are done. When you're satisfied, push the git repository
420and rsync the release files. Remember to announce the release on *BOTH*
421rsync-announce@lists.samba.org and rsync@lists.samba.org (and the web)!
422EOT
423
424exit;
425
426sub get_subprotocol_version
427{
428 my($subver) = @_;
429 if ($pre && $proto_changed eq 'changed') {
430 return $subver == 0 ? 1 : $subver;
431 }
432 0;
433}
434
435sub usage
436{
437 die <<EOT;
438Usage: release-rsync [OPTIONS]
439
440-b, --branch=BRANCH The branch to release (default: master)
441-h, --help Display this help message
442EOT
443}