diff options
author | Moritz Lenz <moritz@faui2k3.org> | 2014-04-01 19:40:30 +0200 |
---|---|---|
committer | Moritz Lenz <moritz@faui2k3.org> | 2014-04-01 19:40:30 +0200 |
commit | a1e13d679c5311fc5cfb9a33a577f52187b4286c (patch) | |
tree | dfaae6c5c392ccf83082b85f6d8cb3bde8f83662 /tools/build/module-install.pl | |
parent | 6363be3b2438a93af3a19366960c69e23fe6934e (diff) | |
parent | f2236b4d8ff36dd6810ac85f24d69dd22f23933b (diff) |
Merge remote-tracking branch 'origin/tristar'
Conflicts:
tools/build/Makefile.in
tools/star/Makefile
tools/star/release-guide.pod
Diffstat (limited to 'tools/build/module-install.pl')
-rw-r--r-- | tools/build/module-install.pl | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/tools/build/module-install.pl b/tools/build/module-install.pl index 2ed2589..b6be9c7 100644 --- a/tools/build/module-install.pl +++ b/tools/build/module-install.pl @@ -9,6 +9,8 @@ use File::Basename; my $perl6bin = shift @ARGV; my $perl6lib = shift @ARGV; +my $compext = shift @ARGV; +my $comptarget = shift @ARGV; my @pmfiles; my @mod_pms; @@ -22,14 +24,14 @@ while (<>) { find({ no_chdir=>1, wanted => \&libcopy }, $mlib); sub libcopy { - return unless /\.pm6?|\.pod/; + return unless /\.pm6?$|\.pod$/; my $source = $File::Find::name; my $target = $source; $target =~ s/\Q$mlib\E/$perl6lib/; print "$source => $target\n"; mkpath dirname($target); copy($source, $target) or die "copy failed: $!\n"; - push @mod_pms, $target if $target =~ /\.pm6?/; + push @mod_pms, $target if $target =~ /\.pm6?$/; } my %usages_of; @@ -76,8 +78,8 @@ do { chdir 'rakudo'; foreach my $pm (@pmfiles) { my $out = $pm; - $out =~ s/\.pm6?$/.pir/; - my @cmd = ($perl6bin, '--target=pir', "--output=$out", $pm); + $out =~ s/\.pm6?$/.$compext/; + my @cmd = ($perl6bin, "--target=$comptarget", "--output=$out", $pm); print join(' ', @cmd), "\n"; system(@cmd); } |