rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-11-29 07:24:13 +01:00
Code Issues Releases Activity

Makefile: split GCS build directory into debug and release

Browse Source 
Now by default GCS is built for release.
AeroSimRC also is placed under misc (as it is installed on Windows).
This commit is contained in:
Oleg Semyonov 2013-03-20 00:48:02 +02:00
parent 1407d4ce61
commit 0957bbb498
4 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
Makefile
View File

@ -34,10 +34,10 @@ export BUILD_DIR := $(ROOT_DIR)/build
export DL_DIR := $(ROOT_DIR)/downloads
# Set up default build configurations (debug | release)
UAVOGEN_BUILD_CONF ?= debug
GCS_BUILD_CONF ?= debug
ANDROIDGCS_BUILD_CONF ?= debug
GOOGLE_API_VERSION ?= 14
GCS_BUILD_CONF := release
UAVOGEN_BUILD_CONF := debug
ANDROIDGCS_BUILD_CONF := debug
GOOGLE_API_VERSION := 14
# Function for converting an absolute path to one relative
# to the top of the source tree.
@ -505,9 +505,10 @@ sim_osx_%: uavobjects_flight
all_ground: openpilotgcs
# Convenience target for the GCS
.PHONY: gcs gcs_clean
.PHONY: gcs gcs_clean gcs_all_clean
gcs: openpilotgcs
gcs_clean: openpilotgcs_clean
gcs_all_clean: openpilotgcs_all_clean
ifeq ($(V), 1)
GCS_SILENT :=
@ -517,14 +518,19 @@ endif
.PHONY: openpilotgcs
openpilotgcs: uavobjects_gcs
$(V1) $(MKDIR) -p $(BUILD_DIR)/ground/$@
$(V1) ( cd $(BUILD_DIR)/ground/$@ && \
$(V1) $(MKDIR) -p $(BUILD_DIR)/ground/$@/$(GCS_BUILD_CONF)
$(V1) ( cd $(BUILD_DIR)/ground/$@/$(GCS_BUILD_CONF) && \
$(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:
$(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:
$(V0) @$(ECHO) " CLEAN $@"
$(V1) [ ! -d "$(BUILD_DIR)/ground/openpilotgcs" ] || $(RM) -r "$(BUILD_DIR)/ground/openpilotgcs"
@ -882,9 +888,10 @@ help:
@$(ECHO) " sim_win32_clean - Delete all build output for the win32 simulation"
@$(ECHO)
@$(ECHO) " [GCS]"
@$(ECHO) " gcs - Build the Ground Control System (GCS) application"
@$(ECHO) " with optional GCS_BUILD_CONF=debug|release (default is $(GCS_BUILD_CONF))"
@$(ECHO) " gcs_clean - Remove the Ground Control System (GCS) application"
@$(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)"
@$(ECHO)
@$(ECHO) " [AndroidGCS]"
@$(ECHO) " androidgcs - Build the Android Ground Control System (GCS) application"

2
ground/openpilotgcs/src/app/gcsversioninfo.pri
View File

@ -8,7 +8,7 @@
# Since debug_and_release option is set, we need this
!debug_and_release|build_pass {
ROOT_DIR = $$GCS_SOURCE_TREE/../..
VERSION_INFO_HEADER = $$GCS_BUILD_TREE/gcsversioninfo.h
VERSION_INFO_HEADER = $$GCS_BUILD_TREE/../gcsversioninfo.h
VERSION_INFO_SCRIPT = $$ROOT_DIR/make/scripts/version-info.py
VERSION_INFO_TEMPLATE = $$ROOT_DIR/make/templates/gcsversioninfotemplate.h
VERSION_INFO_COMMAND = python \"$$VERSION_INFO_SCRIPT\"

2
ground/openpilotgcs/src/plugins/hitl/aerosimrc/src/plugin.pro
View File

@ -11,7 +11,7 @@ TEMPLATE = lib
TARGET = plugin_AeroSIMRC
RES_DIR = $${PWD}/resources
SIM_DIR = $$GCS_BUILD_TREE/../AeroSIM-RC
SIM_DIR = $$GCS_BUILD_TREE/misc/AeroSIM-RC
PLUGIN_DIR = $$SIM_DIR/Plugin/CopterControl
DLLDESTDIR = $$PLUGIN_DIR

2
ground/openpilotgcs/src/plugins/uavobjects/uavobjects_dependencies.pri
View File

@ -2,7 +2,7 @@ include(../../plugins/coreplugin/coreplugin.pri)
include(../../libs/utils/utils.pri)
# Provide the path to the auto-generated uavobject source files for the GCS.
UAVOBJECT_SYNTHETICS=$${GCS_BUILD_TREE}/../../uavobject-synthetics/gcs
UAVOBJECT_SYNTHETICS=$${GCS_BUILD_TREE}/../../../uavobject-synthetics/gcs
#message(UAVOBJECT_SYNTHETICS is $$UAVOBJECT_SYNTHETICS)
# Add the include path to the auto-generated uavobject include files.