Add JNA to build and runtime JARs.

arnsholt · arnsholt · commit 7e305ecacfa6 · 2013-09-05T21:57:53.000+02:00
diff --git a/src/vm/jvm/runners/nqp b/src/vm/jvm/runners/nqp
@@ -1,2 +1,2 @@
 #!/bin/sh
-exec java -Xbootclasspath/a:.:nqp-runtime.jar:3rdparty/asm/asm-4.1.jar:3rdparty/jline/jline-1.0.jar:nqp.jar nqp "$@"
+exec java -Xbootclasspath/a:.:nqp-runtime.jar:3rdparty/asm/asm-4.1.jar:3rdparty/jline/jline-1.0.jar:3rdparty/jna/jna.jar:nqp.jar nqp "$@"
diff --git a/src/vm/jvm/runners/nqp.bat b/src/vm/jvm/runners/nqp.bat
@@ -1 +1 @@
-@java -Xbootclasspath/a:.;nqp-runtime.jar;3rdparty/asm/asm-4.1.jar;3rdparty/jline/jline-1.0.jar;nqp.jar nqp %*
+@java -Xbootclasspath/a:.;nqp-runtime.jar;3rdparty/asm/asm-4.1.jar;3rdparty/jline/jline-1.0.jar;3rdparty/jna/jna.jar;nqp.jar nqp %*
diff --git a/tools/build/Makefile-JVM.in b/tools/build/Makefile-JVM.in
@@ -25,7 +25,7 @@ RUNTIME_JAVAS = \
 
 RUNTIME_JAR = nqp-runtime.jar
 
-THIRDPARTY_JARS = $(ASM)asm-4.1.jar@cpsep@$(ASM)asm-tree-4.1.jar@cpsep@3rdparty/jline/jline-1.0.jar
+THIRDPARTY_JARS = $(ASM)asm-4.1.jar@cpsep@$(ASM)asm-tree-4.1.jar@cpsep@3rdparty/jline/jline-1.0.jar@cpsep@3rdparty/jna/jna.jar
 STAGE0 = src/vm/jvm/stage0
 STAGE1 = src/stage1
 STAGE2 = src/stage2

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`#!/bin/sh`
`2`		`-exec java -Xbootclasspath/a:.:nqp-runtime.jar:3rdparty/asm/asm-4.1.jar:3rdparty/jline/jline-1.0.jar:nqp.jar nqp "$@"`
	`2`	`+exec java -Xbootclasspath/a:.:nqp-runtime.jar:3rdparty/asm/asm-4.1.jar:3rdparty/jline/jline-1.0.jar:3rdparty/jna/jna.jar:nqp.jar nqp "$@"`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-@java -Xbootclasspath/a:.;nqp-runtime.jar;3rdparty/asm/asm-4.1.jar;3rdparty/jline/jline-1.0.jar;nqp.jar nqp %*`
	`1`	`+@java -Xbootclasspath/a:.;nqp-runtime.jar;3rdparty/asm/asm-4.1.jar;3rdparty/jline/jline-1.0.jar;3rdparty/jna/jna.jar;nqp.jar nqp %*`