From 32c7f071758b3f15be048391c3f00e84379d17a2 Mon Sep 17 00:00:00 2001 From: Oleg Semyonov Date: Fri, 13 May 2011 17:40:28 +0300 Subject: [PATCH] OP-483: convert line endings to Unix format (no other changes) --- release/Makefile | 266 ++++++++++++++++++++--------------------- release/Makefile.linux | 20 ++-- release/Makefile.osx | 20 ++-- release/Makefile.win32 | 22 ++-- 4 files changed, 164 insertions(+), 164 deletions(-) diff --git a/release/Makefile b/release/Makefile index 144a0a5dc..a1a45de3b 100644 --- a/release/Makefile +++ b/release/Makefile @@ -1,133 +1,133 @@ -# Set up a default goal -.DEFAULT_GOAL := help - -# Tried the best to support parallel (-j) builds. But since this Makefile -# uses other Makefiles to build few targets which in turn have similar -# dependencies on uavobjects and other generated files, it is difficult -# to support parallel builds perfectly. -# -# Looks like it works for -j8, but fails for -j (unlimited jobs). -# So probably not a bad idea is to build release in single thread. -# -#.NOTPARALLEL: - -# Locate the root of the tree -WHEREAMI := $(dir $(lastword $(MAKEFILE_LIST))) -ROOT_DIR := $(realpath $(WHEREAMI)/../) - -# Set up some macros -BUILD_DIR := $(ROOT_DIR)/build -RELEASE_DATE := $(shell date +%Y%m%d) -RELEASE_TAG := unreleased -RELEASE_LBL := $(RELEASE_DATE)-$(RELEASE_TAG) -RELEASE_DIR := $(BUILD_DIR)/release-$(RELEASE_LBL) -FW_DIR := $(RELEASE_DIR)/firmware-$(RELEASE_LBL) -BL_DIR := $(FW_DIR)/bootloaders -BLUPD_DIR := $(FW_DIR)/bootloader_updaters - -# Setup targets -FW_TARGETS_COMMON := ahrs pipxtreme -FW_TARGETS_INPUT := coptercontrol openpilot -FW_TARGETS := $(FW_TARGETS_COMMON) $(FW_TARGETS_INPUT) -BL_TARGETS := $(addprefix bl_, $(FW_TARGETS)) -BLUPD_TARGETS := $(addprefix blupd_, $(FW_TARGETS)) - -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 " [Release build and packaging]" - @echo " release - Build and package the OpenPilot release" - @echo - @echo " Notes:" - @echo " - the build directory will be removed first on every run" - @echo " - release packages will be placed in $(RELEASE_DIR)" - @echo - -# Clean and build uavobjects since all parts depend on them -uavobjects: all_clean - $(V1) $(MAKE) -C $(ROOT_DIR) $@ - -all_clean: - $(V1) $(MAKE) -C $(ROOT_DIR) $@ - -# Install template: -# $1 = target -# $2 = dependencies -# $3 = install directory (must be defined) -# $4 = installed file name prefix (optional) -# $5 = installed file name suffix (optional) -# $6 = extra make options (for instance, USE_SPEKTRUM=YES) -# $7 = optional target suffix (for instance, clean, if target must be cleaned first) -# $8 = list of targets to install (without _install suffix) -# $9 = inner make target (usually install, but can be other to just build) -define INSTALL_TEMPLATE -$(1): $(2) -ifneq ($(7),) - $$(V1) +$(MAKE) -C $(ROOT_DIR) $(6) $(addsuffix _$(7), $(8)) -endif - $$(V1) +$(MAKE) -C $(ROOT_DIR) INSTALL_DIR=$(3) INSTALL_PFX=$(4) INSTALL_SFX=$(5) $(6) $(addsuffix _$(9), $(8)) -.PHONY: $(1) -endef - -# Firmware for different input drivers -$(eval $(call INSTALL_TEMPLATE,fw_common,uavobjects,$(FW_DIR),,-$(RELEASE_LBL),,,$(FW_TARGETS_COMMON),install)) -$(eval $(call INSTALL_TEMPLATE,fw_pwm,uavobjects,$(FW_DIR),,-pwm-$(RELEASE_LBL),,clean,$(FW_TARGETS_INPUT),install)) -$(eval $(call INSTALL_TEMPLATE,fw_spektrum,uavobjects fw_pwm,$(FW_DIR),,-spektrum-$(RELEASE_LBL),USE_SPEKTRUM=YES,clean,$(FW_TARGETS_INPUT),install)) -$(eval $(call INSTALL_TEMPLATE,fw_ppm,uavobjects fw_spektrum,$(FW_DIR),,-ppm-$(RELEASE_LBL),USE_PPM=YES,clean,$(FW_TARGETS_INPUT),install)) - -# Bootloaders (change 'bin' to 'install' to install bootloaders too) -$(eval $(call INSTALL_TEMPLATE,all_bl,uavobjects,$(BL_DIR),,-$(RELEASE_LBL),,,$(BL_TARGETS),bin)) - -# Bootloader Updaters -$(eval $(call INSTALL_TEMPLATE,blupd_coptercontrol,all_bl,$(BLUPD_DIR),CopterControl_,-$(RELEASE_LBL),,,blupd_coptercontrol,install)) -$(eval $(call INSTALL_TEMPLATE,blupd_ahrs,all_bl,$(BLUPD_DIR),AHRS_,-$(RELEASE_LBL),,,blupd_ahrs,install)) -$(eval $(call INSTALL_TEMPLATE,blupd_openpilot,all_bl,$(BLUPD_DIR),OpenPilot_,-$(RELEASE_LBL),,,blupd_openpilot,install)) -$(eval $(call INSTALL_TEMPLATE,blupd_pipxtreme,all_bl,$(BLUPD_DIR),PipXtreme_,-$(RELEASE_LBL),,,blupd_pipxtreme,install)) - -# Order-only dependencies -# They are bit complicated to support parallel (-j) builds and to -# create the pwm/ppm/spektrum targets in a sequence of build steps - -release: | release_flight release_ground - -release_flight: | release_fw release_blupd - -release_fw: | fw_common fw_pwm fw_spektrum # fw_ppm - -release_blupd: | $(BLUPD_TARGETS) - -release_ground: | ground_package - -.PHONY: help uavobjects all_clean release release_flight release_fw release_blupd release_ground - -# Decide on a verbosity level based on the V= parameter -export AT := @ - -ifndef V -export V0 := -export V1 := $(AT) -else ifeq ($(V), 0) -export V0 := $(AT) -export V1 := $(AT) -else ifeq ($(V), 1) -endif - -ifneq ($(V),1) -MAKEFLAGS += --no-print-directory -endif - -# Platform-dependent stuff -PLATFORM := win32 -UNAME := $(shell uname) -ifeq ($(UNAME), Linux) - PLATFORM := linux -endif -ifeq ($(UNAME), Darwin) - PLATFORM := osx -endif - -include $(WHEREAMI)/Makefile.$(PLATFORM) +# Set up a default goal +.DEFAULT_GOAL := help + +# Tried the best to support parallel (-j) builds. But since this Makefile +# uses other Makefiles to build few targets which in turn have similar +# dependencies on uavobjects and other generated files, it is difficult +# to support parallel builds perfectly. +# +# Looks like it works for -j8, but fails for -j (unlimited jobs). +# So probably not a bad idea is to build release in single thread. +# +#.NOTPARALLEL: + +# Locate the root of the tree +WHEREAMI := $(dir $(lastword $(MAKEFILE_LIST))) +ROOT_DIR := $(realpath $(WHEREAMI)/../) + +# Set up some macros +BUILD_DIR := $(ROOT_DIR)/build +RELEASE_DATE := $(shell date +%Y%m%d) +RELEASE_TAG := unreleased +RELEASE_LBL := $(RELEASE_DATE)-$(RELEASE_TAG) +RELEASE_DIR := $(BUILD_DIR)/release-$(RELEASE_LBL) +FW_DIR := $(RELEASE_DIR)/firmware-$(RELEASE_LBL) +BL_DIR := $(FW_DIR)/bootloaders +BLUPD_DIR := $(FW_DIR)/bootloader_updaters + +# Setup targets +FW_TARGETS_COMMON := ahrs pipxtreme +FW_TARGETS_INPUT := coptercontrol openpilot +FW_TARGETS := $(FW_TARGETS_COMMON) $(FW_TARGETS_INPUT) +BL_TARGETS := $(addprefix bl_, $(FW_TARGETS)) +BLUPD_TARGETS := $(addprefix blupd_, $(FW_TARGETS)) + +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 " [Release build and packaging]" + @echo " release - Build and package the OpenPilot release" + @echo + @echo " Notes:" + @echo " - the build directory will be removed first on every run" + @echo " - release packages will be placed in $(RELEASE_DIR)" + @echo + +# Clean and build uavobjects since all parts depend on them +uavobjects: all_clean + $(V1) $(MAKE) -C $(ROOT_DIR) $@ + +all_clean: + $(V1) $(MAKE) -C $(ROOT_DIR) $@ + +# Install template: +# $1 = target +# $2 = dependencies +# $3 = install directory (must be defined) +# $4 = installed file name prefix (optional) +# $5 = installed file name suffix (optional) +# $6 = extra make options (for instance, USE_SPEKTRUM=YES) +# $7 = optional target suffix (for instance, clean, if target must be cleaned first) +# $8 = list of targets to install (without _install suffix) +# $9 = inner make target (usually install, but can be other to just build) +define INSTALL_TEMPLATE +$(1): $(2) +ifneq ($(7),) + $$(V1) +$(MAKE) -C $(ROOT_DIR) $(6) $(addsuffix _$(7), $(8)) +endif + $$(V1) +$(MAKE) -C $(ROOT_DIR) INSTALL_DIR=$(3) INSTALL_PFX=$(4) INSTALL_SFX=$(5) $(6) $(addsuffix _$(9), $(8)) +.PHONY: $(1) +endef + +# Firmware for different input drivers +$(eval $(call INSTALL_TEMPLATE,fw_common,uavobjects,$(FW_DIR),,-$(RELEASE_LBL),,,$(FW_TARGETS_COMMON),install)) +$(eval $(call INSTALL_TEMPLATE,fw_pwm,uavobjects,$(FW_DIR),,-pwm-$(RELEASE_LBL),,clean,$(FW_TARGETS_INPUT),install)) +$(eval $(call INSTALL_TEMPLATE,fw_spektrum,uavobjects fw_pwm,$(FW_DIR),,-spektrum-$(RELEASE_LBL),USE_SPEKTRUM=YES,clean,$(FW_TARGETS_INPUT),install)) +$(eval $(call INSTALL_TEMPLATE,fw_ppm,uavobjects fw_spektrum,$(FW_DIR),,-ppm-$(RELEASE_LBL),USE_PPM=YES,clean,$(FW_TARGETS_INPUT),install)) + +# Bootloaders (change 'bin' to 'install' to install bootloaders too) +$(eval $(call INSTALL_TEMPLATE,all_bl,uavobjects,$(BL_DIR),,-$(RELEASE_LBL),,,$(BL_TARGETS),bin)) + +# Bootloader Updaters +$(eval $(call INSTALL_TEMPLATE,blupd_coptercontrol,all_bl,$(BLUPD_DIR),CopterControl_,-$(RELEASE_LBL),,,blupd_coptercontrol,install)) +$(eval $(call INSTALL_TEMPLATE,blupd_ahrs,all_bl,$(BLUPD_DIR),AHRS_,-$(RELEASE_LBL),,,blupd_ahrs,install)) +$(eval $(call INSTALL_TEMPLATE,blupd_openpilot,all_bl,$(BLUPD_DIR),OpenPilot_,-$(RELEASE_LBL),,,blupd_openpilot,install)) +$(eval $(call INSTALL_TEMPLATE,blupd_pipxtreme,all_bl,$(BLUPD_DIR),PipXtreme_,-$(RELEASE_LBL),,,blupd_pipxtreme,install)) + +# Order-only dependencies +# They are bit complicated to support parallel (-j) builds and to +# create the pwm/ppm/spektrum targets in a sequence of build steps + +release: | release_flight release_ground + +release_flight: | release_fw release_blupd + +release_fw: | fw_common fw_pwm fw_spektrum # fw_ppm + +release_blupd: | $(BLUPD_TARGETS) + +release_ground: | ground_package + +.PHONY: help uavobjects all_clean release release_flight release_fw release_blupd release_ground + +# Decide on a verbosity level based on the V= parameter +export AT := @ + +ifndef V +export V0 := +export V1 := $(AT) +else ifeq ($(V), 0) +export V0 := $(AT) +export V1 := $(AT) +else ifeq ($(V), 1) +endif + +ifneq ($(V),1) +MAKEFLAGS += --no-print-directory +endif + +# Platform-dependent stuff +PLATFORM := win32 +UNAME := $(shell uname) +ifeq ($(UNAME), Linux) + PLATFORM := linux +endif +ifeq ($(UNAME), Darwin) + PLATFORM := osx +endif + +include $(WHEREAMI)/Makefile.$(PLATFORM) diff --git a/release/Makefile.linux b/release/Makefile.linux index 02e92c941..c966ff6f2 100644 --- a/release/Makefile.linux +++ b/release/Makefile.linux @@ -1,10 +1,10 @@ -# -# Linux-specific packaging -# - -gcs: uavobjects - $(V1) $(MAKE) -C $(ROOT_DIR) GCS_BUILD_CONF=release $@ - -ground_package: | gcs - -.PHONY: gcs ground_package +# +# Linux-specific packaging +# + +gcs: uavobjects + $(V1) $(MAKE) -C $(ROOT_DIR) GCS_BUILD_CONF=release $@ + +ground_package: | gcs + +.PHONY: gcs ground_package diff --git a/release/Makefile.osx b/release/Makefile.osx index c213fbf6e..d18b950d7 100644 --- a/release/Makefile.osx +++ b/release/Makefile.osx @@ -1,10 +1,10 @@ -# -# MacOSX-specific packaging -# - -gcs: uavobjects - $(V1) $(MAKE) -C $(ROOT_DIR) GCS_BUILD_CONF=release $@ - -ground_package: | gcs - -.PHONY: gcs ground_package +# +# MacOSX-specific packaging +# + +gcs: uavobjects + $(V1) $(MAKE) -C $(ROOT_DIR) GCS_BUILD_CONF=release $@ + +ground_package: | gcs + +.PHONY: gcs ground_package diff --git a/release/Makefile.win32 b/release/Makefile.win32 index aed3eca1f..b1283c3cf 100644 --- a/release/Makefile.win32 +++ b/release/Makefile.win32 @@ -1,11 +1,11 @@ -# -# Windows-specific packaging -# - -# Generate GCS installer -gcs_installer: uavobjects - $(V1) $(MAKE) -C $(ROOT_DIR) GCS_BUILD_CONF=release $@ - -ground_package: | gcs_installer - -.PHONY: gcs_installer ground_package +# +# Windows-specific packaging +# + +# Generate GCS installer +gcs_installer: uavobjects + $(V1) $(MAKE) -C $(ROOT_DIR) GCS_BUILD_CONF=release $@ + +ground_package: | gcs_installer + +.PHONY: gcs_installer ground_package