rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-12-01 09:24:10 +01:00
Code Issues Releases Activity

LP-1 – Code Rebranding

Browse Source 
Drop prefix for download and tools variables.
This commit is contained in:
Roy Bekken 2015-07-30 11:29:02 +02:00
parent aa0405001a
commit a968e7594d
4 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Makefile
View File

@ -25,7 +25,7 @@
# existance by each sub-make.
export TOP_LEVEL_MAKEFILE := TRUE
# It is possible to set GCS_DL_DIR and/or GCS_TOOLS_DIR environment
# It is possible to set DL_DIR and/or TOOLS_DIR environment
# variables to override local tools download and installation directorys. So the
# same toolchains can be used for all working copies. Particularly useful for CI
# server build agents, but also for local installations.
@ -43,11 +43,14 @@ toprel = $(subst $(realpath $(ROOT_DIR))/,,$(abspath $(1)))
# Set up some macros for common directories within the tree
export ROOT_DIR := $(realpath $(dir $(lastword $(MAKEFILE_LIST))))
export DL_DIR := $(if $(GCS_DL_DIR),$(call slashfix,$(GCS_DL_DIR)),$(ROOT_DIR)/downloads)
export TOOLS_DIR := $(if $(GCS_TOOLS_DIR),$(call slashfix,$(GCS_TOOLS_DIR)),$(ROOT_DIR)/tools)
export BUILD_DIR := $(ROOT_DIR)/build
export PACKAGE_DIR := $(ROOT_DIR)/build/package
export DIST_DIR := $(ROOT_DIR)/build/dist
override DL_DIR := $(if $(DL_DIR),$(call slashfix,$(DL_DIR)),$(ROOT_DIR)/downloads)
override TOOLS_DIR := $(if $(TOOLS_DIR),$(call slashfix,$(TOOLS_DIR)),$(ROOT_DIR)/tools)
export DL_DIR
export TOOLS_DIR
DIRS = $(DL_DIR) $(TOOLS_DIR) $(BUILD_DIR) $(PACKAGE_DIR) $(DIST_DIR)
@ -1033,7 +1036,7 @@ help:
@$(ECHO) " All build output will be placed in $(BUILD_DIR)"
@$(ECHO)
@$(ECHO) " Tool download and install directories can be changed using environment variables:"
@$(ECHO) " GCS_DL_DIR full path to downloads directory [downloads if not set]"
@$(ECHO) " GCS_TOOLS_DIR full path to installed tools directory [tools if not set]"
@$(ECHO) " DL_DIR full path to downloads directory [downloads if not set]"
@$(ECHO) " TOOLS_DIR full path to installed tools directory [tools if not set]"
@$(ECHO) " More info: http://wiki.openpilot.org/display/Doc/OpenPilot+Build+System+Overview"
@$(ECHO)

9
ground/openpilotgcs/openpilotgcs.pri
View File

@ -118,13 +118,8 @@ isEmpty(GCS_BUILD_TREE) {
# Find the tools directory,
# try from Makefile (not run by Qt Creator),
TOOLS_DIR = $$(TOOLS_DIR)
isEmpty(TOOLS_DIR) {
# check for custom enviroment variable,
TOOLS_DIR = $$(GCS_TOOLS_DIR)
# fallback to default location.
isEmpty(TOOLS_DIR):TOOLS_DIR = $$clean_path($$ROOT_DIR/tools)
}
isEmtpy(TOOLS_DIR):TOOLS_DIR = $$(TOOLS_DIR)
isEmtpy(TOOLS_DIR):TOOLS_DIR = $$clean_path($$ROOT_DIR/tools)
# Set the default name of the application
isEmpty(GCS_SMALL_NAME):GCS_SMALL_NAME = gcs

6
ground/openpilotgcs/src/python.pri
View File

@ -4,9 +4,9 @@
PYTHON_DIR = qt-5.4.1/Tools/mingw491_32/opt/bin
# Search the python using environment override first
GCS_TOOLS_DIR = $$(GCS_TOOLS_DIR)
!isEmpty(GCS_TOOLS_DIR):exists($$GCS_TOOLS_DIR/$$PYTHON_DIR/python*) {
PYTHON = \"$$GCS_TOOLS_DIR/$$PYTHON_DIR/python\"
TOOLS_DIR = $$(TOOLS_DIR)
!isEmpty(TOOLS_DIR):exists($$TOOLS_DIR/$$PYTHON_DIR/python*) {
PYTHON = \"$$TOOLS_DIR/$$PYTHON_DIR/python\"
} else {
# If not found, search the predefined tools path
exists($$ROOT_DIR/tools/$$PYTHON_DIR/python*) {

4
make/winx86/cmd/sh.cmd
View File

@ -16,8 +16,8 @@ rem http://www.mingw.org/wiki/msys
rem
rem Shared directories for toolchains
rem set GCS_DL_DIR=C:/LibrePilot/downloads
rem set GCS_TOOLS_DIR=C:/LibrePilot/tools
rem set DL_DIR=C:/LibrePilot/downloads
rem set TOOLS_DIR=C:/LibrePilot/tools
rem this should let run MSYS shell on x64
if "%PROCESSOR_ARCHITECTURE%" == "AMD64" (