From 84d989aa1fce81f88f4ffc2cdcc80d057f3d573b Mon Sep 17 00:00:00 2001 From: Dirk Alders Date: Sun, 17 Aug 2025 16:32:35 +0200 Subject: [PATCH] Adaption to new Makefile concept --- .venv_required | 0 Makefile | 133 +++++++++++++++++++++++++++++++++++++++++++ __make.d__/config.mk | 15 +++++ __make.d__/help.mk | 12 ++++ init_venv | 24 -------- 5 files changed, 160 insertions(+), 24 deletions(-) create mode 100644 .venv_required create mode 100644 Makefile create mode 100644 __make.d__/config.mk create mode 100644 __make.d__/help.mk delete mode 100755 init_venv diff --git a/.venv_required b/.venv_required new file mode 100644 index 0000000..e69de29 diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..1503a9f --- /dev/null +++ b/Makefile @@ -0,0 +1,133 @@ +# git helper Makefile: Version 2.5 (2025-08-11) +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 + echo + 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 = *[![:space:]]* ]]; then + $(MAKE) print_head + fi + # Create venv if needed + if [[ -e $(VENV_FLAG) ]]; then + BASEPATH=$$(pwd -P) + # + # Create venv + # + if [ ! -e venv ];then + echo -e "\033[1;33mCreating venv in $$BASEPATH...\e[0m" + python3 -m venv $$BASEPATH/venv > /dev/null 2>&1 + else + echo -e "\033[1;33mVirtualenv already exists in $$BASEPATH...\e[0m" + fi + echo + + # + # Install modules + # + echo -e "\033[1;33mInstalling modules to venv in $$BASEPATH...\e[0m" + for req_file in $$(find -L $$BASEPATH -name requirements.txt 2> /dev/null); do + # echo " $$req_file" + while read req_mod; do + if [[ $$req_mod = *[![:space:]]* ]]; then + # req_mod is not empty + OUT=$$($$BASEPATH/venv/bin/pip install -U $$req_mod 2>&1 ) + if [[ $$OUT =~ "Successfully installed" ]]; then + echo -e " * \033[1;32m$$req_mod installed.\e[0m" + elif [[ $$OUT =~ "already satisfied" ]]; then + echo -e " * \033[1;36m$$req_mod already installed.\e[0m" + else + echo -e " * \033[1;31m$$req_mod installation FAILED!\e[0m" + #echo $$OUT + fi + fi + done < $$req_file + done + echo + 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" diff --git a/__make.d__/config.mk b/__make.d__/config.mk new file mode 100644 index 0000000..c49f5c9 --- /dev/null +++ b/__make.d__/config.mk @@ -0,0 +1,15 @@ +.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_srv_brain_hostname }}/localhost/' config.py + sed -i 's/"{{ smart_srv_brain_username }}"/None/' config.py + sed -i 's/"{{ smart_srv_brain_password }}"/None/' config.py + fi + diff --git a/__make.d__/help.mk b/__make.d__/help.mk new file mode 100644 index 0000000..e423626 --- /dev/null +++ b/__make.d__/help.mk @@ -0,0 +1,12 @@ +.ONESHELL: +SHELL = /usr/bin/bash +MAKEFLAGS += --no-print-directory +.SILENT: + +GIT_FLAG = ./.git +VENV_FLAG = ./.venv_required +VENV_FOLDER = ./venv + +localhelp: + echo "Possible local options are:" + echo " - devinit - Initialise the application for development usage" diff --git a/init_venv b/init_venv deleted file mode 100755 index 9f00515..0000000 --- a/init_venv +++ /dev/null @@ -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