rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-02-06 21:54:15 +01:00
Code Issues Releases Activity

OP-1694 make package rule non-nested: removed messy clean_package rule, "make clean package" does the same

Browse Source
This commit is contained in:
James Duley 2015-01-30 09:47:48 +13:00
parent 0711f89180
commit b0ff0f2e52
1 changed files with 5 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Makefile
View File

@ -246,8 +246,8 @@ EF_TARGETS := $(addprefix ef_, $(EF_BOARDS))
# When building any of the "all_*" targets, tell all sub makefiles to display # 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 # additional details on each line of output to describe which build and target
# that each line applies to. The same applies also to all, opfw_resource, # that each line applies to. The same applies also to all, opfw_resource,
# package and clean_package targets # package targets
ifneq ($(strip $(filter all_% all opfw_resource package clean_package,$(MAKECMDGOALS))),) ifneq ($(strip $(filter all_% all opfw_resource package,$(MAKECMDGOALS))),)
export ENABLE_MSG_EXTRA := yes export ENABLE_MSG_EXTRA := yes
endif endif
@ -773,14 +773,13 @@ ifneq ($(strip $(filter opfw_resource all all_fw all_flight,$(MAKECMDGOALS))),)
$(eval openpilotgcs_qmake: $(OPFW_RESOURCE)) $(eval openpilotgcs_qmake: $(OPFW_RESOURCE))
endif endif
# Packaging targets: package, clean_package # Packaging targets: package
# - removes build directory (clean_package only)
# - builds all firmware, opfw_resource, gcs # - builds all firmware, opfw_resource, gcs
# - copies firmware into a package directory # - copies firmware into a package directory
# - calls paltform-specific packaging script # - calls paltform-specific packaging script
# Do some checks and define some values if package is requested # Do some checks and define some values if package is requested
ifneq ($(strip $(filter package clean_package,$(MAKECMDGOALS))),) ifneq ($(strip $(filter package,$(MAKECMDGOALS))),)
# Define some variables # Define some variables
export PACKAGE_LBL := $(shell $(VERSION_INFO) --format=\$${LABEL}) export PACKAGE_LBL := $(shell $(VERSION_INFO) --format=\$${LABEL})
export PACKAGE_NAME := OpenPilot export PACKAGE_NAME := OpenPilot
@ -792,20 +791,7 @@ ifneq ($(strip $(filter package clean_package,$(MAKECMDGOALS))),)
endif endif
# Packaged GCS should depend on opfw_resource # Packaged GCS should depend on opfw_resource
ifneq ($(strip $(filter package clean_package,$(MAKECMDGOALS))),)
$(eval openpilotgcs_qmake: $(OPFW_RESOURCE)) $(eval openpilotgcs_qmake: $(OPFW_RESOURCE))
endif
# 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
.PHONY: clean_package
clean_package: package
endif
endif endif
.PHONY: package .PHONY: package
@ -1082,7 +1068,6 @@ help:
@$(ECHO) " Supported groups are ($(UAVOBJ_TARGETS))" @$(ECHO) " Supported groups are ($(UAVOBJ_TARGETS))"
@$(ECHO) @$(ECHO)
@$(ECHO) " [Packaging]" @$(ECHO) " [Packaging]"
@$(ECHO) " clean_package - Clean, build and package the OpenPilot platform-dependent package"
@$(ECHO) " package - Build and package the OpenPilot platform-dependent package (no clean)" @$(ECHO) " package - Build and package the OpenPilot platform-dependent package (no clean)"
@$(ECHO) " opfw_resource - Generate resources to embed firmware binaries into the GCS" @$(ECHO) " opfw_resource - Generate resources to embed firmware binaries into the GCS"
@$(ECHO) " dist - Generate source archive for distribution" @$(ECHO) " dist - Generate source archive for distribution"