Adaption to DEBUG application and new Makefile concept
This commit is contained in:
parent
2021a0f5bb
commit
af047f91c5
0
.venv_required
Normal file
0
.venv_required
Normal file
103
Makefile
Normal file
103
Makefile
Normal file
@ -0,0 +1,103 @@
|
||||
# git helper Makefile: Version 2.2 (2025-08-10)
|
||||
default: help
|
||||
|
||||
.ONESHELL:
|
||||
SHELL = /usr/bin/bash
|
||||
MAKEFLAGS += --no-print-directory
|
||||
.SILENT:
|
||||
|
||||
-include __make.d__/*.mk
|
||||
|
||||
GIT_FLAG = ./.git
|
||||
VENV_FLAG = ./.venv_required
|
||||
VENV_FOLDER = ./venv
|
||||
|
||||
localhelp:
|
||||
|
||||
help:
|
||||
echo "Possible common options are:"
|
||||
echo " - init - Initialise the repository and all folders below with a Makefile"
|
||||
echo " - giti - Get the git status of all submodules including their submodules"
|
||||
echo " - update_submodules - Set all submodules to remote master"
|
||||
echo " - venv_flag - Set the venev flag for the base folder. A venv will be generated"
|
||||
echo " - clean - clean up"
|
||||
echo " - deepclean - clean up this and all Makefiles below"
|
||||
$(MAKE) localhelp
|
||||
echo "You are able to create files make.d/*.mk and add local rules there. "
|
||||
echo " - localinit: print_head - Will be executed as last step in the init process."
|
||||
echo " - localhelp: print_head - Will be executed in th middle of the help text generation"
|
||||
echo " - localclean:print_head - Will be executed before the clean rule"
|
||||
|
||||
localinit:
|
||||
|
||||
init: print_head
|
||||
# Init git repo
|
||||
if [[ -e $(GIT_FLAG) ]]; then
|
||||
echo -e "\033[1;33mInitialising git submodules...\e[0m"
|
||||
git submodule init
|
||||
git submodule update
|
||||
fi
|
||||
# Init submodules
|
||||
SUBDIRS=$$(find . -maxdepth 2 -mindepth 2 -name Makefile | sort)
|
||||
for subdir in $$SUBDIRS; do
|
||||
$(MAKE) --no-print-directory -C $$(dirname $$subdir) init
|
||||
done
|
||||
if [[ $$SUBDIRS ]]; then
|
||||
$(MAKE) print_head
|
||||
fi
|
||||
# Create venv if needed
|
||||
if [[ -e $(VENV_FLAG) ]]; then
|
||||
if [[ ! -e $(VENV_FOLDER) ]]; then
|
||||
echo -e "\033[1;33mCreating virtual env...\e[0m"
|
||||
mkvenv
|
||||
fi
|
||||
fi
|
||||
# Start local init
|
||||
echo -e "\033[1;33mDoing localinit...\e[0m"
|
||||
$(MAKE) localinit
|
||||
|
||||
update_submodules:
|
||||
git submodule foreach "git fetch && git checkout master && git pull && git submodule init && git submodule update"
|
||||
|
||||
giti_this: print_head
|
||||
giti
|
||||
echo " Submodules:"
|
||||
git submodule --quiet foreach "echo -n ' ' && giti"
|
||||
|
||||
giti:
|
||||
git submodule --quiet foreach "[ -e Makefile ] && make --no-print-directory giti_this || :"
|
||||
|
||||
localclean:
|
||||
|
||||
clean: localclean
|
||||
if [[ ! -e $(VENV_FLAG) ]]; then
|
||||
if [[ -d $(VENV_FOLDER) ]]; then
|
||||
rm -rf $(VENV_FOLDER)
|
||||
fi
|
||||
fi
|
||||
|
||||
cleanall: clean
|
||||
for subdir in $$(find . -maxdepth 2 -mindepth 2 -name Makefile | sort); do
|
||||
$(MAKE) --no-print-directory -C $$(dirname $$subdir) cleanall
|
||||
done
|
||||
|
||||
|
||||
venv_flag:
|
||||
if [[ ! -e $(VENV_FLAG) ]]; then
|
||||
touch $(VENV_FLAG)
|
||||
if [[ -e $(GIT_FLAG) ]]; then
|
||||
git add $(VENV_FLAG)
|
||||
fi
|
||||
fi
|
||||
|
||||
print_head:
|
||||
DIRNAME=$$(basename $$(pwd))
|
||||
DIRLENGTH=$${#DIRNAME}
|
||||
echo -ne "\n\n\033[1;34m╔═"
|
||||
for i in $$(seq 1 $$DIRLENGTH); do echo -n "═"; done
|
||||
echo -e "═╗"
|
||||
echo -e "║ $$DIRNAME ║"
|
||||
echo -ne "╚═"
|
||||
for i in $$(seq 1 $$DIRLENGTH); do echo -n "═"; done
|
||||
echo -e "═╝\033[00m"
|
||||
|
||||
16
__make.d__/config.mk
Normal file
16
__make.d__/config.mk
Normal file
@ -0,0 +1,16 @@
|
||||
.ONESHELL:
|
||||
SHELL = /usr/bin/bash
|
||||
MAKEFLAGS += --no-print-directory
|
||||
.SILENT:
|
||||
|
||||
devinit:
|
||||
if [[ ! -e config.py ]]; then
|
||||
cp config_example/config.j2 config.py
|
||||
chmod 600 config.py
|
||||
sed -i "/^DEBUG.*=.*/c\DEBUG = True" config.py
|
||||
sed -i 's/{{ smart_sat_ambientinfo_hostname }}/localhost/' config.py
|
||||
sed -i 's/"{{ smart_sat_ambientinfo_username }}"/None/' config.py
|
||||
sed -i 's/"{{ smart_sat_ambientinfo_password }}"/None/' config.py
|
||||
sed -i 's/{{ smart_sat_ambientinfo_topic }}/ambient_info/' config.py
|
||||
fi
|
||||
|
||||
@ -1,8 +1,5 @@
|
||||
import config
|
||||
import logging
|
||||
import mqtt
|
||||
import paho.mqtt.client as paho
|
||||
import socket
|
||||
import report
|
||||
import time
|
||||
|
||||
|
||||
@ -33,5 +33,7 @@ except ImportError:
|
||||
USE_PULSE_IO = True
|
||||
else:
|
||||
# DHT-PORT
|
||||
DHT_22_PORT = board.D4
|
||||
|
||||
try:
|
||||
DHT_22_PORT = board.D4
|
||||
except AttributeError:
|
||||
DHT_22_PORT = None # This results in DEBUG-Mode
|
||||
|
||||
24
init_venv
24
init_venv
@ -1,24 +0,0 @@
|
||||
#!/bin/bash
|
||||
#
|
||||
BASEPATH=`realpath $(dirname $0)`
|
||||
|
||||
#
|
||||
# Create venv
|
||||
#
|
||||
if [[ ! -e $BASEPATH/venv ]]; then
|
||||
python3 -m venv $BASEPATH/venv > /dev/null 2>&1
|
||||
# $BASEPATH/venv/bin/pip install --upgrade pip
|
||||
find $BASEPATH -name requirements.txt | xargs -L 1 $BASEPATH/venv/bin/pip install -r > /dev/null 2>&1
|
||||
echo "venv changed"
|
||||
fi
|
||||
#
|
||||
# Update venv modules
|
||||
#
|
||||
for req_mod in $($BASEPATH/venv/bin/pip list --format=json | jq -r '.[] | .name'); do
|
||||
$BASEPATH/venv/bin/pip install -U $req_mod | grep install > /dev/null 2>&1
|
||||
if [[ "$?" -eq "0" ]]; then
|
||||
echo $req_mod changed
|
||||
fi
|
||||
|
||||
done
|
||||
#|xargs -n1 $BASEPATH/venv/bin/pip install -U
|
||||
@ -1,2 +0,0 @@
|
||||
adafruit-circuitpython-dht
|
||||
smbus
|
||||
@ -1 +1 @@
|
||||
Subproject commit 2ffcdf2d59b5621b46973b16130e410ba146c949
|
||||
Subproject commit 2393316bc765a3f3bab987517aa5c3e92001987b
|
||||
Loading…
x
Reference in New Issue
Block a user