]> Git [git.vados.ru] :: Repos - Mikrotiks/ros.vados.ru.git/commitdiff
Auto-commit: Makefile updated on 3/6/2026
authorvados-dev <vados@vados.ru>
Fri, 6 Mar 2026 14:54:11 +0000 (17:54 +0300)
committervados-dev <vados@vados.ru>
Fri, 6 Mar 2026 14:54:11 +0000 (17:54 +0300)
Makefile

index e8cb2e355912de37cca7ba87449e90842e4eff3e..a11509f3f6dad2b14c2c9f7cb4e510861aa3a594 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
 
 BUILD_DIR       = $(shell pwd)
 BIN_DIR         = bin
-COMMITINFO      := $(wildcard bin/commitinfo.sh)
+#COMMITINFO      := $(wildcard bin/commitinfo.sh)
 
 HTML_DIR        = html
 ALL_RSC         := $(wildcard html/*.rsc html/*/*.rsc)
@@ -40,38 +40,31 @@ COMM_INFO       := $(shell echo -e "Autocommit in repo: $(COMM_REPO), generated
 
 export BUILD_DIR BIN_DIR HTML_DIR DATE DTSTAMP VERSION COMMIT_ID COMM_TAG COMM_HASH COMM_INFO
 
-define rungit =
-       cd $(BUILD_DIR) && \
-       git
+define runsed =
+sed \
+       -e "/^:global CommitId/c :global CommitId \"$${COMMIT_ID:-unknown}\";" \
+       -e "/^:global CommitTAG/c :global CommitTAG \"$${COMM_TAG:-unknown}\";" \
+       -e "/^:global CommitInfo/c :global CommitInfo \"$${COMM_INFO:-unknown}\";" \
+       < "${1}"
 endef
 
-.PHONY: all checksums gitcheck commitinfo clean 
+.PHONY: all checksums commit diff commitinfo $(GLOB_FUNC) clean
 #$(COMMITINFO) gitcheck clean
 # docs rsc clean
 
-all: checksums commitinfo
-# $(COMMITINFO)
-# docs rsc
+all: checksums commit comminfo
 
 checksums: checksums.json
 
 checksums.json: bin/checksums.sh $(ALL_RSC)
        bin/checksums.sh > html/tmp/$@
-#
-commitinfo: check-uncommitted
-                       $(COMMITINFO)
-       
-#              ls -la bin 
-#              exit 0;
-
-#              git add . \
-#              git commit -m $(COMM_INFO) \
-#              $(COMMITINFO)
-
-.PHONY: $(COMMITINFO)
-$(COMMITINFO): $(GLOB_FUNC)
-               $@ $< > $<~
-               mv $<~ $<
+
+commitinfo: $(GLOB_FUNC)
+
+.PHONY: $(GLOB_FUNC)
+$(GLOB_FUNC): 
+               $(runsed) $@ > $@<~
+               mv $@<~ $@<