diff options
author | Justin Davis <jrcd83@gmail.com> | 2012-03-07 19:45:54 +0100 |
---|---|---|
committer | Justin Davis <jrcd83@gmail.com> | 2012-03-07 19:45:54 +0100 |
commit | 82a6d2fcba2569c1fe249283e4513ad66cc0e031 (patch) | |
tree | 85446a9ba35e45cdb5efd8b8462d0e447c083a88 /metas/perl.d/perl-dist | |
parent | 0873b3e326586ff2b7b3b0e6cbdd85e1a31ec4ad (diff) | |
download | genpkg-82a6d2fcba2569c1fe249283e4513ad66cc0e031.tar.gz genpkg-82a6d2fcba2569c1fe249283e4513ad66cc0e031.tar.xz |
Change perl-pkgbuild to use new PKGTREE.
Updates genpkg as well. Adds func to genpkg for
merging files back together from PKGTREE dir.
Diffstat (limited to 'metas/perl.d/perl-dist')
-rwxr-xr-x | metas/perl.d/perl-dist | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/metas/perl.d/perl-dist b/metas/perl.d/perl-dist index 99d187b..69f9317 100755 --- a/metas/perl.d/perl-dist +++ b/metas/perl.d/perl-dist @@ -4,7 +4,7 @@ use warnings 'FATAL' => 'all'; use strict; my $PROG = 'metas/perl.d/perl-dist'; -my $FUNCPROG = 'perl-dist-funcs'; +my $PBPROG = 'perl-pkgbuild'; sub DBG {} if(exists $ENV{'GENDBG'}){ @@ -381,12 +381,15 @@ sub printdata return; } -sub printfuncs +sub writepb { my($ddir) = @_; my $dtype = (-f "$ddir/Build.PL" ? "MB" : "MM"); - exec $FUNCPROG => $dtype - or die "$PROG: $FUNCPROG failed to execute!\n"; + if(system $PBPROG => $dtype){ + return $? >> 8; + }else{ + return 0; + } } sub main @@ -419,16 +422,19 @@ sub main %$deps, ); - print STDERR "DBG: \$dir = $dir\n"; chdir $dir or die "chdir: $!"; - close STDOUT or die "close STDOUT: $!"; + my $ret = writepb($dir); + if($ret){ + print STDERR "$PROG: failed to write PKGBUILD: error $ret\n"; + return 1; + } + + close STDOUT; open STDOUT, '>', 'PKGDATA' or die "open PKGDATA: $!"; printdata(\%pbvars); - - close STDOUT or die "close STDOUT: $!"; - open STDOUT, '>', 'PKGFUNC', or die "open PKGFUNC: $!"; - exit printfuncs($dir); + close STDOUT or die "close PKGDATA: $!"; + return 0; } # Create the src/ directory and tarball symlink. Then chdir into it. |