[postgis-tickets] [SCM] PostGIS branch master updated. 3.1.0alpha1-19-g9ed7d84
git at osgeo.org
git at osgeo.org
Thu Feb 27 08:00:19 PST 2020
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 9ed7d8436b902f6086b54e753006bd14a87aba4d (commit)
from 7e5a3233d7437dabe80733a343e9444c9936d4e0 (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 9ed7d8436b902f6086b54e753006bd14a87aba4d
Author: Sandro Santilli <strk at kbt.io>
Date: Thu Feb 27 16:59:29 2020 +0100
Further simplification and unification of extension Makefiles
diff --git a/extensions/postgis/Makefile.in b/extensions/postgis/Makefile.in
index 9acf25e..ef7a451 100644
--- a/extensions/postgis/Makefile.in
+++ b/extensions/postgis/Makefile.in
@@ -55,7 +55,7 @@ EXTENSION_UPGRADE_SCRIPTS = \
# Scripts making up the extension upgrade-from-unpackaged file
# NOTE: order matters
EXTENSION_UNPACKAGED_UPGRADE_SCRIPTS = \
- sql/postgis.sql
+ sql/$(EXTENSION)--$(EXTVERSION).sql
RASTER_DROP_SCRIPTS = \
../../raster/rt_pg/rtpostgis_upgrade_cleanup.sql \
@@ -68,10 +68,6 @@ CURV_big=@POSTGIS_MAJOR_VERSION@@POSTGIS_MINOR_VERSION@
all: sql/$(EXTENSION)--$(EXTVERSION).sql sql/$(EXTENSION)--unpackaged--$(EXTVERSION).sql sql/$(EXTENSION)--ANY--$(EXTVERSION).sql
-sql/$(EXTENSION).sql: $(EXTENSION_SCRIPTS) | sql
- printf '\\echo Use "CREATE EXTENSION $(EXTENSION)" to load this file. \\quit\n' > $@
- cat $^ >> $@
-
$(EXTENSION).control: $(EXTENSION).control.in Makefile
cat $< \
| sed -e 's|@EXTVERSION@|$(EXTVERSION)|g' \
@@ -95,8 +91,9 @@ sql/raster_unpackage.sql: $(RASTER_DROP_SCRIPTS) | sql
sed -ne '/UNPACKAGE_CODE/{s///; :a' -e 'n;p;ba' -e '}' \
unpackage_raster_if_needed.sql >> $@
-sql/$(EXTENSION)--$(EXTVERSION).sql: sql/$(EXTENSION).sql | sql
- cp $< $@
+sql/$(EXTENSION)--$(EXTVERSION).sql: $(EXTENSION_SCRIPTS) | sql
+ printf '\\echo Use "CREATE EXTENSION $(EXTENSION)" to load this file. \\quit\n' > $@
+ cat $^ >> $@
sql/$(EXTENSION)--unpackaged--$(EXTVERSION).sql: $(EXTENSION_UNPACKAGED_UPGRADE_SCRIPTS) sql/$(EXTENSION)--ANY--$(EXTVERSION).sql ../../utils/create_unpackaged.pl Makefile | sql
# Ensure version is correct
diff --git a/extensions/postgis_raster/Makefile.in b/extensions/postgis_raster/Makefile.in
index 5ccbfe0..856c956 100644
--- a/extensions/postgis_raster/Makefile.in
+++ b/extensions/postgis_raster/Makefile.in
@@ -52,7 +52,7 @@ EXTENSION_UPGRADE_SCRIPTS = \
# Scripts making up the extension upgrade-from-unpackaged file
# NOTE: order matters
EXTENSION_UNPACKAGED_UPGRADE_SCRIPTS = \
- sql/rtpostgis.sql
+ sql/$(EXTENSION)--$(EXTVERSION).sql
EXTRA_CLEAN = sql
@@ -63,10 +63,6 @@ all: sql/$(EXTENSION)--$(EXTVERSION).sql sql/$(EXTENSION)--unpackaged--$(EXTVERS
sql:
mkdir -p $@
-sql/$(EXTENSION).sql: $(EXTENSION_SCRIPTS) | sql
- printf '\\echo Use "CREATE EXTENSION $(EXTENSION)" to load this file. \\quit\n' > $@
- cat $^ >> $@
-
$(EXTENSION).control: $(EXTENSION).control.in Makefile
cat $< \
| sed -e 's|@EXTVERSION@|$(EXTVERSION)|g' \
@@ -74,8 +70,9 @@ $(EXTENSION).control: $(EXTENSION).control.in Makefile
| sed -e 's|@MODULEPATH@|$(MODULEPATH)|g' \
> $@
-sql/$(EXTENSION)--$(EXTVERSION).sql: sql/$(EXTENSION).sql | sql
- cp $< $@
+sql/$(EXTENSION)--$(EXTVERSION).sql: $(EXTENSION_SCRIPTS) | sql
+ printf '\\echo Use "CREATE EXTENSION $(EXTENSION)" to load this file. \\quit\n' > $@
+ cat $^ >> $@
sql/$(EXTENSION)--unpackaged--$(EXTVERSION).sql: $(EXTENSION_UNPACKAGED_UPGRADE_SCRIPTS) ../../utils/create_unpackaged.pl sql/$(EXTENSION)--ANY--$(EXTVERSION).sql Makefile | sql
# Ensure version is correct
diff --git a/extensions/postgis_sfcgal/Makefile.in b/extensions/postgis_sfcgal/Makefile.in
index e50e8bf..8d60983 100644
--- a/extensions/postgis_sfcgal/Makefile.in
+++ b/extensions/postgis_sfcgal/Makefile.in
@@ -39,8 +39,13 @@ EXTENSION_UNPACKAGED_UPGRADE_SCRIPTS = \
sql_bits/sfcgal.sql \
../../utils/create_unpackaged.pl
+EXTENSION_SCRIPTS = \
+ sql_bits/sfcgal_comments.sql \
+ sql_bits/sfcgal.sql
+
EXTRA_CLEAN = sql
+
all: sql/$(EXTENSION)--$(EXTVERSION).sql sql/$(EXTENSION)--unpackaged--$(EXTVERSION).sql sql/$(EXTENSION)--ANY--$(EXTVERSION).sql
sql:
@@ -51,21 +56,9 @@ $(EXTENSION).control: $(EXTENSION).control.in Makefile
| sed -e 's|@EXTVERSION@|$(EXTVERSION)|g' \
> $@
-sql/$(EXTENSION)--$(EXTVERSION).sql: sql/$(EXTENSION).sql
- mkdir -p sql
- cp $< $@
-
-sql/$(EXTENSION).sql: sql_bits/sfcgal.sql sql_bits/sfcgal_comments.sql
- mkdir -p sql
- cat $^ > $@
-
-#this is a cludge to allow upgrading from same SVN to same SVN
-sql/$(EXTENSION)--$(EXTVERSION)--$(EXTVERSION)next.sql: sql_bits/sfcgal_upgrade_minor.sql
- mkdir -p sql
+sql/$(EXTENSION)--$(EXTVERSION).sql: $(EXTENSION_SCRIPTS) | sql
+ printf '\\echo Use "CREATE EXTENSION $(EXTENSION)" to load this file. \\quit\n' > $@
cat $^ > $@
-sql/$(EXTENSION)--$(EXTVERSION)next--$(EXTVERSION).sql: sql/$(EXTENSION)--$(EXTVERSION)--$(EXTVERSION)next.sql
- mkdir -p sql
- cp $< $@
sql_bits/sfcgal.sql: ../../postgis/sfcgal.sql
mkdir -p sql_bits
diff --git a/extensions/postgis_topology/Makefile.in b/extensions/postgis_topology/Makefile.in
index 13de422..0f3a2e6 100644
--- a/extensions/postgis_topology/Makefile.in
+++ b/extensions/postgis_topology/Makefile.in
@@ -5,6 +5,12 @@ EXTVERSION = @POSTGIS_LIB_VERSION@
MINORVERSION = @POSTGIS_MAJOR_VERSION at .@POSTGIS_MINOR_VERSION@
MODULEPATH = $$libdir/$(EXTENSION)- at POSTGIS_MAJOR_VERSION@
+EXTENSION_SCRIPTS = \
+ extlock.sql \
+ sql_bits/mark_editable_objects.sql.in \
+ sql_bits/topology_comments.sql \
+ sql_bits/topology.sql
+
ifeq (@LIBINCLUDEMINORVERSION@,yes)
MODULEPATH=$$libdir/$(EXTENSION)-$(MINORVERSION)
endif
@@ -54,10 +60,8 @@ $(EXTENSION).control: $(EXTENSION).control.in Makefile
sql:
mkdir -p $@
-sql/$(EXTENSION)--$(EXTVERSION).sql: sql/$(EXTENSION).sql | sql
- cp $< $@
-
-sql/$(EXTENSION).sql: extlock.sql sql_bits/topology.sql sql_bits/mark_editable_objects.sql.in sql_bits/topology_comments.sql | sql
+sql/$(EXTENSION)--$(EXTVERSION).sql: $(EXTENSION_SCRIPTS) | sql
+ printf '\\echo Use "CREATE EXTENSION $(EXTENSION)" to load this file. \\quit\n' > $@
cat $^ > $@
#strip BEGIN/COMMIT since these are not allowed in extensions
-----------------------------------------------------------------------
Summary of changes:
extensions/postgis/Makefile.in | 11 ++++-------
extensions/postgis_raster/Makefile.in | 11 ++++-------
extensions/postgis_sfcgal/Makefile.in | 21 +++++++--------------
extensions/postgis_topology/Makefile.in | 12 ++++++++----
4 files changed, 23 insertions(+), 32 deletions(-)
hooks/post-receive
--
PostGIS
More information about the postgis-tickets
mailing list