Package NQP runtime into a JAR.

Preferable to having dozens of .class files to load.
jnthn · Apr 14, 2013 · f073947 · f073947
1 parent 140c9ba
commit f073947
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/Makefile b/Makefile
@@ -1,6 +1,7 @@
 NQP    = nqp
 PARROT = parrot
 JAVAC  = javac
+JAR    = jar
 PERL   = perl
 PROVE  = prove
 
@@ -29,6 +30,7 @@ all: $(NQPLIBS)
 bin: $(JAVAS)
 	$(PERL) -MExtUtils::Command -e mkpath bin
 	$(JAVAC) -source 1.7 -cp 3rdparty/asm/asm-debug-all-4.1.jar -g -d bin $(JAVAS)
+	$(JAR) cf0 nqp-runtime.jar -C bin/ .
 
 test: all
 	$(PROVE) --exec=$(NQP) t/jast/*.t t/qast/*.t
@@ -37,7 +39,7 @@ nqptest: all
 	$(PROVE) --exec="$(NQP) nqp-jvm-cc.nqp" t/nqp/*.t
 
 selftest: all
-	$(PROVE) --exec="java -cp .;bin;3rdparty/asm/asm-4.1.jar NQPJVM" t/nqp/*.t t/serialization/*.t
+	$(PROVE) --exec="java -cp .;nqp-runtime.jar;3rdparty/asm/asm-4.1.jar NQPJVM" t/nqp/*.t t/serialization/*.t
 
 clean:
 	$(PERL) -MExtUtils::Command -e rm_rf bin *.pir *.pbc *.class *.dump

diff --git a/nqp-jvm-cc.nqp b/nqp-jvm-cc.nqp
@@ -83,7 +83,7 @@ class HLL::Backend::JVM {
         my $name := %*COMPILING<%?OPTIONS><javaclass>;
         -> {
             run('java',
-                '-cp ' ~ pathlist('.', 'bin', '3rdparty/asm/asm-4.1.jar'),
+                '-cp ' ~ pathlist('.', 'nqp-runtime.jar', '3rdparty/asm/asm-4.1.jar'),
                 $name);
             unlink($name ~ '.class');
         }

diff --git a/t/helper.nqp b/t/helper.nqp
@@ -7,7 +7,7 @@ sub jast_test($jast_maker, $exercise, $expected, $desc = '') is export {
     $jast_maker($c);
     spurt('jastdump.temp', $c.dump());
     run('java',
-        '-cp ' ~ pathlist('bin', '3rdparty/asm/asm-4.1.jar'),
+        '-cp ' ~ pathlist('nqp-runtime.jar', '3rdparty/asm/asm-4.1.jar'),
         'org/perl6/nqp/jast2bc/JASTToJVMBytecode',
         'jastdump.temp', 'JASTTest.class');
     # Compile the test program.
@@ -49,13 +49,13 @@ sub run_qast($qast) is export {
     my $dump := $jast.dump();
     spurt('QAST2JASTOutput.dump', $dump);
     run('java',
-        '-cp ' ~ pathlist('bin', '3rdparty/asm/asm-4.1.jar'),
+        '-cp ' ~ pathlist('nqp-runtime.jar', '3rdparty/asm/asm-4.1.jar'),
         'org/perl6/nqp/jast2bc/JASTToJVMBytecode',
         'QAST2JASTOutput.dump', 'QAST2JASTOutput.class');
 
     my $before := pir::time__N;
     my $spawn_result := pir::spawnw__Is('java ' ~
-        '-cp ' ~ pathlist('.', 'bin', '3rdparty/asm/asm-4.1.jar') ~
+        '-cp ' ~ pathlist('.', 'nqp-runtime.jar', '3rdparty/asm/asm-4.1.jar') ~
         ' QAST2JASTOutput' ~
         '> QAST2JASTOutput.output');
     my $after := pir::time__N;