Update init & makefile
This commit is contained in:
		
							parent
							
								
									b07930cd55
								
							
						
					
					
						commit
						e0161ef696
					
				
							
								
								
									
										6
									
								
								Makefile
									
									
									
									
									
								
							
							
						
						
									
										6
									
								
								Makefile
									
									
									
									
									
								
							@ -22,6 +22,8 @@ MKFILE_DIR := $(patsubst %/,%,$(dir $(MKFILE_PATH)))
 | 
			
		||||
#   UNIX: /usr/local
 | 
			
		||||
#   Windows: c:/Program Files/${PROJECT_NAME}
 | 
			
		||||
 | 
			
		||||
SUDO ?= sudo
 | 
			
		||||
 | 
			
		||||
.DEFAULT_GOAL := help
 | 
			
		||||
 | 
			
		||||
help:
 | 
			
		||||
@ -77,7 +79,7 @@ submodules:
 | 
			
		||||
 | 
			
		||||
init: submodules
 | 
			
		||||
	@$(call echo,Make $@)
 | 
			
		||||
	@$(SH) ./scripts/init.sh
 | 
			
		||||
	@$(SH) ./scripts/init.sh $(INIT_OPTIONS)
 | 
			
		||||
 | 
			
		||||
.PHONY: init
 | 
			
		||||
 | 
			
		||||
@ -125,7 +127,7 @@ else
 | 
			
		||||
endif
 | 
			
		||||
else
 | 
			
		||||
ifeq ($(HOST_OS),Linux)
 | 
			
		||||
	@cd ./_build; sudo make install
 | 
			
		||||
	@cd ./_build; $(SUDO) make install
 | 
			
		||||
else
 | 
			
		||||
	@cd ./_build; make install
 | 
			
		||||
endif
 | 
			
		||||
 | 
			
		||||
@ -16,6 +16,7 @@
 | 
			
		||||
# _VERBOSE_=1
 | 
			
		||||
# _INIT_LINTER_=1
 | 
			
		||||
# _FORCE_INSRALL_=1
 | 
			
		||||
_INSTALL_OPTIONS_=$@
 | 
			
		||||
 | 
			
		||||
BASE_DIR=$(cd "$(dirname "$0")" && pwd)
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@ -16,6 +16,7 @@
 | 
			
		||||
_INIT_BUILD_=1
 | 
			
		||||
# _INIT_LINTER_=1
 | 
			
		||||
# _FORCE_INSRALL_=1
 | 
			
		||||
# _INSTALL_OPTIONS_=-y
 | 
			
		||||
 | 
			
		||||
BASE_DIR=$(cd "$(dirname "$0")" && pwd)
 | 
			
		||||
 | 
			
		||||
@ -42,6 +43,9 @@ fi
 | 
			
		||||
 | 
			
		||||
_install_deps() {
 | 
			
		||||
  _cmd="$1"; shift; _deps_all=($@)
 | 
			
		||||
  if [ -n "${_INSTALL_OPTIONS_}" ]; then
 | 
			
		||||
    _cmd="$_cmd $_INSTALL_OPTIONS_"
 | 
			
		||||
  fi
 | 
			
		||||
  _echo "Install cmd: $_cmd"
 | 
			
		||||
  _echo "Install deps: ${_deps_all[*]}"
 | 
			
		||||
  if [ -n "${_FORCE_INSRALL_}" ]; then
 | 
			
		||||
@ -68,6 +72,7 @@ _echo_s "Init tools"
 | 
			
		||||
if [ "$HOST_OS" = "Linux" ]; then
 | 
			
		||||
  # sudo
 | 
			
		||||
  SUDO="sudo"
 | 
			
		||||
  _detect_cmd $SUDO || SUDO=
 | 
			
		||||
  # detect apt-get
 | 
			
		||||
  _detect apt-get
 | 
			
		||||
  # apt-get install
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user