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

OP-483: remove gcs/packaging subdirectory (not required anymore)

Browse Source
This commit is contained in:
Oleg Semyonov 2011-05-19 13:08:54 +03:00
parent bb423e2520
commit cbdba940b5
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ground/openpilotgcs/packaging/packaging.pro → ground/openpilotgcs/copydata.pro
View File

@ -1,4 +1,4 @@
include(../openpilotgcs.pri) include(openpilotgcs.pri)
TEMPLATE = subdirs TEMPLATE = subdirs

4
ground/openpilotgcs/openpilotgcs.pro
View File

@ -9,5 +9,7 @@ include(openpilotgcs.pri)
TEMPLATE = subdirs TEMPLATE = subdirs
CONFIG += ordered CONFIG += ordered
SUBDIRS = src share packaging SUBDIRS = src share copydata
unix:!macx:!isEmpty(copydata):SUBDIRS += bin unix:!macx:!isEmpty(copydata):SUBDIRS += bin
copydata.file = copydata.pro

2
release/Makefile.winx86
View File

@ -7,7 +7,7 @@ NSIS_OPTS := /V3
NSIS_DIR := $(ROOT_DIR)/release/winx86 NSIS_DIR := $(ROOT_DIR)/release/winx86
NSIS_SCRIPT := $(NSIS_DIR)/openpilotgcs.nsi NSIS_SCRIPT := $(NSIS_DIR)/openpilotgcs.nsi
NSIS_TEMPLATE := $(NSIS_DIR)/openpilotgcs.tpl NSIS_TEMPLATE := $(NSIS_DIR)/openpilotgcs.tpl
NSIS_HEADER := $(BUILD_DIR)/ground/openpilotgcs/packaging/openpilotgcs.nsh NSIS_HEADER := $(BUILD_DIR)/ground/openpilotgcs/openpilotgcs.nsh
$(NSIS_HEADER): $(NSIS_TEMPLATE) $(NSIS_HEADER): $(NSIS_TEMPLATE)
$(V0) @echo " PY $@" $(V0) @echo " PY $@"

3
release/winx86/openpilotgcs.nsi
View File

@ -35,7 +35,6 @@
; Tree root locations (relative to this script location) ; Tree root locations (relative to this script location)
!define NSIS_DATA_TREE "." !define NSIS_DATA_TREE "."
!define GCS_BUILD_TREE "..\..\build\ground\openpilotgcs" !define GCS_BUILD_TREE "..\..\build\ground\openpilotgcs"
!define GCS_PKG_TREE "${GCS_BUILD_TREE}\packaging"
; Default installation folder ; Default installation folder
InstallDir "$LOCALAPPDATA\OpenPilot" InstallDir "$LOCALAPPDATA\OpenPilot"
@ -58,7 +57,7 @@
; !define PRODUCT_VERSION "0.0.0.0" ; !define PRODUCT_VERSION "0.0.0.0"
; !define FILE_VERSION "${TAG_OR_BRANCH}:${HASH8} ${DATETIME}" ; !define FILE_VERSION "${TAG_OR_BRANCH}:${HASH8} ${DATETIME}"
; !define BUILD_DESCRIPTION "${TAG_OR_BRANCH}:${HASH8} built using ${ORIGIN} as origin, committed ${DATETIME} as ${HASH}" ; !define BUILD_DESCRIPTION "${TAG_OR_BRANCH}:${HASH8} built using ${ORIGIN} as origin, committed ${DATETIME} as ${HASH}"
!include "${GCS_PKG_TREE}\openpilotgcs.nsh" !include "${GCS_BUILD_TREE}\openpilotgcs.nsh"
Name "${PRODUCT_NAME}" Name "${PRODUCT_NAME}"
OutFile "${RELEASE_DIR}\${OUT_FILE}" OutFile "${RELEASE_DIR}\${OUT_FILE}"