Revert fix for arduino#37 and always show "multiple libraries warning" again

This reverts commit 2058479:

	Adding info in LibraryResolutionResult about whether selected
	library comes from a platform or from outside. If the former and
	there are duplicates, no warning is printed

Additionally, the librariesInSomePlatform function and
librariesInPlatforms variable in resolveLibrary are removed, since these
are now unused.

The original suggestion in arduino#37 was that if a platform library overrides
a builtin library, no warning would be needed. The implementation,
however, was hiding the warning whenever a platform library was
overriding any other library, including a user library, which seems
harmful (This was [reported on the devlist][1]).

This commit reverts the exception added for arduino#37, making the warning
appear unconditionally again. In a future commit, a better solution
for arduino#37 will be added.

[1]: https://groups.google.com/a/arduino.cc/d/msg/developers/1kkIqIsbuzU/0-abwr1gBQAJ

Signed-off-by: Matthijs Kooijman <[email protected]>

Author: matthijskooijman

Diff for: src/arduino.cc/builder/includes_to_include_folders.go

@@ -123,8 +123,6 @@ func resolveLibrary(header string, headerToLibraries map[string][]*types.Library
 
 	reverse(libraries)
 
-	librariesInPlatforms := librariesInSomePlatform(libraries, platforms)
-
 	var library *types.Library
 
 	for _, platform := range platforms {
@@ -149,8 +147,7 @@ func resolveLibrary(header string, headerToLibraries map[string][]*types.Library
 
 	library = useAlreadyImportedLibraryWithSameNameIfExists(library, markImportedLibrary)
 
-	isLibraryFromPlatform := findLibraryIn(librariesInPlatforms, library) != nil
-	libraryResolutionResults[header] = types.LibraryResolutionResult{Library: library, IsLibraryFromPlatform: isLibraryFromPlatform, NotUsedLibraries: filterOutLibraryFrom(libraries, library)}
+	libraryResolutionResults[header] = types.LibraryResolutionResult{Library: library, NotUsedLibraries: filterOutLibraryFrom(libraries, library)}
 
 	markImportedLibrary[library] = true
 }
@@ -162,17 +159,6 @@ func reverse(data []*types.Library) {
 	}
 }
 
-func librariesInSomePlatform(libraries []*types.Library, platforms []*types.Platform) []*types.Library {
-	librariesInPlatforms := []*types.Library{}
-	for _, platform := range platforms {
-		if platform != nil {
-			librariesWithinSpecifiedPlatform := librariesWithinPlatform(libraries, platform)
-			librariesInPlatforms = append(librariesInPlatforms, librariesWithinSpecifiedPlatform...)
-		}
-	}
-	return librariesInPlatforms
-}
-
 func markImportedLibraryContainsOneOfCandidates(markImportedLibrary map[*types.Library]bool, libraries []*types.Library) bool {
 	for markedLibrary, _ := range markImportedLibrary {
 		for _, library := range libraries {

Diff for: src/arduino.cc/builder/print_used_and_not_used_libraries.go

@@ -47,12 +47,10 @@ func (s *PrintUsedAndNotUsedLibraries) Run(ctx *types.Context) error {
 	libraryResolutionResults := ctx.LibrariesResolutionResults
 
 	for header, libResResult := range libraryResolutionResults {
-		if !libResResult.IsLibraryFromPlatform {
-			logger.Fprintln(os.Stdout, constants.LOG_LEVEL_WARN, constants.MSG_LIBRARIES_MULTIPLE_LIBS_FOUND_FOR, header)
-			logger.Fprintln(os.Stdout, constants.LOG_LEVEL_WARN, constants.MSG_LIBRARIES_USED, libResResult.Library.Folder)
-			for _, notUsedLibrary := range libResResult.NotUsedLibraries {
-				logger.Fprintln(os.Stdout, constants.LOG_LEVEL_WARN, constants.MSG_LIBRARIES_NOT_USED, notUsedLibrary.Folder)
-			}
+		logger.Fprintln(os.Stdout, constants.LOG_LEVEL_WARN, constants.MSG_LIBRARIES_MULTIPLE_LIBS_FOUND_FOR, header)
+		logger.Fprintln(os.Stdout, constants.LOG_LEVEL_WARN, constants.MSG_LIBRARIES_USED, libResResult.Library.Folder)
+		for _, notUsedLibrary := range libResResult.NotUsedLibraries {
+			logger.Fprintln(os.Stdout, constants.LOG_LEVEL_WARN, constants.MSG_LIBRARIES_NOT_USED, notUsedLibrary.Folder)
 		}
 	}
 

Diff for: src/arduino.cc/builder/test/includes_to_include_folders_test.go

@@ -73,10 +73,6 @@ func TestIncludesToIncludeFolders(t *testing.T) {
 	importedLibraries := ctx.ImportedLibraries
 	require.Equal(t, 1, len(importedLibraries))
 	require.Equal(t, "Bridge", importedLibraries[0].Name)
-
-	libraryResolutionResults := ctx.LibrariesResolutionResults
-	require.NotNil(t, libraryResolutionResults)
-	require.False(t, libraryResolutionResults["Bridge.h"].IsLibraryFromPlatform)
 }
 
 func TestIncludesToIncludeFoldersSketchWithIfDef(t *testing.T) {
@@ -112,9 +108,6 @@ func TestIncludesToIncludeFoldersSketchWithIfDef(t *testing.T) {
 
 	importedLibraries := ctx.ImportedLibraries
 	require.Equal(t, 0, len(importedLibraries))
-
-	libraryResolutionResults := ctx.LibrariesResolutionResults
-	require.NotNil(t, libraryResolutionResults)
 }
 
 func TestIncludesToIncludeFoldersIRremoteLibrary(t *testing.T) {
@@ -153,11 +146,6 @@ func TestIncludesToIncludeFoldersIRremoteLibrary(t *testing.T) {
 	require.Equal(t, 2, len(importedLibraries))
 	require.Equal(t, "Bridge", importedLibraries[0].Name)
 	require.Equal(t, "IRremote", importedLibraries[1].Name)
-
-	libraryResolutionResults := ctx.LibrariesResolutionResults
-	require.NotNil(t, libraryResolutionResults)
-	require.False(t, libraryResolutionResults["Bridge.h"].IsLibraryFromPlatform)
-	require.False(t, libraryResolutionResults["IRremote.h"].IsLibraryFromPlatform)
 }
 
 func TestIncludesToIncludeFoldersANewLibrary(t *testing.T) {
@@ -196,11 +184,6 @@ func TestIncludesToIncludeFoldersANewLibrary(t *testing.T) {
 	require.Equal(t, 2, len(importedLibraries))
 	require.Equal(t, "ANewLibrary-master", importedLibraries[0].Name)
 	require.Equal(t, "IRremote", importedLibraries[1].Name)
-
-	libraryResolutionResults := ctx.LibrariesResolutionResults
-	require.NotNil(t, libraryResolutionResults)
-	require.False(t, libraryResolutionResults["anewlibrary.h"].IsLibraryFromPlatform)
-	require.False(t, libraryResolutionResults["IRremote.h"].IsLibraryFromPlatform)
 }
 
 func TestIncludesToIncludeFoldersDuplicateLibs(t *testing.T) {
@@ -238,10 +221,6 @@ func TestIncludesToIncludeFoldersDuplicateLibs(t *testing.T) {
 	require.Equal(t, 1, len(importedLibraries))
 	require.Equal(t, "SPI", importedLibraries[0].Name)
 	require.Equal(t, Abs(t, filepath.Join("user_hardware", "my_avr_platform", "avr", "libraries", "SPI")), importedLibraries[0].SrcFolder)
-
-	libraryResolutionResults := ctx.LibrariesResolutionResults
-	require.NotNil(t, libraryResolutionResults)
-	require.True(t, libraryResolutionResults["SPI.h"].IsLibraryFromPlatform)
 }
 
 func TestIncludesToIncludeFoldersDuplicateLibsWithConflictingLibsOutsideOfPlatform(t *testing.T) {
@@ -280,10 +259,6 @@ func TestIncludesToIncludeFoldersDuplicateLibsWithConflictingLibsOutsideOfPlatfo
 	require.Equal(t, 1, len(importedLibraries))
 	require.Equal(t, "SPI", importedLibraries[0].Name)
 	require.Equal(t, Abs(t, filepath.Join("libraries", "SPI")), importedLibraries[0].SrcFolder)
-
-	libraryResolutionResults := ctx.LibrariesResolutionResults
-	require.NotNil(t, libraryResolutionResults)
-	require.False(t, libraryResolutionResults["SPI.h"].IsLibraryFromPlatform)
 }
 
 func TestIncludesToIncludeFoldersDuplicateLibs2(t *testing.T) {
@@ -322,8 +297,4 @@ func TestIncludesToIncludeFoldersDuplicateLibs2(t *testing.T) {
 	require.Equal(t, 1, len(importedLibraries))
 	require.Equal(t, "USBHost", importedLibraries[0].Name)
 	require.Equal(t, Abs(t, filepath.Join("libraries", "USBHost", "src")), importedLibraries[0].SrcFolder)
-
-	libraryResolutionResults := ctx.LibrariesResolutionResults
-	require.NotNil(t, libraryResolutionResults)
-	require.False(t, libraryResolutionResults["Usb.h"].IsLibraryFromPlatform)
 }

Diff for: src/arduino.cc/builder/types/types.go

@@ -174,7 +174,6 @@ type SourceFolder struct {
 
 type LibraryResolutionResult struct {
 	Library               *Library
-	IsLibraryFromPlatform bool
 	NotUsedLibraries      []*Library
 }