chase recent nqp&rakudo build tool improvements

raku-community-modules · Oct 29, 2013 · d94d6e8 · d94d6e8
1 parent 59fc0f8
commit d94d6e8
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 28 deletions.
diff --git a/compilers.pl b/compilers.pl
@@ -106,30 +106,29 @@
             language  => 'NQP',
             compiler  => 'nqp',
             vm        => 'parrot',
-            f_run     => [qw( install/bin/nqp --vmlibs=math_ops    )],
-            e_run     => [qw( install/bin/nqp --vmlibs=math_ops -e )],
-            show_ver  => [qw( install/bin/nqp --version            )],
+            f_run     => [qw( install/bin/nqp-p --vmlibs=math_ops    )],
+            e_run     => [qw( install/bin/nqp-p --vmlibs=math_ops -e )],
+            show_ver  => [qw( install/bin/nqp-p --version            )],
            },
            {
             name      => 'nqp-jvm',
             enabled   => 1,
             language  => 'NQP',
             compiler  => 'nqp',
             vm        => 'jvm',
-            f_run     => [qw( ./nqp           )],
-            e_run     => [qw( ./nqp -e        )],
-            show_ver  => [qw( ./nqp --version )],
+            f_run     => [qw( install/bin/nqp-j           )],
+            e_run     => [qw( install/bin/nqp-j -e        )],
+            show_ver  => [qw( install/bin/nqp-j --version )],
            },
            {
-            name      => 'moarvm',
+            name      => 'nqp-moarvm',
             enabled   => 1,
             language  => 'NQP',
             compiler  => 'nqp',
             vm        => 'moarvm',
-            dir       => 'nqp-cc',
-            f_run     => [qw( install/bin/nqp nqp-moar-cc.nqp           )],
-            e_run     => [qw( install/bin/nqp nqp-moar-cc.nqp -e        )],
-            show_ver  => [qw( install/bin/nqp nqp-moar-cc.nqp --version )],
+            f_run     => [qw( install/bin/nqp-m           )],
+            e_run     => [qw( install/bin/nqp-m -e        )],
+            show_ver  => [qw( install/bin/nqp-m --version )],
            },
            {
             name      => 'rakudo.nqp',

diff --git a/components.json b/components.json
@@ -1,17 +1,7 @@
 {
     "moarvm": {
         "name":         "moarvm",
-        "repo_url":     "git://github.com/MoarVM/MoarVM.git",
-        "build_steps":  [
-            [ "make", "realclean" ],
-            [ "git", "clean", "-dxf" ],
-            [ "rm", "-rf", "nqp-cc/install", "nqp-cc/parrot", "nqp-cc/nqp" ],
-            [ "perl", "Configure.pl", "--optimize" ],
-            [ "make" ],
-            [ "git", "clone", "-l", "../../parrot/parrot.git", "nqp-cc/parrot" ],
-            [ "git", "clone", "-l", "../../nqp-parrot/nqp-parrot.git", "nqp-cc/nqp" ],
-            "cd nqp-cc && perl Configure.pl --gen-parrot && make"
-        ]
+        "repo_url":     "git://github.com/MoarVM/MoarVM.git"
     },
     "niecza": {
         "name":         "niecza",
@@ -22,6 +12,19 @@
             [ "make" ]
         ]
     },
+    "nqp-moarvm": {
+        "name":         "nqp-moarvm",
+        "repo_url":     "git://github.com/perl6/nqp.git",
+        "release_tags": "^ 20\\d\\d \\D \\d\\d [\\.\\d+]? $",
+        "build_steps":  [
+            [ "make", "realclean" ],
+            [ "rm", "-rf", "install", "moarvm" ],
+            [ "git", "clone", "-l", "../../moarvm/moarvm.git" ],
+            [ "perl", "Configure.pl", "--backends=moar", "--gen-moar" ],
+            [ "make" ],
+            [ "make", "install" ]
+        ]
+    },
     "nqp-parrot": {
         "name":         "nqp-parrot",
         "repo_url":     "git://github.com/perl6/nqp.git",
@@ -31,7 +34,7 @@
             [ "git", "clean", "-dxf" ],
             [ "rm", "-rf", "install", "parrot" ],
             [ "git", "clone", "-l", "../../parrot/parrot.git" ],
-            [ "perl", "Configure.pl", "--gen-parrot" ],
+            [ "perl", "Configure.pl", "--backends=parrot", "--gen-parrot" ],
             [ "make" ],
             [ "make", "install" ]
         ]
@@ -44,10 +47,10 @@
         "name":         "nqp-jvm",
         "repo_url":     "git://github.com/perl6/nqp.git",
         "build_steps":  [
-            [ "make", "clean" ],
+            [ "make", "realclean" ],
             [ "git", "clean", "-dxf" ],
-            [ "rm", "-rf", "install" ],
-            [ "perl", "ConfigureJVM.pl" ],
+            [ "rm", "-rf", "install-jvm", "install" ],
+            [ "perl", "Configure.pl", "--backends=jvm" ],
             [ "make" ],
             [ "make", "install" ]
         ]
@@ -86,7 +89,7 @@
             [ "rm", "-rf", "install", "nqp", "parrot" ],
             [ "git", "clone", "-l", "../../parrot/parrot.git" ],
             [ "git", "clone", "-l", "../../nqp-parrot/nqp-parrot.git", "nqp" ],
-            [ "perl", "Configure.pl", "--gen-parrot" ],
+            [ "perl", "Configure.pl", "--backends=parrot", "--gen-parrot" ],
             [ "make" ],
             [ "make", "install" ]
         ]
@@ -100,7 +103,7 @@
             [ "git", "clean", "-dxf" ],
             [ "rm", "-rf", "install-jvm", "nqp" ],
             [ "git", "clone", "-l", "../../nqp-jvm/nqp-jvm.git", "nqp" ],
-            [ "perl", "ConfigureJVM.pl", "--gen-nqp" ],
+            [ "perl", "Configure.pl", "--backends=jvm", "--gen-nqp" ],
             [ "make" ],
             [ "make", "install" ]
         ]