2013-03-11 20:54:36 +01:00
|
|
|
#
|
|
|
|
# Top level Makefile for the OpenPilot project build system.
|
|
|
|
# Copyright (c) 2010-2013, The OpenPilot Team, http://www.openpilot.org
|
|
|
|
#
|
|
|
|
# This program is free software; you can redistribute it and/or modify
|
|
|
|
# it under the terms of the GNU General Public License as published by
|
|
|
|
# the Free Software Foundation; either version 3 of the License, or
|
|
|
|
# (at your option) any later version.
|
|
|
|
#
|
|
|
|
# This program is distributed in the hope that it will be useful, but
|
|
|
|
# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
|
|
|
|
# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
|
|
|
# for more details.
|
|
|
|
#
|
|
|
|
# You should have received a copy of the GNU General Public License along
|
|
|
|
# with this program; if not, write to the Free Software Foundation, Inc.,
|
|
|
|
# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
|
|
#
|
|
|
|
|
2013-03-11 22:36:26 +01:00
|
|
|
# This top level Makefile passes down some variables to sub-makes through
|
|
|
|
# the environment. They are explicitly exported using the export keyword.
|
|
|
|
# Lower level makefiles assume that these variables are defined. To ensure
|
|
|
|
# that a special magic variable is exported here. It must be checked for
|
|
|
|
# existance by each sub-make.
|
|
|
|
export OPENPILOT_IS_COOL := Fuck Yeah!
|
|
|
|
|
2011-05-09 01:14:50 +02:00
|
|
|
# Set up a default goal
|
|
|
|
.DEFAULT_GOAL := help
|
|
|
|
|
2011-02-23 05:18:56 +01:00
|
|
|
# Set up some macros for common directories within the tree
|
2013-03-21 22:11:30 +01:00
|
|
|
export ROOT_DIR := $(realpath $(dir $(lastword $(MAKEFILE_LIST))))
|
|
|
|
export TOOLS_DIR := $(ROOT_DIR)/tools
|
|
|
|
export BUILD_DIR := $(ROOT_DIR)/build
|
|
|
|
export DL_DIR := $(ROOT_DIR)/downloads
|
|
|
|
export PACKAGE_DIR := $(ROOT_DIR)/build/package
|
2013-03-11 20:54:36 +01:00
|
|
|
|
|
|
|
# Set up default build configurations (debug | release)
|
2013-03-19 23:48:02 +01:00
|
|
|
GCS_BUILD_CONF := release
|
|
|
|
UAVOGEN_BUILD_CONF := debug
|
|
|
|
ANDROIDGCS_BUILD_CONF := debug
|
|
|
|
GOOGLE_API_VERSION := 14
|
2011-02-23 05:18:56 +01:00
|
|
|
|
2012-10-06 02:52:07 +02:00
|
|
|
# Function for converting an absolute path to one relative
|
|
|
|
# to the top of the source tree.
|
|
|
|
toprel = $(subst $(realpath $(ROOT_DIR))/,,$(abspath $(1)))
|
|
|
|
|
2011-04-25 00:21:26 +02:00
|
|
|
# Clean out undesirable variables from the environment and command-line
|
|
|
|
# to remove the chance that they will cause problems with our build
|
|
|
|
define SANITIZE_VAR
|
|
|
|
$(if $(filter-out undefined,$(origin $(1))),
|
2013-03-11 20:54:36 +01:00
|
|
|
$(info *NOTE* Sanitized $(2) variable '$(1)' from $(origin $(1)))
|
|
|
|
MAKEOVERRIDES = $(filter-out $(1)=%,$(MAKEOVERRIDES))
|
|
|
|
override $(1) :=
|
|
|
|
unexport $(1)
|
2011-04-25 00:21:26 +02:00
|
|
|
)
|
|
|
|
endef
|
|
|
|
|
|
|
|
# These specific variables can influence gcc in unexpected (and undesirable) ways
|
|
|
|
SANITIZE_GCC_VARS := TMPDIR GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH
|
|
|
|
SANITIZE_GCC_VARS += CFLAGS CPATH C_INCLUDE_PATH CPLUS_INCLUDE_PATH OBJC_INCLUDE_PATH DEPENDENCIES_OUTPUT
|
|
|
|
$(foreach var, $(SANITIZE_GCC_VARS), $(eval $(call SANITIZE_VAR,$(var),disallowed)))
|
|
|
|
|
|
|
|
# These specific variables used to be valid but now they make no sense
|
|
|
|
SANITIZE_DEPRECATED_VARS := USE_BOOTLOADER
|
|
|
|
$(foreach var, $(SANITIZE_DEPRECATED_VARS), $(eval $(call SANITIZE_VAR,$(var),deprecated)))
|
|
|
|
|
2013-03-11 22:36:26 +01:00
|
|
|
# Make sure this isn't being run as root (no whoami on Windows, but that is ok here)
|
2013-03-11 20:54:36 +01:00
|
|
|
ifeq ($(shell whoami 2>/dev/null),root)
|
|
|
|
$(error You should not be running this as root)
|
2012-12-16 01:32:38 +01:00
|
|
|
endif
|
|
|
|
|
2012-11-28 04:43:02 +01:00
|
|
|
# Decide on a verbosity level based on the V= parameter
|
|
|
|
export AT := @
|
|
|
|
ifndef V
|
2013-03-11 20:54:36 +01:00
|
|
|
export V0 :=
|
|
|
|
export V1 := $(AT)
|
2012-11-28 04:43:02 +01:00
|
|
|
else ifeq ($(V), 0)
|
2013-03-11 20:54:36 +01:00
|
|
|
export V0 := $(AT)
|
|
|
|
export V1 := $(AT)
|
2012-11-28 04:43:02 +01:00
|
|
|
else ifeq ($(V), 1)
|
|
|
|
endif
|
|
|
|
|
2013-03-11 20:54:36 +01:00
|
|
|
# Make sure we know few things about the architecture before including
|
2012-12-16 06:18:07 +01:00
|
|
|
# the tools.mk to ensure that we download/install the right tools.
|
|
|
|
UNAME := $(shell uname)
|
2013-03-11 20:54:36 +01:00
|
|
|
ARCH := $(shell uname -m)
|
|
|
|
# Here and everywhere if not Linux or OSX then assume Windows
|
|
|
|
ifeq ($(filter Linux Darwin, $(UNAME)), )
|
|
|
|
UNAME := Windows
|
|
|
|
endif
|
2012-12-16 06:18:07 +01:00
|
|
|
|
2013-03-11 22:36:26 +01:00
|
|
|
# Set up misc host tools
|
|
|
|
export ECHO := echo
|
|
|
|
export MKDIR := mkdir
|
2013-03-21 20:28:44 +01:00
|
|
|
export CP := cp
|
2013-03-11 22:36:26 +01:00
|
|
|
export RM := rm
|
|
|
|
export LN := ln
|
|
|
|
export CAT := cat
|
|
|
|
export SED := sed
|
|
|
|
export TAR := tar
|
|
|
|
export ANT := ant
|
|
|
|
export JAVAC := javac
|
|
|
|
export JAR := jar
|
|
|
|
export GIT := git
|
|
|
|
export PYTHON := python
|
|
|
|
export INSTALL := install
|
|
|
|
|
Final step: lot of small fixes, last commit in this commit series
This is the first cleanup pass through makefiles and pios.
Probably it is difficult to track changes due to the nature of them.
I would recommend to look at resulting files and compiled code instead.
NOTE: original branch was rebased and lot of conflicts were fixed on
the way. So do not expect that every commit in this series will be
buildable (unlike original branch). Only final result was tested.
The main goal was to remove as much duplication of code (and copy/paste
errors) as possible, moving common parts out of Makefiles. It still is
not perfect, and mostly no code changes made - Makefiles and #ifdefs only.
But please while testing make sure that all code works as before, and no
modules/options are missed by accident.
Brief list of changes:
- Moved common parts of Makefiles into the set of *.mk files.
- Changed method of passing common vars from top Makefile to lower ones.
- Some pios cleanup, mostly #ifdefs, and all pios_config.h files.
- Many obsolete files removed (for instance, AHRS files, op_config.h).
- Many obsolete or unused macros removed or fixed/renamed (ALL_DIGNOSTICS).
- Unified pios_config.h template. Please don't remove lines for board
configs, only comment/uncomment them. Adding new PIOS options, please
propagate them to all board files keeping the same order.
- Some formatting, spacing, indentation (no line endings change yet).
- Some cosmetic fixes (no more C:\X\Y\filename.c printings on Windows).
- Added some library.mk files to move libs into AR achives later.
- EntireFlash target now uses cross-platform python script to generate bin
files. So it works on all supported platforms: Linux, OSX, Windows.
- Top level packaging is completely rewritten. Now it is a part of top
Makefile. As such, all dependencies are checked and accounted, no
more 'make -j' problems should occur.
- Default GCS_BUILD_CONF is release now, may be changed if necessary
using 'make GCS_BUILD_CONF=debug gcs'.
- GCS build paths are separated into debug and release, so no more obj
file clashes. Packaging system supports only release builds.
- New target is introduced: 'clean_package'. Now 'make package' does not
clean build directory. Use clean_package instead for distributable builds.
- Targets like 'all', 'opfw_resource', etc now will print extra contex
in parallel builds too.
- If any of 'package', 'clean_package', 'opfw_resource' targets are given
on command line, GCS build will depend on the resource, so all fw_*.opfw
targets will be built and embedded into GCS. By default GCS does not
depend on resource, and will be built w/o firmware (unless the resource
files already exist and the Qt resource file is generated).
- fw_simposix (ELF executable) is now packaged for linux. Run'n'play!
- Make help is refined and is now up to date.
Still broken:
- UnitTests, should be fixed
- SimPosix: buildable, but should be reworked.
Next planned passes to do:
- toolchain bootstrapping and packaging (including windows - WIP)
- CMSIS/StdPeriph lib cleanup
- more PIOS cleanup
- move libs into AR archives to save build time
- sim targets refactir and cleanup
- move android-related directories under <top>/android
- unit test targets fix
- source code line ending changes (there are many different, were not changed)
- coding style
Merging this, please use --no-ff git option to make it the real commit point
Conflicts:
A lot of... :-)
2013-03-24 12:02:08 +01:00
|
|
|
# Command to extract version info data from the repository and source tree
|
2013-03-11 22:36:26 +01:00
|
|
|
export VERSION_INFO := $(PYTHON) "$(ROOT_DIR)/make/scripts/version-info.py" --path="$(ROOT_DIR)"
|
|
|
|
|
|
|
|
# Test if quotes are needed for the echo-command
|
|
|
|
ifeq (${shell $(ECHO) "test"}, test)
|
|
|
|
export QUOTE := '
|
|
|
|
# This line is just to clear out the single quote above '
|
|
|
|
else
|
|
|
|
export QUOTE :=
|
|
|
|
endif
|
|
|
|
|
2013-03-11 20:54:36 +01:00
|
|
|
# The tools.mk uses wget to fetch tarballs or packages
|
|
|
|
ifeq ($(shell [ -x "$(TOOLS_DIR)/bin/wget" ] && $(ECHO) "exists"), exists)
|
|
|
|
WGET := $(TOOLS_DIR)/bin/wget
|
|
|
|
else
|
|
|
|
# not installed, hope it's in the path...
|
|
|
|
WGET ?= wget
|
|
|
|
endif
|
|
|
|
|
|
|
|
# Include tools installers
|
2012-11-28 04:43:02 +01:00
|
|
|
include $(ROOT_DIR)/make/tools.mk
|
|
|
|
|
2013-03-11 20:54:36 +01:00
|
|
|
# Set up paths to tools
|
|
|
|
ifeq ($(shell [ -d "$(QT_SDK_DIR)" ] && $(ECHO) "exists"), exists)
|
|
|
|
QMAKE := $(QT_SDK_QMAKE_PATH)
|
|
|
|
else
|
|
|
|
# not installed, hope it's in the path...
|
|
|
|
QMAKE ?= qmake
|
2011-02-23 05:18:56 +01:00
|
|
|
endif
|
2013-03-11 20:54:36 +01:00
|
|
|
|
|
|
|
ifeq ($(shell [ -d "$(ARM_SDK_DIR)" ] && $(ECHO) "exists"), exists)
|
2013-03-11 22:36:26 +01:00
|
|
|
export ARM_SDK_PREFIX := $(ARM_SDK_DIR)/bin/arm-none-eabi-
|
2013-03-11 20:54:36 +01:00
|
|
|
else
|
|
|
|
# not installed, hope it's in the path...
|
2013-03-11 22:36:26 +01:00
|
|
|
export ARM_SDK_PREFIX ?= arm-none-eabi-
|
2011-02-23 05:18:56 +01:00
|
|
|
endif
|
|
|
|
|
2013-03-11 20:54:36 +01:00
|
|
|
ifeq ($(shell [ -d "$(OPENOCD_DIR)" ] && $(ECHO) "exists"), exists)
|
2013-03-11 22:36:26 +01:00
|
|
|
export OPENOCD := $(OPENOCD_DIR)/bin/openocd
|
2013-03-11 20:54:36 +01:00
|
|
|
else
|
|
|
|
# not installed, hope it's in the path...
|
2013-03-11 22:36:26 +01:00
|
|
|
export OPENOCD ?= openocd
|
2013-03-11 20:54:36 +01:00
|
|
|
endif
|
2011-02-23 05:18:56 +01:00
|
|
|
|
2013-03-11 20:54:36 +01:00
|
|
|
ifeq ($(shell [ -d "$(ANDROID_SDK_DIR)" ] && $(ECHO) "exists"), exists)
|
|
|
|
ANDROID := $(ANDROID_SDK_DIR)/tools/android
|
|
|
|
ANDROID_DX := $(ANDROID_SDK_DIR)/platform-tools/dx
|
|
|
|
else
|
|
|
|
# not installed, hope it's in the path...
|
|
|
|
ANDROID ?= android
|
|
|
|
ANDROID_DX ?= dx
|
|
|
|
endif
|
2011-02-23 05:18:56 +01:00
|
|
|
|
2013-03-11 20:54:36 +01:00
|
|
|
# We almost need to consider autoconf/automake instead of this
|
|
|
|
ifeq ($(UNAME), Linux)
|
|
|
|
QT_SPEC = linux-g++
|
|
|
|
UAVOBJGENERATOR = "$(BUILD_DIR)/ground/uavobjgenerator/uavobjgenerator"
|
|
|
|
else ifeq ($(UNAME), Darwin)
|
|
|
|
QT_SPEC = macx-g++
|
|
|
|
UAVOBJGENERATOR = "$(BUILD_DIR)/ground/uavobjgenerator/uavobjgenerator"
|
|
|
|
else
|
|
|
|
QT_SPEC = win32-g++
|
|
|
|
UAVOBJGENERATOR = "$(BUILD_DIR)/ground/uavobjgenerator/$(UAVOGEN_BUILD_CONF)/uavobjgenerator.exe"
|
|
|
|
endif
|
|
|
|
|
|
|
|
##############################
|
|
|
|
#
|
|
|
|
# All targets
|
|
|
|
#
|
|
|
|
##############################
|
2011-02-23 05:18:56 +01:00
|
|
|
|
|
|
|
.PHONY: all
|
|
|
|
all: uavobjects all_ground all_flight
|
|
|
|
|
|
|
|
.PHONY: all_clean
|
|
|
|
all_clean:
|
2011-02-28 11:25:56 +01:00
|
|
|
[ ! -d "$(BUILD_DIR)" ] || $(RM) -rf "$(BUILD_DIR)"
|
2011-02-23 05:18:56 +01:00
|
|
|
|
|
|
|
$(DL_DIR):
|
2013-03-11 20:54:36 +01:00
|
|
|
$(MKDIR) -p $@
|
2011-02-23 05:18:56 +01:00
|
|
|
|
|
|
|
$(TOOLS_DIR):
|
2013-03-11 20:54:36 +01:00
|
|
|
$(MKDIR) -p $@
|
2011-02-23 05:18:56 +01:00
|
|
|
|
|
|
|
$(BUILD_DIR):
|
2013-03-11 20:54:36 +01:00
|
|
|
$(MKDIR) -p $@
|
2011-02-23 05:18:56 +01:00
|
|
|
|
|
|
|
##############################
|
|
|
|
#
|
2013-03-11 20:54:36 +01:00
|
|
|
# UAVObjects
|
2011-02-23 05:18:56 +01:00
|
|
|
#
|
|
|
|
##############################
|
|
|
|
|
2013-03-11 20:54:36 +01:00
|
|
|
ifeq ($(V), 1)
|
|
|
|
UAVOGEN_SILENT :=
|
2011-02-23 05:18:56 +01:00
|
|
|
else
|
2013-03-11 20:54:36 +01:00
|
|
|
UAVOGEN_SILENT := silent
|
2011-02-23 05:18:56 +01:00
|
|
|
endif
|
|
|
|
|
2013-03-11 20:54:36 +01:00
|
|
|
.PHONY: uavobjgenerator
|
|
|
|
uavobjgenerator:
|
|
|
|
$(V1) $(MKDIR) -p $(BUILD_DIR)/ground/$@
|
|
|
|
$(V1) ( cd $(BUILD_DIR)/ground/$@ && \
|
|
|
|
$(QMAKE) $(ROOT_DIR)/ground/uavobjgenerator/uavobjgenerator.pro -spec $(QT_SPEC) -r CONFIG+="$(UAVOGEN_BUILD_CONF) $(UAVOGEN_SILENT)" && \
|
|
|
|
$(MAKE) --no-print-directory -w ; \
|
|
|
|
)
|
2011-02-23 05:18:56 +01:00
|
|
|
|
2013-03-11 20:54:36 +01:00
|
|
|
UAVOBJ_TARGETS := gcs flight python matlab java wireshark
|
2011-02-23 05:18:56 +01:00
|
|
|
|
2013-03-11 20:54:36 +01:00
|
|
|
.PHONY: uavobjects
|
|
|
|
uavobjects: $(addprefix uavobjects_, $(UAVOBJ_TARGETS))
|
|
|
|
|
|
|
|
UAVOBJ_XML_DIR := $(ROOT_DIR)/shared/uavobjectdefinition
|
|
|
|
UAVOBJ_OUT_DIR := $(BUILD_DIR)/uavobject-synthetics
|
|
|
|
|
|
|
|
$(UAVOBJ_OUT_DIR):
|
|
|
|
$(V1) $(MKDIR) -p $@
|
|
|
|
|
|
|
|
uavobjects_%: $(UAVOBJ_OUT_DIR) uavobjgenerator
|
|
|
|
$(V1) ( cd $(UAVOBJ_OUT_DIR) && \
|
|
|
|
$(UAVOBJGENERATOR) -$* $(UAVOBJ_XML_DIR) $(ROOT_DIR) ; \
|
|
|
|
)
|
|
|
|
|
|
|
|
uavobjects_test: $(UAVOBJ_OUT_DIR) uavobjgenerator
|
|
|
|
$(V1) $(UAVOBJGENERATOR) -v -none $(UAVOBJ_XML_DIR) $(ROOT_DIR)
|
|
|
|
|
|
|
|
uavobjects_clean:
|
|
|
|
$(V0) @$(ECHO) " CLEAN $@"
|
|
|
|
$(V1) [ ! -d "$(UAVOBJ_OUT_DIR)" ] || $(RM) -r "$(UAVOBJ_OUT_DIR)"
|
2012-10-06 00:47:10 +02:00
|
|
|
|
2011-02-23 05:18:56 +01:00
|
|
|
##############################
|
|
|
|
#
|
|
|
|
# Flight related components
|
|
|
|
#
|
|
|
|
##############################
|
|
|
|
|
2012-11-28 04:32:51 +01:00
|
|
|
# Define some pointers to the various important pieces of the flight code
|
|
|
|
# to prevent these being repeated in every sub makefile
|
2013-03-11 22:36:26 +01:00
|
|
|
export PIOS := $(ROOT_DIR)/flight/PiOS
|
|
|
|
export FLIGHTLIB := $(ROOT_DIR)/flight/Libraries
|
|
|
|
export OPMODULEDIR := $(ROOT_DIR)/flight/Modules
|
|
|
|
export OPUAVOBJ := $(ROOT_DIR)/flight/targets/UAVObjects
|
|
|
|
export OPUAVTALK := $(ROOT_DIR)/flight/targets/UAVTalk
|
|
|
|
export HWDEFS := $(ROOT_DIR)/flight/targets/board_hw_defs
|
|
|
|
export DOXYGENDIR := $(ROOT_DIR)/flight/Doc/Doxygen
|
|
|
|
export OPUAVSYNTHDIR := $(BUILD_DIR)/uavobject-synthetics/flight
|
2012-11-28 04:32:51 +01:00
|
|
|
|
2013-03-18 19:24:50 +01:00
|
|
|
# Define supported board lists
|
Final step: lot of small fixes, last commit in this commit series
This is the first cleanup pass through makefiles and pios.
Probably it is difficult to track changes due to the nature of them.
I would recommend to look at resulting files and compiled code instead.
NOTE: original branch was rebased and lot of conflicts were fixed on
the way. So do not expect that every commit in this series will be
buildable (unlike original branch). Only final result was tested.
The main goal was to remove as much duplication of code (and copy/paste
errors) as possible, moving common parts out of Makefiles. It still is
not perfect, and mostly no code changes made - Makefiles and #ifdefs only.
But please while testing make sure that all code works as before, and no
modules/options are missed by accident.
Brief list of changes:
- Moved common parts of Makefiles into the set of *.mk files.
- Changed method of passing common vars from top Makefile to lower ones.
- Some pios cleanup, mostly #ifdefs, and all pios_config.h files.
- Many obsolete files removed (for instance, AHRS files, op_config.h).
- Many obsolete or unused macros removed or fixed/renamed (ALL_DIGNOSTICS).
- Unified pios_config.h template. Please don't remove lines for board
configs, only comment/uncomment them. Adding new PIOS options, please
propagate them to all board files keeping the same order.
- Some formatting, spacing, indentation (no line endings change yet).
- Some cosmetic fixes (no more C:\X\Y\filename.c printings on Windows).
- Added some library.mk files to move libs into AR achives later.
- EntireFlash target now uses cross-platform python script to generate bin
files. So it works on all supported platforms: Linux, OSX, Windows.
- Top level packaging is completely rewritten. Now it is a part of top
Makefile. As such, all dependencies are checked and accounted, no
more 'make -j' problems should occur.
- Default GCS_BUILD_CONF is release now, may be changed if necessary
using 'make GCS_BUILD_CONF=debug gcs'.
- GCS build paths are separated into debug and release, so no more obj
file clashes. Packaging system supports only release builds.
- New target is introduced: 'clean_package'. Now 'make package' does not
clean build directory. Use clean_package instead for distributable builds.
- Targets like 'all', 'opfw_resource', etc now will print extra contex
in parallel builds too.
- If any of 'package', 'clean_package', 'opfw_resource' targets are given
on command line, GCS build will depend on the resource, so all fw_*.opfw
targets will be built and embedded into GCS. By default GCS does not
depend on resource, and will be built w/o firmware (unless the resource
files already exist and the Qt resource file is generated).
- fw_simposix (ELF executable) is now packaged for linux. Run'n'play!
- Make help is refined and is now up to date.
Still broken:
- UnitTests, should be fixed
- SimPosix: buildable, but should be reworked.
Next planned passes to do:
- toolchain bootstrapping and packaging (including windows - WIP)
- CMSIS/StdPeriph lib cleanup
- more PIOS cleanup
- move libs into AR archives to save build time
- sim targets refactir and cleanup
- move android-related directories under <top>/android
- unit test targets fix
- source code line ending changes (there are many different, were not changed)
- coding style
Merging this, please use --no-ff git option to make it the real commit point
Conflicts:
A lot of... :-)
2013-03-24 12:02:08 +01:00
|
|
|
ALL_BOARDS := coptercontrol pipxtreme revolution revomini osd simposix
|
2013-03-18 19:24:50 +01:00
|
|
|
ALL_BOARDS_BU := coptercontrol pipxtreme simposix
|
|
|
|
|
|
|
|
# Friendly names of each board (used to find source tree)
|
|
|
|
coptercontrol_friendly := CopterControl
|
|
|
|
pipxtreme_friendly := PipXtreme
|
|
|
|
revolution_friendly := Revolution
|
|
|
|
revomini_friendly := RevoMini
|
|
|
|
osd_friendly := OSD
|
Final step: lot of small fixes, last commit in this commit series
This is the first cleanup pass through makefiles and pios.
Probably it is difficult to track changes due to the nature of them.
I would recommend to look at resulting files and compiled code instead.
NOTE: original branch was rebased and lot of conflicts were fixed on
the way. So do not expect that every commit in this series will be
buildable (unlike original branch). Only final result was tested.
The main goal was to remove as much duplication of code (and copy/paste
errors) as possible, moving common parts out of Makefiles. It still is
not perfect, and mostly no code changes made - Makefiles and #ifdefs only.
But please while testing make sure that all code works as before, and no
modules/options are missed by accident.
Brief list of changes:
- Moved common parts of Makefiles into the set of *.mk files.
- Changed method of passing common vars from top Makefile to lower ones.
- Some pios cleanup, mostly #ifdefs, and all pios_config.h files.
- Many obsolete files removed (for instance, AHRS files, op_config.h).
- Many obsolete or unused macros removed or fixed/renamed (ALL_DIGNOSTICS).
- Unified pios_config.h template. Please don't remove lines for board
configs, only comment/uncomment them. Adding new PIOS options, please
propagate them to all board files keeping the same order.
- Some formatting, spacing, indentation (no line endings change yet).
- Some cosmetic fixes (no more C:\X\Y\filename.c printings on Windows).
- Added some library.mk files to move libs into AR achives later.
- EntireFlash target now uses cross-platform python script to generate bin
files. So it works on all supported platforms: Linux, OSX, Windows.
- Top level packaging is completely rewritten. Now it is a part of top
Makefile. As such, all dependencies are checked and accounted, no
more 'make -j' problems should occur.
- Default GCS_BUILD_CONF is release now, may be changed if necessary
using 'make GCS_BUILD_CONF=debug gcs'.
- GCS build paths are separated into debug and release, so no more obj
file clashes. Packaging system supports only release builds.
- New target is introduced: 'clean_package'. Now 'make package' does not
clean build directory. Use clean_package instead for distributable builds.
- Targets like 'all', 'opfw_resource', etc now will print extra contex
in parallel builds too.
- If any of 'package', 'clean_package', 'opfw_resource' targets are given
on command line, GCS build will depend on the resource, so all fw_*.opfw
targets will be built and embedded into GCS. By default GCS does not
depend on resource, and will be built w/o firmware (unless the resource
files already exist and the Qt resource file is generated).
- fw_simposix (ELF executable) is now packaged for linux. Run'n'play!
- Make help is refined and is now up to date.
Still broken:
- UnitTests, should be fixed
- SimPosix: buildable, but should be reworked.
Next planned passes to do:
- toolchain bootstrapping and packaging (including windows - WIP)
- CMSIS/StdPeriph lib cleanup
- more PIOS cleanup
- move libs into AR archives to save build time
- sim targets refactir and cleanup
- move android-related directories under <top>/android
- unit test targets fix
- source code line ending changes (there are many different, were not changed)
- coding style
Merging this, please use --no-ff git option to make it the real commit point
Conflicts:
A lot of... :-)
2013-03-24 12:02:08 +01:00
|
|
|
simposix_friendly := SimPosix
|
2013-03-18 19:24:50 +01:00
|
|
|
|
|
|
|
# Short names of each board (used to display board name in parallel builds)
|
|
|
|
coptercontrol_short := 'cc '
|
|
|
|
pipxtreme_short := 'pipx'
|
|
|
|
revolution_short := 'revo'
|
|
|
|
revomini_short := 'rm '
|
|
|
|
osd_short := 'osd '
|
Final step: lot of small fixes, last commit in this commit series
This is the first cleanup pass through makefiles and pios.
Probably it is difficult to track changes due to the nature of them.
I would recommend to look at resulting files and compiled code instead.
NOTE: original branch was rebased and lot of conflicts were fixed on
the way. So do not expect that every commit in this series will be
buildable (unlike original branch). Only final result was tested.
The main goal was to remove as much duplication of code (and copy/paste
errors) as possible, moving common parts out of Makefiles. It still is
not perfect, and mostly no code changes made - Makefiles and #ifdefs only.
But please while testing make sure that all code works as before, and no
modules/options are missed by accident.
Brief list of changes:
- Moved common parts of Makefiles into the set of *.mk files.
- Changed method of passing common vars from top Makefile to lower ones.
- Some pios cleanup, mostly #ifdefs, and all pios_config.h files.
- Many obsolete files removed (for instance, AHRS files, op_config.h).
- Many obsolete or unused macros removed or fixed/renamed (ALL_DIGNOSTICS).
- Unified pios_config.h template. Please don't remove lines for board
configs, only comment/uncomment them. Adding new PIOS options, please
propagate them to all board files keeping the same order.
- Some formatting, spacing, indentation (no line endings change yet).
- Some cosmetic fixes (no more C:\X\Y\filename.c printings on Windows).
- Added some library.mk files to move libs into AR achives later.
- EntireFlash target now uses cross-platform python script to generate bin
files. So it works on all supported platforms: Linux, OSX, Windows.
- Top level packaging is completely rewritten. Now it is a part of top
Makefile. As such, all dependencies are checked and accounted, no
more 'make -j' problems should occur.
- Default GCS_BUILD_CONF is release now, may be changed if necessary
using 'make GCS_BUILD_CONF=debug gcs'.
- GCS build paths are separated into debug and release, so no more obj
file clashes. Packaging system supports only release builds.
- New target is introduced: 'clean_package'. Now 'make package' does not
clean build directory. Use clean_package instead for distributable builds.
- Targets like 'all', 'opfw_resource', etc now will print extra contex
in parallel builds too.
- If any of 'package', 'clean_package', 'opfw_resource' targets are given
on command line, GCS build will depend on the resource, so all fw_*.opfw
targets will be built and embedded into GCS. By default GCS does not
depend on resource, and will be built w/o firmware (unless the resource
files already exist and the Qt resource file is generated).
- fw_simposix (ELF executable) is now packaged for linux. Run'n'play!
- Make help is refined and is now up to date.
Still broken:
- UnitTests, should be fixed
- SimPosix: buildable, but should be reworked.
Next planned passes to do:
- toolchain bootstrapping and packaging (including windows - WIP)
- CMSIS/StdPeriph lib cleanup
- more PIOS cleanup
- move libs into AR archives to save build time
- sim targets refactir and cleanup
- move android-related directories under <top>/android
- unit test targets fix
- source code line ending changes (there are many different, were not changed)
- coding style
Merging this, please use --no-ff git option to make it the real commit point
Conflicts:
A lot of... :-)
2013-03-24 12:02:08 +01:00
|
|
|
simposix_short := 'posx'
|
2013-03-18 19:24:50 +01:00
|
|
|
|
|
|
|
# SimPosix only builds on Linux so drop it from the list for
|
|
|
|
# all other platforms.
|
|
|
|
ifneq ($(UNAME), Linux)
|
|
|
|
ALL_BOARDS := $(filter-out simposix, $(ALL_BOARDS))
|
|
|
|
ALL_BOARDS_BU := $(filter-out simposix, $(ALL_BOARDS_BU))
|
|
|
|
endif
|
|
|
|
|
|
|
|
# Start out assuming that we'll build fw, bl and bu for all boards
|
|
|
|
FW_BOARDS := $(ALL_BOARDS)
|
|
|
|
BL_BOARDS := $(ALL_BOARDS)
|
|
|
|
BU_BOARDS := $(ALL_BOARDS_BU)
|
|
|
|
EF_BOARDS := $(ALL_BOARDS)
|
|
|
|
|
|
|
|
# SimPosix doesn't have a BL, BU or EF target so we need to
|
|
|
|
# filter them out to prevent errors on the all_flight target.
|
|
|
|
BL_BOARDS := $(filter-out simposix, $(BL_BOARDS))
|
|
|
|
BU_BOARDS := $(filter-out simposix, $(BU_BOARDS))
|
|
|
|
EF_BOARDS := $(filter-out simposix, $(EF_BOARDS))
|
|
|
|
|
|
|
|
# Generate the targets for whatever boards are left in each list
|
|
|
|
FW_TARGETS := $(addprefix fw_, $(FW_BOARDS))
|
|
|
|
BL_TARGETS := $(addprefix bl_, $(BL_BOARDS))
|
|
|
|
BU_TARGETS := $(addprefix bu_, $(BU_BOARDS))
|
|
|
|
EF_TARGETS := $(addprefix ef_, $(EF_BOARDS))
|
|
|
|
|
|
|
|
# When building any of the "all_*" targets, tell all sub makefiles to display
|
|
|
|
# additional details on each line of output to describe which build and target
|
2013-03-21 20:28:44 +01:00
|
|
|
# that each line applies to. The same applies also to all, opfw_resource,
|
|
|
|
# package and clean_package targets
|
|
|
|
ifneq ($(strip $(filter all_% all opfw_resource package clean_package,$(MAKECMDGOALS))),)
|
2013-03-18 19:24:50 +01:00
|
|
|
export ENABLE_MSG_EXTRA := yes
|
|
|
|
endif
|
|
|
|
|
|
|
|
# When building more than one goal in a single make invocation, also
|
|
|
|
# enable the extra context for each output line
|
|
|
|
ifneq ($(word 2,$(MAKECMDGOALS)),)
|
|
|
|
export ENABLE_MSG_EXTRA := yes
|
|
|
|
endif
|
|
|
|
|
|
|
|
# TEMPLATES (used to generate build rules)
|
|
|
|
|
build: refactor fw, bl and bu rules
- New macros for fw, bl and bu rules in top-level make
- Per-board info factored into make/board/*/board-info.mk
- Per-board info now shared btw. fw, bl and blupd for each board
- BOARD_TYPE, BOARD_REVISION, BOOTLOADER_VERSION, HW_TYPE
- MCU, CHIP, BOARD, MODEL, MODEL_SUFFIX
- START_OF_BL_CODE, START_OF_FW_CODE
- blupd_* goals renamed to bu_*
- all_blupd goal renamed to all_bu
- firmware goals renamed to fw_*, board name goals are preserved
- bu_*_program now writes updater to correct address for all boards
- BL updater firmware builds now produce .opf format including
version info blob.
- BL updater firmware name now includes board name.
- INS makefile brought up to date w.r.t. linker scripts
2011-05-23 21:11:53 +02:00
|
|
|
# $(1) = Canonical board name all in lower case (e.g. coptercontrol)
|
|
|
|
# $(2) = Name of board used in source tree (e.g. CopterControl)
|
2012-06-03 02:27:58 +02:00
|
|
|
# $(3) = Short name for board (e.g CC)
|
build: refactor fw, bl and bu rules
- New macros for fw, bl and bu rules in top-level make
- Per-board info factored into make/board/*/board-info.mk
- Per-board info now shared btw. fw, bl and blupd for each board
- BOARD_TYPE, BOARD_REVISION, BOOTLOADER_VERSION, HW_TYPE
- MCU, CHIP, BOARD, MODEL, MODEL_SUFFIX
- START_OF_BL_CODE, START_OF_FW_CODE
- blupd_* goals renamed to bu_*
- all_blupd goal renamed to all_bu
- firmware goals renamed to fw_*, board name goals are preserved
- bu_*_program now writes updater to correct address for all boards
- BL updater firmware builds now produce .opf format including
version info blob.
- BL updater firmware name now includes board name.
- INS makefile brought up to date w.r.t. linker scripts
2011-05-23 21:11:53 +02:00
|
|
|
define FW_TEMPLATE
|
|
|
|
.PHONY: $(1) fw_$(1)
|
2011-05-25 06:20:02 +02:00
|
|
|
$(1): fw_$(1)_opfw
|
|
|
|
fw_$(1): fw_$(1)_opfw
|
build: refactor fw, bl and bu rules
- New macros for fw, bl and bu rules in top-level make
- Per-board info factored into make/board/*/board-info.mk
- Per-board info now shared btw. fw, bl and blupd for each board
- BOARD_TYPE, BOARD_REVISION, BOOTLOADER_VERSION, HW_TYPE
- MCU, CHIP, BOARD, MODEL, MODEL_SUFFIX
- START_OF_BL_CODE, START_OF_FW_CODE
- blupd_* goals renamed to bu_*
- all_blupd goal renamed to all_bu
- firmware goals renamed to fw_*, board name goals are preserved
- bu_*_program now writes updater to correct address for all boards
- BL updater firmware builds now produce .opf format including
version info blob.
- BL updater firmware name now includes board name.
- INS makefile brought up to date w.r.t. linker scripts
2011-05-23 21:11:53 +02:00
|
|
|
|
|
|
|
fw_$(1)_%: uavobjects_flight
|
2013-03-11 20:54:36 +01:00
|
|
|
$(V1) $(MKDIR) -p $(BUILD_DIR)/fw_$(1)/dep
|
2012-11-27 07:23:44 +01:00
|
|
|
$(V1) cd $(ROOT_DIR)/flight/targets/$(2) && \
|
build: refactor fw, bl and bu rules
- New macros for fw, bl and bu rules in top-level make
- Per-board info factored into make/board/*/board-info.mk
- Per-board info now shared btw. fw, bl and blupd for each board
- BOARD_TYPE, BOARD_REVISION, BOOTLOADER_VERSION, HW_TYPE
- MCU, CHIP, BOARD, MODEL, MODEL_SUFFIX
- START_OF_BL_CODE, START_OF_FW_CODE
- blupd_* goals renamed to bu_*
- all_blupd goal renamed to all_bu
- firmware goals renamed to fw_*, board name goals are preserved
- bu_*_program now writes updater to correct address for all boards
- BL updater firmware builds now produce .opf format including
version info blob.
- BL updater firmware name now includes board name.
- INS makefile brought up to date w.r.t. linker scripts
2011-05-23 21:11:53 +02:00
|
|
|
$$(MAKE) -r --no-print-directory \
|
|
|
|
BOARD_NAME=$(1) \
|
2012-06-03 02:27:58 +02:00
|
|
|
BOARD_SHORT_NAME=$(3) \
|
2012-06-03 02:26:41 +02:00
|
|
|
BUILD_TYPE=fw \
|
2012-11-28 04:32:51 +01:00
|
|
|
HWDEFSINC=$(HWDEFS)/$(1) \
|
2013-03-16 12:40:30 +01:00
|
|
|
TOPDIR=$(ROOT_DIR)/flight/targets/$(2) \
|
2013-03-15 20:33:25 +01:00
|
|
|
OUTDIR=$(BUILD_DIR)/fw_$(1) \
|
|
|
|
TARGET=fw_$(1) \
|
build: refactor fw, bl and bu rules
- New macros for fw, bl and bu rules in top-level make
- Per-board info factored into make/board/*/board-info.mk
- Per-board info now shared btw. fw, bl and blupd for each board
- BOARD_TYPE, BOARD_REVISION, BOOTLOADER_VERSION, HW_TYPE
- MCU, CHIP, BOARD, MODEL, MODEL_SUFFIX
- START_OF_BL_CODE, START_OF_FW_CODE
- blupd_* goals renamed to bu_*
- all_blupd goal renamed to all_bu
- firmware goals renamed to fw_*, board name goals are preserved
- bu_*_program now writes updater to correct address for all boards
- BL updater firmware builds now produce .opf format including
version info blob.
- BL updater firmware name now includes board name.
- INS makefile brought up to date w.r.t. linker scripts
2011-05-23 21:11:53 +02:00
|
|
|
$$*
|
2011-02-23 05:18:56 +01:00
|
|
|
|
build: refactor fw, bl and bu rules
- New macros for fw, bl and bu rules in top-level make
- Per-board info factored into make/board/*/board-info.mk
- Per-board info now shared btw. fw, bl and blupd for each board
- BOARD_TYPE, BOARD_REVISION, BOOTLOADER_VERSION, HW_TYPE
- MCU, CHIP, BOARD, MODEL, MODEL_SUFFIX
- START_OF_BL_CODE, START_OF_FW_CODE
- blupd_* goals renamed to bu_*
- all_blupd goal renamed to all_bu
- firmware goals renamed to fw_*, board name goals are preserved
- bu_*_program now writes updater to correct address for all boards
- BL updater firmware builds now produce .opf format including
version info blob.
- BL updater firmware name now includes board name.
- INS makefile brought up to date w.r.t. linker scripts
2011-05-23 21:11:53 +02:00
|
|
|
.PHONY: $(1)_clean
|
|
|
|
$(1)_clean: fw_$(1)_clean
|
|
|
|
fw_$(1)_clean:
|
2013-03-11 20:54:36 +01:00
|
|
|
$(V0) @$(ECHO) " CLEAN $$@"
|
build: refactor fw, bl and bu rules
- New macros for fw, bl and bu rules in top-level make
- Per-board info factored into make/board/*/board-info.mk
- Per-board info now shared btw. fw, bl and blupd for each board
- BOARD_TYPE, BOARD_REVISION, BOOTLOADER_VERSION, HW_TYPE
- MCU, CHIP, BOARD, MODEL, MODEL_SUFFIX
- START_OF_BL_CODE, START_OF_FW_CODE
- blupd_* goals renamed to bu_*
- all_blupd goal renamed to all_bu
- firmware goals renamed to fw_*, board name goals are preserved
- bu_*_program now writes updater to correct address for all boards
- BL updater firmware builds now produce .opf format including
version info blob.
- BL updater firmware name now includes board name.
- INS makefile brought up to date w.r.t. linker scripts
2011-05-23 21:11:53 +02:00
|
|
|
$(V1) $(RM) -fr $(BUILD_DIR)/fw_$(1)
|
|
|
|
endef
|
2011-04-25 00:37:45 +02:00
|
|
|
|
build: refactor fw, bl and bu rules
- New macros for fw, bl and bu rules in top-level make
- Per-board info factored into make/board/*/board-info.mk
- Per-board info now shared btw. fw, bl and blupd for each board
- BOARD_TYPE, BOARD_REVISION, BOOTLOADER_VERSION, HW_TYPE
- MCU, CHIP, BOARD, MODEL, MODEL_SUFFIX
- START_OF_BL_CODE, START_OF_FW_CODE
- blupd_* goals renamed to bu_*
- all_blupd goal renamed to all_bu
- firmware goals renamed to fw_*, board name goals are preserved
- bu_*_program now writes updater to correct address for all boards
- BL updater firmware builds now produce .opf format including
version info blob.
- BL updater firmware name now includes board name.
- INS makefile brought up to date w.r.t. linker scripts
2011-05-23 21:11:53 +02:00
|
|
|
# $(1) = Canonical board name all in lower case (e.g. coptercontrol)
|
|
|
|
# $(2) = Name of board used in source tree (e.g. CopterControl)
|
|
|
|
define BL_TEMPLATE
|
|
|
|
.PHONY: bl_$(1)
|
|
|
|
bl_$(1): bl_$(1)_bin
|
|
|
|
bl_$(1)_bino: bl_$(1)_bin
|
|
|
|
|
|
|
|
bl_$(1)_%:
|
2013-03-11 20:54:36 +01:00
|
|
|
$(V1) $(MKDIR) -p $(BUILD_DIR)/bl_$(1)/dep
|
2012-11-27 07:23:44 +01:00
|
|
|
$(V1) cd $(ROOT_DIR)/flight/targets/Bootloaders/$(2) && \
|
build: refactor fw, bl and bu rules
- New macros for fw, bl and bu rules in top-level make
- Per-board info factored into make/board/*/board-info.mk
- Per-board info now shared btw. fw, bl and blupd for each board
- BOARD_TYPE, BOARD_REVISION, BOOTLOADER_VERSION, HW_TYPE
- MCU, CHIP, BOARD, MODEL, MODEL_SUFFIX
- START_OF_BL_CODE, START_OF_FW_CODE
- blupd_* goals renamed to bu_*
- all_blupd goal renamed to all_bu
- firmware goals renamed to fw_*, board name goals are preserved
- bu_*_program now writes updater to correct address for all boards
- BL updater firmware builds now produce .opf format including
version info blob.
- BL updater firmware name now includes board name.
- INS makefile brought up to date w.r.t. linker scripts
2011-05-23 21:11:53 +02:00
|
|
|
$$(MAKE) -r --no-print-directory \
|
|
|
|
BOARD_NAME=$(1) \
|
2012-06-03 02:27:58 +02:00
|
|
|
BOARD_SHORT_NAME=$(3) \
|
2012-06-03 02:26:41 +02:00
|
|
|
BUILD_TYPE=bl \
|
2012-11-28 04:32:51 +01:00
|
|
|
HWDEFSINC=$(HWDEFS)/$(1) \
|
2013-03-16 12:40:30 +01:00
|
|
|
TOPDIR=$(ROOT_DIR)/flight/targets/Bootloaders/$(2) \
|
2013-03-14 08:45:21 +01:00
|
|
|
OUTDIR=$(BUILD_DIR)/bl_$(1) \
|
|
|
|
TARGET=bl_$(1) \
|
build: refactor fw, bl and bu rules
- New macros for fw, bl and bu rules in top-level make
- Per-board info factored into make/board/*/board-info.mk
- Per-board info now shared btw. fw, bl and blupd for each board
- BOARD_TYPE, BOARD_REVISION, BOOTLOADER_VERSION, HW_TYPE
- MCU, CHIP, BOARD, MODEL, MODEL_SUFFIX
- START_OF_BL_CODE, START_OF_FW_CODE
- blupd_* goals renamed to bu_*
- all_blupd goal renamed to all_bu
- firmware goals renamed to fw_*, board name goals are preserved
- bu_*_program now writes updater to correct address for all boards
- BL updater firmware builds now produce .opf format including
version info blob.
- BL updater firmware name now includes board name.
- INS makefile brought up to date w.r.t. linker scripts
2011-05-23 21:11:53 +02:00
|
|
|
$$*
|
2011-02-23 05:18:56 +01:00
|
|
|
|
2011-06-08 04:53:08 +02:00
|
|
|
.PHONY: unbrick_$(1)
|
|
|
|
unbrick_$(1): bl_$(1)_hex
|
|
|
|
$(if $(filter-out undefined,$(origin UNBRICK_TTY)),
|
2013-03-11 20:54:36 +01:00
|
|
|
$(V0) @$(ECHO) " UNBRICK $(1) via $$(UNBRICK_TTY)"
|
2011-06-08 04:53:08 +02:00
|
|
|
$(V1) $(STM32FLASH_DIR)/stm32flash \
|
|
|
|
-w $(BUILD_DIR)/bl_$(1)/bl_$(1).hex \
|
|
|
|
-g 0x0 \
|
|
|
|
$$(UNBRICK_TTY)
|
|
|
|
,
|
2013-03-11 20:54:36 +01:00
|
|
|
$(V0) @$(ECHO)
|
|
|
|
$(V0) @$(ECHO) "ERROR: You must specify UNBRICK_TTY=<serial-device> to use for unbricking."
|
|
|
|
$(V0) @$(ECHO) " eg. $$(MAKE) $$@ UNBRICK_TTY=/dev/ttyUSB0"
|
2011-06-08 04:53:08 +02:00
|
|
|
)
|
|
|
|
|
build: refactor fw, bl and bu rules
- New macros for fw, bl and bu rules in top-level make
- Per-board info factored into make/board/*/board-info.mk
- Per-board info now shared btw. fw, bl and blupd for each board
- BOARD_TYPE, BOARD_REVISION, BOOTLOADER_VERSION, HW_TYPE
- MCU, CHIP, BOARD, MODEL, MODEL_SUFFIX
- START_OF_BL_CODE, START_OF_FW_CODE
- blupd_* goals renamed to bu_*
- all_blupd goal renamed to all_bu
- firmware goals renamed to fw_*, board name goals are preserved
- bu_*_program now writes updater to correct address for all boards
- BL updater firmware builds now produce .opf format including
version info blob.
- BL updater firmware name now includes board name.
- INS makefile brought up to date w.r.t. linker scripts
2011-05-23 21:11:53 +02:00
|
|
|
.PHONY: bl_$(1)_clean
|
|
|
|
bl_$(1)_clean:
|
2013-03-11 20:54:36 +01:00
|
|
|
$(V0) @$(ECHO) " CLEAN $$@"
|
build: refactor fw, bl and bu rules
- New macros for fw, bl and bu rules in top-level make
- Per-board info factored into make/board/*/board-info.mk
- Per-board info now shared btw. fw, bl and blupd for each board
- BOARD_TYPE, BOARD_REVISION, BOOTLOADER_VERSION, HW_TYPE
- MCU, CHIP, BOARD, MODEL, MODEL_SUFFIX
- START_OF_BL_CODE, START_OF_FW_CODE
- blupd_* goals renamed to bu_*
- all_blupd goal renamed to all_bu
- firmware goals renamed to fw_*, board name goals are preserved
- bu_*_program now writes updater to correct address for all boards
- BL updater firmware builds now produce .opf format including
version info blob.
- BL updater firmware name now includes board name.
- INS makefile brought up to date w.r.t. linker scripts
2011-05-23 21:11:53 +02:00
|
|
|
$(V1) $(RM) -fr $(BUILD_DIR)/bl_$(1)
|
|
|
|
endef
|
2011-02-23 05:19:02 +01:00
|
|
|
|
build: refactor fw, bl and bu rules
- New macros for fw, bl and bu rules in top-level make
- Per-board info factored into make/board/*/board-info.mk
- Per-board info now shared btw. fw, bl and blupd for each board
- BOARD_TYPE, BOARD_REVISION, BOOTLOADER_VERSION, HW_TYPE
- MCU, CHIP, BOARD, MODEL, MODEL_SUFFIX
- START_OF_BL_CODE, START_OF_FW_CODE
- blupd_* goals renamed to bu_*
- all_blupd goal renamed to all_bu
- firmware goals renamed to fw_*, board name goals are preserved
- bu_*_program now writes updater to correct address for all boards
- BL updater firmware builds now produce .opf format including
version info blob.
- BL updater firmware name now includes board name.
- INS makefile brought up to date w.r.t. linker scripts
2011-05-23 21:11:53 +02:00
|
|
|
# $(1) = Canonical board name all in lower case (e.g. coptercontrol)
|
|
|
|
define BU_TEMPLATE
|
|
|
|
.PHONY: bu_$(1)
|
2011-05-25 06:20:02 +02:00
|
|
|
bu_$(1): bu_$(1)_opfw
|
2011-04-25 00:37:45 +02:00
|
|
|
|
build: refactor fw, bl and bu rules
- New macros for fw, bl and bu rules in top-level make
- Per-board info factored into make/board/*/board-info.mk
- Per-board info now shared btw. fw, bl and blupd for each board
- BOARD_TYPE, BOARD_REVISION, BOOTLOADER_VERSION, HW_TYPE
- MCU, CHIP, BOARD, MODEL, MODEL_SUFFIX
- START_OF_BL_CODE, START_OF_FW_CODE
- blupd_* goals renamed to bu_*
- all_blupd goal renamed to all_bu
- firmware goals renamed to fw_*, board name goals are preserved
- bu_*_program now writes updater to correct address for all boards
- BL updater firmware builds now produce .opf format including
version info blob.
- BL updater firmware name now includes board name.
- INS makefile brought up to date w.r.t. linker scripts
2011-05-23 21:11:53 +02:00
|
|
|
bu_$(1)_%: bl_$(1)_bino
|
2013-03-11 20:54:36 +01:00
|
|
|
$(V1) $(MKDIR) -p $(BUILD_DIR)/bu_$(1)/dep
|
2013-03-21 15:24:08 +01:00
|
|
|
$(V1) cd $(ROOT_DIR)/flight/targets/BootloaderUpdater && \
|
build: refactor fw, bl and bu rules
- New macros for fw, bl and bu rules in top-level make
- Per-board info factored into make/board/*/board-info.mk
- Per-board info now shared btw. fw, bl and blupd for each board
- BOARD_TYPE, BOARD_REVISION, BOOTLOADER_VERSION, HW_TYPE
- MCU, CHIP, BOARD, MODEL, MODEL_SUFFIX
- START_OF_BL_CODE, START_OF_FW_CODE
- blupd_* goals renamed to bu_*
- all_blupd goal renamed to all_bu
- firmware goals renamed to fw_*, board name goals are preserved
- bu_*_program now writes updater to correct address for all boards
- BL updater firmware builds now produce .opf format including
version info blob.
- BL updater firmware name now includes board name.
- INS makefile brought up to date w.r.t. linker scripts
2011-05-23 21:11:53 +02:00
|
|
|
$$(MAKE) -r --no-print-directory \
|
|
|
|
BOARD_NAME=$(1) \
|
2012-06-03 02:27:58 +02:00
|
|
|
BOARD_SHORT_NAME=$(3) \
|
2012-06-03 02:26:41 +02:00
|
|
|
BUILD_TYPE=bu \
|
2012-11-28 04:32:51 +01:00
|
|
|
HWDEFSINC=$(HWDEFS)/$(1) \
|
2013-03-21 15:24:08 +01:00
|
|
|
TOPDIR=$(ROOT_DIR)/flight/targets/BootloaderUpdater \
|
2013-03-16 23:38:11 +01:00
|
|
|
OUTDIR=$(BUILD_DIR)/bu_$(1) \
|
|
|
|
TARGET=bu_$(1) \
|
build: refactor fw, bl and bu rules
- New macros for fw, bl and bu rules in top-level make
- Per-board info factored into make/board/*/board-info.mk
- Per-board info now shared btw. fw, bl and blupd for each board
- BOARD_TYPE, BOARD_REVISION, BOOTLOADER_VERSION, HW_TYPE
- MCU, CHIP, BOARD, MODEL, MODEL_SUFFIX
- START_OF_BL_CODE, START_OF_FW_CODE
- blupd_* goals renamed to bu_*
- all_blupd goal renamed to all_bu
- firmware goals renamed to fw_*, board name goals are preserved
- bu_*_program now writes updater to correct address for all boards
- BL updater firmware builds now produce .opf format including
version info blob.
- BL updater firmware name now includes board name.
- INS makefile brought up to date w.r.t. linker scripts
2011-05-23 21:11:53 +02:00
|
|
|
$$*
|
2011-02-23 05:18:56 +01:00
|
|
|
|
build: refactor fw, bl and bu rules
- New macros for fw, bl and bu rules in top-level make
- Per-board info factored into make/board/*/board-info.mk
- Per-board info now shared btw. fw, bl and blupd for each board
- BOARD_TYPE, BOARD_REVISION, BOOTLOADER_VERSION, HW_TYPE
- MCU, CHIP, BOARD, MODEL, MODEL_SUFFIX
- START_OF_BL_CODE, START_OF_FW_CODE
- blupd_* goals renamed to bu_*
- all_blupd goal renamed to all_bu
- firmware goals renamed to fw_*, board name goals are preserved
- bu_*_program now writes updater to correct address for all boards
- BL updater firmware builds now produce .opf format including
version info blob.
- BL updater firmware name now includes board name.
- INS makefile brought up to date w.r.t. linker scripts
2011-05-23 21:11:53 +02:00
|
|
|
.PHONY: bu_$(1)_clean
|
|
|
|
bu_$(1)_clean:
|
2013-03-11 20:54:36 +01:00
|
|
|
$(V0) @$(ECHO) " CLEAN $$@"
|
build: refactor fw, bl and bu rules
- New macros for fw, bl and bu rules in top-level make
- Per-board info factored into make/board/*/board-info.mk
- Per-board info now shared btw. fw, bl and blupd for each board
- BOARD_TYPE, BOARD_REVISION, BOOTLOADER_VERSION, HW_TYPE
- MCU, CHIP, BOARD, MODEL, MODEL_SUFFIX
- START_OF_BL_CODE, START_OF_FW_CODE
- blupd_* goals renamed to bu_*
- all_blupd goal renamed to all_bu
- firmware goals renamed to fw_*, board name goals are preserved
- bu_*_program now writes updater to correct address for all boards
- BL updater firmware builds now produce .opf format including
version info blob.
- BL updater firmware name now includes board name.
- INS makefile brought up to date w.r.t. linker scripts
2011-05-23 21:11:53 +02:00
|
|
|
$(V1) $(RM) -fr $(BUILD_DIR)/bu_$(1)
|
|
|
|
endef
|
2011-02-23 05:19:02 +01:00
|
|
|
|
2012-02-03 06:18:06 +01:00
|
|
|
# $(1) = Canonical board name all in lower case (e.g. coptercontrol)
|
|
|
|
define EF_TEMPLATE
|
|
|
|
.PHONY: ef_$(1)
|
2012-02-04 18:03:42 +01:00
|
|
|
ef_$(1): ef_$(1)_bin
|
2012-02-03 06:18:06 +01:00
|
|
|
|
2012-05-28 03:39:15 +02:00
|
|
|
ef_$(1)_%: bl_$(1)_bin fw_$(1)_opfw
|
2013-03-21 15:21:45 +01:00
|
|
|
$(V1) $(MKDIR) -p $(BUILD_DIR)/ef_$(1)
|
2012-11-27 07:23:44 +01:00
|
|
|
$(V1) cd $(ROOT_DIR)/flight/targets/EntireFlash && \
|
2012-02-04 18:03:42 +01:00
|
|
|
$$(MAKE) -r --no-print-directory \
|
|
|
|
BOARD_NAME=$(1) \
|
2012-06-03 02:27:58 +02:00
|
|
|
BOARD_SHORT_NAME=$(3) \
|
2012-06-03 02:26:41 +02:00
|
|
|
BUILD_TYPE=ef \
|
2012-02-04 18:03:42 +01:00
|
|
|
DFU_CMD="$(DFUUTIL_DIR)/bin/dfu-util" \
|
2013-03-21 15:21:45 +01:00
|
|
|
TOPDIR=$(ROOT_DIR)/flight/targets/EntireFlash \
|
2012-11-28 04:32:51 +01:00
|
|
|
OUTDIR=$(BUILD_DIR)/ef_$(1) \
|
2013-03-21 15:21:45 +01:00
|
|
|
TARGET=ef_$(1) \
|
2012-02-04 18:03:42 +01:00
|
|
|
$$*
|
2012-02-03 06:18:06 +01:00
|
|
|
|
|
|
|
.PHONY: ef_$(1)_clean
|
|
|
|
ef_$(1)_clean:
|
2013-03-11 20:54:36 +01:00
|
|
|
$(V0) @$(ECHO) " CLEAN $$@"
|
2012-02-03 06:18:06 +01:00
|
|
|
$(V1) $(RM) -fr $(BUILD_DIR)/ef_$(1)
|
|
|
|
endef
|
|
|
|
|
2011-05-24 04:04:54 +02:00
|
|
|
# $(1) = Canonical board name all in lower case (e.g. coptercontrol)
|
|
|
|
define BOARD_PHONY_TEMPLATE
|
|
|
|
.PHONY: all_$(1)
|
|
|
|
all_$(1): $$(filter fw_$(1), $$(FW_TARGETS))
|
|
|
|
all_$(1): $$(filter bl_$(1), $$(BL_TARGETS))
|
|
|
|
all_$(1): $$(filter bu_$(1), $$(BU_TARGETS))
|
2012-02-03 06:18:06 +01:00
|
|
|
all_$(1): $$(filter ef_$(1), $$(EF_TARGETS))
|
2011-05-24 04:04:54 +02:00
|
|
|
|
|
|
|
.PHONY: all_$(1)_clean
|
|
|
|
all_$(1)_clean: $$(addsuffix _clean, $$(filter fw_$(1), $$(FW_TARGETS)))
|
|
|
|
all_$(1)_clean: $$(addsuffix _clean, $$(filter bl_$(1), $$(BL_TARGETS)))
|
|
|
|
all_$(1)_clean: $$(addsuffix _clean, $$(filter bu_$(1), $$(BU_TARGETS)))
|
2012-02-03 06:18:06 +01:00
|
|
|
all_$(1)_clean: $$(addsuffix _clean, $$(filter ef_$(1), $$(EF_TARGETS)))
|
2011-05-24 04:04:54 +02:00
|
|
|
endef
|
|
|
|
|
2013-03-18 19:24:50 +01:00
|
|
|
# Generate flight build rules
|
build: refactor fw, bl and bu rules
- New macros for fw, bl and bu rules in top-level make
- Per-board info factored into make/board/*/board-info.mk
- Per-board info now shared btw. fw, bl and blupd for each board
- BOARD_TYPE, BOARD_REVISION, BOOTLOADER_VERSION, HW_TYPE
- MCU, CHIP, BOARD, MODEL, MODEL_SUFFIX
- START_OF_BL_CODE, START_OF_FW_CODE
- blupd_* goals renamed to bu_*
- all_blupd goal renamed to all_bu
- firmware goals renamed to fw_*, board name goals are preserved
- bu_*_program now writes updater to correct address for all boards
- BL updater firmware builds now produce .opf format including
version info blob.
- BL updater firmware name now includes board name.
- INS makefile brought up to date w.r.t. linker scripts
2011-05-23 21:11:53 +02:00
|
|
|
.PHONY: all_fw all_fw_clean
|
2011-05-25 06:20:02 +02:00
|
|
|
all_fw: $(addsuffix _opfw, $(FW_TARGETS))
|
build: refactor fw, bl and bu rules
- New macros for fw, bl and bu rules in top-level make
- Per-board info factored into make/board/*/board-info.mk
- Per-board info now shared btw. fw, bl and blupd for each board
- BOARD_TYPE, BOARD_REVISION, BOOTLOADER_VERSION, HW_TYPE
- MCU, CHIP, BOARD, MODEL, MODEL_SUFFIX
- START_OF_BL_CODE, START_OF_FW_CODE
- blupd_* goals renamed to bu_*
- all_blupd goal renamed to all_bu
- firmware goals renamed to fw_*, board name goals are preserved
- bu_*_program now writes updater to correct address for all boards
- BL updater firmware builds now produce .opf format including
version info blob.
- BL updater firmware name now includes board name.
- INS makefile brought up to date w.r.t. linker scripts
2011-05-23 21:11:53 +02:00
|
|
|
all_fw_clean: $(addsuffix _clean, $(FW_TARGETS))
|
2011-04-14 14:46:39 +02:00
|
|
|
|
build: refactor fw, bl and bu rules
- New macros for fw, bl and bu rules in top-level make
- Per-board info factored into make/board/*/board-info.mk
- Per-board info now shared btw. fw, bl and blupd for each board
- BOARD_TYPE, BOARD_REVISION, BOOTLOADER_VERSION, HW_TYPE
- MCU, CHIP, BOARD, MODEL, MODEL_SUFFIX
- START_OF_BL_CODE, START_OF_FW_CODE
- blupd_* goals renamed to bu_*
- all_blupd goal renamed to all_bu
- firmware goals renamed to fw_*, board name goals are preserved
- bu_*_program now writes updater to correct address for all boards
- BL updater firmware builds now produce .opf format including
version info blob.
- BL updater firmware name now includes board name.
- INS makefile brought up to date w.r.t. linker scripts
2011-05-23 21:11:53 +02:00
|
|
|
.PHONY: all_bl all_bl_clean
|
|
|
|
all_bl: $(addsuffix _bin, $(BL_TARGETS))
|
|
|
|
all_bl_clean: $(addsuffix _clean, $(BL_TARGETS))
|
2011-04-14 14:46:39 +02:00
|
|
|
|
build: refactor fw, bl and bu rules
- New macros for fw, bl and bu rules in top-level make
- Per-board info factored into make/board/*/board-info.mk
- Per-board info now shared btw. fw, bl and blupd for each board
- BOARD_TYPE, BOARD_REVISION, BOOTLOADER_VERSION, HW_TYPE
- MCU, CHIP, BOARD, MODEL, MODEL_SUFFIX
- START_OF_BL_CODE, START_OF_FW_CODE
- blupd_* goals renamed to bu_*
- all_blupd goal renamed to all_bu
- firmware goals renamed to fw_*, board name goals are preserved
- bu_*_program now writes updater to correct address for all boards
- BL updater firmware builds now produce .opf format including
version info blob.
- BL updater firmware name now includes board name.
- INS makefile brought up to date w.r.t. linker scripts
2011-05-23 21:11:53 +02:00
|
|
|
.PHONY: all_bu all_bu_clean
|
2011-05-25 06:20:02 +02:00
|
|
|
all_bu: $(addsuffix _opfw, $(BU_TARGETS))
|
build: refactor fw, bl and bu rules
- New macros for fw, bl and bu rules in top-level make
- Per-board info factored into make/board/*/board-info.mk
- Per-board info now shared btw. fw, bl and blupd for each board
- BOARD_TYPE, BOARD_REVISION, BOOTLOADER_VERSION, HW_TYPE
- MCU, CHIP, BOARD, MODEL, MODEL_SUFFIX
- START_OF_BL_CODE, START_OF_FW_CODE
- blupd_* goals renamed to bu_*
- all_blupd goal renamed to all_bu
- firmware goals renamed to fw_*, board name goals are preserved
- bu_*_program now writes updater to correct address for all boards
- BL updater firmware builds now produce .opf format including
version info blob.
- BL updater firmware name now includes board name.
- INS makefile brought up to date w.r.t. linker scripts
2011-05-23 21:11:53 +02:00
|
|
|
all_bu_clean: $(addsuffix _clean, $(BU_TARGETS))
|
2011-04-14 14:46:39 +02:00
|
|
|
|
2012-02-03 06:18:06 +01:00
|
|
|
.PHONY: all_ef all_ef_clean
|
2012-05-28 03:51:55 +02:00
|
|
|
all_ef: $(EF_TARGETS)
|
2012-02-03 06:18:06 +01:00
|
|
|
all_ef_clean: $(addsuffix _clean, $(EF_TARGETS))
|
|
|
|
|
build: refactor fw, bl and bu rules
- New macros for fw, bl and bu rules in top-level make
- Per-board info factored into make/board/*/board-info.mk
- Per-board info now shared btw. fw, bl and blupd for each board
- BOARD_TYPE, BOARD_REVISION, BOOTLOADER_VERSION, HW_TYPE
- MCU, CHIP, BOARD, MODEL, MODEL_SUFFIX
- START_OF_BL_CODE, START_OF_FW_CODE
- blupd_* goals renamed to bu_*
- all_blupd goal renamed to all_bu
- firmware goals renamed to fw_*, board name goals are preserved
- bu_*_program now writes updater to correct address for all boards
- BL updater firmware builds now produce .opf format including
version info blob.
- BL updater firmware name now includes board name.
- INS makefile brought up to date w.r.t. linker scripts
2011-05-23 21:11:53 +02:00
|
|
|
.PHONY: all_flight all_flight_clean
|
2012-02-03 06:18:06 +01:00
|
|
|
all_flight: all_fw all_bl all_bu all_ef
|
|
|
|
all_flight_clean: all_fw_clean all_bl_clean all_bu_clean all_ef_clean
|
2011-04-14 14:46:39 +02:00
|
|
|
|
2011-06-08 04:47:07 +02:00
|
|
|
# Expand the groups of targets for each board
|
2011-05-24 04:04:54 +02:00
|
|
|
$(foreach board, $(ALL_BOARDS), $(eval $(call BOARD_PHONY_TEMPLATE,$(board))))
|
|
|
|
|
build: refactor fw, bl and bu rules
- New macros for fw, bl and bu rules in top-level make
- Per-board info factored into make/board/*/board-info.mk
- Per-board info now shared btw. fw, bl and blupd for each board
- BOARD_TYPE, BOARD_REVISION, BOOTLOADER_VERSION, HW_TYPE
- MCU, CHIP, BOARD, MODEL, MODEL_SUFFIX
- START_OF_BL_CODE, START_OF_FW_CODE
- blupd_* goals renamed to bu_*
- all_blupd goal renamed to all_bu
- firmware goals renamed to fw_*, board name goals are preserved
- bu_*_program now writes updater to correct address for all boards
- BL updater firmware builds now produce .opf format including
version info blob.
- BL updater firmware name now includes board name.
- INS makefile brought up to date w.r.t. linker scripts
2011-05-23 21:11:53 +02:00
|
|
|
# Expand the firmware rules
|
2012-06-03 02:27:58 +02:00
|
|
|
$(foreach board, $(ALL_BOARDS), $(eval $(call FW_TEMPLATE,$(board),$($(board)_friendly),$($(board)_short))))
|
2011-04-14 14:46:39 +02:00
|
|
|
|
build: refactor fw, bl and bu rules
- New macros for fw, bl and bu rules in top-level make
- Per-board info factored into make/board/*/board-info.mk
- Per-board info now shared btw. fw, bl and blupd for each board
- BOARD_TYPE, BOARD_REVISION, BOOTLOADER_VERSION, HW_TYPE
- MCU, CHIP, BOARD, MODEL, MODEL_SUFFIX
- START_OF_BL_CODE, START_OF_FW_CODE
- blupd_* goals renamed to bu_*
- all_blupd goal renamed to all_bu
- firmware goals renamed to fw_*, board name goals are preserved
- bu_*_program now writes updater to correct address for all boards
- BL updater firmware builds now produce .opf format including
version info blob.
- BL updater firmware name now includes board name.
- INS makefile brought up to date w.r.t. linker scripts
2011-05-23 21:11:53 +02:00
|
|
|
# Expand the bootloader rules
|
2012-06-03 02:27:58 +02:00
|
|
|
$(foreach board, $(ALL_BOARDS), $(eval $(call BL_TEMPLATE,$(board),$($(board)_friendly),$($(board)_short))))
|
2011-04-14 14:46:39 +02:00
|
|
|
|
2013-03-18 19:24:50 +01:00
|
|
|
# Expand the bootloader updater rules
|
|
|
|
$(foreach board, $(ALL_BOARDS), $(eval $(call BU_TEMPLATE,$(board),$($(board)_friendly),$($(board)_short))))
|
|
|
|
|
2012-02-03 06:18:06 +01:00
|
|
|
# Expand the entire-flash rules
|
2012-06-03 02:27:58 +02:00
|
|
|
$(foreach board, $(ALL_BOARDS), $(eval $(call EF_TEMPLATE,$(board),$($(board)_friendly),$($(board)_short))))
|
2012-02-03 06:18:06 +01:00
|
|
|
|
2011-02-23 05:18:56 +01:00
|
|
|
.PHONY: sim_win32
|
|
|
|
sim_win32: sim_win32_exe
|
|
|
|
|
|
|
|
sim_win32_%: uavobjects_flight
|
2013-03-11 20:54:36 +01:00
|
|
|
$(V1) $(MKDIR) -p $(BUILD_DIR)/sitl_win32
|
2011-04-02 17:06:01 +02:00
|
|
|
$(V1) $(MAKE) --no-print-directory \
|
2012-11-27 07:23:44 +01:00
|
|
|
-C $(ROOT_DIR)/flight/targets/OpenPilot --file=$(ROOT_DIR)/flight/targets/OpenPilot/Makefile.win32 $*
|
2011-05-19 00:57:35 +02:00
|
|
|
|
2012-03-11 13:40:58 +01:00
|
|
|
.PHONY: sim_osx
|
|
|
|
sim_osx: sim_osx_elf
|
2012-06-03 02:31:57 +02:00
|
|
|
|
2012-03-11 13:40:58 +01:00
|
|
|
sim_osx_%: uavobjects_flight
|
2013-03-11 20:54:36 +01:00
|
|
|
$(V1) $(MKDIR) -p $(BUILD_DIR)/sim_osx
|
2012-03-11 13:40:58 +01:00
|
|
|
$(V1) $(MAKE) --no-print-directory \
|
2012-11-27 07:23:44 +01:00
|
|
|
-C $(ROOT_DIR)/flight/targets/Revolution --file=$(ROOT_DIR)/flight/targets/Revolution/Makefile.osx $*
|
2012-12-14 06:25:02 +01:00
|
|
|
|
2013-03-18 19:24:50 +01:00
|
|
|
##############################
|
|
|
|
#
|
|
|
|
# GCS related components
|
|
|
|
#
|
|
|
|
##############################
|
|
|
|
|
|
|
|
.PHONY: all_ground
|
|
|
|
all_ground: openpilotgcs
|
|
|
|
|
|
|
|
# Convenience target for the GCS
|
2013-03-19 23:48:02 +01:00
|
|
|
.PHONY: gcs gcs_clean gcs_all_clean
|
2013-03-18 19:24:50 +01:00
|
|
|
gcs: openpilotgcs
|
|
|
|
gcs_clean: openpilotgcs_clean
|
2013-03-19 23:48:02 +01:00
|
|
|
gcs_all_clean: openpilotgcs_all_clean
|
2013-03-18 19:24:50 +01:00
|
|
|
|
|
|
|
ifeq ($(V), 1)
|
|
|
|
GCS_SILENT :=
|
|
|
|
else
|
|
|
|
GCS_SILENT := silent
|
|
|
|
endif
|
|
|
|
|
|
|
|
.PHONY: openpilotgcs
|
|
|
|
openpilotgcs: uavobjects_gcs
|
2013-03-19 23:48:02 +01:00
|
|
|
$(V1) $(MKDIR) -p $(BUILD_DIR)/ground/$@/$(GCS_BUILD_CONF)
|
|
|
|
$(V1) ( cd $(BUILD_DIR)/ground/$@/$(GCS_BUILD_CONF) && \
|
2013-03-18 19:24:50 +01:00
|
|
|
$(QMAKE) $(ROOT_DIR)/ground/openpilotgcs/openpilotgcs.pro -spec $(QT_SPEC) -r CONFIG+="$(GCS_BUILD_CONF) $(GCS_SILENT)" $(GCS_QMAKE_OPTS) && \
|
|
|
|
$(MAKE) -w ; \
|
|
|
|
)
|
|
|
|
|
|
|
|
.PHONY: openpilotgcs_clean
|
|
|
|
openpilotgcs_clean:
|
2013-03-19 23:48:02 +01:00
|
|
|
$(V0) @$(ECHO) " CLEAN $@"
|
|
|
|
$(V1) [ ! -d "$(BUILD_DIR)/ground/openpilotgcs/$(GCS_BUILD_CONF)" ] || $(RM) -r "$(BUILD_DIR)/ground/openpilotgcs/$(GCS_BUILD_CONF)"
|
|
|
|
|
|
|
|
.PHONY: openpilotgcs_all_clean
|
|
|
|
openpilotgcs_all_clean:
|
2013-03-18 19:24:50 +01:00
|
|
|
$(V0) @$(ECHO) " CLEAN $@"
|
|
|
|
$(V1) [ ! -d "$(BUILD_DIR)/ground/openpilotgcs" ] || $(RM) -r "$(BUILD_DIR)/ground/openpilotgcs"
|
|
|
|
|
|
|
|
################################
|
|
|
|
#
|
|
|
|
# Android GCS related components
|
|
|
|
#
|
|
|
|
################################
|
|
|
|
|
|
|
|
# Build the output directory for the Android GCS build
|
|
|
|
ANDROIDGCS_OUT_DIR := $(BUILD_DIR)/androidgcs
|
|
|
|
$(ANDROIDGCS_OUT_DIR):
|
|
|
|
$(V1) $(MKDIR) -p $@
|
|
|
|
|
|
|
|
# Build the asset directory for the android assets
|
|
|
|
ANDROIDGCS_ASSETS_DIR := $(ANDROIDGCS_OUT_DIR)/assets
|
|
|
|
$(ANDROIDGCS_ASSETS_DIR)/uavos:
|
|
|
|
$(V1) $(MKDIR) -p $@
|
|
|
|
|
|
|
|
ifeq ($(V), 1)
|
|
|
|
ANT_QUIET :=
|
|
|
|
ANDROID_SILENT :=
|
|
|
|
else
|
|
|
|
ANT_QUIET := -q
|
|
|
|
ANDROID_SILENT := -s
|
|
|
|
endif
|
|
|
|
|
|
|
|
.PHONY: androidgcs
|
|
|
|
androidgcs: uavo-collections_java
|
|
|
|
$(V0) @$(ECHO) " ANDROID $(call toprel, $(ANDROIDGCS_OUT_DIR))"
|
|
|
|
$(V1) $(MKDIR) -p $(ANDROIDGCS_OUT_DIR)
|
|
|
|
$(V1) $(ANDROID) $(ANDROID_SILENT) update project \
|
|
|
|
--target "Google Inc.:Google APIs:$(GOOGLE_API_VERSION)" \
|
|
|
|
--name androidgcs \
|
|
|
|
--path ./androidgcs
|
|
|
|
$(V1) $(ANT) -f ./androidgcs/build.xml \
|
|
|
|
$(ANT_QUIET) \
|
|
|
|
-Dout.dir="../$(call toprel, $(ANDROIDGCS_OUT_DIR)/bin)" \
|
|
|
|
-Dgen.absolute.dir="$(ANDROIDGCS_OUT_DIR)/gen" \
|
|
|
|
$(ANDROIDGCS_BUILD_CONF)
|
|
|
|
|
|
|
|
.PHONY: androidgcs_clean
|
|
|
|
androidgcs_clean:
|
|
|
|
$(V0) @$(ECHO) " CLEAN $@"
|
|
|
|
$(V1) [ ! -d "$(ANDROIDGCS_OUT_DIR)" ] || $(RM) -r "$(ANDROIDGCS_OUT_DIR)"
|
|
|
|
|
|
|
|
# We want to take snapshots of the UAVOs at each point that they change
|
|
|
|
# to allow the GCS to be compatible with as many versions as possible.
|
|
|
|
# We always include a pseudo collection called "srctree" which represents
|
|
|
|
# the UAVOs in the source tree. So not necessary to add current tree UAVO
|
|
|
|
# hash here, it is always included.
|
|
|
|
|
|
|
|
# Find the git hashes of each commit that changes uavobjects with:
|
|
|
|
# git log --format=%h -- shared/uavobjectdefinition/ | head -n 2
|
|
|
|
# List only UAVO hashes of past releases, do not list current hash.
|
|
|
|
UAVO_GIT_VERSIONS := 5e14f53
|
|
|
|
|
|
|
|
# All versions includes also the current source tree UAVO hash
|
|
|
|
UAVO_ALL_VERSIONS := $(UAVO_GIT_VERSIONS) srctree
|
|
|
|
|
|
|
|
# This is where the UAVO collections are stored
|
|
|
|
UAVO_COLLECTION_DIR := $(BUILD_DIR)/uavo-collections
|
|
|
|
|
|
|
|
# $(1) git hash of a UAVO snapshot
|
|
|
|
define UAVO_COLLECTION_GIT_TEMPLATE
|
|
|
|
|
|
|
|
# Make the output directory that will contain all of the synthetics for the
|
|
|
|
# uavo collection referenced by the git hash $(1)
|
|
|
|
$$(UAVO_COLLECTION_DIR)/$(1):
|
|
|
|
$$(V1) $(MKDIR) -p $$(UAVO_COLLECTION_DIR)/$(1)
|
|
|
|
|
|
|
|
# Extract the snapshot of shared/uavobjectdefinition from git hash $(1)
|
|
|
|
$$(UAVO_COLLECTION_DIR)/$(1)/uavo-xml.tar: | $$(UAVO_COLLECTION_DIR)/$(1)
|
|
|
|
$$(UAVO_COLLECTION_DIR)/$(1)/uavo-xml.tar:
|
|
|
|
$$(V0) @$(ECHO) " UAVOTAR $(1)"
|
|
|
|
$$(V1) $(GIT) archive $(1) -o $$@ -- shared/uavobjectdefinition/
|
|
|
|
|
|
|
|
# Extract the uavo xml files from our snapshot
|
|
|
|
$$(UAVO_COLLECTION_DIR)/$(1)/uavo-xml: $$(UAVO_COLLECTION_DIR)/$(1)/uavo-xml.tar
|
|
|
|
$$(V0) @$(ECHO) " UAVOUNTAR $(1)"
|
|
|
|
$$(V1) $(RM) -rf $$@
|
|
|
|
$$(V1) $(MKDIR) -p $$@
|
|
|
|
$$(V1) $(TAR) -C $$(call toprel, $$@) -xf $$(call toprel, $$<) || $(RM) -rf $$@
|
|
|
|
endef
|
|
|
|
|
|
|
|
# Map the current working directory into the set of UAVO collections
|
|
|
|
$(UAVO_COLLECTION_DIR)/srctree:
|
|
|
|
$(V1) $(MKDIR) -p $@
|
|
|
|
|
|
|
|
$(UAVO_COLLECTION_DIR)/srctree/uavo-xml: | $(UAVO_COLLECTION_DIR)/srctree
|
|
|
|
$(UAVO_COLLECTION_DIR)/srctree/uavo-xml: $(UAVOBJ_XML_DIR)
|
|
|
|
$(V1) $(LN) -sf $(ROOT_DIR) $(UAVO_COLLECTION_DIR)/srctree/uavo-xml
|
|
|
|
|
|
|
|
# $(1) git hash (or symbolic name) of a UAVO snapshot
|
|
|
|
define UAVO_COLLECTION_BUILD_TEMPLATE
|
|
|
|
|
|
|
|
# This leaves us with a (broken) symlink that points to the full sha1sum of the collection
|
|
|
|
$$(UAVO_COLLECTION_DIR)/$(1)/uavohash: $$(UAVO_COLLECTION_DIR)/$(1)/uavo-xml
|
|
|
|
# Compute the sha1 hash for this UAVO collection
|
|
|
|
# The sed bit truncates the UAVO hash to 16 hex digits
|
|
|
|
$$(V1) $$(VERSION_INFO) \
|
|
|
|
--uavodir=$$(UAVO_COLLECTION_DIR)/$(1)/uavo-xml/shared/uavobjectdefinition \
|
|
|
|
--format='$$$${UAVOSHA1TXT}' | \
|
|
|
|
$(SED) -e 's|\(................\).*|\1|' > $$@
|
|
|
|
|
|
|
|
$$(V0) @$(ECHO) " UAVOHASH $(1) ->" $$$$(cat $$(UAVO_COLLECTION_DIR)/$(1)/uavohash)
|
|
|
|
|
|
|
|
# Generate the java uavobjects for this UAVO collection
|
|
|
|
$$(UAVO_COLLECTION_DIR)/$(1)/java-build/java: $$(UAVO_COLLECTION_DIR)/$(1)/uavohash
|
|
|
|
$$(V0) @$(ECHO) " UAVOJAVA $(1) " $$$$(cat $$(UAVO_COLLECTION_DIR)/$(1)/uavohash)
|
|
|
|
$$(V1) $(MKDIR) -p $$@
|
|
|
|
$$(V1) ( \
|
|
|
|
cd $$(UAVO_COLLECTION_DIR)/$(1)/java-build && \
|
|
|
|
$$(UAVOBJGENERATOR) -java $$(UAVO_COLLECTION_DIR)/$(1)/uavo-xml/shared/uavobjectdefinition $$(ROOT_DIR) ; \
|
|
|
|
)
|
|
|
|
|
|
|
|
# Build a jar file for this UAVO collection
|
|
|
|
$$(UAVO_COLLECTION_DIR)/$(1)/java-build/uavobjects.jar: | $$(ANDROIDGCS_ASSETS_DIR)/uavos
|
|
|
|
$$(UAVO_COLLECTION_DIR)/$(1)/java-build/uavobjects.jar: $$(UAVO_COLLECTION_DIR)/$(1)/java-build/java
|
|
|
|
$$(V0) @$(ECHO) " UAVOJAR $(1) " $$$$(cat $$(UAVO_COLLECTION_DIR)/$(1)/uavohash)
|
|
|
|
$$(V1) ( \
|
|
|
|
HASH=$$$$(cat $$(UAVO_COLLECTION_DIR)/$(1)/uavohash) && \
|
|
|
|
cd $$(UAVO_COLLECTION_DIR)/$(1)/java-build && \
|
|
|
|
$(JAVAC) java/*.java \
|
|
|
|
$$(ROOT_DIR)/androidgcs/src/org/openpilot/uavtalk/UAVDataObject.java \
|
|
|
|
$$(ROOT_DIR)/androidgcs/src/org/openpilot/uavtalk/UAVObject*.java \
|
|
|
|
$$(ROOT_DIR)/androidgcs/src/org/openpilot/uavtalk/UAVMetaObject.java \
|
|
|
|
-d . && \
|
|
|
|
find ./org/openpilot/uavtalk/uavobjects -type f -name '*.class' > classlist.txt && \
|
|
|
|
$(JAR) cf tmp_uavobjects.jar @classlist.txt && \
|
|
|
|
$$(ANDROID_DX) \
|
|
|
|
--dex \
|
|
|
|
--output $$(ANDROIDGCS_ASSETS_DIR)/uavos/$$$${HASH}.jar \
|
|
|
|
tmp_uavobjects.jar && \
|
|
|
|
$(LN) -sf $$(ANDROIDGCS_ASSETS_DIR)/uavos/$$$${HASH}.jar uavobjects.jar \
|
|
|
|
)
|
|
|
|
|
|
|
|
endef
|
|
|
|
|
|
|
|
# One of these for each element of UAVO_GIT_VERSIONS so we can extract the UAVOs from git
|
|
|
|
$(foreach githash, $(UAVO_GIT_VERSIONS), $(eval $(call UAVO_COLLECTION_GIT_TEMPLATE,$(githash))))
|
|
|
|
|
|
|
|
# One of these for each UAVO_ALL_VERSIONS which includes the ones in the srctree
|
|
|
|
$(foreach githash, $(UAVO_ALL_VERSIONS), $(eval $(call UAVO_COLLECTION_BUILD_TEMPLATE,$(githash))))
|
|
|
|
|
|
|
|
.PHONY: uavo-collections_java
|
|
|
|
uavo-collections_java: $(foreach githash, $(UAVO_ALL_VERSIONS), $(UAVO_COLLECTION_DIR)/$(githash)/java-build/uavobjects.jar)
|
|
|
|
|
|
|
|
.PHONY: uavo-collections
|
|
|
|
uavo-collections: uavo-collections_java
|
|
|
|
|
|
|
|
.PHONY: uavo-collections_clean
|
|
|
|
uavo-collections_clean:
|
|
|
|
$(V0) @$(ECHO) " CLEAN $(UAVO_COLLECTION_DIR)"
|
|
|
|
$(V1) [ ! -d "$(UAVO_COLLECTION_DIR)" ] || $(RM) -r $(UAVO_COLLECTION_DIR)
|
|
|
|
|
2012-12-14 06:25:02 +01:00
|
|
|
##############################
|
|
|
|
#
|
|
|
|
# Unit Tests
|
|
|
|
#
|
|
|
|
##############################
|
|
|
|
|
2012-12-20 08:02:35 +01:00
|
|
|
ALL_UNITTESTS := logfs
|
2012-12-14 06:25:02 +01:00
|
|
|
|
2013-03-11 20:54:36 +01:00
|
|
|
# Build the directory for the unit tests
|
2012-12-14 06:25:02 +01:00
|
|
|
UT_OUT_DIR := $(BUILD_DIR)/unit_tests
|
|
|
|
$(UT_OUT_DIR):
|
2013-03-11 20:54:36 +01:00
|
|
|
$(V1) $(MKDIR) -p $@
|
2012-12-14 06:25:02 +01:00
|
|
|
|
2012-12-20 08:02:35 +01:00
|
|
|
.PHONY: all_ut
|
|
|
|
all_ut: $(addsuffix _elf, $(addprefix ut_, $(ALL_UNITTESTS)))
|
|
|
|
|
2013-01-09 07:09:55 +01:00
|
|
|
.PHONY: all_ut_xml
|
|
|
|
all_ut_xml: $(addsuffix _xml, $(addprefix ut_, $(ALL_UNITTESTS)))
|
2012-12-20 08:02:35 +01:00
|
|
|
|
|
|
|
.PHONY: all_ut_run
|
|
|
|
all_ut_run: $(addsuffix _run, $(addprefix ut_, $(ALL_UNITTESTS)))
|
|
|
|
|
2013-01-04 01:58:29 +01:00
|
|
|
.PHONY: all_ut_clean
|
2012-12-20 08:02:35 +01:00
|
|
|
all_ut_clean:
|
2013-03-11 20:54:36 +01:00
|
|
|
$(V0) @$(ECHO) " CLEAN $@"
|
2012-12-20 08:02:35 +01:00
|
|
|
$(V1) [ ! -d "$(UT_OUT_DIR)" ] || $(RM) -r "$(UT_OUT_DIR)"
|
|
|
|
|
|
|
|
# $(1) = Unit test name
|
|
|
|
define UT_TEMPLATE
|
|
|
|
.PHONY: ut_$(1)
|
|
|
|
ut_$(1): ut_$(1)_run
|
|
|
|
|
|
|
|
ut_$(1)_%: $$(UT_OUT_DIR)
|
2013-03-11 20:54:36 +01:00
|
|
|
$(V1) $(MKDIR) -p $(UT_OUT_DIR)/$(1)
|
2012-12-20 08:02:35 +01:00
|
|
|
$(V1) cd $(ROOT_DIR)/flight/tests/$(1) && \
|
|
|
|
$$(MAKE) -r --no-print-directory \
|
2012-12-14 06:25:02 +01:00
|
|
|
BUILD_TYPE=ut \
|
2012-12-20 08:02:35 +01:00
|
|
|
BOARD_SHORT_NAME=$(1) \
|
2012-12-14 06:25:02 +01:00
|
|
|
TCHAIN_PREFIX="" \
|
|
|
|
REMOVE_CMD="$(RM)" \
|
|
|
|
\
|
2012-12-20 08:02:35 +01:00
|
|
|
TARGET=$(1) \
|
|
|
|
OUTDIR="$(UT_OUT_DIR)/$(1)" \
|
2012-12-14 06:25:02 +01:00
|
|
|
\
|
|
|
|
PIOS=$(PIOS) \
|
|
|
|
OPUAVOBJ=$(OPUAVOBJ) \
|
|
|
|
OPUAVTALK=$(OPUAVTALK) \
|
|
|
|
FLIGHTLIB=$(FLIGHTLIB) \
|
|
|
|
\
|
2012-12-20 08:02:35 +01:00
|
|
|
GTEST_DIR=$(GTEST_DIR) \
|
|
|
|
\
|
2013-02-23 17:04:20 +01:00
|
|
|
$$*
|
2012-12-14 06:25:02 +01:00
|
|
|
|
2012-12-20 08:02:35 +01:00
|
|
|
.PHONY: ut_$(1)_clean
|
|
|
|
ut_$(1)_clean:
|
2013-03-11 20:54:36 +01:00
|
|
|
$(V0) @$(ECHO) " CLEAN $(1)"
|
2012-12-20 08:02:35 +01:00
|
|
|
$(V1) [ ! -d "$(UT_OUT_DIR)/$(1)" ] || $(RM) -r "$(UT_OUT_DIR)/$(1)"
|
|
|
|
endef
|
|
|
|
|
|
|
|
# Expand the unittest rules
|
|
|
|
$(foreach ut, $(ALL_UNITTESTS), $(eval $(call UT_TEMPLATE,$(ut))))
|
|
|
|
|
|
|
|
# Disable parallel make when the all_ut_run target is requested otherwise the TAP
|
|
|
|
# output is interleaved with the rest of the make output.
|
|
|
|
ifneq ($(strip $(filter all_ut_run,$(MAKECMDGOALS))),)
|
|
|
|
.NOTPARALLEL:
|
2013-03-11 20:54:36 +01:00
|
|
|
$(info *NOTE* Parallel make disabled by all_ut_run target so we have sane console output)
|
2012-12-20 08:02:35 +01:00
|
|
|
endif
|
2012-12-14 06:25:02 +01:00
|
|
|
|
2011-05-19 00:57:35 +02:00
|
|
|
##############################
|
|
|
|
#
|
2011-05-28 02:14:51 +02:00
|
|
|
# Packaging components
|
2011-05-19 00:57:35 +02:00
|
|
|
#
|
|
|
|
##############################
|
2012-10-05 22:23:42 +02:00
|
|
|
|
2013-03-23 22:24:15 +01:00
|
|
|
# Firmware files to package
|
|
|
|
PACKAGE_FW_TARGETS := $(filter-out fw_simposix, $(FW_TARGETS))
|
|
|
|
PACKAGE_ELF_TARGETS := $(filter fw_simposix, $(FW_TARGETS))
|
|
|
|
|
2013-03-19 16:52:24 +01:00
|
|
|
# Rules to generate GCS resources used to embed firmware binaries into the GCS.
|
|
|
|
# They are used later by the vehicle setup wizard to update board firmware.
|
|
|
|
# To open a firmware image use ":/firmware/fw_coptercontrol.opfw"
|
|
|
|
OPFW_RESOURCE := $(BUILD_DIR)/ground/opfw_resource/opfw_resource.qrc
|
|
|
|
OPFW_RESOURCE_PREFIX := ../../../
|
2013-03-23 22:24:15 +01:00
|
|
|
OPFW_FILES := $(foreach fw_targ, $(PACKAGE_FW_TARGETS), $(call toprel, $(BUILD_DIR)/$(fw_targ)/$(fw_targ).opfw))
|
2013-03-19 16:52:24 +01:00
|
|
|
OPFW_CONTENTS := \
|
|
|
|
<!DOCTYPE RCC><RCC version="1.0"> \
|
|
|
|
<qresource prefix="/firmware"> \
|
|
|
|
$(foreach fw_file, $(OPFW_FILES), <file alias="$(notdir $(fw_file))">$(OPFW_RESOURCE_PREFIX)$(fw_file)</file>) \
|
|
|
|
</qresource> \
|
|
|
|
</RCC>
|
|
|
|
|
|
|
|
.PHONY: opfw_resource
|
|
|
|
opfw_resource: $(OPFW_RESOURCE)
|
|
|
|
|
|
|
|
$(OPFW_RESOURCE): $(FW_TARGETS)
|
|
|
|
@$(ECHO) Generating OPFW resource file $(call toprel, $@)
|
|
|
|
$(V1) $(MKDIR) -p $(dir $@)
|
|
|
|
$(V1) $(ECHO) $(QUOTE)$(OPFW_CONTENTS)$(QUOTE) > $@
|
|
|
|
|
2013-03-21 22:11:30 +01:00
|
|
|
# If opfw_resource is requested, GCS should depend on it
|
|
|
|
ifneq ($(strip $(filter opfw_resource,$(MAKECMDGOALS))),)
|
|
|
|
$(eval openpilotgcs: | opfw_resource)
|
|
|
|
endif
|
|
|
|
|
2013-03-21 20:28:44 +01:00
|
|
|
# Packaging targets: package, clean_package
|
|
|
|
# - removes build directory (clean_package only)
|
|
|
|
# - builds all firmware, opfw_resource, gcs
|
|
|
|
# - copies firmware into a package directory
|
|
|
|
# - calls paltform-specific packaging script
|
|
|
|
|
2013-03-21 22:11:30 +01:00
|
|
|
# Do some checks and define some values if package is requested
|
|
|
|
ifneq ($(strip $(filter package clean_package,$(MAKECMDGOALS))),)
|
|
|
|
# Define some variables
|
|
|
|
export PACKAGE_LBL := $(shell $(VERSION_INFO) --format=\$${LABEL})
|
|
|
|
export PACKAGE_NAME := OpenPilot
|
|
|
|
export PACKAGE_SEP := -
|
2013-03-21 20:28:44 +01:00
|
|
|
|
2013-03-21 22:11:30 +01:00
|
|
|
# We can only package release builds
|
|
|
|
ifneq ($(GCS_BUILD_CONF),release)
|
|
|
|
$(error Packaging is currently supported for release builds only)
|
2013-03-21 20:28:44 +01:00
|
|
|
endif
|
|
|
|
|
2013-03-21 22:11:30 +01:00
|
|
|
# Packaged GCS should depend on opfw_resource
|
|
|
|
ifneq ($(strip $(filter package clean_package,$(MAKECMDGOALS))),)
|
|
|
|
$(eval openpilotgcs: | opfw_resource)
|
|
|
|
endif
|
2013-03-21 20:28:44 +01:00
|
|
|
|
2013-03-21 22:11:30 +01:00
|
|
|
# Clean the build directory if clean_package is requested
|
|
|
|
ifneq ($(strip $(filter clean_package,$(MAKECMDGOALS))),)
|
|
|
|
$(info Cleaning build directory before packaging...)
|
|
|
|
ifneq ($(shell $(MAKE) all_clean >/dev/null 2>&1 && $(ECHO) "clean"), clean)
|
|
|
|
$(error Cannot clean build directory)
|
|
|
|
endif
|
2013-03-21 20:28:44 +01:00
|
|
|
|
2013-03-21 22:11:30 +01:00
|
|
|
.PHONY: clean_package
|
|
|
|
clean_package: package
|
|
|
|
endif
|
2013-03-21 20:28:44 +01:00
|
|
|
endif
|
|
|
|
|
|
|
|
# Copy file template. Empty line before the endef is required, do not remove
|
2013-03-23 22:24:15 +01:00
|
|
|
# $(1) = copy file name without extension
|
|
|
|
# $(2) = source file extension
|
|
|
|
# $(3) = destination file extension
|
2013-03-21 20:28:44 +01:00
|
|
|
define COPY_FW_FILES
|
2013-03-23 22:24:15 +01:00
|
|
|
$(V1) $(CP) "$(BUILD_DIR)/$(1)/$(1)$(2)" "$(PACKAGE_DIR)/firmware/$(1)$(PACKAGE_SEP)$(PACKAGE_LBL)$(3)"
|
2013-03-21 20:28:44 +01:00
|
|
|
|
|
|
|
endef
|
|
|
|
|
|
|
|
# Build and copy package files into the package directory
|
2013-03-21 22:11:30 +01:00
|
|
|
# and call platform-specific packaging script
|
2011-05-28 02:14:51 +02:00
|
|
|
.PHONY: package
|
2013-03-21 22:11:30 +01:00
|
|
|
package: all_fw all_ground uavobjects_matlab
|
Final step: lot of small fixes, last commit in this commit series
This is the first cleanup pass through makefiles and pios.
Probably it is difficult to track changes due to the nature of them.
I would recommend to look at resulting files and compiled code instead.
NOTE: original branch was rebased and lot of conflicts were fixed on
the way. So do not expect that every commit in this series will be
buildable (unlike original branch). Only final result was tested.
The main goal was to remove as much duplication of code (and copy/paste
errors) as possible, moving common parts out of Makefiles. It still is
not perfect, and mostly no code changes made - Makefiles and #ifdefs only.
But please while testing make sure that all code works as before, and no
modules/options are missed by accident.
Brief list of changes:
- Moved common parts of Makefiles into the set of *.mk files.
- Changed method of passing common vars from top Makefile to lower ones.
- Some pios cleanup, mostly #ifdefs, and all pios_config.h files.
- Many obsolete files removed (for instance, AHRS files, op_config.h).
- Many obsolete or unused macros removed or fixed/renamed (ALL_DIGNOSTICS).
- Unified pios_config.h template. Please don't remove lines for board
configs, only comment/uncomment them. Adding new PIOS options, please
propagate them to all board files keeping the same order.
- Some formatting, spacing, indentation (no line endings change yet).
- Some cosmetic fixes (no more C:\X\Y\filename.c printings on Windows).
- Added some library.mk files to move libs into AR achives later.
- EntireFlash target now uses cross-platform python script to generate bin
files. So it works on all supported platforms: Linux, OSX, Windows.
- Top level packaging is completely rewritten. Now it is a part of top
Makefile. As such, all dependencies are checked and accounted, no
more 'make -j' problems should occur.
- Default GCS_BUILD_CONF is release now, may be changed if necessary
using 'make GCS_BUILD_CONF=debug gcs'.
- GCS build paths are separated into debug and release, so no more obj
file clashes. Packaging system supports only release builds.
- New target is introduced: 'clean_package'. Now 'make package' does not
clean build directory. Use clean_package instead for distributable builds.
- Targets like 'all', 'opfw_resource', etc now will print extra contex
in parallel builds too.
- If any of 'package', 'clean_package', 'opfw_resource' targets are given
on command line, GCS build will depend on the resource, so all fw_*.opfw
targets will be built and embedded into GCS. By default GCS does not
depend on resource, and will be built w/o firmware (unless the resource
files already exist and the Qt resource file is generated).
- fw_simposix (ELF executable) is now packaged for linux. Run'n'play!
- Make help is refined and is now up to date.
Still broken:
- UnitTests, should be fixed
- SimPosix: buildable, but should be reworked.
Next planned passes to do:
- toolchain bootstrapping and packaging (including windows - WIP)
- CMSIS/StdPeriph lib cleanup
- more PIOS cleanup
- move libs into AR archives to save build time
- sim targets refactir and cleanup
- move android-related directories under <top>/android
- unit test targets fix
- source code line ending changes (there are many different, were not changed)
- coding style
Merging this, please use --no-ff git option to make it the real commit point
Conflicts:
A lot of... :-)
2013-03-24 12:02:08 +01:00
|
|
|
@$(ECHO) "Packaging for $(UNAME) $(ARCH) into $(call toprel, $(PACKAGE_DIR)) directory"
|
2013-03-21 22:11:30 +01:00
|
|
|
$(V1) [ ! -d "$(PACKAGE_DIR)" ] || $(RM) -rf "$(PACKAGE_DIR)"
|
|
|
|
$(V1) $(MKDIR) -p "$(PACKAGE_DIR)/firmware"
|
2013-03-23 22:24:15 +01:00
|
|
|
$(foreach fw_targ, $(PACKAGE_FW_TARGETS), $(call COPY_FW_FILES,$(fw_targ),.opfw,.opfw))
|
|
|
|
$(foreach fw_targ, $(PACKAGE_ELF_TARGETS), $(call COPY_FW_FILES,$(fw_targ),.elf,))
|
2013-03-21 22:11:30 +01:00
|
|
|
$(MAKE) --no-print-directory -C $(ROOT_DIR)/package --file=$(UNAME).mk $@
|
2013-02-04 14:56:11 +01:00
|
|
|
|
2013-03-11 20:54:36 +01:00
|
|
|
##############################
|
|
|
|
#
|
|
|
|
# Build info
|
|
|
|
#
|
|
|
|
##############################
|
|
|
|
|
2013-02-04 14:56:11 +01:00
|
|
|
.PHONY: build-info
|
|
|
|
build-info:
|
2013-03-11 20:54:36 +01:00
|
|
|
$(V1) $(MKDIR) -p $(BUILD_DIR)
|
|
|
|
$(V1) $(VERSION_INFO) \
|
2013-02-04 14:56:11 +01:00
|
|
|
--uavodir=$(ROOT_DIR)/shared/uavobjectdefinition \
|
|
|
|
--template="make/templates/$@.txt" \
|
|
|
|
--outfile="$(BUILD_DIR)/$@.txt"
|
2013-03-11 20:54:36 +01:00
|
|
|
|
|
|
|
##############################
|
|
|
|
#
|
|
|
|
# Help message, the default Makefile goal
|
|
|
|
#
|
|
|
|
##############################
|
|
|
|
|
|
|
|
.PHONY: help
|
|
|
|
help:
|
|
|
|
@$(ECHO)
|
|
|
|
@$(ECHO) " This Makefile is known to work on Linux and Mac in a standard shell environment."
|
|
|
|
@$(ECHO) " It also works on Windows by following the instructions in make/winx86/README.txt."
|
|
|
|
@$(ECHO)
|
|
|
|
@$(ECHO) " Here is a summary of the available targets:"
|
|
|
|
@$(ECHO)
|
|
|
|
@$(ECHO) " [Tool Installers]"
|
2013-03-19 17:20:09 +01:00
|
|
|
@$(ECHO) " qt_sdk_install - Install the QT development tools"
|
2013-03-11 20:54:36 +01:00
|
|
|
@$(ECHO) " arm_sdk_install - Install the GNU ARM gcc toolchain"
|
|
|
|
@$(ECHO) " openocd_install - Install the OpenOCD JTAG daemon"
|
2013-03-19 17:20:09 +01:00
|
|
|
@$(ECHO) " stm32flash_install - Install the stm32flash tool for unbricking F1-based boards"
|
2013-03-11 20:54:36 +01:00
|
|
|
@$(ECHO) " dfuutil_install - Install the dfu-util tool for unbricking F4-based boards"
|
|
|
|
@$(ECHO) " android_sdk_install - Install the Android SDK tools"
|
|
|
|
@$(ECHO)
|
|
|
|
@$(ECHO) " [Big Hammer]"
|
|
|
|
@$(ECHO) " all - Generate UAVObjects, build openpilot firmware and gcs"
|
|
|
|
@$(ECHO) " all_flight - Build all firmware, bootloaders and bootloader updaters"
|
|
|
|
@$(ECHO) " all_fw - Build only firmware for all boards"
|
|
|
|
@$(ECHO) " all_bl - Build only bootloaders for all boards"
|
|
|
|
@$(ECHO) " all_bu - Build only bootloader updaters for all boards"
|
|
|
|
@$(ECHO)
|
|
|
|
@$(ECHO) " all_clean - Remove your build directory ($(BUILD_DIR))"
|
|
|
|
@$(ECHO) " all_flight_clean - Remove all firmware, bootloaders and bootloader updaters"
|
|
|
|
@$(ECHO) " all_fw_clean - Remove firmware for all boards"
|
|
|
|
@$(ECHO) " all_bl_clean - Remove bootlaoders for all boards"
|
|
|
|
@$(ECHO) " all_bu_clean - Remove bootloader updaters for all boards"
|
|
|
|
@$(ECHO)
|
|
|
|
@$(ECHO) " all_<board> - Build all available images for <board>"
|
|
|
|
@$(ECHO) " all_<board>_clean - Remove all available images for <board>"
|
|
|
|
@$(ECHO)
|
|
|
|
@$(ECHO) " all_ut - Build all unit tests"
|
|
|
|
@$(ECHO) " all_ut_tap - Run all unit tests and capture all TAP output to files"
|
|
|
|
@$(ECHO) " all_ut_run - Run all unit tests and dump TAP output to console"
|
|
|
|
@$(ECHO)
|
|
|
|
@$(ECHO) " [Firmware]"
|
|
|
|
@$(ECHO) " <board> - Build firmware for <board>"
|
|
|
|
@$(ECHO) " supported boards are ($(ALL_BOARDS))"
|
|
|
|
@$(ECHO) " fw_<board> - Build firmware for <board>"
|
|
|
|
@$(ECHO) " supported boards are ($(FW_BOARDS))"
|
|
|
|
@$(ECHO) " fw_<board>_clean - Remove firmware for <board>"
|
|
|
|
@$(ECHO) " fw_<board>_program - Use OpenOCD + JTAG to write firmware to <board>"
|
|
|
|
@$(ECHO)
|
|
|
|
@$(ECHO) " [Bootloader]"
|
|
|
|
@$(ECHO) " bl_<board> - Build bootloader for <board>"
|
|
|
|
@$(ECHO) " supported boards are ($(BL_BOARDS))"
|
|
|
|
@$(ECHO) " bl_<board>_clean - Remove bootloader for <board>"
|
|
|
|
@$(ECHO) " bl_<board>_program - Use OpenOCD + JTAG to write bootloader to <board>"
|
|
|
|
@$(ECHO)
|
2013-03-19 17:20:09 +01:00
|
|
|
@$(ECHO) " [Entire Flash]"
|
|
|
|
@$(ECHO) " ef_<board> - Build entire flash image for <board>"
|
|
|
|
@$(ECHO) " supported boards are ($(EF_BOARDS))"
|
|
|
|
@$(ECHO) " ef_<board>_clean - Remove entire flash image for <board>"
|
|
|
|
@$(ECHO) " ef_<board>_program - Use OpenOCD + JTAG to write entire flash image to <board>"
|
|
|
|
@$(ECHO)
|
2013-03-11 20:54:36 +01:00
|
|
|
@$(ECHO) " [Bootloader Updater]"
|
|
|
|
@$(ECHO) " bu_<board> - Build bootloader updater for <board>"
|
|
|
|
@$(ECHO) " supported boards are ($(BU_BOARDS))"
|
|
|
|
@$(ECHO) " bu_<board>_clean - Remove bootloader updater for <board>"
|
|
|
|
@$(ECHO)
|
|
|
|
@$(ECHO) " [Unbrick a board]"
|
|
|
|
@$(ECHO) " unbrick_<board> - Use the STM32's built in boot ROM to write a bootloader to <board>"
|
|
|
|
@$(ECHO) " supported boards are ($(BL_BOARDS))"
|
|
|
|
@$(ECHO) " [Unittests]"
|
|
|
|
@$(ECHO) " ut_<test> - Build unit test <test>"
|
2013-03-19 17:20:09 +01:00
|
|
|
@$(ECHO) " ut_<test>_xml - Run test and capture XML output into a file"
|
|
|
|
@$(ECHO) " ut_<test>_run - Run test and dump output to console"
|
2013-03-11 20:54:36 +01:00
|
|
|
@$(ECHO)
|
|
|
|
@$(ECHO) " [Simulation]"
|
|
|
|
@$(ECHO) " sim_osx - Build OpenPilot simulation firmware for OSX"
|
|
|
|
@$(ECHO) " sim_osx_clean - Delete all build output for the osx simulation"
|
|
|
|
@$(ECHO) " sim_win32 - Build OpenPilot simulation firmware for"
|
|
|
|
@$(ECHO) " Windows using mingw and msys"
|
|
|
|
@$(ECHO) " sim_win32_clean - Delete all build output for the win32 simulation"
|
|
|
|
@$(ECHO)
|
|
|
|
@$(ECHO) " [GCS]"
|
2013-03-19 23:48:02 +01:00
|
|
|
@$(ECHO) " gcs - Build the Ground Control System (GCS) application (debug|release)"
|
|
|
|
@$(ECHO) " gcs_clean - Remove the Ground Control System (GCS) application (debug|release)"
|
|
|
|
@$(ECHO) " supported build configurations: GCS_BUILD_CONF=debug|release (default is $(GCS_BUILD_CONF))"
|
|
|
|
@$(ECHO) " gcs_all_clean - Remove the Ground Control System (GCS) application (all build confgurations)"
|
2013-03-11 20:54:36 +01:00
|
|
|
@$(ECHO)
|
2013-03-19 17:20:09 +01:00
|
|
|
@$(ECHO) " [AndroidGCS]"
|
|
|
|
@$(ECHO) " androidgcs - Build the Android Ground Control System (GCS) application"
|
|
|
|
@$(ECHO) " androidgcs_install - Use ADB to install the Android GCS application"
|
|
|
|
@$(ECHO) " androidgcs_run - Run the Android GCS application"
|
|
|
|
@$(ECHO) " androidgcs_clean - Remove the Android GCS application"
|
|
|
|
@$(ECHO)
|
2013-03-11 20:54:36 +01:00
|
|
|
@$(ECHO) " [UAVObjects]"
|
|
|
|
@$(ECHO) " uavobjects - Generate source files from the UAVObject definition XML files"
|
|
|
|
@$(ECHO) " uavobjects_test - parse xml-files - check for valid, duplicate ObjId's, ... "
|
|
|
|
@$(ECHO) " uavobjects_<group> - Generate source files from a subset of the UAVObject definition XML files"
|
|
|
|
@$(ECHO) " supported groups are ($(UAVOBJ_TARGETS))"
|
|
|
|
@$(ECHO)
|
2013-03-19 17:20:09 +01:00
|
|
|
@$(ECHO) " [Packaging]"
|
2013-03-21 20:28:44 +01:00
|
|
|
@$(ECHO) " opfw_resource - Generate resources to embed firmware binaries into the GCS"
|
|
|
|
@$(ECHO) " clean_package - Clean, build and package the OpenPilot platform-dependent package"
|
2013-03-19 17:20:09 +01:00
|
|
|
@$(ECHO) " package - Build and package the OpenPilot platform-dependent package"
|
|
|
|
@$(ECHO)
|
2013-03-11 20:54:36 +01:00
|
|
|
@$(ECHO) " Hint: Add V=1 to your command line to see verbose build output."
|
|
|
|
@$(ECHO)
|
|
|
|
@$(ECHO) " Note: All tools will be installed into $(TOOLS_DIR)"
|
|
|
|
@$(ECHO) " All build output will be placed in $(BUILD_DIR)"
|
2013-03-24 15:32:30 +01:00
|
|
|
@$(ECHO) " Package will be placed into $(PACKAGE_DIR)"
|
2013-03-11 20:54:36 +01:00
|
|
|
@$(ECHO)
|