tami/MYNT-EYE-S-SDK
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update init & makefile

Browse Source
This commit is contained in:
John Zhao 2018-10-24 11:06:31 +08:00
parent b07930cd55
commit e0161ef696
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -22,6 +22,8 @@ MKFILE_DIR := $(patsubst %/,%,$(dir $(MKFILE_PATH)))
# UNIX: /usr/local # UNIX: /usr/local
# Windows: c:/Program Files/${PROJECT_NAME} # Windows: c:/Program Files/${PROJECT_NAME}
SUDO ?= sudo
.DEFAULT_GOAL := help .DEFAULT_GOAL := help
help: help:
@ -77,7 +79,7 @@ submodules:
init: submodules init: submodules
@$(call echo,Make $@) @$(call echo,Make $@)
@$(SH) ./scripts/init.sh @$(SH) ./scripts/init.sh $(INIT_OPTIONS)
.PHONY: init .PHONY: init
@ -125,7 +127,7 @@ else
endif endif
else else
ifeq ($(HOST_OS),Linux) ifeq ($(HOST_OS),Linux)
@cd ./_build; sudo make install @cd ./_build; $(SUDO) make install
else else
@cd ./_build; make install @cd ./_build; make install
endif endif

1
scripts/init.sh
View File

@ -16,6 +16,7 @@
# _VERBOSE_=1 # _VERBOSE_=1
# _INIT_LINTER_=1 # _INIT_LINTER_=1
# _FORCE_INSRALL_=1 # _FORCE_INSRALL_=1
_INSTALL_OPTIONS_=$@
BASE_DIR=$(cd "$(dirname "$0")" && pwd) BASE_DIR=$(cd "$(dirname "$0")" && pwd)

5
scripts/init_tools.sh
View File

@ -16,6 +16,7 @@
_INIT_BUILD_=1 _INIT_BUILD_=1
# _INIT_LINTER_=1 # _INIT_LINTER_=1
# _FORCE_INSRALL_=1 # _FORCE_INSRALL_=1
# _INSTALL_OPTIONS_=-y
BASE_DIR=$(cd "$(dirname "$0")" && pwd) BASE_DIR=$(cd "$(dirname "$0")" && pwd)
@ -42,6 +43,9 @@ fi
_install_deps() { _install_deps() {
_cmd="$1"; shift; _deps_all=($@) _cmd="$1"; shift; _deps_all=($@)
if [ -n "${_INSTALL_OPTIONS_}" ]; then
_cmd="$_cmd $_INSTALL_OPTIONS_"
fi
_echo "Install cmd: $_cmd" _echo "Install cmd: $_cmd"
_echo "Install deps: ${_deps_all[*]}" _echo "Install deps: ${_deps_all[*]}"
if [ -n "${_FORCE_INSRALL_}" ]; then if [ -n "${_FORCE_INSRALL_}" ]; then
@ -68,6 +72,7 @@ _echo_s "Init tools"
if [ "$HOST_OS" = "Linux" ]; then if [ "$HOST_OS" = "Linux" ]; then
# sudo # sudo
SUDO="sudo" SUDO="sudo"
_detect_cmd $SUDO || SUDO=
# detect apt-get # detect apt-get
_detect apt-get _detect apt-get
# apt-get install # apt-get install