import NQP::Configure changes from Rakudo

Author: moritz

tools/lib/NQP/Configure.pm

@@ -14,6 +14,7 @@ our @EXPORT_OK = qw(sorry slurp system_or_die
                     gen_nqp gen_parrot);
 
 our $exe = $^O eq 'MSWin32' ? '.exe' : '';
+our $bat = $^O eq 'MSWin32' ? '.bat' : '';
 
 our @required_parrot_files = qw(
     @bindir@/parrot@exe@
@@ -25,7 +26,7 @@ our @required_parrot_files = qw(
 );
 
 our @required_nqp_files = qw(
-    @bindir@/nqp@exe@
+    @bindir@/nqp-p@exe@
 );
 
 our $nqp_git = 'http://github.com/perl6/nqp.git';
@@ -82,11 +83,12 @@ sub cmp_rev {
 sub read_config {
     my @config_src = @_;
     my %config = ();
+    local $_;
     for my $file (@config_src) {
         no warnings;
         if (open my $CONFIG, '-|', "$file --show-config") {
             while (<$CONFIG>) {
-                if (/^([\w:]+)=(.*)/) { $config{$1} = $2 }
+                if (/^([^\s=]+)=(.*)/) { $config{$1} = $2 }
             }
             close($CONFIG);
         }
@@ -264,61 +266,84 @@ sub gen_nqp {
     my $nqp_want = shift;
     my %options  = @_;
 
+    my $backends    = $options{'backends'};
     my $gen_nqp     = $options{'gen-nqp'};
-    my $with_parrot = $options{'with-parrot'};
     my $gen_parrot  = $options{'gen-parrot'};
     my $prefix      = $options{'prefix'} || cwd().'/install';
     my $startdir    = cwd();
 
     my $PARROT_REVISION = 'nqp/tools/build/PARROT_REVISION';
 
-    my %config;
-    my $nqp_exe;
-    if ($with_parrot) {
-        %config = read_parrot_config($with_parrot)
-            or die "Unable to read parrot configuration from $with_parrot\n";
-        $prefix  = $config{'parrot::prefix'};
-        $nqp_exe = fill_template_text('@bindir@/nqp@ext@', %config);
-        %config = read_config($nqp_exe);
+    my (%impls, %need);
+
+    if ($backends =~ /parrot/) {
+        my %c = read_parrot_config("$prefix/bin/parrot");
+
+        if (%c) {
+            my $bin = fill_template_text('@bindir@/nqp-p@ext@', %c);
+            $impls{parrot}{bin} = $bin;
+            %c  = read_config($bin);
+            my $nqp_have = $c{'nqp::version'};
+            my $nqp_ok   = $nqp_have && cmp_rev($nqp_have, $nqp_want) >= 0;
+            if ($nqp_ok) {
+                $impls{parrot}{config} = \%c;
+            }
+            else {
+                $need{parrot} = 1;
+            }
+        }
+        else {
+            $need{parrot} = 1;
+        }
     }
-    elsif ($prefix) {
-        $nqp_exe = "$prefix/bin/nqp$exe";
-        %config = read_config($nqp_exe);
+    for my $b (qw/jvm moar/) {
+        if ($backends =~ /$b/) {
+            my $postfix = substr $b, 0, 1;
+            my $bin = "$prefix/bin/nqp-$postfix$bat";
+            $impls{$b}{bin} = $bin;
+            my %c = read_config($bin);
+            my $nqp_have = $c{'nqp::version'} || '';
+            my $nqp_ok   = $nqp_have && cmp_rev($nqp_have, $nqp_want) >= 0;
+            if ($nqp_ok) {
+                $impls{$b}{config} = \%c;
+            }
+            else {
+                $need{$b} = 1;
+            }
+        }
     }
 
-    my $nqp_have = $config{'nqp::version'} || '';
-    my $nqp_ok   = $nqp_have && cmp_rev($nqp_have, $nqp_want) >= 0;
-    if ($gen_nqp) {
-        my $nqp_repo = git_checkout($nqp_git, 'nqp', $gen_nqp, $nqp_push);
-        $nqp_ok = $nqp_have eq $nqp_repo;
-    }
-    elsif (!$nqp_ok || defined $gen_parrot && !-f $PARROT_REVISION) {
+    return %impls unless %need;
+
+    if (defined $gen_nqp || defined $gen_parrot) {
         git_checkout($nqp_git, 'nqp', $nqp_want, $nqp_push);
     }
 
-    if (defined $gen_parrot) {
+    if ($need{parrot} && defined $gen_parrot) {
         my ($par_want) = split(' ', slurp($PARROT_REVISION));
-        $with_parrot = gen_parrot($par_want, %options, prefix => $prefix);
-        %config = read_parrot_config($with_parrot);
-    }
-    elsif (!%config) {
-        %config = read_parrot_config("$prefix/bin/parrot$exe", "parrot$exe");
-        $with_parrot = fill_template_text('@bindir@/parrot@exe@', %config);
+        my $parrot = gen_parrot($par_want, %options, prefix => $prefix);
+        my %c = read_parrot_config($parrot);
+        $impls{parrot}{bin} = fill_template_text('@bindir@/nqp-p@ext@', %c);
+        $impls{parrot}{config} = \%c;
     }
 
-    if ($nqp_ok && -M $nqp_exe < -M $with_parrot) {
-        print "$nqp_exe is NQP $nqp_have.\n";
-        return $nqp_exe;
-    }
+    return %impls unless defined($gen_nqp) || defined($gen_parrot);
 
-    my @cmd = ($^X, 'Configure.pl', "--with-parrot=\"$with_parrot\"",
-               "--make-install");
+    my $backends_to_build = join ',', sort keys %need;
+    my @cmd = ($^X, 'Configure.pl', "--prefix=$prefix",
+               "--backends=$backends", "--make-install");
     print "Building NQP ...\n";
     chdir("$startdir/nqp");
     print "@cmd\n";
     system_or_die(@cmd);
     chdir($startdir);
-    return fill_template_text('@bindir@/nqp@exe@', %config);
+
+    for my $k (keys %need) {
+        my %c = read_config($impls{$k}{bin});
+        %c = (%{ $impls{$k}{config} || {} }, %c);
+        $impls{$k}{config} = \%c;
+    }
+    return %impls;
 }