dominic/Arduino-Makefile
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add automatic lib detection with python script, enhance lib listing output when compiling

Browse source
This commit is contained in:
ladislas 2014-08-19 00:02:38 +02:00
parent 58f303a5d3
commit f930c17801
2 changed files with 40 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
Arduino.mk
View file

@ -736,7 +736,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) $(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 else
#TODO: Support more than one file. https://github.com/sudar/Arduino-Makefile/issues/49 #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
endif endif
@ -763,6 +763,19 @@ else
$(call show_config_info,NO_CORE set so core library will not be built,[MANUAL]) $(call show_config_info,NO_CORE set so core library will not be built,[MANUAL])
endif endif
########################################################################
# Automatically find the libraries needed to compile the sketch
ifndef MAIN_LIBS
MAIN_LIBS = $(shell $(ARDMK_DIR)/bin/auto-lib.py $(USER_LIB_PATH) | \
sed -ne 's/MAIN_LIBS \(.*\) /\1/p')
endif
ifndef LIBS_DEPS
LIBS_DEPS = $(shell $(ARDMK_DIR)/bin/auto-lib.py $(USER_LIB_PATH) | \
sed -ne 's/LIBS_DEPS \(.*\) /\1/p')
endif
######################################################################## ########################################################################
# Determine ARDUINO_LIBS automatically # Determine ARDUINO_LIBS automatically
@ -772,8 +785,7 @@ ifndef ARDUINO_LIBS
$(shell sed -ne "s/^ *\# *include *[<\"]\(.*\)\.h[>\"]/\1/p" $(LOCAL_SRCS))) $(shell sed -ne "s/^ *\# *include *[<\"]\(.*\)\.h[>\"]/\1/p" $(LOCAL_SRCS)))
ARDUINO_LIBS += $(filter $(notdir $(wildcard $(ARDUINO_SKETCHBOOK)/libraries/*)), \ ARDUINO_LIBS += $(filter $(notdir $(wildcard $(ARDUINO_SKETCHBOOK)/libraries/*)), \
$(shell sed -ne "s/^ *\# *include *[<\"]\(.*\)\.h[>\"]/\1/p" $(LOCAL_SRCS))) $(shell sed -ne "s/^ *\# *include *[<\"]\(.*\)\.h[>\"]/\1/p" $(LOCAL_SRCS)))
ARDUINO_LIBS += $(filter $(notdir $(wildcard $(USER_LIB_PATH)/*)), \ ARDUINO_LIBS += $(MAIN_LIBS) $(LIBS_DEPS)
$(shell sed -ne "s/^ *\# *include *[<\"]\(.*\)\.h[>\"]/\1/p" $(LOCAL_SRCS)))
endif endif
######################################################################## ########################################################################
@ -989,13 +1001,27 @@ else
$(call show_config_info,Size utility: Basic (not AVR-aware),[AUTODETECTED]) $(call show_config_info,Size utility: Basic (not AVR-aware),[AUTODETECTED])
endif endif
ifneq (,$(strip $(ARDUINO_LIBS))) ifneq (,$(strip $(MAIN_LIBS)))
$(call arduino_output,-) $(call arduino_output,-)
$(call show_config_info,ARDUINO_LIBS =) $(call show_config_info,MAIN_LIBS =)
endif endif
ifneq (,$(strip $(USER_LIB_NAMES))) ifneq (,$(strip $(MAIN_LIBS)))
$(foreach lib,$(USER_LIB_NAMES),$(call show_config_info, $(lib),[USER])) $(foreach lib,$(MAIN_LIBS),$(call show_config_info, $(lib),[USER]))
endif
ifneq (,$(strip $(LIBS_DEPS)))
$(call arduino_output,-)
$(call show_config_info,LIBS_DEPS =)
endif
ifneq (,$(strip $(LIBS_DEPS)))
$(foreach lib,$(LIBS_DEPS),$(call show_config_info, $(lib),[USER]))
endif
ifneq (,$(strip $(SYS_LIBS)))
$(call arduino_output,-)
$(call show_config_info,SYS_LIBS =)
endif endif
ifneq (,$(strip $(SYS_LIB_NAMES))) ifneq (,$(strip $(SYS_LIB_NAMES)))

22
bin/auto-lib.py
View file

@ -16,6 +16,12 @@ MAIN_LIBS = [] ;
LIBS_DEPS = [] ; LIBS_DEPS = [] ;
LIBS_DEPS_STACK = [] ; LIBS_DEPS_STACK = [] ;
# Define functions
def outputLibs(libArray):
for lib in libArray:
print(lib),
print("")
# Find local sources .ino, .c or .cpp # Find local sources .ino, .c or .cpp
for file in os.listdir(os.curdir): for file in os.listdir(os.curdir):
if file.endswith((".c", ".cpp", ".ino")): if file.endswith((".c", ".cpp", ".ino")):
@ -70,24 +76,10 @@ while LIBS_DEPS_STACK:
LIBS_DEPS_STACK.remove(lib) LIBS_DEPS_STACK.remove(lib)
LIBS_DEPS_STACK = sorted(set(LIBS_DEPS_STACK)) LIBS_DEPS_STACK = sorted(set(LIBS_DEPS_STACK))
# print(LIBS_DEPS_STACK)
LIBS_DEPS = sorted(set(LIBS_DEPS)) LIBS_DEPS = sorted(set(LIBS_DEPS))
# print("Main libraries: ") # Output libraries for the Makefile
# print(MAIN_LIBS);
# print("")
# print("Dependencies stack: ")
# print(LIBS_DEPS_STACK)
# print("")
# print("Libraries dependencies: ")
# print(LIBS_DEPS);
def outputLibs(libArray):
for lib in libArray:
print(lib),
print("")
print("MAIN_LIBS"), print("MAIN_LIBS"),
outputLibs(MAIN_LIBS) outputLibs(MAIN_LIBS)