Skip to content

Don't forbid unknown files in a library #198

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

Don't forbid unknown files in a library #198

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5cb5996
Don't forbid unknown files in a library
mfalkvidd Dec 18, 2016
a91351a
Cleanup unused code that caused the build to fail
mfalkvidd Dec 18, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion src/arduino.cc/builder/constants/constants.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,6 @@ const MSG_USING_CACHED_INCLUDES = "Using cached library dependencies for file: {
const MSG_WARNING_LIB_INVALID_CATEGORY = "WARNING: Category '{0}' in library {1} is not valid. Setting to '{2}'"
const MSG_WARNING_PLATFORM_MISSING_VALUE = "Warning: platform.txt from core '{0}' misses property '{1}', using default value '{2}'. Consider upgrading this core."
const MSG_WARNING_PLATFORM_OLD_VALUES = "Warning: platform.txt from core '{0}' contains deprecated {1}, automatically converted to {2}. Consider upgrading this core."
const MSG_WARNING_SPURIOUS_FILE_IN_LIB = "WARNING: Spurious {0} folder in '{1}' library"
const MSG_WRONG_PROPERTIES_FILE = "Property line '{0}' in file {1} is invalid"
const MSG_WRONG_PROPERTIES = "Property line '{0}' is invalid"
const PACKAGE_NAME = "name"
Expand Down
15 changes: 0 additions & 15 deletions src/arduino.cc/builder/libraries_loader.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,21 +148,6 @@ func makeNewLibrary(libraryFolder string, debugLevel int, logger i18n.Logger) (*
addUtilityFolder(library)
}

subFolders, err := utils.ReadDirFiltered(libraryFolder, utils.FilterDirs)
if err != nil {
return nil, i18n.WrapError(err)
}

if debugLevel >= 0 {
for _, subFolder := range subFolders {
if utils.IsSCCSOrHiddenFile(subFolder) {
if !utils.IsSCCSFile(subFolder) && utils.IsHiddenFile(subFolder) {
logger.Fprintln(os.Stdout, constants.LOG_LEVEL_WARN, constants.MSG_WARNING_SPURIOUS_FILE_IN_LIB, filepath.Base(subFolder.Name()), libProperties[constants.LIBRARY_NAME])
}
}
}
}

if libProperties[constants.LIBRARY_ARCHITECTURES] == constants.EMPTY_STRING {
libProperties[constants.LIBRARY_ARCHITECTURES] = constants.LIBRARY_ALL_ARCHS
}
Expand Down