perl make_patchnum.pl
+=head1 DESCRIPTION
+
This program creates the files holding the information
about locally applied patches to the source code. The created
-files are C<.patchnum>, C<unpushed.h> and C<lib/Config_git.pl>.
+files are C<git_version.h> and C<lib/Config_git.pl>.
+
+=head2 C<lib/Config_git.pl>
+
+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:git.\* will be uninformative without it.
-C<.patchnum> contains ???
+C<git_version.h> 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.
-C<lib/Config_git.pl> contains the configuration of git for
-this branch.
+=head1 AUTHOR
-C<unpushed.h> contains the local changes that haven't been
-synchronized with the remote repository as configured with
-C<< git configure branch.<current branch>.remote >>
+Yves Orton, Kenichi Ishigaki, Max Maischein
+
+=head1 COPYRIGHT
+
+Same terms as Perl itself.
=cut
+# from a -Dmksymlink target dir, I need to cd to the git-src tree to
+# use git (like script does). Presuming that's not unique, one fix is
+# to follow Configure's symlink-path to run git. Maybe GIT_DIR or
+# path-args can solve it, if so we should advise here, I tried only
+# very briefly ('cd -' works too).
+
+my ($subcd, $srcdir);
+our $opt_v = scalar grep $_ eq '-v', @ARGV;
+
BEGIN {
my $root=".";
+ # test 1st to see if we're a -Dmksymlinks target dir
+ $subcd = '';
+ $srcdir = $root;
+ if (-l "./Configure") {
+ $srcdir = readlink("./Configure");
+ $srcdir =~ s/Configure//;
+ $subcd = "cd $srcdir &&"; # activate backtick fragment
+ }
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.
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> };
}
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 {
+ # only for git. If we're in a -Dmksymlinks build-dir, we need to
+ # cd to src so git will work . Probably a better way.
my $command = shift;
if (wantarray) {
- my @result= `$command`;
+ my @result= `$subcd $command`;
+ warn "$subcd $command: \$?=$?\n" if $?;
+ print "#> $subcd $command ->\n @result\n" if !$? and $opt_v;
chomp @result;
return @result;
} else {
- my $result= `$command`;
+ my $result= `$subcd $command`;
$result="" if ! defined $result;
+ warn "$subcd $command: \$?=$?\n" if $?;
+ print "#> $subcd $command ->\n $result\n" if !$? and $opt_v;
chomp $result;
return $result;
}
my %content= map { /WARNING: '([^']+)'/ || die "Bad mojo!"; $1 => $_ } @_;
my @files= sort keys %content;
my $files= join " and ", map { "'$_'" } @files;
- foreach my $file (@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)= ("") 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')) {
+elsif (-d "$srcdir/.git") {
# git branch | awk 'BEGIN{ORS=""} /\*/ { print $2 }'
- ($branch) = map { /\* ([^(]\S*)/ ? $1 : () } backtick('git branch');
+ ($branch) = map { /\* ([^(]\S*)/ ? $1 : () } backtick("git branch");
my ($remote,$merge);
if (length $branch) {
- $merge= backtick("git config branch.$branch.merge");
+ $merge= backtick("git config branch.$branch.merge");
+ $merge = "" unless $? == 0;
$merge =~ s!^refs/heads/!!;
$remote= backtick("git config branch.$branch.remote");
+ $remote = "" unless $? == 0;
}
$commit_id = backtick("git rev-parse HEAD");
$describe = backtick("git describe");
git_unpushed='$unpushed_commit_list'";
}
}
- if ($changed) {
+ if ($changed) { # not touched since init'd. never true.
$changed = 'true';
$commit_title = "Derived from:";
$status='"uncommitted-changes"'
} else {
- $status='/*clean-working-directory*/'
+ $status='/*clean-working-directory-maybe*/'
}
$commit_title ||= "Commit id:";
}
# we extract the filename out of the warning header, so dont mess with that
-exit(write_files(<<"EOF_HEADER", <<"EOF_CONFIG"));
+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
$extra_info
ENDOFGIT
EOF_CONFIG
-# ex: set ts=4 sts=4 et ft=perl:
+# ex: set ts=8 sts=4 sw=4 et ft=perl:
projects / p5sagit/p5-mst-13.2.git / blobdiff