Skip to content

Commit 5ee4585

Browse files
author
Federico Fissore
committed
Added library path to error message about both src and utility folders
used by library. Fixes #56 Signed-off-by: Federico Fissore <[email protected]>
1 parent 52bd9f1 commit 5ee4585

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

src/arduino.cc/builder/constants/constants.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ const MSG_LIB_LEGACY = "(legacy)"
210210
const MSG_LIBRARIES_MULTIPLE_LIBS_FOUND_FOR = "Multiple libraries were found for \"{0}\""
211211
const MSG_LIBRARIES_NOT_USED = " Not used: {0}"
212212
const MSG_LIBRARIES_USED = " Used: {0}"
213-
const MSG_LIBRARY_CAN_USE_SRC_AND_UTILITY_FOLDERS = "Library can't use both 'src' and 'utility' folders."
213+
const MSG_LIBRARY_CAN_USE_SRC_AND_UTILITY_FOLDERS = "Library can't use both 'src' and 'utility' folders. Double ckeck {0}"
214214
const MSG_LIBRARY_INCOMPATIBLE_ARCH = "WARNING: library {0} claims to run on {1} architecture(s) and may be incompatible with your current board which runs on {2} architecture(s)."
215215
const MSG_LOOKING_FOR_RECIPES = "Looking for recipes like {0}*{1}"
216216
const MSG_MISSING_BUILD_BOARD = "Board {0}:{1}:{2} doesn''t define a ''build.board'' preference. Auto-set to: {3}"

src/arduino.cc/builder/libraries_loader.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ func makeNewLibrary(libraryFolder string, debugLevel int, logger i18n.Logger) (*
149149
library.Layout = types.LIBRARY_RECURSIVE
150150
library.SrcFolder = filepath.Join(libraryFolder, constants.LIBRARY_FOLDER_SRC)
151151
if stat, err := os.Stat(filepath.Join(libraryFolder, constants.LIBRARY_FOLDER_UTILITY)); err == nil && stat.IsDir() {
152-
return nil, utils.ErrorfWithLogger(logger, constants.MSG_LIBRARY_CAN_USE_SRC_AND_UTILITY_FOLDERS)
152+
return nil, utils.ErrorfWithLogger(logger, constants.MSG_LIBRARY_CAN_USE_SRC_AND_UTILITY_FOLDERS, libraryFolder)
153153
}
154154
} else {
155155
library.Layout = types.LIBRARY_FLAT

0 commit comments

Comments
 (0)