Build: fixes #1

Author: rafie

automation/Makefile

@@ -6,11 +6,14 @@ MK_CMAKE:=1
 MK_CMAKE_INSTALL:=1
 
 define HELP
-make fetch # download and prepare dependant modules
-make build # compile and link
-make clean # remove build artifacts
-make pack  # create installation packages
-make test  # run tests
+make setup    # install prerequisited (CAUTION: THIS WILL MODIFY YOUR SYSTEM)
+make fetch    # download and prepare dependant modules
+make build    # compile and link
+make clean    # remove build artifacts
+make pack     # create installation packages
+make test     # run tests
+make deploy   # copy packages to S3
+make release  # release a version
 endef
 
 #---------------------------------------------------------------------------------------------- 
@@ -40,7 +43,7 @@ CMAKE_FLAGS += \
 	-DDEPS_PATH=$(realpath $(ROOT)/deps) \
 	-DDEVICE=$(DEVICE)
 
-include readies/mk/defs
+include $(MK)/defs
 
 #----------------------------------------------------------------------------------------------
 
@@ -50,7 +53,10 @@ include $(MK)/rules
 
 #---------------------------------------------------------------------------------------------- 
 
-$(TARGET): $(MK_MAKEFILES) $(DEPS)
+prebuild:
+	@if [ -d $(ROOT)/deps ]; then echo $$'Dependencies are not in place.\nPlease run \'make fetch\'.'; exit 1; fi
+
+$(TARGET): prebuild $(MK_MAKEFILES) $(DEPS)
 	$(MAKE) -C $(BINDIR)
 	$(MAKE) -C $(BINDIR) install
 	cd $(ROOT) ;\

automation/readies/bin/getpy

@@ -16,6 +16,8 @@ fi
 
 [ ! -z $(command -v python3) ] && exit 0
 
+[[ $CHECK == 1 ]] && exit 1
+
 if [ ! -z $(command -v apt-get) ]; then
 	runn apt-get -qq update
 	runn apt-get -qq install -y python3

automation/readies/bin/getpy2

@@ -2,30 +2,35 @@
 
 [ "$VERBOSE" = "1" ] && set -x
 
-show_if_error() {
-	{ "${@:1}"; } > /tmp/py2.log  2>&1
-	[ $? != 0 ] && cat /tmp/py2.log
-	rm -f /tmp/py2.log
+runn() {
+	[[ $NOP == 1 ]] && { echo "${@:1}"; return; }
+	__runn_log=$(mktemp /tmp/run.XXXXX)
+	{ "${@:1}"; } > $__runn_log  2>&1
+	[ $? != 0 ] && cat $__runn_log
+	rm -f $__runn_log
 }
 
 if [ ! -z $(command -v python) ]; then
 	[ "$(python --version 2>&1 | cut -d" " -f2 | cut -d. -f1)" = "2" ] && exit 0
 fi
 
 [ ! -z $(command -v python2) ] && exit 0
+[ ! -z $(command -v python2.7) ] && exit 0
+
+[[ $CHECK == 1 ]] && exit 1
 
 if [ ! -z $(command -v apt-get) ]; then
-	show_if_error apt-get -qq update
-	show_if_error apt-get -qq install -y python
+	runn apt-get -qq update
+	runn apt-get -qq install -y python
 elif [ ! -z $(command -v dnf) ]; then
-	show_if_error dnf install -y python2
+	runn dnf install -y python2
 elif [ ! -z $(command -v yum) ]; then
-	show_if_error yum install -y python2
+	runn yum install -y python2
 elif [ ! -z $(command -v apk) ]; then
-	show_if_error apk update
-	show_if_error apk add python2
+	runn apk update
+	runn apk add python2
 elif [ ! -z $(command -v brew) ]; then
-	show_if_error brew install python2
+	runn brew install python2
 fi
 
 if [ -z $(command -v python) ]; then

automation/readies/mk/main

@@ -1,4 +1,10 @@
 
+SHELL=/bin/bash
+
+ifneq ($(shell { CHECK=1 $(ROOT)/automation/readies/bin/getpy; echo $$?; }),0)
+$(error It seems prerequisites have not been installed: please run 'make setup'.)
+endif
+
 MK=$(ROOT)/automation/readies/mk
 
 MK_ALL_TARGETS:=bindirs build