From 500c982312859c8d3eba9172e5b13a190affa585 Mon Sep 17 00:00:00 2001 From: "Karl O. Pinc" Date: Tue, 30 Jan 2024 22:49:05 -0600 Subject: [PATCH] Cache db content install per database --- db/schemas/Makefile | 8 +++++--- make_files/make_db.mk | 5 +++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/db/schemas/Makefile b/db/schemas/Makefile index 0edf099..797c738 100644 --- a/db/schemas/Makefile +++ b/db/schemas/Makefile @@ -89,7 +89,8 @@ COMMENT_DIRS := ../../doc/sphinx-doc/comment_src \ ../../doc/sphinx-doc/comment_txt # The directory recording database create targets -DB_CACHE := db_cache +DB_CACHE_DIR := db_cache +DB_CACHE := $(DB_CACHE_DIR)/$(TARGET_DB) # We can't have $(DB_CACHE) as a prerequsite, since its timestamp # gets updated when the directory content is created. So Have # separate prerequsite that keeps track of cache creation time. @@ -146,7 +147,8 @@ COMMENT_OFF_FILES := $(patsubst %,%/comment_off.sql, \ .PHONY: check check: for dirpath in \ - $$(find . -mindepth 1 -maxdepth 1 -type d \! -name $(DB_CACHE)) \ + $$(find . -mindepth 1 -maxdepth 1 -type d \ + \! -name $(DB_CACHE_DIR)) \ ; do \ dirname=$$(basename $${dirpath}) ; \ awk -v order="$(ORDER)" \ @@ -210,7 +212,7 @@ check: ## Remove all record of database modifications .PHONY: clean-db-cache clean-db-cache: - rm -rf $(DB_CACHE) + rm -rf $(DB_CACHE_DIR) ## clean-db Clean up the files produced by make .PHONY: clean-db diff --git a/make_files/make_db.mk b/make_files/make_db.mk index c1deaa4..965f84e 100644 --- a/make_files/make_db.mk +++ b/make_files/make_db.mk @@ -126,7 +126,8 @@ DROP_SUB_DB_TARGETS := db/schemas/droptriggers.sql \ # The cache directory which records when something has been # installed in the db. -DB_CACHE := $(DB_DIR)/db_cache +DB_CACHE_DIR := $(DB_DIR)/db_cache +DB_CACHE := $(DB_CACHE_DIR)/$(TARGET_DB) # We can't have $(DB_CACHE) as a prerequsite, since its timestamp # gets updated when the directory content is created. So Have # separate prerequsite that keeps track of cache creation time. @@ -333,7 +334,7 @@ recomment: $(PSQL_DEPENDS) \ .PHONY: clean-db-cache clean-db-cache: $(MAKE) -C db/schemas clean-db-cache - rm -rf $(DB_CACHE) + rm -rf $(DB_CACHE_DIR) ## clean-db Remove all the generated db related files .PHONY: clean-db -- 2.34.1