mirror of
https://bitbucket.org/librepilot/librepilot.git
synced 2025-02-21 11:54:15 +01:00
OP-483: move Windows installer out of ground/gcs tree
In preparation for release build the Windows installer source is moved out of ground/gcs source tree into release directory. It is also disabled in the qmake source file and removed from top level Makefile.
This commit is contained in:
parent
8535ae52b8
commit
5b1e45a8df
12
Makefile
12
Makefile
@ -270,18 +270,6 @@ openpilotgcs: uavobjects_gcs
|
|||||||
$(MAKE) -w ; \
|
$(MAKE) -w ; \
|
||||||
)
|
)
|
||||||
|
|
||||||
.PHONY: gcs_installer
|
|
||||||
gcs_installer: openpilotgcs
|
|
||||||
ifeq ($(QT_SPEC), win32-g++)
|
|
||||||
ifeq ($(GCS_BUILD_CONF), release)
|
|
||||||
$(V1) cd $(BUILD_DIR)/ground/openpilotgcs/packaging/winx86 && $(MAKE) -r --no-print-directory $@
|
|
||||||
else
|
|
||||||
$(error $@ can be generated for release build only (GCS_BUILD_CONF=release))
|
|
||||||
endif
|
|
||||||
else
|
|
||||||
$(error $@ is currently only available on Windows)
|
|
||||||
endif
|
|
||||||
|
|
||||||
.PHONY: openpilotgcs_clean
|
.PHONY: openpilotgcs_clean
|
||||||
openpilotgcs_clean:
|
openpilotgcs_clean:
|
||||||
$(V0) @echo " CLEAN $@"
|
$(V0) @echo " CLEAN $@"
|
||||||
|
@ -1,7 +1,6 @@
|
|||||||
include(../openpilotgcs.pri)
|
include(../openpilotgcs.pri)
|
||||||
|
|
||||||
TEMPLATE = subdirs
|
TEMPLATE = subdirs
|
||||||
SUBDIRS = winx86
|
|
||||||
|
|
||||||
# Copy Qt runtime libraries into the build directory (to run or package)
|
# Copy Qt runtime libraries into the build directory (to run or package)
|
||||||
equals(copydata, 1) {
|
equals(copydata, 1) {
|
||||||
|
@ -2,10 +2,9 @@
|
|||||||
# Windows-specific packaging
|
# Windows-specific packaging
|
||||||
#
|
#
|
||||||
|
|
||||||
# Generate GCS installer
|
gcs: uavobjects
|
||||||
gcs_installer: uavobjects
|
|
||||||
$(V1) $(MAKE) -C $(ROOT_DIR) GCS_BUILD_CONF=release $@
|
$(V1) $(MAKE) -C $(ROOT_DIR) GCS_BUILD_CONF=release $@
|
||||||
|
|
||||||
ground_package: | gcs_installer
|
ground_package: | gcs
|
||||||
|
|
||||||
.PHONY: gcs_installer ground_package
|
.PHONY: gcs ground_package
|
||||||
|
Before Width: | Height: | Size: 25 KiB After Width: | Height: | Size: 25 KiB |
Before Width: | Height: | Size: 33 KiB After Width: | Height: | Size: 33 KiB |
Before Width: | Height: | Size: 151 KiB After Width: | Height: | Size: 151 KiB |
Loading…
x
Reference in New Issue
Block a user