diff --git a/Makefile b/Makefile index ba89e4a..2060876 100644 --- a/Makefile +++ b/Makefile @@ -84,6 +84,8 @@ info: $(call tprint,{a.b_magenta}This is task-print output:{a.end}) $(call tprint,$(msg)) +task.mk: + ./generate.py $(shell git describe --tags) > task.mk define USAGE {a.$(HEADER_COLOR)}usage:{a.end} diff --git a/src/py-script.mk b/src/py-script.mk index 23bd044..e9f3caa 100644 --- a/src/py-script.mk +++ b/src/py-script.mk @@ -1,5 +1,3 @@ define #% block name %##% endblock %#_py - #% block script %##% endblock %# - endef diff --git a/src/vars.py b/src/vars.py index 59c2ce4..00222a5 100644 --- a/src/vars.py +++ b/src/vars.py @@ -1,7 +1,6 @@ #% extends "py-script.mk" %# #% block name %#vars#% endblock %# #% block script %# - import os ##- '$(ansi_py)' -## diff --git a/task.mk b/task.mk index 1c4af60..7824950 100644 --- a/task.mk +++ b/task.mk @@ -1,7 +1,7 @@ # }> [github.com/daylinmorgan/task.mk] <{ # # Copyright (c) 2022 Daylin Morgan # MIT License -# 22.9.5 +# v22.9.5-3-g9c67418 # # task.mk should be included at the bottom of your Makefile. # See below for the standard configuration options that should be set prior to including this file. @@ -103,7 +103,6 @@ pysh = printf "$(call create_string,$($(1)))" | python3 define help_py - import os import re @@ -141,12 +140,10 @@ for goal, msg in goals: print(f"""$(EPILOG)""") - endef define ansi_py - import os import sys @@ -197,22 +194,18 @@ class Ansi: a = ansi = Ansi() - endef define info_py - $(ansi_py) print(f"""$(2)""") - endef define print_ansi_py - $(ansi_py) codes_names = { @@ -224,13 +217,10 @@ for code in sorted(codes_names.keys(), key=lambda item: (len(item), item)): print("{:>20} {}".format(codes_names[code], code + "******" + ansi.end)) - endef define vars_py - - import os $(ansi_py) @@ -245,6 +235,5 @@ for v in vars: print() - endef