Merge branch 'master' of github.com:/perl6/nqp

Author: jnthn

.gitignore

@@ -52,3 +52,4 @@ nqp-runtime.jar
 /nqp-m.bat
 /jvmconfig.properties
 *.moarvm
+MoarVM

Configure.pl

@@ -8,7 +8,7 @@
 use Getopt::Long;
 use Cwd qw/abs_path cwd/;
 use lib "tools/lib";
-use NQP::Configure qw(cmp_rev read_parrot_config
+use NQP::Configure qw(cmp_rev read_parrot_config gen_moar
                       fill_template_file fill_template_text
                       slurp system_or_die verify_install sorry gen_parrot);
 
@@ -27,7 +27,7 @@
     GetOptions(\%options, 'help!', 'prefix=s',
                'with-parrot=s', 'gen-parrot:s',
                'make-install!', 'makefile-timing!',
-               'backends=s',
+               'backends=s', 'gen-moar:s',
                'parrot-config=s', 'parrot-option=s@');
 
     # Print help if it's requested
@@ -56,7 +56,15 @@
             $backends{$be} = 1;
         }
     }
-    else {
+    if (defined $options{'gen-parrot'}) {
+        $backends{parrot} = 1;
+        $default_backend ||= 'parrot';
+    }
+    if (defined $options{'gen-moar'}) {
+        $backends{moar} = 1;
+        $default_backend ||= 'moar';
+    }
+    unless (%backends) {
         # TODO: come up with more sensible defaults
         $backends{parrot} = 1;
         $default_backend = 'parrot';
@@ -197,22 +205,15 @@
     }
     if ($backends{moar}) {
         my @errors;
-        my $moar_path = "$prefix${slash}bin${slash}moar" . ($^O =~ /MSWin32/ ? '.exe' : '');
-        my @moar_info = `$moar_path --help`;
-        my $moar_found = 0;
-        for (@moar_info) {
-            if (/USAGE: moar/) {
-                $moar_found = 1;
-                last;
-            }
-        }
-        if (!$moar_found) {
+        my ($moar_want) = split(' ', slurp('tools/build/MOAR_REVISION'));
+        my $moar_path = gen_moar($moar_want, %config, %options);
+        if (!$moar_path) {
             push @errors,
-                "No MoarVM (moar executable) found using the --prefix";
+                "No suitable MoarVM (moar executable) found using the --prefix";
         }
         sorry(@errors) if @errors;
         $config{'make'}   = $^O eq 'MSWin32' ? 'nmake' : 'make';
-        $config{'runner'} = $^O eq 'MSWin32' ? 'nqp.bat' : 'nqp';
+        $config{moar} = $moar_path;
         fill_template_file(
             'tools/build/Makefile-Moar.in',
             $MAKEFILE,

tools/build/MOAR_REVISION

@@ -0,0 +1 @@
+2013.10-4-gb85d5e6

tools/lib/NQP/Configure.pm

@@ -10,7 +10,7 @@ our @EXPORT_OK = qw(sorry slurp system_or_die
                     read_parrot_config read_config
                     fill_template_file fill_template_text 
                     git_checkout
-                    verify_install
+                    verify_install gen_moar
                     gen_nqp gen_parrot);
 
 our $exe = $^O eq 'MSWin32' ? '.exe' : '';
@@ -31,9 +31,11 @@ our @required_nqp_files = qw(
 
 our $nqp_git = 'http://github.com/perl6/nqp.git';
 our $par_git = 'http://github.com/parrot/parrot.git';
+our $moar_git= 'https://github.com/MoarVM/MoarVM.git';
 
 our $nqp_push = 'git@github.com:perl6/nqp.git';
 our $par_push = 'git@github.com:parrot/parrot.git';
+our $moar_push= 'git@github.com:MoarVM/MoarVM.git';
 
 sub sorry {
     my @msg = @_;
@@ -408,5 +410,51 @@ sub gen_parrot {
     return fill_template_text('@bindir@/parrot@exe@', %config);
 }
 
+sub gen_moar {
+    my $moar_want = shift;
+    my %options  = @_;
+
+    my $prefix     = $options{'prefix'} || cwd()."/install";
+    my $gen_moar   = $options{'gen-moar'};
+    my @opts       = @{ $options{'moar-option'} || [] };
+#    push @opts, "--optimize";
+    my $startdir   = cwd();
+
+    my $moar_exe   = "$prefix/bin/moar$exe";
+    my $moar_have  = qx{ $moar_exe --version };
+    if ($moar_have) {
+        $moar_have = $moar_have =~ /version (\S+)/ ? $1 : undef;
+    }
+
+    my $moar_ok   = $moar_have && cmp_rev($moar_have, $moar_want) >= 0;
+    if ($moar_ok) {
+        print "Found $moar_exe version $moar_have, which is new enough.\n";
+        return $moar_exe;
+    }
+    elsif ($moar_have) {
+        print "Found $moar_exe version $moar_have, which is too old.\n";
+    }
+
+    return unless defined $gen_moar;
+
+    my $moar_repo = git_checkout($moar_git, 'MoarVM', $gen_moar || $moar_want, $moar_push);
+
+    unless (cmp_rev($moar_repo, $moar_want) >= 0) {
+        die "You asked me to build $gen_moar, but $moar_repo is not new enough to satisfy version $moar_want\n";
+    }
+
+    chdir("$startdir/MoarVM") or die $!;
+
+    $prefix =~ s{\\}{/}g;
+    print "\nConfiguring and building MoarVM ...\n";
+    my @cmd = ($^X, "Configure.pl", @opts, "--prefix=\"$prefix\"", '--make-install');
+    print "@cmd\n";
+    system_or_die(@cmd);
+
+    chdir($startdir);
+
+    return $moar_exe;
+}
+
 
 1;