Use enumeration for LibraryLayout in grpc API

The enumeration is also reused inside the arduino package to reduce
code duplication.

Author: cmaglie

arduino/libraries/libraries.go

@@ -61,7 +61,7 @@ type Library struct {
 	UtilityDir        *paths.Path
 	Location          rpc.LibraryLocation
 	ContainerPlatform *cores.PlatformRelease `json:""`
-	Layout            LibraryLayout
+	Layout            rpc.LibraryLayout
 	RealName          string
 	DotALinkage       bool
 	Precompiled       bool
@@ -126,7 +126,7 @@ func (library *Library) SourceDirs() []SourceDir {
 	dirs = append(dirs,
 		SourceDir{
 			Dir:     library.SourceDir,
-			Recurse: library.Layout == RecursiveLayout,
+			Recurse: library.Layout == rpc.LibraryLayout_recursive_layout,
 		})
 	if library.UtilityDir != nil {
 		dirs = append(dirs,

arduino/libraries/libraries_layout.go

@@ -60,10 +60,10 @@ func makeNewLibrary(libraryDir *paths.Path, location rpc.LibraryLocation) (*Libr
 	library.Location = location
 	library.InstallDir = libraryDir
 	if libraryDir.Join("src").Exist() {
-		library.Layout = RecursiveLayout
+		library.Layout = rpc.LibraryLayout_recursive_layout
 		library.SourceDir = libraryDir.Join("src")
 	} else {
-		library.Layout = FlatLayout
+		library.Layout = rpc.LibraryLayout_flat_layout
 		library.SourceDir = libraryDir
 		addUtilityDirectory(library)
 	}
@@ -116,7 +116,7 @@ func makeLegacyLibrary(path *paths.Path, location rpc.LibraryLocation) (*Library
 		InstallDir:    path,
 		Location:      location,
 		SourceDir:     path,
-		Layout:        FlatLayout,
+		Layout:        rpc.LibraryLayout_flat_layout,
 		Name:          path.Base(),
 		Architectures: []string{"*"},
 		IsLegacy:      true,

arduino/libraries/loader.go

@@ -109,7 +109,7 @@ func GetOutputLibrary(lib *libraries.Library) *rpc.Library {
 		UtilityDir:        utldir,
 		Location:          lib.Location,
 		ContainerPlatform: cntplat,
-		Layout:            lib.Layout.String(),
+		Layout:            lib.Layout,
 		RealName:          lib.RealName,
 		DotALinkage:       lib.DotALinkage,
 		Precompiled:       lib.Precompiled,

commands/lib/list.go

@@ -20,6 +20,7 @@ import (
 	"github.com/arduino/arduino-cli/legacy/builder/constants"
 	"github.com/arduino/arduino-cli/legacy/builder/i18n"
 	"github.com/arduino/arduino-cli/legacy/builder/types"
+	rpc "github.com/arduino/arduino-cli/rpc/commands"
 )
 
 type FailIfImportedLibraryIsWrong struct{}
@@ -41,7 +42,7 @@ func (s *FailIfImportedLibraryIsWrong) Run(ctx *types.Context) error {
 					return i18n.ErrorfWithLogger(logger, constants.MSG_PROP_IN_LIBRARY, propName, library.InstallDir)
 				}
 			}
-			if library.Layout == libraries.RecursiveLayout {
+			if library.Layout == rpc.LibraryLayout_recursive_layout {
 				if library.UtilityDir != nil {
 					return i18n.ErrorfWithLogger(logger, constants.MSG_LIBRARY_CAN_USE_SRC_AND_UTILITY_FOLDERS, library.InstallDir)
 				}

legacy/builder/fail_if_imported_library_is_wrong.go

@@ -26,6 +26,7 @@ import (
 	"github.com/arduino/arduino-cli/legacy/builder/i18n"
 	"github.com/arduino/arduino-cli/legacy/builder/types"
 	"github.com/arduino/arduino-cli/legacy/builder/utils"
+	rpc "github.com/arduino/arduino-cli/rpc/commands"
 	"github.com/arduino/go-paths-helper"
 	"github.com/arduino/go-properties-orderedmap"
 )
@@ -191,7 +192,7 @@ func compileLibrary(ctx *types.Context, library *libraries.Library, buildPath *p
 		}
 	}
 
-	if library.Layout == libraries.RecursiveLayout {
+	if library.Layout == rpc.LibraryLayout_recursive_layout {
 		libObjectFiles, err := builder_utils.CompileFilesRecursive(ctx, library.SourceDir, libraryBuildPath, buildProperties, includes)
 		if err != nil {
 			return nil, i18n.WrapError(err)