INITIAL: integrate compile with arduino-cli

Author: facchinm

arduino-core/src/cc/arduino/Compiler.java

@@ -29,6 +29,7 @@
 
 package cc.arduino;
 
+import cc.arduino.cli.ArduinoCoreInstance;
 import cc.arduino.i18n.I18NAwareMessageConsumer;
 import cc.arduino.packages.BoardPort;
 import org.apache.commons.exec.CommandLine;
@@ -142,6 +143,7 @@ enum BuilderAction {
   private File buildCache;
   private final boolean verbose;
   private RunnerException exception;
+  private ArduinoCoreInstance core;
 
   public Compiler(Sketch data) {
     this(data.getPrimaryFile().getFile(), data);
@@ -150,6 +152,7 @@ public Compiler(Sketch data) {
   public Compiler(File pathToSketch, Sketch sketch) {
     this.pathToSketch = pathToSketch;
     this.sketch = sketch;
+    this.core = BaseNoGui.getArduinoCoreService();
     this.verbose = PreferencesData.getBoolean("build.verbose");
   }
 
@@ -209,18 +212,7 @@ private String VIDPID() {
   }
 
   private PreferencesMap loadPreferences(TargetBoard board, TargetPlatform platform, TargetPackage aPackage, String vidpid) throws RunnerException, IOException {
-    ByteArrayOutputStream stdout = new ByteArrayOutputStream();
-    ByteArrayOutputStream stderr = new ByteArrayOutputStream();
-    MessageConsumerOutputStream err = new MessageConsumerOutputStream(new I18NAwareMessageConsumer(new PrintStream(stderr), Compiler.this), "\n");
-    try {
-      callArduinoBuilder(board, platform, aPackage, vidpid, BuilderAction.DUMP_PREFS, stdout, err);
-    } catch (RunnerException e) {
-      System.err.println(new String(stderr.toByteArray()));
-      throw e;
-    }
-    PreferencesMap prefs = new PreferencesMap();
-    prefs.load(new ByteArrayInputStream(stdout.toByteArray()));
-    return prefs;
+    return new PreferencesMap();
   }
 
   private void addPathFlagIfPathExists(List<String> cmd, String flag, File folder) {
@@ -294,7 +286,9 @@ private void callArduinoBuilder(TargetBoard board, TargetPlatform platform, Targ
 
     int result;
     try {
-      Process proc = ProcessUtils.exec(cmd.toArray(new String[0]));
+      core.compile(fqbn, pathToSketch.getAbsolutePath());
+
+      /*
       MessageSiphon in = new MessageSiphon(proc.getInputStream(), (msg) -> {
         try {
           outStream.write(msg.getBytes());
@@ -313,18 +307,12 @@ private void callArduinoBuilder(TargetBoard board, TargetPlatform platform, Targ
       in.join();
       err.join();
       result = proc.waitFor();
+      */
     } catch (Exception e) {
       throw new RunnerException(e);
     }
 
-    if (exception != null)
-      throw exception;
-
-    if (result > 1) {
-      System.err.println(I18n.format(tr("{0} returned {1}"), cmd.get(0), result));
-    }
-
-    if (result != 0) {
+    if (exception != null) {
       RunnerException re = new RunnerException(I18n.format(tr("Error compiling for board {0}."), board.getName()));
       re.hideStackTrace();
       throw re;