From 4036a2e19bbcd4fb774eff30e62826bbec7e1bfd Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Tue, 9 Jun 2015 14:07:44 +1000 Subject: [PATCH] px4: show warning if old PX4 subdirectories exist --- mk/px4_targets.mk | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/mk/px4_targets.mk b/mk/px4_targets.mk index d50f3fef69..9738a03391 100644 --- a/mk/px4_targets.mk +++ b/mk/px4_targets.mk @@ -18,6 +18,17 @@ NUTTX_ROOT := $(shell cd $(SKETCHBOOK)/modules/PX4NuttX && pwd) NUTTX_SRC := $(NUTTX_ROOT)/nuttx/ UAVCAN_DIR=$(shell cd $(SKETCHBOOK)/modules/uavcan && pwd)/ +# warn if user has old PX4Firmware or PX4NuttX trees +ifneq ($(wildcard $(SKETCHBOOK)/../PX4Firmware),) +$(warning *** You have an old PX4Firmware tree - see http://dev.ardupilot.com/wiki/git-submodules/) +endif +ifneq ($(wildcard $(SKETCHBOOK)/../PX4NuttX),) +$(warning *** You have an old PX4NuttX tree - see http://dev.ardupilot.com/wiki/git-submodules/) +endif +ifneq ($(wildcard $(SKETCHBOOK)/../uavcan),) +$(warning *** You have an old uavcan tree - see http://dev.ardupilot.com/wiki/git-submodules/) +endif + NUTTX_GIT_VERSION := $(shell cd $(NUTTX_SRC) && git rev-parse HEAD | cut -c1-8) PX4_GIT_VERSION := $(shell cd $(PX4_ROOT) && git rev-parse HEAD | cut -c1-8)