Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-02-28 02:33:58 -04:00
Code Issues Packages Projects Releases Wiki Activity

Build: Cygwin Windows build and upload fixes

Browse Source 
SITL, HIL and normal builds and uploads work under Cygwin
This commit is contained in:
Stephen 2013-03-05 23:32:55 +11:00 committed by rmackay9
parent 26fedc543c
commit c4ea89b10a
4 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mk/apm.mk
View File

@ -1,6 +1,12 @@
# find the mk/ directory, which is where this makefile fragment # find the mk/ directory, which is where this makefile fragment
# lives. (patsubst strips the trailing slash.) # lives. (patsubst strips the trailing slash.)
MK_DIR := $(patsubst %/,%,$(dir $(lastword $(MAKEFILE_LIST)))) SYSTYPE := $(shell uname)
ifneq ($(findstring CYGWIN, $(SYSTYPE)),)
MK_DIR := $(shell cygpath -m ../mk)
else
MK_DIR := $(patsubst %/,%,$(dir $(lastword $(MAKEFILE_LIST))))
endif
include $(MK_DIR)/environ.mk include $(MK_DIR)/environ.mk

12
mk/board_avr.mk
View File

@ -85,7 +85,12 @@ HARDWARE_CORE := $(shell grep $(BOARD).build.core $(BOARDFILE) | cut -d = -f 2)
UPLOAD_SPEED := $(shell grep $(BOARD).upload.speed $(BOARDFILE) | cut -d = -f 2) UPLOAD_SPEED := $(shell grep $(BOARD).upload.speed $(BOARDFILE) | cut -d = -f 2)
# User can define USERAVRDUDEFLAGS = -V in their config.mk to skip verification # User can define USERAVRDUDEFLAGS = -V in their config.mk to skip verification
USERAVRDUDEFLAGS ?= #make sure the avrdude conf file is referenced correctly in cygwin
ifneq ($(findstring CYGWIN, $(SYSTYPE)),)
USERAVRDUDEFLAGS := -C $(ARDUINO)/hardware/tools/avr/etc/avrdude.conf
else
USERAVRDUDEFLAGS ?=
endif
ifeq ($(UPLOAD_PROTOCOL),) ifeq ($(UPLOAD_PROTOCOL),)
UPLOAD_PROTOCOL := $(shell grep $(BOARD).upload.protocol $(BOARDFILE) | cut -d = -f 2) UPLOAD_PROTOCOL := $(shell grep $(BOARD).upload.protocol $(BOARDFILE) | cut -d = -f 2)
@ -97,6 +102,11 @@ ifeq ($(BOARD),mega)
UPLOAD_PROTOCOL := arduino UPLOAD_PROTOCOL := arduino
endif endif
#On Cygwin, the wiring programmer will perform the DTR reset for us
ifneq ($(findstring CYGWIN, $(SYSTYPE)),)
UPLOAD_PROTOCOL := wiring
endif
ifeq ($(MCU),) ifeq ($(MCU),)
$(error ERROR: Could not locate board $(BOARD) in $(BOARDFILE)) $(error ERROR: Could not locate board $(BOARD) in $(BOARDFILE))
endif endif

2
mk/environ.mk
View File

@ -47,7 +47,7 @@ else
endif endif
ifneq ($(findstring CYGWIN, $(SYSTYPE)),) ifneq ($(findstring CYGWIN, $(SYSTYPE)),)
# Convert cygwin path into a windows normal path # Convert cygwin path into a windows normal path
SKETCHBOOK := $(shell cygpath ${SKETCHBOOK}) SKETCHBOOK := $(shell cygpath -m ${SKETCHBOOK})
endif endif
# #

4
mk/targets.mk
View File

@ -87,9 +87,5 @@ etags:
cd .. && etags -f APMrover2/TAGS --lang=c++ $$(git ls-files APMrover2 libraries) cd .. && etags -f APMrover2/TAGS --lang=c++ $$(git ls-files APMrover2 libraries)
clean: clean:
ifneq ($(findstring CYGWIN, $(SYSTYPE)),)
@del /S $(BUILDROOT)
else
@rm -fr $(BUILDROOT) @rm -fr $(BUILDROOT)
endif