From 2bf20fb09cbaeb1b546b7c3fffc94e387b2d89ed Mon Sep 17 00:00:00 2001
From: Divarion-D <danil.dmitrievn@gmail.com>
Date: Sun, 15 Mar 2026 12:28:06 +0300
Subject: [PATCH] build: improve delete_files_list and add LB-scoped variant

delete_files_list:
- Add LAST_TAG empty guard to prevent git diff against empty ref
- Use --diff-filter=DR to catch both deletions and renames
- Add sort -u to deduplicate entries

New target lb_delete_files_list:
- Filters deleted files to only those relevant to LB builds
- Uses awk to match against LB_DIRS and LB_ROOT_FILES
- lb_update now uses lb_delete_files_list instead of delete_files_list
---
 Makefile | 36 ++++++++++++++++++++++++++++++++----
 1 file changed, 32 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 4473883..33dd993 100644
--- a/Makefile
+++ b/Makefile
@@ -72,12 +72,12 @@ LB_FILES_TO_REMOVE := \
 
 EXCLUDE_ARGS := $(addprefix --exclude=,$(EXCLUDES))
 
-.PHONY: new lb main main_update lb_update lb_copy_files lb_update_copy_files main_copy_files main_update_copy_files set_permissions create_archive lb_archive_move lb_update_archive_move main_archive_move main_update_archive_move main_install_archive clean delete_files_list
+.PHONY: new lb main main_update lb_update lb_copy_files lb_update_copy_files main_copy_files main_update_copy_files set_permissions create_archive lb_archive_move lb_update_archive_move main_archive_move main_update_archive_move main_install_archive clean delete_files_list lb_delete_files_list
 
 lb: lb_copy_files set_permissions create_archive lb_archive_move clean
 main: main_copy_files set_permissions create_archive main_archive_move main_install_archive clean
 main_update: main_update_copy_files delete_files_list set_permissions create_archive main_update_archive_move clean
-lb_update: lb_update_copy_files delete_files_list set_permissions create_archive lb_update_archive_move clean
+lb_update: lb_update_copy_files lb_delete_files_list set_permissions create_archive lb_update_archive_move clean
 
 lb_copy_files:
 	@echo "==> [LB] Creating distribution directory: $(DIST_DIR)"
@@ -99,7 +99,7 @@ lb_copy_files:
 	@echo "==> [LB] Copying root files from $(MAIN_DIR)"
 	@for root_file in $(LB_ROOT_FILES); do \
 		if git ls-files --error-unmatch "src/$$root_file" >/dev/null 2>&1; then \
-			printf "   → Copying: %s\n" "$$root_file"; \
+# 			printf "   → Copying: %s\n" "$$root_file"; \
 			cp "$(MAIN_DIR)/$$root_file" "$(TEMP_DIR)/$$root_file"; \
 		else \
 			printf "   ⚠ Not tracked: %s\n" "$$root_file"; \
@@ -228,8 +228,13 @@ main_update_copy_files:
 
 delete_files_list:
 	@echo "[INFO] Generating deleted files list from $(LAST_TAG) to HEAD"
+	@if [ -z "$(LAST_TAG)" ]; then \
+		echo "[ERROR] LAST_TAG is empty — cannot generate deleted files list"; \
+		exit 1; \
+	fi
 	@mkdir -p $(TEMP_DIR)/migrations
-	@git diff --name-status $(LAST_TAG)..HEAD | grep '^D' | cut -f2 | grep '^src/' | sed 's|^src/||' \
+	@git diff --name-status --diff-filter=DR $(LAST_TAG)..HEAD \
+		| cut -f2 | grep '^src/' | sed 's|^src/||' | sort -u \
 		> $(TEMP_DIR)/migrations/deleted_files.txt
 	@if [ -s $(TEMP_DIR)/migrations/deleted_files.txt ]; then \
 		echo "[INFO] Files to delete on update:"; \
@@ -239,6 +244,29 @@ delete_files_list:
 		rm -f $(TEMP_DIR)/migrations/deleted_files.txt; \
 	fi
 
+lb_delete_files_list:
+	@echo "[INFO] Generating LB-scoped deleted files list from $(LAST_TAG) to HEAD"
+	@if [ -z "$(LAST_TAG)" ]; then \
+		echo "[ERROR] LAST_TAG is empty — cannot generate deleted files list"; \
+		exit 1; \
+	fi
+	@mkdir -p $(TEMP_DIR)/migrations
+	@git diff --name-status --diff-filter=DR $(LAST_TAG)..HEAD \
+		| cut -f2 | grep '^src/' | sed 's|^src/||' | sort -u \
+		| awk -v dirs="$(LB_DIRS)" -v files="$(LB_ROOT_FILES)" ' \
+			BEGIN { n=split(dirs,d," "); m=split(files,f," ") } \
+			{ ok=0; for(i=1;i<=n;i++) if(index($$0,d[i]"/")==1){ok=1;break} \
+			  if(!ok) for(i=1;i<=m;i++) if($$0==f[i]){ok=1;break} \
+			  if(ok) print }' \
+		> $(TEMP_DIR)/migrations/deleted_files.txt
+	@if [ -s $(TEMP_DIR)/migrations/deleted_files.txt ]; then \
+		echo "[INFO] LB files to delete on update:"; \
+		cat $(TEMP_DIR)/migrations/deleted_files.txt; \
+	else \
+		echo "[INFO] No LB-scoped deleted files found"; \
+		rm -f $(TEMP_DIR)/migrations/deleted_files.txt; \
+	fi
+
 set_permissions:
 	@echo "==> Setting file and directory permissions"