[postgis-tickets] [SCM] PostGIS branch master updated. 3.3.0beta2-31-g296133092

[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  2961330921dcd0e09074cc36b2bbef51312959c9 (commit)
       via  ae25d4488b670dc5dfa725c24f4e919ab6122fc0 (commit)
      from  523502dc1f07203b75a5cfeddccdfb3856e78e53 (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 2961330921dcd0e09074cc36b2bbef51312959c9
Author: Regina Obe <lr at pcorp.us>
Date:   Mon Aug 1 19:53:17 2022 -0400

    cleanup remove unused functions, fix help

diff --git a/utils/create_or_replace_to_create.pl b/utils/create_or_replace_to_create.pl
index 6b43953f8..650aaa839 100644
--- a/utils/create_or_replace_to_create.pl
+++ b/utils/create_or_replace_to_create.pl
@@ -31,58 +31,12 @@ eval "exec perl -w $0 $@"
 use strict;
 use warnings;
 
-#
-# Conditionally upgraded types and operators based
-# on their last updated version and the version of
-# the target database
-#
-
-sub parse_last_updated
-{
-    my $comment = shift;
-    if ( $comment =~ m/.*(?:Availability|Changed|Updated):\s([^\.])\.([^.]*)/s )
-    {
-        return $1*100 + $2;
-    }
-    return 0;
-}
-
-sub parse_replaces
-{
-    my @replaces = ();
-    my $comment = shift;
-    my ($name, $args, $ver);
-    foreach my $line ( split /\n/, $comment )
-    {
-        if ( $line =~ m/.*Replaces\s\s*([^\(]*)\(([^\)]*)\)\s\s*deprecated in\s\s*([^\.]*)\.([^.]*)/ )
-        {
-            $name = $1;
-            $args = $2;
-            $ver = $3*100 + $4;
-            my @r = ($name, $args, $ver);
-            push @replaces, \@r;
-        }
-    }
-    return @replaces;
-}
-
-sub parse_missing
-{
-    my $comment = shift;
-    my @missing = ();
-    if ( $comment =~ m/.*(?:Missing in):\s([^\.])\.([^.]*)/s )
-    {
-        push(@missing, $1*100 + $2);
-    }
-    return join(',', at missing);
-}
-
 #
 # Commandline argument handling
 #
 ($#ARGV == 0)
   ||die
-"Usage: perl create_upgrade.pl <create_script.sql> [<schema>]\nCreates a new SQL script that has all CREATE OR REPLACE converted to CREATE so it is suitable for CREATE EXTENSION only.\n"
+"Usage: perl create_or_replace_to_create.pl <create_script.sql> [<schema>]\nCreates a new SQL script that has all CREATE OR REPLACE converted to CREATE so it is suitable for CREATE EXTENSION only.\n"
   if ( @ARGV < 1 || @ARGV > 3 );
 
 my $sql_file = $ARGV[0];
@@ -161,8 +115,6 @@ while(<INPUT>)
 
 close(INPUT);
 
-#print "COMMIT;\n";
-
 1;
 
 __END__

commit ae25d4488b670dc5dfa725c24f4e919ab6122fc0
Author: Regina Obe <lr at pcorp.us>
Date:   Mon Aug 1 19:47:17 2022 -0400

    Try to fix out of tree build, broken by recent extension changes

diff --git a/extensions/address_standardizer/Makefile.in b/extensions/address_standardizer/Makefile.in
index 0fa8f7d13..ea980d9af 100644
--- a/extensions/address_standardizer/Makefile.in
+++ b/extensions/address_standardizer/Makefile.in
@@ -79,13 +79,13 @@ sql/address_standardizer_pre.sql: $(EXTENSION_SCRIPTS)
 sql/address_standardizer--$(EXTVERSION).sql: sql/address_standardizer_pre.sql ../../utils/create_or_replace_to_create.pl
 	mkdir -p sql
 	cat $< \
-		| $(PERL) ../../utils/create_or_replace_to_create.pl sql/address_standardizer_pre.sql \
+		| $(PERL) @top_srcdir@/utils/create_or_replace_to_create.pl sql/address_standardizer_pre.sql \
 		> $@
 
 sql/address_standardizer.sql: sql/address_standardizer_pre.sql ../../utils/create_or_replace_to_create.pl
 	mkdir -p sql
 	cat $< \
-		| $(PERL) ../../utils/create_or_replace_to_create.pl sql/address_standardizer_pre.sql \
+		| $(PERL) @top_srcdir@/utils/create_or_replace_to_create.pl sql/address_standardizer_pre.sql \
 		> $@
 
 EXTENSION_UPGRADE_SCRIPTS = sql/address_standardizer_functions.sql
diff --git a/extensions/postgis_tiger_geocoder/Makefile.in b/extensions/postgis_tiger_geocoder/Makefile.in
index 49cfd80a1..a0a3fd578 100644
--- a/extensions/postgis_tiger_geocoder/Makefile.in
+++ b/extensions/postgis_tiger_geocoder/Makefile.in
@@ -81,7 +81,7 @@ sql/$(EXTENSION)_pre.sql: sql/tiger_geocoder.sql  sql_bits/mark_editable_objects
 
 sql/$(EXTENSION).sql: sql/$(EXTENSION)_pre.sql ../../utils/create_or_replace_to_create.pl
 	cat $< \
-		| $(PERL) ../../utils/create_or_replace_to_create.pl sql/$(EXTENSION)_pre.sql \
+		| $(PERL) @top_srcdir@/utils/create_or_replace_to_create.pl sql/$(EXTENSION)_pre.sql \
 		> $@
 
 sql/$(EXTENSION)--ANY--$(EXTVERSION).sql: ../postgis_extension_helper.sql sql_bits/remove_from_extension.sql.in sql/tiger_geocoder_upgrade_minor.sql sql_bits/mark_editable_objects.sql.in sql_bits/tiger_geocoder_comments.sql | sql

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

Summary of changes:
 extensions/address_standardizer/Makefile.in   |  4 +--
 extensions/postgis_tiger_geocoder/Makefile.in |  2 +-
 utils/create_or_replace_to_create.pl          | 50 +--------------------------
 3 files changed, 4 insertions(+), 52 deletions(-)


hooks/post-receive
-- 
PostGIS