[postgis-tickets] [SCM] PostGIS branch master updated. 3.4.0rc1-578-g93a9e00c4
git at osgeo.org
git at osgeo.org
Mon Sep 18 12:10:19 PDT 2023
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 93a9e00c4dac2841a3a2dabe93aee97628e08657 (commit)
via c7f249f4a03923ebe8f56b72f41449a13df6c1b4 (commit)
from d596b5a06616ae913e1de0ac355f2500b4cc69bf (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 93a9e00c4dac2841a3a2dabe93aee97628e08657
Author: Sandro Santilli <strk at kbt.io>
Date: Mon Sep 18 20:33:01 2023 +0200
Stop including comments in extensions
Closes #5536
Includes mention in the NEWS file
diff --git a/NEWS b/NEWS
index 0e6695379..c86ee3c7e 100644
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,7 @@ xxxx/xx/xx
* Breaking Changes *
+ - #5536, comments are not anymore included in PostGIS extensions
- xmllint is now required to build comments and documentation
- DocBook5 XSL is now required to build html documentation
diff --git a/extensions/README b/extensions/README
index cd1384903..7f941b69d 100644
--- a/extensions/README
+++ b/extensions/README
@@ -19,15 +19,6 @@ completing these steps::
make
make install
-If you are building from the source SVN repository, it is also recommended to
-make the comments, since the function descriptions will be included::
-
- make comments
-
-Making the comments is not necessary if you are building from the tar.gz source
-distributions, since these include pre-built ``postgis_comments.sql``,
-``topology_comments.sql``, and ``raster_comments.sql`` files.
-
Then, to build and install the extensions::
cd extensions
diff --git a/extensions/postgis/Makefile.in b/extensions/postgis/Makefile.in
index 799fdf925..972dc3e8a 100644
--- a/extensions/postgis/Makefile.in
+++ b/extensions/postgis/Makefile.in
@@ -41,7 +41,6 @@ DATA_built = \
# NOTE: order matters
EXTENSION_SCRIPTS = \
sql/postgis_for_extension.sql \
- ../../doc/postgis_comments.sql \
sql/spatial_ref_sys_config_dump.sql \
sql/spatial_ref_sys.sql
@@ -51,7 +50,6 @@ EXTENSION_UPGRADE_SCRIPTS = \
../postgis_extension_helper.sql \
sql/raster_unpackage.sql \
sql/postgis_upgrade.sql \
- ../../doc/postgis_comments.sql \
sql/spatial_ref_sys.sql \
sql/spatial_ref_sys_config_dump.sql \
../postgis_extension_helper_uninstall.sql
@@ -110,9 +108,6 @@ sql:
sql/spatial_ref_sys.sql: ../../spatial_ref_sys.sql | sql
$(PERL) -pe 's/BEGIN\;//g ; s/COMMIT\;//g' $< > $@
-../../doc/postgis_comments.sql:
- $(MAKE) -C ../../doc comments
-
sql/spatial_ref_sys_config_dump.sql: ../../spatial_ref_sys.sql ../../utils/create_spatial_ref_sys_config_dump.pl | sql
$(PERL) @top_srcdir@/utils/create_spatial_ref_sys_config_dump.pl $< > $@
diff --git a/extensions/postgis_raster/Makefile.in b/extensions/postgis_raster/Makefile.in
index 4a2af9502..be4d08df0 100644
--- a/extensions/postgis_raster/Makefile.in
+++ b/extensions/postgis_raster/Makefile.in
@@ -39,15 +39,13 @@ DATA_built = \
# Scripts making up the extension file
# NOTE: order matters
EXTENSION_SCRIPTS = \
- sql/rtpostgis.sql \
- sql/raster_comments.sql
+ sql/rtpostgis.sql
# Scripts making up the extension minor upgrade file
# NOTE: order matters
EXTENSION_UPGRADE_SCRIPTS = \
../postgis_extension_helper.sql \
sql/rtpostgis_upgrade.sql \
- ../../doc/raster_comments.sql \
../postgis_extension_helper_uninstall.sql
# Scripts making up the extension upgrade-from-unpackaged file
@@ -112,12 +110,6 @@ sql/rtpostgis_upgrade_for_extension.sql.in: sql/rtpostgis_for_extension.sql ../.
$(PERL) @top_srcdir@/utils/create_upgrade.pl $< > $@
-../../doc/raster_comments.sql:
- $(MAKE) -C ../../doc comments
-
-sql/raster_comments.sql: ../../doc/raster_comments.sql | sql
- cp $< $@
-
sql/$(EXTENSION)--ANY--$(EXTVERSION).sql: $(EXTENSION_UPGRADE_SCRIPTS) | sql
printf '\\echo Use "CREATE EXTENSION $(EXTENSION)" to load this file. \\quit\n' > $@
cat $^ >> $@
diff --git a/extensions/postgis_sfcgal/Makefile.in b/extensions/postgis_sfcgal/Makefile.in
index 28f00a99c..3480dcb39 100644
--- a/extensions/postgis_sfcgal/Makefile.in
+++ b/extensions/postgis_sfcgal/Makefile.in
@@ -42,8 +42,7 @@ EXTENSION_UNPACKAGED_UPGRADE_SCRIPTS = \
# Scripts making up the extension file
# NOTE: order matters
EXTENSION_SCRIPTS = \
- sql/sfcgal.sql \
- sql/sfcgal_comments.sql
+ sql/sfcgal.sql
EXTRA_CLEAN = sql
@@ -65,12 +64,6 @@ sql/$(EXTENSION)--$(EXTVERSION).sql: $(EXTENSION_SCRIPTS) | sql
sql/sfcgal.sql: ../../sfcgal/sfcgal.sql | sql
$(PERL) -pe 's/BEGIN\;//g ; s/COMMIT\;//g' $< > $@
-../../doc/sfcgal_comments.sql:
- $(MAKE) -C ../../doc comments
-
-sql/sfcgal_comments.sql: ../../doc/sfcgal_comments.sql | sql
- cp $< $@
-
sql/$(EXTENSION)--unpackaged.sql: Makefile | sql
echo "-- Nothing to do here" > $@
@@ -87,7 +80,7 @@ sql/$(EXTENSION)--unpackaged--$(EXTVERSION).sql: sql/sfcgal.sql sql/$(EXTENSION)
sql/sfcgal_upgrade.sql : ../../sfcgal/sfcgal_upgrade.sql | sql
$(PERL) -pe 's/BEGIN\;//g ; s/COMMIT\;//g' $< > $@
-sql/sfcgal_upgrade_minor.sql: ../postgis_extension_helper.sql sql/sfcgal_upgrade.sql ../../doc/sfcgal_comments.sql ../postgis_extension_helper_uninstall.sql | sql
+sql/sfcgal_upgrade_minor.sql: ../postgis_extension_helper.sql sql/sfcgal_upgrade.sql ../postgis_extension_helper_uninstall.sql | sql
printf '\\echo Use "CREATE EXTENSION $(EXTENSION)" to load this file. \\quit\n' > $@
cat $^ >> $@
diff --git a/extensions/postgis_tiger_geocoder/Makefile.in b/extensions/postgis_tiger_geocoder/Makefile.in
index 516b52882..5beff997e 100644
--- a/extensions/postgis_tiger_geocoder/Makefile.in
+++ b/extensions/postgis_tiger_geocoder/Makefile.in
@@ -77,7 +77,7 @@ expected/test-upgrade.out: sql/test-upgrade.sql | expected
sql/test-pagc_normalize_address.sql: sql_bits/test_tuples_only_unaligned.sql.in ../../extras/tiger_geocoder/regress/pagc_normalize_address_regress.sql | sql
cat $^ > $@
-sql/$(EXTENSION)_pre.sql: sql/tiger_geocoder.sql sql_bits/mark_editable_objects.sql.in sql_bits/tiger_geocoder_comments.sql | sql
+sql/$(EXTENSION)_pre.sql: sql/tiger_geocoder.sql sql_bits/mark_editable_objects.sql.in | sql
cat $^ > $@
sql/$(EXTENSION).sql: sql/$(EXTENSION)_pre.sql ../../utils/create_or_replace_to_create.pl
@@ -85,7 +85,7 @@ sql/$(EXTENSION).sql: sql/$(EXTENSION)_pre.sql ../../utils/create_or_replace_to_
| $(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
+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
cat $^ > $@
echo "SELECT postgis_extension_drop_if_exists('${EXTENSION}', 'DROP SCHEMA tiger_data');" >> $@
cat @srcdir@/../postgis_extension_helper_uninstall.sql >> $@
@@ -179,13 +179,6 @@ sql/tiger_geocoder.sql: sql/tiger_geocoder.sql.in
sql/add_search_path.sql: sql_bits/add_search_path.sql.in | sql
cp $< $@
-../../doc/tiger_geocoder_comments.sql:
- $(MAKE) -C ../../doc comments
-
-sql_bits/tiger_geocoder_comments.sql: ../../doc/tiger_geocoder_comments.sql
- mkdir -p sql_bits
- cp $< $@
-
#hardcode for now
#TODO: generate via create_unpackaged.pl
sql/$(EXTENSION)--unpackaged--$(EXTVERSION).sql: sql_bits/tiger_geocoder--unpackaged.sql.in | sql
diff --git a/extensions/postgis_topology/Makefile.in b/extensions/postgis_topology/Makefile.in
index f5c9c9920..3247605fe 100644
--- a/extensions/postgis_topology/Makefile.in
+++ b/extensions/postgis_topology/Makefile.in
@@ -10,8 +10,7 @@ MODULEPATH = $$libdir/$(EXTENSION)- at POSTGIS_MAJOR_VERSION@
EXTENSION_SCRIPTS = \
extlock.sql \
sql/topology.sql \
- sql_bits/mark_editable_objects.sql.in \
- sql/topology_comments.sql
+ sql_bits/mark_editable_objects.sql.in
ifeq (@LIBINCLUDEMINORVERSION@,yes)
MODULEPATH=$$libdir/$(EXTENSION)-$(MINORVERSION)
@@ -46,7 +45,6 @@ EXTENSION_UPGRADE_SCRIPTS = \
sql_bits/remove_from_extension.sql.in \
sql/topology_upgrade.sql \
sql_bits/mark_editable_objects.sql.in \
- sql/topology_comments.sql \
../postgis_extension_helper_uninstall.sql
EXTRA_CLEAN = sql/
@@ -71,12 +69,6 @@ sql/$(EXTENSION)--$(EXTVERSION).sql: $(EXTENSION_SCRIPTS) | sql
sql/topology.sql: ../../topology/topology.sql | sql
sed -e 's/BEGIN;//g' -e 's/COMMIT;//g' -e '/^CREATE SCHEMA/d;' $< > $@
-../../doc/topology_comments.sql:
- $(MAKE) -C ../../doc comments
-
-sql/topology_comments.sql: ../../doc/topology_comments.sql | sql
- cp $< $@
-
sql/$(EXTENSION)--unpackaged.sql: Makefile | sql
echo "-- Nothing to do here" > $@
commit c7f249f4a03923ebe8f56b72f41449a13df6c1b4
Author: Sandro Santilli <strk at kbt.io>
Date: Mon Sep 18 21:08:57 2023 +0200
Add breaking change about new documentation requirements
diff --git a/NEWS b/NEWS
index db10d3cae..0e6695379 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,11 @@
-PostGIS 3.4.0
+PostGIS 3.5.0dev
xxxx/xx/xx
+* Breaking Changes *
+
+ - xmllint is now required to build comments and documentation
+ - DocBook5 XSL is now required to build html documentation
+
* New Features *
- #5055, add explicit <> geometry operator to prevent non-unique
-----------------------------------------------------------------------
Summary of changes:
NEWS | 8 +++++++-
extensions/README | 9 ---------
extensions/postgis/Makefile.in | 5 -----
extensions/postgis_raster/Makefile.in | 10 +---------
extensions/postgis_sfcgal/Makefile.in | 11 ++---------
extensions/postgis_tiger_geocoder/Makefile.in | 11 ++---------
extensions/postgis_topology/Makefile.in | 10 +---------
7 files changed, 13 insertions(+), 51 deletions(-)
hooks/post-receive
--
PostGIS
More information about the postgis-tickets
mailing list