[postgis-tickets] [SCM] PostGIS branch master updated. 3.3.0rc2-670-g1a004f40f

[git at osgeo.org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "PostGIS".

The branch, master has been updated
       via  1a004f40f7fb446aa84caae213d4b782ea74e209 (commit)
      from  e7ac8e1f8a63cbc4af2eb0d3b815f7fac79eac6f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 1a004f40f7fb446aa84caae213d4b782ea74e209
Author: Sandro Santilli <strk at kbt.io>
Date:   Mon Feb 27 19:11:38 2023 +0100

    Always update the postgis_restore.pl skip list
    
    References #5348

diff --git a/.gitignore b/.gitignore
index 8485dcc10..b928337a8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -185,6 +185,8 @@ libpgcommon/Makefile
 libpgcommon/cunit/Makefile
 utils/Makefile
 utils/postgis_restore.pl
+utils/postgis_restore_data.generated
+utils/postgis_restore_data.hardcoded
 doc/sfcgal_comments.sql
 postgis/sfcgal.sql
 postgis/uninstall_sfcgal.sql
diff --git a/utils/Makefile.in b/utils/Makefile.in
index a0b8be196..938dca6ad 100644
--- a/utils/Makefile.in
+++ b/utils/Makefile.in
@@ -41,14 +41,18 @@ SCRIPTS = \
 all: $(SCRIPTS_built)
 
 DROP_FILES = \
-  ../raster/rt_pg/rtpostgis_upgrade_cleanup.sql.in \
-  ../raster/rt_pg/rtpostgis_drop.sql.in \
-  ../postgis/postgis_after_upgrade.sql \
-  ../postgis/postgis_before_upgrade.sql
-
-update-restore:
-	tac postgis_restore.pl.in | sed '/^__END__/q' | grep -v '^__END__' \
-    > postgis_restore_data
+  $(top_srcdir)/raster/rt_pg/rtpostgis_upgrade_cleanup.sql.in \
+  $(top_srcdir)/raster/rt_pg/rtpostgis_drop.sql.in \
+  $(top_srcdir)/postgis/postgis_after_upgrade.sql \
+  $(top_srcdir)/postgis/postgis_before_upgrade.sql
+
+postgis_restore_data.hardcoded: postgis_restore.pl.in
+	tac $< \
+		| sed '/^__END__/q' \
+		| grep -v '^__END__' \
+    > $@
+
+postgis_restore_data.generated: $(DROP_FILES)
 	grep '^DROP FUNCTION IF EXISTS' $(DROP_FILES) | \
     cut -d: -f2 | sed 's/^DROP FUNCTION IF EXISTS //' | \
     sed 's/ *, */,/g' | \
@@ -60,17 +64,20 @@ update-restore:
     sed 's/\<int\>/integer/g' | \
     sed 's/\<int4\>/integer/g' | \
     sed 's/\<int8\>/bigint/g' | \
-    sed 's/\(.*\); *\(--.*\)\?/FUNCTION \1/' >> postgis_restore_data
-	cat postgis_restore.pl.in | sed '/^__END__/q' > postgis_restore.pl.in.new
-	cat postgis_restore_data | sort -u >> postgis_restore.pl.in.new
-	mv postgis_restore.pl.in.new postgis_restore.pl.in
+    sed 's/\(.*\); *\(--.*\)\?/FUNCTION \1/' \
+		> $@
 
-postgis_restore.pl: postgis_restore.pl.in
-	sed 's, at SRID_MAXIMUM@,$(SRID_MAXIMUM),g;s, at SRID_USER_MAXIMUM@,$(SRID_USER_MAXIMUM),' $< >$@
+postgis_restore.pl: postgis_restore.pl.in postgis_restore_data.hardcoded postgis_restore_data.generated Makefile
+	cat $< \
+		| sed '/^__END__/q' \
+		| sed 's, at SRID_MAXIMUM@,$(SRID_MAXIMUM),g;s, at SRID_USER_MAXIMUM@,$(SRID_USER_MAXIMUM),' \
+		> postgis_restore.pl
+	cat postgis_restore_data.hardcoded postgis_restore_data.generated \
+		| sort -u >> postgis_restore.pl
 	chmod +x $@
 
 clean:
-	rm -f $(SCRIPTS_built) postgis_restore_data
+	rm -f $(SCRIPTS_built) postgis_restore_data.generated postgis_restore_data.hardcoded
 
 distclean: clean
 	rm -f Makefile

-----------------------------------------------------------------------

Summary of changes:
 .gitignore        |  2 ++
 utils/Makefile.in | 37 ++++++++++++++++++++++---------------
 2 files changed, 24 insertions(+), 15 deletions(-)


hooks/post-receive
-- 
PostGIS