From 479d83bb4e66319efdd5e440f48aa3253097a9c8 Mon Sep 17 00:00:00 2001 From: John Gemignani Date: Thu, 11 Jan 2024 11:13:25 -0800 Subject: [PATCH] Correct cleanup of age--x.x.x.sql files Corrected the cleanup that I added to the Makefile for the age--x.x.x.sql files. modified: Makefile This change is NOT needed for the other branches as it was added as part of the release cleanup. --- Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index df846baac..b405ff61a 100644 --- a/Makefile +++ b/Makefile @@ -75,7 +75,9 @@ OBJS = src/backend/age.o \ EXTENSION = age -CLEANUP := $(shell rm age--?\.?\.?\.sql) +# to allow cleaning of previous (old) age--.sql files +all_age_sql = $(shell find . -maxdepth 1 -type f -regex './age--[0-9]+\.[0-9]+\.[0-9]+\.sql') + SQLS := $(shell cat sql/sql_files) SQLS := $(addprefix sql/,$(SQLS)) SQLS := $(addsuffix .sql,$(SQLS)) @@ -115,7 +117,7 @@ ag_regress_dir = $(srcdir)/regress REGRESS_OPTS = --load-extension=age --inputdir=$(ag_regress_dir) --outputdir=$(ag_regress_dir) --temp-instance=$(ag_regress_dir)/instance --port=61958 --encoding=UTF-8 --temp-config $(ag_regress_dir)/age_regression.conf ag_regress_out = instance/ log/ results/ regression.* -EXTRA_CLEAN = $(addprefix $(ag_regress_dir)/, $(ag_regress_out)) src/backend/parser/cypher_gram.c src/include/parser/cypher_gram_def.h src/include/parser/cypher_kwlist_d.h $(age_sql) +EXTRA_CLEAN = $(addprefix $(ag_regress_dir)/, $(ag_regress_out)) src/backend/parser/cypher_gram.c src/include/parser/cypher_gram_def.h src/include/parser/cypher_kwlist_d.h $(all_age_sql) GEN_KEYWORDLIST = $(PERL) -I ./tools/ ./tools/gen_keywordlist.pl GEN_KEYWORDLIST_DEPS = ./tools/gen_keywordlist.pl tools/PerfectHash.pm