X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=make_patchnum.pl;h=2bacd4bcad249e4ef7e41bee5c96ab18b3924623;hb=7e8acedc1c377e0e0cc1a6fe4d1acce5f69323f2;hp=df26391d4afa18cac17a667d7b160f7c244262de;hpb=f22725be88de3e535d7cb5ec4c1b09c92c9a722e;p=p5sagit%2Fp5-mst-13.2.git diff --git a/make_patchnum.pl b/make_patchnum.pl index df26391..2bacd4b 100644 --- a/make_patchnum.pl +++ b/make_patchnum.pl @@ -9,7 +9,34 @@ make_patchnum.pl - make patchnum =head1 SYNOPSIS -... + miniperl make_patchnum.pl + + perl make_patchnum.pl + +=head1 DESCRITPTION + +This program creates the files holding the information +about locally applied patches to the source code. The created +files are C and C. + +=item C + +Contains status information from git in a form meant to be processed +by the tied hash logic of Config.pm. It is actually optional, +although -V will look strange without it. + +C contains similar information in a C header file +format, designed to be used by patchlevel.h. This file is obtained +from stock_git_version.h if miniperl is not available, and then +later on replaced by the version created by this script. + +=head1 AUTHOR + +Yves Orton, Kenichi Ishigaki, Max Maischein + +=head1 COPYRIGHT + +Same terms as Perl itself. =cut @@ -17,10 +44,10 @@ BEGIN { my $root="."; while (!-e "$root/perl.c" and length($root)<100) { if ($root eq '.') { - $root=".."; - } else { - $root.="/.."; - } + $root=".."; + } else { + $root.="/.."; + } } die "Can't find toplevel" if !-e "$root/perl.c"; sub path_to { "$root/$_[0]" } # use $_[0] if this'd be placed in toplevel. @@ -30,7 +57,7 @@ sub read_file { my $file = path_to(@_); return "" unless -e $file; open my $fh, '<', $file - or die "Failed to open for read '$file':$!"; + or die "Failed to open for read '$file':$!"; return do { local $/; <$fh> }; } @@ -38,37 +65,56 @@ sub write_file { my ($file, $content) = @_; $file= path_to($file); open my $fh, '>', $file - or die "Failed to open for write '$file':$!"; + or die "Failed to open for write '$file':$!"; print $fh $content; close $fh; } sub backtick { my $command = shift; - my $result = `$command`; - chomp $result; - return $result; + if (wantarray) { + my @result= `$command`; + chomp @result; + return @result; + } else { + my $result= `$command`; + $result="" if ! defined $result; + chomp $result; + return $result; + } } -my $existing_patchnum = read_file('.patchnum'); -my $existing_config = read_file('lib/Config_git.pl'); -my $existing_unpushed = read_file('unpushed.h'); +sub write_files { + my %content= map { /WARNING: '([^']+)'/ || die "Bad mojo!"; $1 => $_ } @_; + my @files= sort keys %content; + my $files= join " and ", map { "'$_'" } @files; + foreach my $file (@files) { + if (read_file($file) ne $content{$file}) { + print "Updating $files\n"; + write_file($_,$content{$_}) for @files; + return 1; + } + } + print "Reusing $files\n"; + return 0; +} my $unpushed_commits = '/*no-op*/'; -my ($read, $branch, $snapshot_created, $commit_id, $describe); -my ($changed, $extra_info, $commit_title, $new_patchnum); -if (my $patch_file= read_file('.patch')) { - ($branch, $snapshot_created, $commit_id, $describe) = split /\s+/, $patchfile; +my ($read, $branch, $snapshot_created, $commit_id, $describe)= ("") x 5; +my ($changed, $extra_info, $commit_title, $new_patchnum, $status)= ("") x 5; +if (my $patch_file= read_file(".patch")) { + ($branch, $snapshot_created, $commit_id, $describe) = split /\s+/, $patch_file; $extra_info = "git_snapshot_date='$snapshot_created'"; $commit_title = "Snapshot of:"; } elsif (-d path_to('.git')) { # git branch | awk 'BEGIN{ORS=""} /\*/ { print $2 }' - $branch = join "", map { (split /\s/, $_)[1] } - grep {/\*/} split /\n/, backtick('git branch'); - my $remote; + ($branch) = map { /\* ([^(]\S*)/ ? $1 : () } backtick('git branch'); + my ($remote,$merge); if (length $branch) { - $remote = backtick("git config branch.$branch.remote"); + $merge= backtick("git config branch.$branch.merge"); + $merge =~ s!^refs/heads/!!; + $remote= backtick("git config branch.$branch.remote"); } $commit_id = backtick("git rev-parse HEAD"); $describe = backtick("git describe"); @@ -79,44 +125,45 @@ elsif (-d path_to('.git')) { # git cherry $remote/$branch | awk 'BEGIN{ORS=","} /\+/ {print $2}' | sed -e 's/,$//' my $unpushed_commit_list = join ",", map { (split /\s/, $_)[1] } - grep {/\+/} split /\n/, backtick("git cherry $remote/$branch"); + grep {/\+/} backtick("git cherry $remote/$merge"); # git cherry $remote/$branch | awk 'BEGIN{ORS="\t\\\\\n"} /\+/ {print ",\"" $2 "\""}' $unpushed_commits = - join "", map { ',"'.(split /\s/, $_)[1].'"'."\t\\\n" } - grep {/\+/} split /\n/, backtick("git cherry $remote/$branch"); + join "", map { ',"'.(split /\s/, $_)[1]."\"\t\\\n" } + grep {/\+/} backtick("git cherry $remote/$merge"); if (length $unpushed_commits) { $commit_title = "Local Commit:"; - my $ancestor = backtick("git rev-parse $remote/$branch"); + my $ancestor = backtick("git rev-parse $remote/$merge"); $extra_info = "$extra_info git_ancestor='$ancestor' +git_remote_branch='$remote/$merge' git_unpushed='$unpushed_commit_list'"; } } - if (length $changed) { + if ($changed) { $changed = 'true'; $commit_title = "Derived from:"; - $new_patchnum = "$new_patchnum -status: uncommitted-changes"; - } - if (not length $commit_title) { - $commit_title = "Commit id:"; + $status='"uncommitted-changes"' + } else { + $status='/*clean-working-directory*/' } + $commit_title ||= "Commit id:"; } -my $new_unpushed =<<"EOFTEXT"; -/********************************************************************* -* WARNING: unpushed.h is automatically generated by make_patchnum.pl * -* DO NOT EDIT DIRECTLY - edit make_patchnum.pl instead * -*********************************************************************/ -#define PERL_GIT_UNPUSHED_COMMITS $unpushed_commits -/*leave-this-comment*/ -EOFTEXT - -my $new_config =<<"EOFDATA"; -################################################################# -# WARNING: lib/Config_git.pl is generated by make_patchnum.pl # -# DO NOT EDIT DIRECTLY - edit make_patchnum.pl instead # -################################################################# +# we extract the filename out of the warning header, so dont mess with that +write_files(<<"EOF_HEADER", <<"EOF_CONFIG"); +/************************************************************************** +* WARNING: 'git_version.h' is automatically generated by make_patchnum.pl +* DO NOT EDIT DIRECTLY - edit make_patchnum.pl instead +***************************************************************************/ +#define PERL_GIT_UNCOMMITTED_CHANGES $status +#define PERL_PATCHNUM "$describe" +#define PERL_GIT_UNPUSHED_COMMITS\t\t\\ +$unpushed_commits/*leave-this-comment*/ +EOF_HEADER +###################################################################### +# WARNING: 'lib/Config_git.pl' is generated by make_patchnum.pl +# DO NOT EDIT DIRECTLY - edit make_patchnum.pl instead +###################################################################### \$Config::Git_Data=<<'ENDOFGIT'; git_commit_id='$commit_id' git_describe='$describe' @@ -125,17 +172,5 @@ git_uncommitted_changes='$changed' git_commit_id_title='$commit_title' $extra_info ENDOFGIT -EOFDATA - -# only update the files if necessary, other build product depends on these files -if (( $existing_patchnum ne $new_patchnum ) || ( $existing_config ne $new_config ) || ( $existing_unpushed ne $new_unpushed )) { - print "Updating .patchnum and lib/Config_git.pl\n"; - write_file('.patchnum', $new_patchnum); - write_file('lib/Config_git.pl', $new_config); - write_file('unpushed.h', $new_unpushed); -} -else { - print "Reusing .patchnum and lib/Config_git.pl\n" -} - -# ex: set ts=4 sts=4 et ft=perl: +EOF_CONFIG +# ex: set ts=8 sts=4 sw=4 et ft=perl: