Merge remote-tracking branch 'upstream/master'

jnthn · Jan 14, 2013 · fa69397 · fa69397
2 parents 5208842 + 901b289
commit fa69397
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 11 deletions.
diff --git a/Makefile b/Makefile
@@ -1,4 +1,9 @@
-all: jast helper.pbc
+JAVAS=src/org/perl6/nqp/jast2bc/*.java \
+      src/org/perl6/nqp/runtime/*.java \
+	  src/org/perl6/nqp/sixmodel/*.java \
+	  src/org/perl6/nqp/sixmodel/reprs/*.java
+
+all: jast helper.pbc bin
 
 jast: JASTNodes.pbc QASTJASTCompiler.pbc
 
@@ -14,5 +19,9 @@ helper.pbc: t/helper.nqp QASTJASTCompiler.pbc
 	nqp --target=pir --output=helper.pir t/helper.nqp
 	parrot -o helper.pbc helper.pir
 
-test: jast helper.pbc
+bin: $(JAVAS)
+	perl -MExtUtils::Command -e mkpath bin
+	javac -cp 3rdparty/bcel/bcel-5.2.jar -d bin $(JAVAS)
+
+test: all
 	prove --exec=nqp t/*.t
diff --git a/src/org/perl6/nqp/jast2bc/JASTToJVMBytecode.java b/src/org/perl6/nqp/jast2bc/JASTToJVMBytecode.java
@@ -4,9 +4,9 @@
 import java.io.BufferedReader;
 import java.io.FileInputStream;
 import java.io.InputStreamReader;
-import org.apache.bcel.generic.*;
 
-import com.sun.org.apache.bcel.internal.Constants;
+import org.apache.bcel.Constants;
+import org.apache.bcel.generic.*;
 
 public class JASTToJVMBytecode {
     public static void main(String[] argv)

diff --git a/src/org/perl6/nqp/sixmodel/reprs/P6Opaque.java b/src/org/perl6/nqp/sixmodel/reprs/P6Opaque.java
@@ -3,10 +3,11 @@
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
+
+import org.apache.bcel.Constants;
 import org.apache.bcel.generic.*;
 import org.perl6.nqp.runtime.ThreadContext;
 import org.perl6.nqp.sixmodel.*;
-import com.sun.org.apache.bcel.internal.Constants;
 
 public class P6Opaque extends REPR {
     private static long typeId = 0;

diff --git a/src/org/perl6/nqp/sixmodel/reprs/P6int.java b/src/org/perl6/nqp/sixmodel/reprs/P6int.java
@@ -1,5 +1,6 @@
 package org.perl6.nqp.sixmodel.reprs;
 
+import org.apache.bcel.Constants;
 import org.apache.bcel.generic.ClassGen;
 import org.apache.bcel.generic.ConstantPoolGen;
 import org.apache.bcel.generic.FieldGen;
@@ -16,8 +17,6 @@
 import org.perl6.nqp.sixmodel.StorageSpec;
 import org.perl6.nqp.sixmodel.TypeObject;
 
-import com.sun.org.apache.bcel.internal.Constants;
-
 public class P6int extends REPR {
 	public SixModelObject type_object_for(ThreadContext tc, SixModelObject HOW) {
 		STable st = new STable(this, HOW);

diff --git a/src/org/perl6/nqp/sixmodel/reprs/P6num.java b/src/org/perl6/nqp/sixmodel/reprs/P6num.java
@@ -1,5 +1,6 @@
 package org.perl6.nqp.sixmodel.reprs;
 
+import org.apache.bcel.Constants;
 import org.apache.bcel.generic.ClassGen;
 import org.apache.bcel.generic.ConstantPoolGen;
 import org.apache.bcel.generic.FieldGen;
@@ -16,8 +17,6 @@
 import org.perl6.nqp.sixmodel.StorageSpec;
 import org.perl6.nqp.sixmodel.TypeObject;
 
-import com.sun.org.apache.bcel.internal.Constants;
-
 public class P6num extends REPR {
 	public SixModelObject type_object_for(ThreadContext tc, SixModelObject HOW) {
 		STable st = new STable(this, HOW);

diff --git a/src/org/perl6/nqp/sixmodel/reprs/P6str.java b/src/org/perl6/nqp/sixmodel/reprs/P6str.java
@@ -1,5 +1,6 @@
 package org.perl6.nqp.sixmodel.reprs;
 
+import org.apache.bcel.Constants;
 import org.apache.bcel.generic.ClassGen;
 import org.apache.bcel.generic.ConstantPoolGen;
 import org.apache.bcel.generic.FieldGen;
@@ -16,8 +17,6 @@
 import org.perl6.nqp.sixmodel.StorageSpec;
 import org.perl6.nqp.sixmodel.TypeObject;
 
-import com.sun.org.apache.bcel.internal.Constants;
-
 public class P6str extends REPR {
     public SixModelObject type_object_for(ThreadContext tc, SixModelObject HOW) {
         STable st = new STable(this, HOW);