From 989d09803caf0df668b6e99156ced601a58a9ac3 Mon Sep 17 00:00:00 2001 From: James Duley Date: Tue, 21 Apr 2015 09:05:59 +1200 Subject: [PATCH 1/3] OP-1843 Makefile bugs: make opfw_resource before gcs_qmake to ensure it is included --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 6860634c6..6b6ab615b 100644 --- a/Makefile +++ b/Makefile @@ -711,7 +711,7 @@ $(OPFW_RESOURCE): $(FW_TARGETS) | $(OPGCSSYNTHDIR) # If opfw_resource or all firmware are requested, GCS should depend on the resource ifneq ($(strip $(filter opfw_resource all all_fw all_flight package,$(MAKECMDGOALS))),) - $(eval openpilotgcs_qmake: $(OPFW_RESOURCE)) +$(OPENPILOTGCS_MAKEFILE): $(OPFW_RESOURCE) endif # Packaging targets: package From bf527f741d49deebcd0cb41143998aa14bed096e Mon Sep 17 00:00:00 2001 From: James Duley Date: Tue, 21 Apr 2015 09:20:13 +1200 Subject: [PATCH 2/3] OP-1843 Makefile bugs: split qmake CONFIG variables as a temporary solution to broken qmake quoting on windows --- Makefile | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index 6b6ab615b..d5edb054a 100644 --- a/Makefile +++ b/Makefile @@ -160,10 +160,10 @@ DIRS += $(UAVOBJGENERATOR_DIR) .PHONY: uavobjgenerator uavobjgenerator: | $(UAVOBJGENERATOR_DIR) - $(V1) ( cd $(UAVOBJGENERATOR_DIR) && \ - $(QMAKE) $(ROOT_DIR)/ground/uavobjgenerator/uavobjgenerator.pro -spec $(QT_SPEC) -r CONFIG+="$(UAVOGEN_BUILD_CONF) $(UAVOGEN_SILENT)" && \ - $(MAKE) --no-print-directory -w ; \ - ) + $(V1) cd $(UAVOBJGENERATOR_DIR) && \ + $(QMAKE) $(ROOT_DIR)/ground/uavobjgenerator/uavobjgenerator.pro \ + -spec $(QT_SPEC) -r CONFIG+=$(UAVOGEN_BUILD_CONF) CONFIG+=$(UAVOGEN_SILENT) && \ + $(MAKE) --no-print-directory -w UAVOBJ_TARGETS := gcs flight python matlab java wireshark @@ -469,9 +469,9 @@ OPENPILOTGCS_MAKEFILE := $(OPENPILOTGCS_DIR)/Makefile .PHONY: openpilotgcs_qmake openpilotgcs_qmake $(OPENPILOTGCS_MAKEFILE): | $(OPENPILOTGCS_DIR) - $(V1) ( cd $(OPENPILOTGCS_DIR) && \ - $(QMAKE) $(ROOT_DIR)/ground/openpilotgcs/openpilotgcs.pro -spec $(QT_SPEC) -r CONFIG+="$(GCS_BUILD_CONF) $(GCS_SILENT)" $(GCS_QMAKE_OPTS) \ - ) + $(V1) cd $(OPENPILOTGCS_DIR) && \ + $(QMAKE) $(ROOT_DIR)/ground/openpilotgcs/openpilotgcs.pro \ + -spec $(QT_SPEC) -r CONFIG+=$(GCS_BUILD_CONF) CONFIG+=$(GCS_SILENT) $(GCS_QMAKE_OPTS) .PHONY: openpilotgcs openpilotgcs: uavobjects_gcs $(OPENPILOTGCS_MAKEFILE) @@ -495,9 +495,9 @@ UPLOADER_MAKEFILE := $(UPLOADER_DIR)/Makefile .PHONY: uploader_qmake uploader_qmake $(UPLOADER_MAKEFILE): | $(UPLOADER_DIR) - $(V1) ( cd $(UPLOADER_DIR) && \ - $(QMAKE) $(ROOT_DIR)/ground/openpilotgcs/src/experimental/USB_UPLOAD_TOOL/upload.pro -spec $(QT_SPEC) -r CONFIG+="$(GCS_BUILD_CONF) $(GCS_SILENT)" $(GCS_QMAKE_OPTS) \ - ) + $(V1) cd $(UPLOADER_DIR) && \ + $(QMAKE) $(ROOT_DIR)/ground/openpilotgcs/src/experimental/USB_UPLOAD_TOOL/upload.pro \ + -spec $(QT_SPEC) -r CONFIG+=$(GCS_BUILD_CONF) CONFIG+=$(GCS_SILENT) $(GCS_QMAKE_OPTS) .PHONY: uploader uploader: $(UPLOADER_MAKEFILE) From 580ae1998379eeaad622bfbde94a49510fc28b48 Mon Sep 17 00:00:00 2001 From: James Duley Date: Tue, 21 Apr 2015 15:30:45 +1200 Subject: [PATCH 3/3] Revert "OP-1792: make firmware_info.c depend on uavobjectdefition instead of FORCE so it isn't always updated" This reverts commit 428bba0c0960ad0c686db149c4df2c81a25a7499. On windows directory timestamps are not modified when a file is modified. --- make/firmware-defs.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/make/firmware-defs.mk b/make/firmware-defs.mk index d184c0b05..5f1ed36ee 100644 --- a/make/firmware-defs.mk +++ b/make/firmware-defs.mk @@ -136,7 +136,7 @@ endef define OPFW_TEMPLATE FORCE: -$(1).firmware_info.c: $(1) $(ROOT_DIR)/flight/templates/firmware_info.c.template $(ROOT_DIR)/shared/uavobjectdefinition +$(1).firmware_info.c: $(1) $(ROOT_DIR)/flight/templates/firmware_info.c.template FORCE @$(ECHO) $(MSG_FWINFO) $$(call toprel, $$@) $(V1) $(VERSION_INFO) \ --template=$(ROOT_DIR)/flight/templates/firmware_info.c.template \