Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add the ability to find the sketchbook when called from a Makefile in a library example. 

git-svn-id: https://arducopter.googlecode.com/svn/trunk@1400 f9c3cf11-9bcb-44bc-f272-b75c42450872
This commit is contained in:
DrZiplok 2011-01-02 22:16:21 +00:00
parent 76dd412f7d
commit 1c22560133
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
libraries/AP_Common/Arduino.mk
View File

@ -52,10 +52,24 @@ SYSTYPE := $(shell uname)
SRCROOT := $(realpath $(dir $(firstword $(MAKEFILE_LIST)))) SRCROOT := $(realpath $(dir $(firstword $(MAKEFILE_LIST))))
# #
# We need to know the location of the sketchbook. For now, assume that it's # We need to know the location of the sketchbook. If it hasn't been overridden,
# the parent of the source directory. # try the parent of the current directory. If there is no libraries directory
# there, assume that we are in a library's examples directory and try backing up
# further.
# #
SKETCHBOOK := $(shell cd $(SRCROOT)/.. && pwd) ifeq ($(SKETCHBOOK),)
SKETCHBOOK := $(shell cd $(SRCROOT)/.. && pwd)
ifeq ($(wildcard $(SKETCHBOOK)/libraries),)
SKETCHBOOK := $(shell cd $(SRCROOT)/../../../.. && pwd)
endif
ifeq ($(wildcard $(SKETCHBOOK)/libraries),)
$(error ERROR: cannot determine sketchbook location - please specify on the commandline with SKETCHBOOK=<path>)
endif
else
ifeq ($(wildcard $(SKETCHBOOK)/libraries),)
$(warning WARNING: sketchbook directory $(SKETCHBOOK) contains no libraries)
endif
endif
# #
# Work out the sketch name from the name of the source directory. # Work out the sketch name from the name of the source directory.
@ -261,7 +275,7 @@ MCU := $(shell grep $(BOARD).build.mcu $(BOARDFILE) | cut -d = -f 2)
F_CPU := $(shell grep $(BOARD).build.f_cpu $(BOARDFILE) | cut -d = -f 2) F_CPU := $(shell grep $(BOARD).build.f_cpu $(BOARDFILE) | cut -d = -f 2)
HARDWARE_CORE := $(shell grep $(BOARD).build.core $(BOARDFILE) | cut -d = -f 2) HARDWARE_CORE := $(shell grep $(BOARD).build.core $(BOARDFILE) | cut -d = -f 2)
ifeq ($(MCU),) ifeq ($(MCU),)
$(error ERROR: Could not locate board $(BOARD) in $(BOARDFILE) $(error ERROR: Could not locate board $(BOARD) in $(BOARDFILE))
endif endif
# Hardware source files # Hardware source files