file only

Author: Ecdcaeb

src/main/java/mods/Hileb/shotaasm/impl/compiler/Compiler.java

@@ -14,7 +14,7 @@
 
 public class Compiler {
 
-    public List<String> options = null;
+    public List<File> classpath = null;
 
     private final Map<String, VirtualJavaFileObject> javaFileObjectMap = new HashMap<>();
     private Map<String, byte[]> results = new HashMap<>();
@@ -25,8 +25,8 @@ public Compiler(){
         this(null);
     }
 
-    public Compiler(List<String> options) {
-        this.options = options;
+    public Compiler(List<File> options) {
+        this.classpath = options;
     }
 
     public void addSource(String name, String content) {
@@ -62,10 +62,13 @@ public CompileError compile() {
         if (compiler == null) return new CompileError("Could not found JavaCompiler, might not run in jdk.");
         else {
             try(StandardJavaFileManager standardJavaFileManager = compiler.getStandardFileManager(null, null, StandardCharsets.UTF_8)) {
+                if (this.classpath != null) 
+                    standardJavaFileManager.setLocation(StandardLocation.CLASS_PATH, classpath);
                 VirtualFileManager fileManager = new VirtualFileManager(standardJavaFileManager, this.javaFileObjectMap);
+                
                 try {
                     StringWriter stringWriter = new StringWriter();
-                    JavaCompiler.CompilationTask task = compiler.getTask(stringWriter, fileManager, (DiagnosticListener<? super JavaFileObject>)(Object) listener, options, null, javaFileObjectMap.values());
+                    JavaCompiler.CompilationTask task = compiler.getTask(stringWriter, fileManager, (DiagnosticListener<? super JavaFileObject>)(Object) listener, null, null, javaFileObjectMap.values());
                     if (task.call() == Boolean.TRUE) {
                         this.results = fileManager.getClasses();
                         return null;

src/main/java/mods/Hileb/shotaasm/impl/compiler/CompilerFactory.java

@@ -7,52 +7,35 @@
 
 import javax.tools.*;
 import java.io.*;
-import java.net.URISyntaxException;
-import java.net.URL;
+import java.net.*;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.*;
 import java.util.*;
 
 public class CompilerFactory{
-    public List<String> options = null;
+    public List<File> classpath = null;
 
     public CompilerFactory(URL[] classpath) {
-        this.options = new ArrayList<>();
-        this.options.add("-classpath");
-        this.options.add(buildClasspath(classpath));
-        this.options.add("-Xlint:unchecked");
+        this.classpath = new ArrayList<>();
+        for(URL url : classpath) {
+            if ("file".equals(url.getProtocol())) {
+                try {
+                    this.classpath.add(new File(url.toURI()));
+                } catch (URISyntaxException e) {}
+            }
+        }
 
         if (ShotaASM.DEBUG) {
             ShotaASM.LOGGER.info("Java Compiler Factory Debug.");
             String s0 = "";
-            for (String s : this.options) {
+            for (File s : this.classpath) {
                 s0 = s0 + s;
             }
-            ShotaASM.LOGGER.info("Options : {}", s0);
+            ShotaASM.LOGGER.info("Classpath : {}", s0);
         }
     }
 
     public Compiler compiler(){
         return new Compiler(this.options);
     }
-
-    public static String buildClasspath(URL[] urls) {
-        if (urls == null || urls.length == 0) return System.getProperty("java.class.path");
-
-        StringBuilder classpath = new StringBuilder(System.getProperty("java.class.path"));
-        for (URL url : urls) {
-            try {
-                //Attempt to handle different URL schemes.  This is not exhaustive, but covers common cases.
-                if("file".equals(url.getProtocol())){
-                    //Handle potential space in file path
-                    classpath.append(File.pathSeparator).append(url.getPath().replace(" ", "%20"));
-                } else {
-                    classpath.append(File.pathSeparator).append(url.toString());
-                }
-            } catch (Exception e) {
-                ShotaASM.LOGGER.error("Error processing URL {} because of {}", url, e);
-            }
-        }
-        return classpath.toString();
-    }
 }