Use Name field where appropriate instead of CanonicalName

cmaglie · cmaglie · commit 1908634b8a56 · 2022-09-16T14:04:50.000+02:00
diff --git a/arduino/libraries/libraries.go b/arduino/libraries/libraries.go
@@ -85,9 +85,9 @@ type Library struct {
 
 func (library *Library) String() string {
 	if library.Version.String() == "" {
-		return library.CanonicalName
+		return library.Name
 	}
-	return library.CanonicalName + "@" + library.Version.String()
+	return library.Name + "@" + library.Version.String()
 }
 
 // ToRPCLibrary converts this library into an rpc.Library
@@ -117,7 +117,7 @@ func (library *Library) ToRPCLibrary() (*rpc.Library, error) {
 	}
 
 	return &rpc.Library{
-		Name:              library.CanonicalName,
+		Name:              library.Name,
 		Author:            library.Author,
 		Maintainer:        library.Maintainer,
 		Sentence:          library.Sentence,
diff --git a/arduino/libraries/librarieslist.go b/arduino/libraries/librarieslist.go
@@ -55,7 +55,7 @@ func (list *List) Remove(library *Library) {
 // the specified name or nil if not found
 func (list *List) FindByName(name string) *Library {
 	for _, lib := range *list {
-		if lib.CanonicalName == name {
+		if lib.Name == name {
 			return lib
 		}
 	}
@@ -82,7 +82,7 @@ func (list *List) FilterByVersionAndInstallLocation(version *semver.Version, ins
 func (list *List) SortByName() {
 	sort.Slice(*list, func(i, j int) bool {
 		a, b := (*list)[i], (*list)[j]
-		return a.CanonicalName < b.CanonicalName
+		return a.Name < b.Name
 	})
 }
 
diff --git a/arduino/libraries/librariesresolver/cpp.go b/arduino/libraries/librariesresolver/cpp.go
@@ -135,7 +135,7 @@ func (resolver *Cpp) ResolveFor(header, architecture string) *libraries.Library
 			msg = "  found another lib with same priority"
 		}
 		logrus.
-			WithField("lib", lib.CanonicalName).
+			WithField("lib", lib.Name).
 			WithField("prio", fmt.Sprintf("%03X", libPriority)).
 			Infof(msg)
 	}
@@ -149,12 +149,12 @@ func (resolver *Cpp) ResolveFor(header, architecture string) *libraries.Library
 	// If more than one library qualifies use the "closestmatch" algorithm to
 	// find the best matching one (instead of choosing it randomly)
 	if best := findLibraryWithNameBestDistance(header, found); best != nil {
-		logrus.WithField("lib", best.CanonicalName).Info("  library with the best matching name")
+		logrus.WithField("lib", best.Name).Info("  library with the best matching name")
 		return best
 	}
 
 	found.SortByName()
-	logrus.WithField("lib", found[0].CanonicalName).Info("  first library in alphabetic order")
+	logrus.WithField("lib", found[0].Name).Info("  first library in alphabetic order")
 	return found[0]
 }
 
@@ -167,8 +167,8 @@ func simplify(name string) string {
 func computePriority(lib *libraries.Library, header, arch string) int {
 	header = strings.TrimSuffix(header, filepath.Ext(header))
 	header = simplify(header)
-	name := simplify(lib.CanonicalName)
-	realName := simplify(lib.Name)
+	name := simplify(lib.Name)
+	canonicalName := simplify(lib.CanonicalName)
 
 	priority := 0
 
@@ -185,17 +185,17 @@ func computePriority(lib *libraries.Library, header, arch string) int {
 		priority += 0
 	}
 
-	if realName == header && name == header {
+	if name == header && canonicalName == header {
 		priority += 600
-	} else if realName == header || name == header {
+	} else if name == header || canonicalName == header {
 		priority += 500
-	} else if realName == header+"-master" || name == header+"-master" {
+	} else if name == header+"-master" || canonicalName == header+"-master" {
 		priority += 400
-	} else if strings.HasPrefix(realName, header) || strings.HasPrefix(name, header) {
+	} else if strings.HasPrefix(name, header) || strings.HasPrefix(canonicalName, header) {
 		priority += 300
-	} else if strings.HasSuffix(realName, header) || strings.HasSuffix(name, header) {
+	} else if strings.HasSuffix(name, header) || strings.HasSuffix(canonicalName, header) {
 		priority += 200
-	} else if strings.Contains(realName, header) || strings.Contains(name, header) {
+	} else if strings.Contains(name, header) || strings.Contains(canonicalName, header) {
 		priority += 100
 	}
 
@@ -220,7 +220,7 @@ func findLibraryWithNameBestDistance(name string, libs libraries.List) *librarie
 	// Create closestmatch DB
 	wordsToTest := []string{}
 	for _, lib := range libs {
-		wordsToTest = append(wordsToTest, simplify(lib.CanonicalName))
+		wordsToTest = append(wordsToTest, simplify(lib.Name))
 	}
 	// Choose a set of bag sizes, more is more accurate but slower
 	bagSizes := []int{2}
@@ -232,7 +232,7 @@ func findLibraryWithNameBestDistance(name string, libs libraries.List) *librarie
 	// Return the closest-matching lib
 	var winner *libraries.Library
 	for _, lib := range libs {
-		if closestName == simplify(lib.CanonicalName) {
+		if closestName == simplify(lib.Name) {
 			winner = lib
 			break
 		}
diff --git a/arduino/libraries/librariesresolver/cpp_test.go b/arduino/libraries/librariesresolver/cpp_test.go
@@ -22,14 +22,14 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
-var l1 = &libraries.Library{CanonicalName: "Calculus Lib", Location: libraries.User}
-var l2 = &libraries.Library{CanonicalName: "Calculus Lib-master", Location: libraries.User}
-var l3 = &libraries.Library{CanonicalName: "Calculus Lib Improved", Location: libraries.User}
-var l4 = &libraries.Library{CanonicalName: "Another Calculus Lib", Location: libraries.User}
-var l5 = &libraries.Library{CanonicalName: "Yet Another Calculus Lib Improved", Location: libraries.User}
-var l6 = &libraries.Library{CanonicalName: "Calculus Unified Lib", Location: libraries.User}
-var l7 = &libraries.Library{CanonicalName: "AnotherLib", Location: libraries.User}
-var bundleServo = &libraries.Library{CanonicalName: "Servo", Location: libraries.IDEBuiltIn, Architectures: []string{"avr", "sam", "samd"}}
+var l1 = &libraries.Library{Name: "Calculus Lib", Location: libraries.User}
+var l2 = &libraries.Library{Name: "Calculus Lib-master", Location: libraries.User}
+var l3 = &libraries.Library{Name: "Calculus Lib Improved", Location: libraries.User}
+var l4 = &libraries.Library{Name: "Another Calculus Lib", Location: libraries.User}
+var l5 = &libraries.Library{Name: "Yet Another Calculus Lib Improved", Location: libraries.User}
+var l6 = &libraries.Library{Name: "Calculus Unified Lib", Location: libraries.User}
+var l7 = &libraries.Library{Name: "AnotherLib", Location: libraries.User}
+var bundleServo = &libraries.Library{Name: "Servo", Location: libraries.IDEBuiltIn, Architectures: []string{"avr", "sam", "samd"}}
 
 func runResolver(include string, arch string, libs ...*libraries.Library) *libraries.Library {
 	libraryList := libraries.List{}
@@ -41,19 +41,19 @@ func runResolver(include string, arch string, libs ...*libraries.Library) *libra
 
 func TestArchitecturePriority(t *testing.T) {
 	userServo := &libraries.Library{
-		CanonicalName: "Servo",
+		Name:          "Servo",
 		Location:      libraries.User,
 		Architectures: []string{"avr", "sam", "samd"}}
 	userServoAllArch := &libraries.Library{
-		CanonicalName: "Servo",
+		Name:          "Servo",
 		Location:      libraries.User,
 		Architectures: []string{"*"}}
 	userServoNonavr := &libraries.Library{
-		CanonicalName: "Servo",
+		Name:          "Servo",
 		Location:      libraries.User,
 		Architectures: []string{"sam", "samd"}}
 	userAnotherServo := &libraries.Library{
-		CanonicalName: "AnotherServo",
+		Name:          "AnotherServo",
 		Location:      libraries.User,
 		Architectures: []string{"avr", "sam", "samd", "esp32"}}
 
@@ -78,11 +78,11 @@ func TestArchitecturePriority(t *testing.T) {
 	require.Equal(t, userServoAllArch, res, "selected library")
 
 	userSDAllArch := &libraries.Library{
-		CanonicalName: "SD",
+		Name:          "SD",
 		Location:      libraries.User,
 		Architectures: []string{"*"}}
 	builtinSDesp := &libraries.Library{
-		CanonicalName: "SD",
+		Name:          "SD",
 		Location:      libraries.PlatformBuiltIn,
 		Architectures: []string{"esp8266"}}
 	res = runResolver("SD.h", "esp8266", userSDAllArch, builtinSDesp)
@@ -133,7 +133,7 @@ func TestCppHeaderResolver(t *testing.T) {
 			librarylist.Add(lib)
 		}
 		resolver.headers[header] = librarylist
-		return resolver.ResolveFor(header, "avr").CanonicalName
+		return resolver.ResolveFor(header, "avr").Name
 	}
 	require.Equal(t, "Calculus Lib", resolve("calculus_lib.h", l1, l2, l3, l4, l5, l6, l7))
 	require.Equal(t, "Calculus Lib-master", resolve("calculus_lib.h", l2, l3, l4, l5, l6, l7))
diff --git a/arduino/libraries/loader.go b/arduino/libraries/loader.go
@@ -131,6 +131,7 @@ func makeLegacyLibrary(path *paths.Path, location LibraryLocation) (*Library, er
 		Location:      location,
 		SourceDir:     path,
 		Layout:        FlatLayout,
+		Name:          path.Base(),
 		CanonicalName: path.Base(),
 		Architectures: []string{"*"},
 		IsLegacy:      true,
diff --git a/commands/compile/compile.go b/commands/compile/compile.go
@@ -205,7 +205,7 @@ func Compile(ctx context.Context, req *rpc.CompileRequest, outStream, errStream
 		for _, lib := range builderCtx.ImportedLibraries {
 			rpcLib, err := lib.ToRPCLibrary()
 			if err != nil {
-				msg := tr("Error getting information for library %s", lib.CanonicalName) + ": " + err.Error() + "\n"
+				msg := tr("Error getting information for library %s", lib.Name) + ": " + err.Error() + "\n"
 				errStream.Write([]byte(msg))
 			}
 			importedLibs = append(importedLibs, rpcLib)
diff --git a/commands/lib/resolve_deps.go b/commands/lib/resolve_deps.go
@@ -41,7 +41,7 @@ func LibraryResolveDependencies(ctx context.Context, req *rpc.LibraryResolveDepe
 	// Extract all installed libraries
 	installedLibs := map[string]*libraries.Library{}
 	for _, lib := range listLibraries(lm, false, false) {
-		installedLibs[lib.Library.CanonicalName] = lib.Library
+		installedLibs[lib.Library.Name] = lib.Library
 	}
 
 	// Resolve all dependencies...
diff --git a/legacy/builder/container_find_includes.go b/legacy/builder/container_find_includes.go
@@ -352,7 +352,7 @@ func findIncludesUntilDone(ctx *types.Context, cache *includeCache, sourceFile t
 				// Fully precompiled libraries should have no dependencies
 				// to avoid ABI breakage
 				if ctx.Verbose {
-					ctx.Info(tr("Skipping dependencies detection for precompiled library %[1]s", library.CanonicalName))
+					ctx.Info(tr("Skipping dependencies detection for precompiled library %[1]s", library.Name))
 				}
 				return nil
 			}
diff --git a/legacy/builder/phases/libraries_builder.go b/legacy/builder/phases/libraries_builder.go
@@ -86,7 +86,7 @@ func findExpectedPrecompiledLibFolder(ctx *types.Context, library *libraries.Lib
 		}
 	}
 
-	ctx.Info(tr("Library %[1]s has been declared precompiled:", library.CanonicalName))
+	ctx.Info(tr("Library %[1]s has been declared precompiled:", library.Name))
 
 	// Try directory with full fpuSpecs first, if available
 	if len(fpuSpecs) > 0 {
@@ -129,7 +129,7 @@ func compileLibraries(ctx *types.Context, libraries libraries.List, buildPath *p
 
 func compileLibrary(ctx *types.Context, library *libraries.Library, buildPath *paths.Path, buildProperties *properties.Map, includes []string) (paths.PathList, error) {
 	if ctx.Verbose {
-		ctx.Info(tr(`Compiling library "%[1]s"`, library.CanonicalName))
+		ctx.Info(tr(`Compiling library "%[1]s"`, library.Name))
 	}
 	libraryBuildPath := buildPath.Join(library.CanonicalName)
 
diff --git a/legacy/builder/print_used_libraries_if_verbose.go b/legacy/builder/print_used_libraries_if_verbose.go
@@ -36,13 +36,13 @@ func (s *PrintUsedLibrariesIfVerbose) Run(ctx *types.Context) error {
 		if library.Version.String() == "" {
 			ctx.Info(
 				tr("Using library %[1]s in folder: %[2]s %[3]s",
-					library.CanonicalName,
+					library.Name,
 					library.InstallDir,
 					legacy))
 		} else {
 			ctx.Info(
 				tr("Using library %[1]s at version %[2]s in folder: %[3]s %[4]s",
-					library.CanonicalName,
+					library.Name,
 					library.Version,
 					library.InstallDir,
 					legacy))
diff --git a/legacy/builder/resolve_library.go b/legacy/builder/resolve_library.go
@@ -45,7 +45,7 @@ func ResolveLibrary(ctx *types.Context, header string) *libraries.Library {
 	}
 
 	selected := resolver.ResolveFor(header, ctx.TargetPlatform.Platform.Architecture)
-	if alreadyImported := importedLibraries.FindByName(selected.CanonicalName); alreadyImported != nil {
+	if alreadyImported := importedLibraries.FindByName(selected.Name); alreadyImported != nil {
 		// Certain libraries might have the same name but be different.
 		// This usually happens when the user includes two or more custom libraries that have
 		// different header name but are stored in a parent folder with identical name, like
diff --git a/legacy/builder/test/helper.go b/legacy/builder/test/helper.go
@@ -84,5 +84,5 @@ func (s ByLibraryName) Swap(i, j int) {
 	s[i], s[j] = s[j], s[i]
 }
 func (s ByLibraryName) Less(i, j int) bool {
-	return s[i].CanonicalName < s[j].CanonicalName
+	return s[i].Name < s[j].Name
 }
diff --git a/legacy/builder/test/includes_to_include_folders_test.go b/legacy/builder/test/includes_to_include_folders_test.go
@@ -59,7 +59,7 @@ func TestIncludesToIncludeFolders(t *testing.T) {
 
 	importedLibraries := ctx.ImportedLibraries
 	require.Equal(t, 1, len(importedLibraries))
-	require.Equal(t, "Bridge", importedLibraries[0].CanonicalName)
+	require.Equal(t, "Bridge", importedLibraries[0].Name)
 }
 
 func TestIncludesToIncludeFoldersSketchWithIfDef(t *testing.T) {
@@ -131,8 +131,8 @@ func TestIncludesToIncludeFoldersIRremoteLibrary(t *testing.T) {
 	importedLibraries := ctx.ImportedLibraries
 	sort.Sort(ByLibraryName(importedLibraries))
 	require.Equal(t, 2, len(importedLibraries))
-	require.Equal(t, "Bridge", importedLibraries[0].CanonicalName)
-	require.Equal(t, "IRremote", importedLibraries[1].CanonicalName)
+	require.Equal(t, "Bridge", importedLibraries[0].Name)
+	require.Equal(t, "IRremote", importedLibraries[1].Name)
 }
 
 func TestIncludesToIncludeFoldersANewLibrary(t *testing.T) {
@@ -166,8 +166,8 @@ func TestIncludesToIncludeFoldersANewLibrary(t *testing.T) {
 	importedLibraries := ctx.ImportedLibraries
 	sort.Sort(ByLibraryName(importedLibraries))
 	require.Equal(t, 2, len(importedLibraries))
-	require.Equal(t, "ANewLibrary-master", importedLibraries[0].CanonicalName)
-	require.Equal(t, "IRremote", importedLibraries[1].CanonicalName)
+	require.Equal(t, "ANewLibrary-master", importedLibraries[0].Name)
+	require.Equal(t, "IRremote", importedLibraries[1].Name)
 }
 
 func TestIncludesToIncludeFoldersDuplicateLibs(t *testing.T) {
@@ -203,7 +203,7 @@ func TestIncludesToIncludeFoldersDuplicateLibs(t *testing.T) {
 	importedLibraries := ctx.ImportedLibraries
 	sort.Sort(ByLibraryName(importedLibraries))
 	require.Equal(t, 1, len(importedLibraries))
-	require.Equal(t, "SPI", importedLibraries[0].CanonicalName)
+	require.Equal(t, "SPI", importedLibraries[0].Name)
 	requireEquivalentPaths(t, importedLibraries[0].SourceDir.String(), filepath.Join("user_hardware", "my_avr_platform", "avr", "libraries", "SPI"))
 }
 
@@ -241,7 +241,7 @@ func TestIncludesToIncludeFoldersDuplicateLibsWithConflictingLibsOutsideOfPlatfo
 	importedLibraries := ctx.ImportedLibraries
 	sort.Sort(ByLibraryName(importedLibraries))
 	require.Equal(t, 1, len(importedLibraries))
-	require.Equal(t, "SPI", importedLibraries[0].CanonicalName)
+	require.Equal(t, "SPI", importedLibraries[0].Name)
 	requireEquivalentPaths(t, importedLibraries[0].SourceDir.String(), filepath.Join("libraries", "SPI"))
 }
 
@@ -279,7 +279,7 @@ func TestIncludesToIncludeFoldersDuplicateLibs2(t *testing.T) {
 	importedLibraries := ctx.ImportedLibraries
 	sort.Sort(ByLibraryName(importedLibraries))
 	require.Equal(t, 1, len(importedLibraries))
-	require.Equal(t, "USBHost", importedLibraries[0].CanonicalName)
+	require.Equal(t, "USBHost", importedLibraries[0].Name)
 	requireEquivalentPaths(t, importedLibraries[0].SourceDir.String(), filepath.Join("libraries", "USBHost", "src"))
 }
 
@@ -317,7 +317,7 @@ func TestIncludesToIncludeFoldersSubfolders(t *testing.T) {
 	importedLibraries := ctx.ImportedLibraries
 	sort.Sort(ByLibraryName(importedLibraries))
 	require.Equal(t, 3, len(importedLibraries))
-	require.Equal(t, "testlib1", importedLibraries[0].CanonicalName)
-	require.Equal(t, "testlib2", importedLibraries[1].CanonicalName)
-	require.Equal(t, "testlib3", importedLibraries[2].CanonicalName)
+	require.Equal(t, "testlib1", importedLibraries[0].Name)
+	require.Equal(t, "testlib2", importedLibraries[1].Name)
+	require.Equal(t, "testlib3", importedLibraries[2].Name)
 }
diff --git a/legacy/builder/test/libraries_loader_test.go b/legacy/builder/test/libraries_loader_test.go
diff --git a/legacy/builder/test/unused_compiled_libraries_remover_test.go b/legacy/builder/test/unused_compiled_libraries_remover_test.go
diff --git a/legacy/builder/unused_compiled_libraries_remover.go b/legacy/builder/unused_compiled_libraries_remover.go
diff --git a/legacy/builder/warn_about_arch_incompatible_libraries.go b/legacy/builder/warn_about_arch_incompatible_libraries.go
diff --git a/rpc/cc/arduino/cli/commands/v1/lib.pb.go b/rpc/cc/arduino/cli/commands/v1/lib.pb.go
diff --git a/rpc/cc/arduino/cli/commands/v1/lib.proto b/rpc/cc/arduino/cli/commands/v1/lib.proto

Original file line number	Diff line number	Diff line change
`@@ -85,9 +85,9 @@ type Library struct {`
`85`	`85`
`86`	`86`	`func (library *Library) String() string {`
`87`	`87`	`if library.Version.String() == "" {`
`88`		`- return library.CanonicalName`
	`88`	`+ return library.Name`
`89`	`89`	`}`
`90`		`- return library.CanonicalName + "@" + library.Version.String()`
	`90`	`+ return library.Name + "@" + library.Version.String()`
`91`	`91`	`}`
`92`	`92`
`93`	`93`	`// ToRPCLibrary converts this library into an rpc.Library`
`@@ -117,7 +117,7 @@ func (library Library) ToRPCLibrary() (rpc.Library, error) {`
`117`	`117`	`}`
`118`	`118`
`119`	`119`	`return &rpc.Library{`
`120`		`- Name: library.CanonicalName,`
	`120`	`+ Name: library.Name,`
`121`	`121`	`Author: library.Author,`
`122`	`122`	`Maintainer: library.Maintainer,`
`123`	`123`	`Sentence: library.Sentence,`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ func (list List) Remove(library Library) {`
`55`	`55`	`// the specified name or nil if not found`
`56`	`56`	`func (list List) FindByName(name string) Library {`
`57`	`57`	`for _, lib := range *list {`
`58`		`- if lib.CanonicalName == name {`
	`58`	`+ if lib.Name == name {`
`59`	`59`	`return lib`
`60`	`60`	`}`
`61`	`61`	`}`
`@@ -82,7 +82,7 @@ func (list List) FilterByVersionAndInstallLocation(version semver.Version, ins`
`82`	`82`	`func (list *List) SortByName() {`
`83`	`83`	`sort.Slice(*list, func(i, j int) bool {`
`84`	`84`	`a, b := (list)[i], (list)[j]`
`85`		`- return a.CanonicalName < b.CanonicalName`
	`85`	`+ return a.Name < b.Name`
`86`	`86`	`})`
`87`	`87`	`}`
`88`	`88`
Original file line number	Diff line number	Diff line change
`@@ -205,7 +205,7 @@ func Compile(ctx context.Context, req *rpc.CompileRequest, outStream, errStream`
`205`	`205`	`for _, lib := range builderCtx.ImportedLibraries {`
`206`	`206`	`rpcLib, err := lib.ToRPCLibrary()`
`207`	`207`	`if err != nil {`
`208`		`- msg := tr("Error getting information for library %s", lib.CanonicalName) + ": " + err.Error() + "\n"`
	`208`	`+ msg := tr("Error getting information for library %s", lib.Name) + ": " + err.Error() + "\n"`
`209`	`209`	`errStream.Write([]byte(msg))`
`210`	`210`	`}`
`211`	`211`	`importedLibs = append(importedLibs, rpcLib)`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ func LibraryResolveDependencies(ctx context.Context, req *rpc.LibraryResolveDepe`
`41`	`41`	`// Extract all installed libraries`
`42`	`42`	`installedLibs := map[string]*libraries.Library{}`
`43`	`43`	`for _, lib := range listLibraries(lm, false, false) {`
`44`		`- installedLibs[lib.Library.CanonicalName] = lib.Library`
	`44`	`+ installedLibs[lib.Library.Name] = lib.Library`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`// Resolve all dependencies...`
Original file line number	Diff line number	Diff line change
`@@ -352,7 +352,7 @@ func findIncludesUntilDone(ctx types.Context, cache includeCache, sourceFile t`
`352`	`352`	`// Fully precompiled libraries should have no dependencies`
`353`	`353`	`// to avoid ABI breakage`
`354`	`354`	`if ctx.Verbose {`
`355`		`- ctx.Info(tr("Skipping dependencies detection for precompiled library %[1]s", library.CanonicalName))`
	`355`	`+ ctx.Info(tr("Skipping dependencies detection for precompiled library %[1]s", library.Name))`
`356`	`356`	`}`
`357`	`357`	`return nil`
`358`	`358`	`}`
Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ func findExpectedPrecompiledLibFolder(ctx types.Context, library libraries.Lib`
`86`	`86`	`}`
`87`	`87`	`}`
`88`	`88`
`89`		`- ctx.Info(tr("Library %[1]s has been declared precompiled:", library.CanonicalName))`
	`89`	`+ ctx.Info(tr("Library %[1]s has been declared precompiled:", library.Name))`
`90`	`90`
`91`	`91`	`// Try directory with full fpuSpecs first, if available`
`92`	`92`	`if len(fpuSpecs) > 0 {`
`@@ -129,7 +129,7 @@ func compileLibraries(ctx types.Context, libraries libraries.List, buildPath p`
`129`	`129`
`130`	`130`	`func compileLibrary(ctx types.Context, library libraries.Library, buildPath paths.Path, buildProperties properties.Map, includes []string) (paths.PathList, error) {`
`131`	`131`	`if ctx.Verbose {`
`132`		- ctx.Info(tr(`Compiling library "%[1]s"`, library.CanonicalName))
	`132`	+ ctx.Info(tr(`Compiling library "%[1]s"`, library.Name))
`133`	`133`	`}`
`134`	`134`	`libraryBuildPath := buildPath.Join(library.CanonicalName)`
`135`	`135`