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

Changed bytes option for the head shell command, so that it works in Mac as well

Browse source
This commit is contained in:
Sudar 2012-07-13 22:56:48 +05:30
parent aabe3d2c58
commit ad005789a0
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
README.md
View file

@ -80,3 +80,4 @@ The following are the list of changes that I have made or merged in this fork. H
- Categorize libs into user and system (https://github.com/rpavlik/) - Categorize libs into user and system (https://github.com/rpavlik/)
- Dump size at the end of the build (https://github.com/rpavlik/) - Dump size at the end of the build (https://github.com/rpavlik/)
- Lots and lots of improvements (https://github.com/rpavlik/) - Lots and lots of improvements (https://github.com/rpavlik/)
- Changed bytes option for the head shell command, so that it works in Mac as well

5
arduino-mk/Arduino.mk
View file

@ -101,6 +101,7 @@
# - Categorize libs into user and system (https://github.com/rpavlik/) # - Categorize libs into user and system (https://github.com/rpavlik/)
# - Dump size at the end of the build (https://github.com/rpavlik/) # - Dump size at the end of the build (https://github.com/rpavlik/)
# - Lots and lots of improvements (https://github.com/rpavlik/) # - Lots and lots of improvements (https://github.com/rpavlik/)
# - Changed bytes option for the head shell command, so that it works in Mac as well
######################################################################## ########################################################################
# #
# DEPENDENCIES # DEPENDENCIES
@ -229,7 +230,7 @@ dir_if_exists = $(if $(wildcard $(1)$(2)),$(1))
# For message printing: pad the right side of the first argument with spaces to # For message printing: pad the right side of the first argument with spaces to
# the number of bytes indicated by the second argument. # the number of bytes indicated by the second argument.
space_pad_to = $(shell echo $(1) " " | head --bytes=$(2)) space_pad_to = $(shell echo $(1) " " | head -c$(2))
# Call with some text, and a prefix tag if desired (like [AUTODETECTED]), # Call with some text, and a prefix tag if desired (like [AUTODETECTED]),
show_config_info = $(info - $(call space_pad_to,$(2),20) $(1)) show_config_info = $(info - $(call space_pad_to,$(2),20) $(1))
@ -272,7 +273,7 @@ ifndef ARDUINO_VERSION
# Remove all the decimals, and right-pad with zeros, and finally grab the first 3 bytes. # Remove all the decimals, and right-pad with zeros, and finally grab the first 3 bytes.
# Works for 1.0 and 1.0.1 # Works for 1.0 and 1.0.1
AUTO_ARDUINO_VERSION := $(shell cat $(ARDUINO_DIR)/lib/version.txt | sed -e 's/[.]//g' -e 's/$$/0000/' | head --bytes=3) AUTO_ARDUINO_VERSION := $(shell cat $(ARDUINO_DIR)/lib/version.txt | sed -e 's/[.]//g' -e 's/$$/0000/' | head -c3)
ifdef AUTO_ARDUINO_VERSION ifdef AUTO_ARDUINO_VERSION
ARDUINO_VERSION = $(AUTO_ARDUINO_VERSION) ARDUINO_VERSION = $(AUTO_ARDUINO_VERSION)
$(call show_config_variable,ARDUINO_VERSION,[AUTODETECTED]) $(call show_config_variable,ARDUINO_VERSION,[AUTODETECTED])