Refactor legacy libraries loader

arduino/builder/compilation_database.go

@@ -19,8 +19,8 @@ import (
 	"encoding/json"
 	"fmt"
 	"os"
-	"os/exec"
 
+	"github.com/arduino/arduino-cli/executils"
 	"github.com/arduino/go-paths-helper"
 )
 
@@ -68,8 +68,8 @@ func (db *CompilationDatabase) SaveToFile() {
 }
 
 // Add adds a new CompilationDatabase entry
-func (db *CompilationDatabase) Add(target *paths.Path, command *exec.Cmd) {
-	commandDir := command.Dir
+func (db *CompilationDatabase) Add(target *paths.Path, command *executils.Process) {
+	commandDir := command.GetDir()
 	if commandDir == "" {
 		// This mimics what Cmd.Run also does: Use Dir if specified,
 		// current directory otherwise
@@ -82,7 +82,7 @@ func (db *CompilationDatabase) Add(target *paths.Path, command *exec.Cmd) {
 
 	entry := CompilationCommand{
 		Directory: commandDir,
-		Arguments: command.Args,
+		Arguments: command.GetArgs(),
 		File:      target.String(),
 	}
 

arduino/builder/compilation_database_test.go

@@ -16,9 +16,9 @@
 package builder
 
 import (
-	"os/exec"
 	"testing"
 
+	"github.com/arduino/arduino-cli/executils"
 	"github.com/arduino/go-paths-helper"
 	"github.com/stretchr/testify/require"
 )
@@ -28,7 +28,8 @@ func TestCompilationDatabase(t *testing.T) {
 	require.NoError(t, err)
 	defer tmpfile.Remove()
 
-	cmd := exec.Command("gcc", "arg1", "arg2")
+	cmd, err := executils.NewProcess(nil, "gcc", "arg1", "arg2")
+	require.NoError(t, err)
 	db := NewCompilationDatabase(tmpfile)
 	db.Add(paths.New("test"), cmd)
 	db.SaveToFile()

arduino/builder/cpp/cpp.go

@@ -106,3 +106,8 @@ func ParseString(line string) (string, string, bool) {
 		i += width
 	}
 }
+
+// WrapWithHyphenI fixdoc
+func WrapWithHyphenI(value string) string {
+	return "\"-I" + value + "\""
+}