Moved some library consistency checks into FailIfImportedLibraryIsWrong, which

loops on imported libs only (not on all libs). Fixes #62

Signed-off-by: Federico Fissore <[email protected]>

Author: Federico Fissore

src/arduino.cc/builder/container_find_includes.go

@@ -82,6 +82,11 @@ func (s *ContainerFindIncludes) Run(context map[string]interface{}) error {
 		}
 	}
 
+	err = runCommand(context, &FailIfImportedLibraryIsWrong{})
+	if err != nil {
+		return utils.WrapError(err)
+	}
+
 	return nil
 }
 

src/arduino.cc/builder/fail_if_imported_library_is_wrong.go

@@ -0,0 +1,70 @@
+/*
+ * This file is part of Arduino Builder.
+ *
+ * Arduino Builder is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * As a special exception, you may use this file as part of a free software
+ * library without restriction.  Specifically, if other files instantiate
+ * templates or use macros or inline functions from this file, or you compile
+ * this file and link it with other files to produce an executable, this
+ * file does not by itself cause the resulting executable to be covered by
+ * the GNU General Public License.  This exception does not however
+ * invalidate any other reasons why the executable file might be covered by
+ * the GNU General Public License.
+ *
+ * Copyright 2015 Arduino LLC (http://www.arduino.cc/)
+ */
+
+package builder
+
+import (
+	"arduino.cc/builder/constants"
+	"arduino.cc/builder/i18n"
+	"arduino.cc/builder/types"
+	"arduino.cc/builder/utils"
+	"os"
+	"path/filepath"
+)
+
+type FailIfImportedLibraryIsWrong struct{}
+
+func (s *FailIfImportedLibraryIsWrong) Run(context map[string]interface{}) error {
+	if !utils.MapHas(context, constants.CTX_IMPORTED_LIBRARIES) {
+		return nil
+	}
+
+	logger := context[constants.CTX_LOGGER].(i18n.Logger)
+	importedLibraries := context[constants.CTX_IMPORTED_LIBRARIES].([]*types.Library)
+
+	for _, library := range importedLibraries {
+		if !library.IsLegacy {
+			if stat, err := os.Stat(filepath.Join(library.Folder, constants.LIBRARY_FOLDER_ARCH)); err == nil && stat.IsDir() {
+				return utils.ErrorfWithLogger(logger, constants.MSG_ARCH_FOLDER_NOT_SUPPORTED)
+			}
+			for _, propName := range LIBRARY_MANDATORY_PROPERTIES {
+				if _, ok := library.Properties[propName]; !ok {
+					return utils.ErrorfWithLogger(logger, constants.MSG_PROP_IN_LIBRARY, propName, library.Folder)
+				}
+			}
+			if library.Layout == types.LIBRARY_RECURSIVE {
+				if stat, err := os.Stat(filepath.Join(library.Folder, constants.LIBRARY_FOLDER_UTILITY)); err == nil && stat.IsDir() {
+					return utils.ErrorfWithLogger(logger, constants.MSG_LIBRARY_CAN_USE_SRC_AND_UTILITY_FOLDERS, library.Folder)
+				}
+			}
+		}
+	}
+
+	return nil
+}

src/arduino.cc/builder/libraries_loader.go

@@ -129,15 +129,6 @@ func makeNewLibrary(libraryFolder string, debugLevel int, logger i18n.Logger) (*
 		properties[constants.LIBRARY_MAINTAINER] = properties[constants.LIBRARY_EMAIL]
 	}
 
-	if stat, err := os.Stat(filepath.Join(libraryFolder, constants.LIBRARY_FOLDER_ARCH)); err == nil && stat.IsDir() {
-		return nil, utils.ErrorfWithLogger(logger, constants.MSG_ARCH_FOLDER_NOT_SUPPORTED)
-	}
-
-	for _, propName := range LIBRARY_MANDATORY_PROPERTIES {
-		if _, ok := properties[propName]; !ok {
-			return nil, utils.ErrorfWithLogger(logger, constants.MSG_PROP_IN_LIBRARY, propName, libraryFolder)
-		}
-	}
 	for _, propName := range LIBRARY_NOT_SO_MANDATORY_PROPERTIES {
 		if properties[propName] == constants.EMPTY_STRING {
 			properties[propName] = "-"
@@ -148,9 +139,6 @@ func makeNewLibrary(libraryFolder string, debugLevel int, logger i18n.Logger) (*
 	if stat, err := os.Stat(filepath.Join(libraryFolder, constants.LIBRARY_FOLDER_SRC)); err == nil && stat.IsDir() {
 		library.Layout = types.LIBRARY_RECURSIVE
 		library.SrcFolder = filepath.Join(libraryFolder, constants.LIBRARY_FOLDER_SRC)
-		if stat, err := os.Stat(filepath.Join(libraryFolder, constants.LIBRARY_FOLDER_UTILITY)); err == nil && stat.IsDir() {
-			return nil, utils.ErrorfWithLogger(logger, constants.MSG_LIBRARY_CAN_USE_SRC_AND_UTILITY_FOLDERS, libraryFolder)
-		}
 	} else {
 		library.Layout = types.LIBRARY_FLAT
 		library.SrcFolder = libraryFolder
@@ -199,6 +187,7 @@ func makeNewLibrary(libraryFolder string, debugLevel int, logger i18n.Logger) (*
 	library.URL = strings.TrimSpace(properties[constants.LIBRARY_URL])
 	library.IsLegacy = false
 	library.DotALinkage = strings.TrimSpace(properties[constants.LIBRARY_DOT_A_LINKAGE]) == "true"
+	library.Properties = properties
 
 	return library, nil
 }

src/arduino.cc/builder/test/libraries/wronglib/library.properties

@@ -0,0 +1,8 @@
+name=wronglib
+version=1.0
+author=Arduino
+maintainer=Arduino <[email protected]>
+sentence=sentence
+paragraph=paragraph
+url=url
+architectures=*

src/arduino.cc/builder/test/libraries/wronglib/src/.gitkeep

@@ -69,7 +69,7 @@ func TestLoadLibrariesAVR(t *testing.T) {
 	require.Equal(t, Abs(t, filepath.Join("libraries")), librariesFolders[2])
 
 	libraries := context[constants.CTX_LIBRARIES].([]*types.Library)
-	require.Equal(t, 17, len(libraries))
+	require.Equal(t, 18, len(libraries))
 
 	sort.Sort(ByLibraryName(libraries))
 
@@ -175,7 +175,7 @@ func TestLoadLibrariesSAM(t *testing.T) {
 	require.Equal(t, Abs(t, filepath.Join("libraries")), librariesFolders[2])
 
 	libraries := context[constants.CTX_LIBRARIES].([]*types.Library)
-	require.Equal(t, 15, len(libraries))
+	require.Equal(t, 16, len(libraries))
 
 	sort.Sort(ByLibraryName(libraries))
 

src/arduino.cc/builder/test/libraries/wronglib/utility/.gitkeep

@@ -112,6 +112,7 @@ type Library struct {
 	URL         string
 	Category    string
 	License     string
+	Properties  map[string]string
 }
 
 func (library *Library) String() string {