Add convenience .bat/.sh to run NQP on JVM.

Raku · Apr 18, 2013 · 6918dfd · 6918dfd
1 parent 459c817
commit 6918dfd
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -43,3 +43,5 @@ config.default
 bin
 nqp-runtime.jar
 *.class
+/nqp.bat
+/nqp.sh
diff --git a/ConfigureJVM.pl b/ConfigureJVM.pl
@@ -78,6 +78,7 @@
     $config{'shell'} = $^O eq 'MSWin32' ? 'cmd' : 'sh';
     $config{'make'} = $^O eq 'MSWin32' ? 'nmake' : 'make';
     $config{'cpsep'} = $^O eq 'MSWin32' ? ';' : ':';
+    $config{'runner'} = $^O eq 'MSWin32' ? 'nqp.bat' : 'nqp.sh';
 
     fill_template_file('tools/build/Makefile-JVM.in', 'Makefile', %config);
 

diff --git a/src/vm/jvm/nqp.bat b/src/vm/jvm/nqp.bat
@@ -0,0 +1 @@
+@java -cp .;nqp-runtime.jar;3rdparty/asm/asm-4.1.jar nqp %*
diff --git a/src/vm/jvm/nqp.sh b/src/vm/jvm/nqp.sh
@@ -0,0 +1,2 @@
+#!/bin/bash
+java -cp .:nqp-runtime.jar:3rdparty/asm/asm-4.1.jar nqp $@
diff --git a/tools/build/Makefile-JVM.in b/tools/build/Makefile-JVM.in
@@ -7,6 +7,7 @@ ASM    = 3rdparty/asm/
 
 MKPATH = $(PERL) -MExtUtils::Command -e mkpath
 CP     = $(PERL) -MExtUtils::Command -e cp
+CHMOD  = $(PERL) -MExtUtils::Command -e chmod
 
 RUNTIME_JAVAS = \
   src/vm/jvm/runtime/org/perl6/nqp/jast2bc/*.java \
@@ -131,7 +132,9 @@ ALL_OUTPUT = $(NQP_MO_CLASS) $(MODULE_LOADER_CLASS) \
              $(JASTNODES_CLASS) $(QAST_CLASS) \
              $(P6QREGEX_CLASS) $(NQP_CLASS) \
 
-all: $(ALL_OUTPUT)
+RUNNER = @runner@
+
+all: $(ALL_OUTPUT) $(RUNNER)
 
 $(RUNTIME_JAR): $(RUNTIME_JAVAS)
 	$(PERL) -MExtUtils::Command -e mkpath bin
@@ -290,3 +293,7 @@ $(ALL_OUTPUT): $(STAGE2_OUTPUT)
 	$(CP) $(STAGE2)/$(QAST_CLASS) .
 	$(CP) $(STAGE2)/$(P6QREGEX_CLASS) .
 	$(CP) $(STAGE2)/$(NQP_CLASS) .
+
+$(RUNNER):
+	$(CP) src/vm/jvm/$(RUNNER) .
+	$(CHMOD) 755 $(RUNNER)