Transformed FailIfImportedLibraryIsWrong into a functon

There was no need to have it encapsulated in a Command

Author: cmaglie

legacy/builder/constants/constants.go

@@ -49,7 +49,6 @@ const FOLDER_SKETCH = "sketch"
 const FOLDER_TOOLS = "tools"
 const LIBRARY_ALL_ARCHS = "*"
 const LIBRARY_EMAIL = "email"
-const LIBRARY_FOLDER_ARCH = "arch"
 const LIBRARY_FOLDER_SRC = "src"
 const LOG_LEVEL_DEBUG = "debug"
 const LOG_LEVEL_ERROR = "error"

legacy/builder/container_find_includes.go

@@ -159,8 +159,7 @@ func (s *ContainerFindIncludes) findIncludes(ctx *types.Context) error {
 		return errors.WithStack(err)
 	}
 
-	err = runCommand(ctx, &FailIfImportedLibraryIsWrong{})
-	if err != nil {
+	if err := failIfImportedLibraryIsWrong(ctx); err != nil {
 		return errors.WithStack(err)
 	}
 
@@ -177,15 +176,6 @@ func appendIncludeFolder(ctx *types.Context, cache *includeCache, sourceFilePath
 	cache.ExpectEntry(sourceFilePath, include, folder)
 }
 
-func runCommand(ctx *types.Context, command types.Command) error {
-	PrintRingNameIfDebug(ctx, command)
-	err := command.Run(ctx)
-	if err != nil {
-		return errors.WithStack(err)
-	}
-	return nil
-}
-
 type includeCacheEntry struct {
 	Sourcefile  *paths.Path
 	Include     string
@@ -471,3 +461,29 @@ func ResolveLibrary(ctx *types.Context, header string) *libraries.Library {
 
 	return selected
 }
+
+func failIfImportedLibraryIsWrong(ctx *types.Context) error {
+	if len(ctx.ImportedLibraries) == 0 {
+		return nil
+	}
+
+	for _, library := range ctx.ImportedLibraries {
+		if !library.IsLegacy {
+			if library.InstallDir.Join("arch").IsDir() {
+				return errors.New(tr("%[1]s folder is no longer supported! See %[2]s for more information", "'arch'", "http://goo.gl/gfFJzU"))
+			}
+			for _, propName := range libraries.MandatoryProperties {
+				if !library.Properties.ContainsKey(propName) {
+					return errors.New(tr("Missing '%[1]s' from library in %[2]s", propName, library.InstallDir))
+				}
+			}
+			if library.Layout == libraries.RecursiveLayout {
+				if library.UtilityDir != nil {
+					return errors.New(tr("Library can't use both '%[1]s' and '%[2]s' folders. Double check in '%[3]s'.", "src", "utility", library.InstallDir))
+				}
+			}
+		}
+	}
+
+	return nil
+}