[postgis-tickets] [SCM] PostGIS branch master updated. 3.1.0alpha1-18-g7e5a323
git at osgeo.org
git at osgeo.org
Thu Feb 27 01:01:11 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 7e5a3233d7437dabe80733a343e9444c9936d4e0 (commit)
from 9e40e8e35795fab1553e52711a6f83d832dc62ba (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 7e5a3233d7437dabe80733a343e9444c9936d4e0
Author: Sandro Santilli <strk at kbt.io>
Date: Thu Feb 27 10:00:43 2020 +0100
Add the sql target for postgis_topology extension
simplifies directory creation and improve `make` concurrency
diff --git a/extensions/postgis_topology/Makefile.in b/extensions/postgis_topology/Makefile.in
index 3b271a4..13de422 100644
--- a/extensions/postgis_topology/Makefile.in
+++ b/extensions/postgis_topology/Makefile.in
@@ -51,12 +51,13 @@ $(EXTENSION).control: $(EXTENSION).control.in Makefile
| sed -e 's|@EXTVERSION@|$(EXTVERSION)|g' \
> $@
-sql/$(EXTENSION)--$(EXTVERSION).sql: sql/$(EXTENSION).sql
- mkdir -p sql
+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
- mkdir -p sql
+sql/$(EXTENSION).sql: extlock.sql sql_bits/topology.sql sql_bits/mark_editable_objects.sql.in sql_bits/topology_comments.sql | sql
cat $^ > $@
#strip BEGIN/COMMIT since these are not allowed in extensions
@@ -71,8 +72,7 @@ sql_bits/topology.sql: ../../topology/topology.sql
sql_bits/topology_comments.sql: ../../doc/topology_comments.sql
cp $< $@
-sql/$(EXTENSION)--unpackaged--$(EXTVERSION).sql: ../../topology/topology.sql ../../utils/create_unpackaged.pl sql/topology_upgrade.sql Makefile
- mkdir -p sql
+sql/$(EXTENSION)--unpackaged--$(EXTVERSION).sql: ../../topology/topology.sql ../../utils/create_unpackaged.pl sql/topology_upgrade.sql Makefile | sql
# Ugprade before packaging
cat sql/topology_upgrade.sql > $@
cat $< | $(PERL) ../../utils/create_unpackaged.pl postgis_topology >> $@
@@ -85,8 +85,7 @@ sql/$(EXTENSION)--unpackaged--$(EXTVERSION).sql: ../../topology/topology.sql ../
#aggregates are special
#they can be dropped but we need to remove
#them from the extension first
-sql/topology_upgrade.sql: ../../topology/topology_upgrade.sql
- mkdir -p sql
+sql/topology_upgrade.sql: ../../topology/topology_upgrade.sql | sql
sed -e 's/BEGIN;//g' -e 's/COMMIT;//g' -e '/^CREATE SCHEMA/d;' $< > $@
sql/$(EXTENSION)--ANY--$(EXTVERSION).sql: $(EXTENSION_UPGRADE_SCRIPTS)
-----------------------------------------------------------------------
Summary of changes:
extensions/postgis_topology/Makefile.in | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
hooks/post-receive
--
PostGIS
More information about the postgis-tickets
mailing list