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

tools: Makefile and sh.cmd minor updates (mostly comments)

Browse Source
This commit is contained in:
Oleg Semyonov 2013-04-04 23:57:43 +03:00
parent 7a5c04034f
commit f57610dc78
2 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Makefile
View File

@ -27,6 +27,17 @@ export OPENPILOT_IS_COOL := Fuck Yeah!
# Set up a default goal # Set up a default goal
.DEFAULT_GOAL := help .DEFAULT_GOAL := help
# It is possible to set OPENPILOT_DL_DIR and/or OPENPILOT_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.
#
# NOTE: paths should use forward (unix-style) slashes.
#
# If no OPENPILOT_* variables found, makefile internal DL_DIR and TOOLS_DIR paths
# will be used. They still can be overriden by the make command line parameters:
# make DL_DIR=/path/to/download/directory TOOLS_DIR=/path/to/tools/directory targets...
# Set up some macros for common directories within the tree # Set up some macros for common directories within the tree
export ROOT_DIR := $(realpath $(dir $(lastword $(MAKEFILE_LIST)))) export ROOT_DIR := $(realpath $(dir $(lastword $(MAKEFILE_LIST))))
export DL_DIR := $(if $(OPENPILOT_DL_DIR),$(OPENPILOT_DL_DIR),$(ROOT_DIR)/downloads) export DL_DIR := $(if $(OPENPILOT_DL_DIR),$(OPENPILOT_DL_DIR),$(ROOT_DIR)/downloads)
@ -111,10 +122,10 @@ export VERSION_INFO := $(PYTHON) "$(ROOT_DIR)/make/scripts/version-info.py" --pa
# Test if quotes are needed for the echo-command # Test if quotes are needed for the echo-command
ifeq (${shell $(ECHO) "test"}, test) ifeq (${shell $(ECHO) "test"}, test)
export QUOTE := ' export QUOTE := '
# This line is just to clear out the single quote above ' # This line is just to clear out the single quote above '
else else
export QUOTE := export QUOTE :=
endif endif
# Include tools installers # Include tools installers

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

@ -15,6 +15,10 @@ rem Based on the msys.bat file from the MSYS package
rem http://www.mingw.org/wiki/msys rem http://www.mingw.org/wiki/msys
rem rem
rem Shared directories for toolchains
rem set OPENPILOT_DL_DIR=C:/OpenPilot/downloads
rem set OPENPILOT_TOOLS_DIR=C:/OpenPilot/tools
rem this should let run MSYS shell on x64 rem this should let run MSYS shell on x64
if "%PROCESSOR_ARCHITECTURE%" == "AMD64" ( if "%PROCESSOR_ARCHITECTURE%" == "AMD64" (
SET COMSPEC=%WINDIR%\SysWOW64\cmd.exe SET COMSPEC=%WINDIR%\SysWOW64\cmd.exe
@ -53,13 +57,13 @@ rem --------------------------------------------------------------------------
set NOT_FOUND= set NOT_FOUND=
set PATH_DIRS= set PATH_DIRS=
call :which MSYSGIT "%ProgramFiles%\Git\bin" git.exe rem Replace %ProgramFiles% by %ProgramFiles(x86)% for 64bit system
call :which QTMINGW "C:\QtSDK\mingw\bin" mingw32-make.exe call :which MSYSGIT "%ProgramFiles%\Git\bin" git.exe
call :which QTSDK "C:\QtSDK\Desktop\Qt\4.8.1\mingw\bin" qmake.exe call :which QTMINGW "C:\QtSDK\mingw\bin" mingw32-make.exe
call :which CODESOURCERY "%ProgramFiles%\CodeSourcery\Sourcery G++ Lite\bin" cs-make.exe call :which QTSDK "C:\QtSDK\Desktop\Qt\4.8.1\mingw\bin" qmake.exe
call :which PYTHON "C:\Python27" python.exe call :which ARMGCC "C:\OpenPilot\gcc-arm-none-eabi-4_6-2012q4\bin" arm-none-eabi-gcc.exe
call :which UNSIS "%ProgramFiles%\NSIS\Unicode" makensis.exe call :which PYTHON "C:\Python27" python.exe
call :which OPENOCDBIN "C:\OpenOCD\0.4.0\bin" openocd.exe call :which UNSIS "%ProgramFiles%\NSIS\Unicode" makensis.exe
if "%NOT_FOUND%" == "" goto set_path if "%NOT_FOUND%" == "" goto set_path