My patches to ladislas' PR sudar#341 auto-lib (2nd attempt)

Author: sej7278

Arduino.mk

@@ -794,7 +794,7 @@ ifeq ($(strip $(CHK_SOURCES)),)
                 $(call show_config_info,No .pde or .ino files found. If you are compiling .c or .cpp files then you need to explicitly include Arduino header files)
             else
                 #TODO: Support more than one file. https://github.com/sudar/Arduino-Makefile/issues/49
-                $(error Need exactly one .pde or .ino file. This makefile doesn't support multiple .ino/.pde files yet)
+                $(error Need exactly one .pde or .ino file. This makefile doesn\'t support multiple .ino/.pde files yet)
             endif
         endif
 
@@ -821,17 +821,29 @@ else
     $(call show_config_info,NO_CORE set so core library will not be built,[MANUAL])
 endif
 
+########################################################################
+# Automatically find the libraries needed to compile the sketch
+
+ARD_LIB_DETECTION := $(shell which ard-lib-detection 2> /dev/null)
+ifndef ARD_LIB_DETECTION
+	ARD_LIB_DETECTION := $(ARDMK_DIR)/bin/ard-lib-detection
+endif
+
+ifndef SKETCH_LIBS
+	SKETCH_LIBS := $(shell $(ARD_LIB_DETECTION) $(USER_LIB_PATH) | sed -ne 's/SKETCH_LIBS \(.*\) /\1/p')
+endif
+
+ifndef SKETCH_LIBS_DEPS
+	SKETCH_LIBS_DEPS := $(shell $(ARD_LIB_DETECTION) $(USER_LIB_PATH) | sed -ne 's/SKETCH_LIBS_DEPS \(.*\) /\1/p')
+endif
+
 ########################################################################
 # Determine ARDUINO_LIBS automatically
 
 ifndef ARDUINO_LIBS
     # automatically determine included libraries
     ARDUINO_LIBS += $(filter $(notdir $(wildcard $(ARDUINO_DIR)/libraries/*)), \
         $(shell sed -ne 's/^ *\# *include *[<\"]\(.*\)\.h[>\"]/\1/p' $(LOCAL_SRCS)))
-    ARDUINO_LIBS += $(filter $(notdir $(wildcard $(ARDUINO_SKETCHBOOK)/libraries/*)), \
-        $(shell sed -ne 's/^ *\# *include *[<\"]\(.*\)\.h[>\"]/\1/p' $(LOCAL_SRCS)))
-    ARDUINO_LIBS += $(filter $(notdir $(wildcard $(USER_LIB_PATH)/*)), \
-        $(shell sed -ne 's/^ *\# *include *[<\"]\(.*\)\.h[>\"]/\1/p' $(LOCAL_SRCS)))
     ARDUINO_LIBS += $(filter $(notdir $(wildcard $(ARDUINO_PLATFORM_LIB_PATH)/*)), \
         $(shell sed -ne 's/^ *\# *include *[<\"]\(.*\)\.h[>\"]/\1/p' $(LOCAL_SRCS)))
 endif
@@ -932,7 +944,10 @@ get_library_files  = $(if $(and $(wildcard $(1)/src), $(wildcard $(1)/library.pr
                         $(wildcard $(1)/*.$(2) $(1)/utility/*.$(2)))
 
 # General arguments
-USER_LIBS      := $(sort $(wildcard $(patsubst %,$(USER_LIB_PATH)/%,$(ARDUINO_LIBS))))
+USER_LIBS      := $(wildcard $(patsubst %,$(USER_LIB_PATH)/%,$(ARDUINO_LIBS))) \
+                  $(wildcard $(patsubst %,$(USER_LIB_PATH)/%,$(SKETCH_LIBS))) \
+                  $(wildcard $(patsubst %,$(USER_LIB_PATH)/%,$(SKETCH_LIBS_DEPS)))
+
 USER_LIB_NAMES := $(patsubst $(USER_LIB_PATH)/%,%,$(USER_LIBS))
 
 # Let user libraries override system ones.
@@ -1107,23 +1122,6 @@ else
     $(call show_config_info,Size utility: Basic (not AVR-aware),[AUTODETECTED])
 endif
 
-ifneq (,$(strip $(ARDUINO_LIBS)))
-    $(call arduino_output,-)
-    $(call show_config_info,ARDUINO_LIBS =)
-endif
-
-ifneq (,$(strip $(USER_LIB_NAMES)))
-    $(foreach lib,$(USER_LIB_NAMES),$(call show_config_info,  $(lib),[USER]))
-endif
-
-ifneq (,$(strip $(SYS_LIB_NAMES)))
-    $(foreach lib,$(SYS_LIB_NAMES),$(call show_config_info,  $(lib),[SYSTEM]))
-endif
-
-ifneq (,$(strip $(PLATFORM_LIB_NAMES)))
-    $(foreach lib,$(PLATFORM_LIB_NAMES),$(call show_config_info,  $(lib),[PLATFORM]))
-endif
-
 # either calculate parent dir from arduino dir, or user-defined path
 ifndef BOOTLOADER_PARENT
     BOOTLOADER_PARENT = $(ARDUINO_DIR)/hardware/$(VENDOR)/$(ARCHITECTURE)/bootloaders
@@ -1132,14 +1130,34 @@ else
     $(call show_config_variable,BOOTLOADER_PARENT,[USER])
 endif
 
-########################################################################
 # Tools version info
 ARDMK_VERSION = 1.5
 $(call show_config_variable,ARDMK_VERSION,[COMPUTED])
 
 CC_VERSION := $(shell $(CC) -dumpversion)
 $(call show_config_variable,CC_VERSION,[COMPUTED],($(CC_NAME)))
 
+# do we have any libs?
+ifneq (,$(strip $(USER_LIBS) $(ARDUINO_LIBS) $(SYS_LIBS) $(PLATFORM_LIBS) $(SKETCH_LIBS) $(SKETCH_LIBS_DEPS)))
+    $(call show_config_info,ARDUINO_LIBS =)
+endif
+
+ifneq (,$(strip $(SKETCH_LIBS)))
+    $(foreach lib,$(SKETCH_LIBS),$(call show_config_info,  $(lib),[USER]))
+endif
+
+ifneq (,$(strip $(SKETCH_LIBS_DEPS)))
+    $(foreach lib,$(SKETCH_LIBS_DEPS),$(call show_config_info,  $(lib),[USER]))
+endif
+
+ifneq (,$(strip $(SYS_LIB_NAMES)))
+    $(foreach lib,$(SYS_LIB_NAMES),$(call show_config_info,  $(lib),[SYSTEM]))
+endif
+
+ifneq (,$(strip $(PLATFORM_LIB_NAMES)))
+    $(foreach lib,$(PLATFORM_LIB_NAMES),$(call show_config_info,  $(lib),[PLATFORM]))
+endif
+
 # end of config output
 $(call show_separator)
 

HISTORY.md

@@ -52,6 +52,7 @@ I tried to give credit whenever possible. If I have missed anyone, kindly add it
 - Fix: Added support for VARIANT being a submenu item in 1.6 cores like attiny (https://github.com/sej7278)
 - Fix: Replaced copyright symbol causing sed problems on OSX (Issue #335). (https://github.com/sej7278)
 - Fix: Fix issues with resetting Leonardo and Micro boards(Issue #340) (https://github.com/calvinli)
+- New: Add automatic library detection when compiling a sketch. (http://github.com/ladislas)
 
 ### 1.3.4 (2014-07-12)
 - Tweak: Allow spaces in "Serial.begin (....)". (Issue #190) (https://github.com/pdav)

README.md

@@ -217,7 +217,7 @@ The libraries will be searched in the following places in the following order.
 
 The libraries inside user directories will take precedence over libraries present in Arduino core directory.
 
-The makefile can autodetect the libraries that are included from your sketch and can include them automatically. But it can't detect libraries that are included from other libraries. (see [issue #93](https://github.com/sudar/Arduino-Makefile/issues/93))
+The makefile can autodetect the libraries that are included from your sketch and can include them automatically. It can also detect libraries that are included from other libraries.
 
 ## avrdude
 

bin/ard-lib-detection

@@ -0,0 +1,89 @@
+#!/usr/bin/env python
+
+import os
+import re
+import sys
+
+# Set variables
+USER_LIB_PATH = sys.argv[1]
+USER_LIBS = []
+
+includeRegex = re.compile('^\#include\s(<|")(.*)\.h("|>)', re.DOTALL|re.M)
+
+SKETCH_SRCS = []
+SKETCH_LIBS = []
+
+SKETCH_LIBS_DEPS = []
+SKETCH_LIBS_DEPS_STACK = []
+
+
+# Define functions
+def outputLibs(libArray):
+    for lib in libArray:
+        print(lib),
+    print("")
+
+
+# Find local sources .ino, .c or .cpp
+FILE_END = (".c", ".cpp", ".ino")
+SKETCH_SRCS = [f for f in os.listdir(os.curdir) if f.endswith(FILE_END)]
+
+# Find all USER_LIBS
+for path, dirs, files in os.walk(USER_LIB_PATH):
+    for d in dirs:
+        USER_LIBS.append(d)
+
+# Find SKETCH_LIBS included in SKETCH_SRCS
+for src in SKETCH_SRCS:
+    currentFile = open(src)
+
+    for line in currentFile:
+        match = includeRegex.search(line)
+        if match is not None:
+            group = match.group(2)
+            if group in USER_LIBS:
+                SKETCH_LIBS.append(group)
+
+SKETCH_LIBS = sorted(set(SKETCH_LIBS))
+
+# Find SKETCH_LIBS_DEPS includes in SKETCH_LIBS
+for lib in SKETCH_LIBS:
+    if lib in USER_LIBS:
+        currentFile = open(os.path.join(USER_LIB_PATH, lib, lib + ".h"))
+
+        for line in currentFile:
+            match = includeRegex.search(line)
+            if match is not None:
+                group = match.group(2)
+                if group in USER_LIBS and group not in SKETCH_LIBS:
+                    SKETCH_LIBS_DEPS_STACK.append(group)
+
+SKETCH_LIBS_DEPS_STACK = list(set(SKETCH_LIBS_DEPS_STACK))
+
+# Recursively find all dependencies of every libraries in USER_LIB_PATH
+while len(SKETCH_LIBS_DEPS_STACK) > 0:
+    for lib in SKETCH_LIBS_DEPS_STACK:
+        if lib in USER_LIBS:
+            currentFile = open(os.path.join(USER_LIB_PATH, lib, lib + ".h"))
+
+            for line in currentFile:
+                match = includeRegex.search(line)
+                if match is not None:
+                    group = match.group(2)
+                    if group in USER_LIBS and group not in SKETCH_LIBS_DEPS_STACK and group not in SKETCH_LIBS_DEPS and group not in SKETCH_LIBS:
+                        SKETCH_LIBS_DEPS_STACK.append(group)
+
+                else:
+                    if lib not in SKETCH_LIBS_DEPS:
+                        SKETCH_LIBS_DEPS.append(lib)
+                        if lib in SKETCH_LIBS_DEPS_STACK:
+                            SKETCH_LIBS_DEPS_STACK.remove(lib)
+
+SKETCH_LIBS_DEPS.sort()
+
+# Output libraries for the Makefile
+print("SKETCH_LIBS"),
+outputLibs(SKETCH_LIBS)
+
+print("SKETCH_LIBS_DEPS"),
+outputLibs(SKETCH_LIBS_DEPS)