rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-03-01 18:29:16 +01:00
Code Issues Releases Activity

Merge branch 'stac/package-opfw-resources' of ssh://git.openpilot.org/OpenPilot into pt/wiz_autoupdate

Browse Source
This commit is contained in:
PT_Dreamer 2012-10-06 19:50:17 +01:00
commit f6443fc995
3 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile
View File

@ -750,6 +750,11 @@ sim_win32_%: uavobjects_flight
# Packaging components # Packaging components
# #
############################## ##############################
.PHONY: package .PHONY: package
package: package:
$(V1) cd $@ && $(MAKE) --no-print-directory $@ $(V1) cd $@ && $(MAKE) --no-print-directory $@
.PHONY: package_resources
package_resources:
$(V1) cd package && $(MAKE) --no-print-directory opfw_resource

3
ground/openpilotgcs/src/plugins/uploader/uploader.pro
View File

@ -43,3 +43,6 @@ FORMS += \
RESOURCES += \ RESOURCES += \
uploader.qrc uploader.qrc
exists( ../../../../build/ground/opfw_resource/opfw_resource.qrc ) {
\ ../../../../build/ground/opfw_resource/opfw_resource.qrc
}

19
package/Makefile
View File

@ -99,7 +99,7 @@ package_flight: | all_fw all_bu
package_ground: | ground_package package_ground: | ground_package
package: | package_flight package_ground package: | package_flight opfw_resource package_ground
.PHONY: help uavobjects all_clean package_flight package_ground package .PHONY: help uavobjects all_clean package_flight package_ground package
@ -129,4 +129,21 @@ ifeq ($(UNAME), Darwin)
PLATFORM := osx PLATFORM := osx
endif endif
toprel = $(subst $(realpath $(ROOT_DIR))/,,$(abspath $(1)))
OPFW_FILES := $(foreach fw_targ, $(FW_TARGETS), $(call toprel, $(BUILD_DIR)/$(fw_targ)/$(fw_targ).opfw))
OPFW_CONTENTS := \
<!DOCTYPE RCC><RCC version="1.0"> \
<qresource> \
$(foreach fw_file, $(OPFW_FILES), <file>$(fw_file)</file>) \
</qresource> \
</RCC>
.PHONY: opfw_resource
opfw_resource:
@echo Generating OPFW resource file $(call toprel, $(BUILD_DIR)/ground/$@)
$(V1) mkdir -p $(BUILD_DIR)/ground/$@
$(V1) mkdir -p $(BUILD_DIR)/ground/$@/build
$(V1) echo '$(OPFW_CONTENTS)' > $(BUILD_DIR)/ground/$@/opfw_resource.qrc
$(V1) $(foreach fw_targ, $(FW_TARGETS), mkdir -p $(BUILD_DIR)/ground/$@/build/$(fw_targ);)
$(V1)$(foreach fw_targ, $(FW_TARGETS), cp $(BUILD_DIR)/$(fw_targ)/$(fw_targ).opfw $(BUILD_DIR)/ground/$@/build/$(fw_targ)/;)
include $(WHEREAMI)/Makefile.$(PLATFORM) include $(WHEREAMI)/Makefile.$(PLATFORM)