# Cygwin and ensure its 'bin' folder is on the PATH in the shell where you run
# this script. The Cygwin 'bin' folder needs to precede the Windows 'system32'
# folder so that Cygwin's 'find' command is found in preference to the Windows
-# 'find' command. Your Cygwin installation will need to contain at least the
-# 'cpio' command, in addition to the commands installed by default, and it will
-# also be useful to have 'curl' and 'diffstat' installed too for later stages
-# of the release process (namely, Porting\corelist.pl and generating the commit
-# statistics for the perlXYZdelta.pod file respectively). Finally, ensure that
-# the 'awk' and 'shasum' commands are copies of gawk.exe and sha1sum.exe
-# respectively, rather than the links to them that only work in a Cygwin bash
-# shell which they are by default.
+# 'find' command. In addition to the commands installed by default, your Cygwin
+# installation will need to contain at least the 'cpio' and '7z' commands.
+# Finally, ensure that the 'awk', 'shasum' (if you have it) and '7z' commands
+# are copies of 'gawk.exe', 'sha1sum.exe' and 'lib\p7zip\7z.exe' respectively,
+# rather than the links to them that only work in a Cygwin bash shell which
+# they are by default.
#
# No matter how automated this gets, you'll always need to read
# and re-read pumpkin.pod and release_managers_guide.pod to
$|=1;
sub usage { die <<EOF; }
-usage: $0 [ -r rootdir ] [-s suffix ] [ -b ] [ -n ]
+usage: $0 [ -r rootdir ] [-s suffix ] [ -x ] [ -n ]
-r rootdir directory under which to create the build dir and tarball
defaults to '..'
- -s suffix suffix to append to to the perl-x.y.z dir and tarball name
+ -s suffix suffix to append to the perl-x.y.z dir and tarball name
defaults to the concatenation of the local_patches entry
in patchlevel.h (or blank, if none)
- -b make a .bz2 file in addtion to a .gz file
+ -x make a .xz file in addition to a .gz file
-n do not make any tarballs, just the directory
+ -c cleanup perform a cleanup before building: clean git repo and target directory/tarballs
EOF
my %opts;
-getopts('bnr:s:', \%opts) or usage;
+getopts('xncr:s:', \%opts) or usage;
@ARGV && usage;
$relroot = defined $opts{r} ? $opts{r} : "..";
die "Must be in root of the perl source tree.\n"
unless -f "./MANIFEST" and -f "patchlevel.h";
-open PATCHLEVEL,"<patchlevel.h" or die;
+open PATCHLEVEL, '<', 'patchlevel.h' or die;
my @patchlevel_h = <PATCHLEVEL>;
close PATCHLEVEL;
my $patchlevel_h = join "", grep { /^#\s*define/ } @patchlevel_h;
# fetch list of local patches
my (@local_patches, @lpatch_tags, $lpatch_tags);
-@local_patches = grep { /^static.*local_patches/../^};/ } @patchlevel_h;
-@local_patches = grep { !/^\s*,?NULL/ } @local_patches;
+@local_patches = grep { !/^\s*,?NULL/ && ! /,"uncommitted-changes"/ }
+ grep { /^static.*local_patches/../^};/ }
+ @patchlevel_h;
@lpatch_tags = map { /^\s*,"(\w+)/ } @local_patches;
$lpatch_tags = join "-", @lpatch_tags;
print "\nMaking a release for $perl in $relroot/$reldir\n\n";
+cleanup($relroot, $reldir) if $opts{c};
+
print "Cross-checking the MANIFEST...\n";
($missfile, $missentry) = fullcheck();
@$missentry
- = grep {$_ !~ m!^\.git/! and $_ !~ m!(?:/|^)\.gitignore!} @$missentry;
+ = grep {$_ !~ m!^\.(?:git|github|mailmap)! and $_ !~ m!(?:/|^)\.gitignore!} @$missentry;
if (@$missfile ) {
warn "Can't make a release with MANIFEST files missing:\n";
warn "\t".$_."\n" for (@$missfile);
# VMS no longer has hardcoded version numbers descrip.mms
print "Creating $relroot/$reldir release directory...\n";
-die "$relroot/$reldir release directory already exists\n" if -e "$relroot/$reldir";
-die "$relroot/$reldir.tar.gz release file already exists\n" if -e "$relroot/$reldir.tar.gz";
+die "$relroot/$reldir release directory already exists [consider using -c]\n" if -e "$relroot/$reldir";
+die "$relroot/$reldir.tar.gz release file already exists [consider using -c]\n" if -e "$relroot/$reldir.tar.gz";
+die "$relroot/$reldir.tar.xz release file already exists [consider using -c]\n" if $opts{x} && -e "$relroot/$reldir.tar.xz";
mkdir("$relroot/$reldir", 0755) or die "mkdir $relroot/$reldir: $!\n";
print "\n";
my @writables = qw(
NetWare/config_H.wc
NetWare/Makefile
+ feature.h
+ lib/feature.pm
keywords.h
keywords.c
opcode.h
proto.h
embed.h
embedvar.h
- overload.c
+ overload.inc
overload.h
mg_vtable.h
- perlapi.h
- perlapi.c
- cpan/Devel-PPPort/module2.c
- cpan/Devel-PPPort/module3.c
+ dist/Devel-PPPort/module2.c
+ dist/Devel-PPPort/module3.c
+ cpan/autodie/t/touch_me
reentr.c
reentr.h
regcharclass.h
regnodes.h
warnings.h
lib/warnings.pm
+ win32/GNUmakefile
win32/Makefile
- win32/Makefile.ce
win32/makefile.mk
- win32/config_H.ce
win32/config_H.gc
- win32/config_H.gc64
- win32/config_H.gc64nox
win32/config_H.vc
- win32/config_H.vc64
- utils/Makefile
uconfig.h
);
-system("chmod u+w @writables") == 0
- or die "system: $!";
+
+my $out = `chmod u+w @writables 2>&1`;
+if ($? != 0) {
+ warn $out;
+ if ($out =~ /no such file/i) {
+ warn "Check that the files above still exist in the Perl core.\n";
+ warn "If not, remove them from \@writables in Porting/makerel\n";
+ }
+ exit 1;
+}
+
+warn $out if $out;
chdir ".." or die $!;
}
}
-if ($opts{b}) {
- if ($have_7z) {
- print "Creating and compressing the tar.bz2 file with 7z...\n";
- $cmd = "tar cf - $reldir | 7z a -tbzip2 -mx9 -bd -si $reldir.tar.bz2";
- system($cmd) == 0 or die "$cmd failed";
- } else {
- print "Creating and compressing the tar.bz2 file...\n";
- $cmd = "tar cf - $reldir | bzip2 > $reldir.tar.bz2";
- system($cmd) == 0 or die "$cmd failed";
- }
+if ($opts{x}) {
+ print "Creating and compressing the tar.xz file with xz...\n";
+ $cmd = "tar cf - $reldir | xz -z -c > $reldir.tar.xz";
+ system($cmd) == 0 or die "$cmd failed";
}
print "\n";
last;
}
}
+
+sub cleanup {
+ my ( $relroot, $reldir ) = @_;
+
+ require File::Path;
+
+ my @cmds = (
+ [ qw{make distclean} ],
+ [ qw{git clean -dxf} ],
+ );
+
+ foreach my $cmd (@cmds) {
+ print join( ' ', "Running:", @$cmd, "\n" );
+ system @$cmd;
+ die "fail to run ".(join(' ', @$cmd) ) unless $? == 0;
+ }
+
+ if ( -d "$relroot/$reldir" ) {
+ print "Removing directory $relroot/$reldir\n";
+ File::Path::rmtree("$relroot/$reldir");
+ }
+
+ # always clean both
+ my @files = ( "$relroot/$reldir.tar.gz", "$relroot/$reldir.tar.xz" );
+
+ foreach my $f ( @files ) {
+ next unless -f $f;
+ print "Removing file '$f'\n";
+ unlink($f);
+ }
+
+ return;
+
+}
+
+1;
https://perl5.git.perl.org / perl5.git / blobdiff