[SCM] PostGIS branch master updated. 3.5.0beta1-5-g167219620
git at osgeo.org
git at osgeo.org
Wed Sep 18 09:14:04 PDT 2024
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 16721962049068cc26a18ee6a16eb42ac002b0c4 (commit)
via b4cf3d95d83de80bf62a07e64215ed7a499cbd9a (commit)
from 4b786d9992479041f4bc0cf559cc10e3feca4e2c (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 16721962049068cc26a18ee6a16eb42ac002b0c4
Author: Regina Obe <lr at pcorp.us>
Date: Wed Sep 18 12:11:26 2024 -0400
Many sections ignoring topology and sfcgal funcs
Closes #5778 for PostGIS 3.5.0
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 6f3527c86..41b9ffd12 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -217,7 +217,8 @@ XSL_GENERATED_SOURCES = \
list_raster_functions.xsl.xml \
list_sqlmm_functions.xsl.xml \
list_window_functions.xsl.xml \
- table_body_function_support_matrix.xsl.xml
+ table_body_function_support_matrix.xsl.xml \
+ list_polyhedral_functions.xsl.xml
TAG_GENERATED_SOURCES = \
address_standardizer_required.tag \
diff --git a/doc/postgis.xml b/doc/postgis.xml
index 1fbd28ec8..fbe169b2e 100644
--- a/doc/postgis.xml
+++ b/doc/postgis.xml
@@ -83,7 +83,7 @@
<!ENTITY list_dump_functions SYSTEM "list_dump_functions.xsl.xml">
<!ENTITY list_geography_functions SYSTEM "list_geography_functions.xsl.xml">
<!ENTITY list_new_functions SYSTEM "list_new_functions.xsl.xml">
-<!ENTITY list_polyhedral_geometry_functions SYSTEM "list_curved_geometry_functions.xsl.xml">
+<!ENTITY list_polyhedral_geometry_functions SYSTEM "list_polyhedral_functions.xsl.xml">
<!ENTITY list_raster_functions SYSTEM "list_raster_functions.xsl.xml">
<!ENTITY list_sqlmm_functions SYSTEM "list_sqlmm_functions.xsl.xml">
<!ENTITY list_window_functions SYSTEM "list_window_functions.xsl.xml">
diff --git a/doc/reference_sfcgal.xml b/doc/reference_sfcgal.xml
index fc27d67c6..c45e2e5c9 100644
--- a/doc/reference_sfcgal.xml
+++ b/doc/reference_sfcgal.xml
@@ -1407,7 +1407,7 @@ ST_GeomFromText('POLYHEDRALSURFACE Z( ((0 0 0, 0 0 1, 0 1 1, 0 1 0, 0 0 0)),
<refnamediv>
<refname>CG_3DUnion</refname>
- <refpurpose>Perform 3D union.</refpurpose>
+ <refpurpose>Perform 3D union using postgis_sfcgal.</refpurpose>
</refnamediv>
<refsynopsisdiv>
diff --git a/doc/xsl/list_3d_functions.xml.xsl b/doc/xsl/list_3d_functions.xml.xsl
index cbee3e2d4..46c2460d6 100644
--- a/doc/xsl/list_3d_functions.xml.xsl
+++ b/doc/xsl/list_3d_functions.xml.xsl
@@ -13,12 +13,12 @@
******************************************************************** -->
<xsl:output method="xml" indent="yes" encoding="utf-8" />
- <!-- We deal only with the reference chapter -->
+ <!-- We deal only with the reference chapters -->
<xsl:template match="/">
- <xsl:apply-templates select="/db:book/db:chapter[@xml:id='reference']" />
+ <xsl:apply-templates select="/db:book/db:chapter[contains(@xml:id, 'reference')]" />
</xsl:template>
- <xsl:template match="//db:chapter">
+ <xsl:template match="/">
<itemizedlist>
<!-- Pull out the purpose section for each ref entry and strip whitespace and put in a variable to be tagged unto each function comment -->
diff --git a/doc/xsl/list_aggregates.xml.xsl b/doc/xsl/list_aggregates.xml.xsl
index 395289711..a8f268cae 100644
--- a/doc/xsl/list_aggregates.xml.xsl
+++ b/doc/xsl/list_aggregates.xml.xsl
@@ -13,12 +13,12 @@
******************************************************************** -->
<xsl:output method="xml" indent="yes" encoding="utf-8" />
- <!-- We deal only with the reference chapter -->
+ <!-- We deal only with the reference chapters -->
<xsl:template match="/">
- <xsl:apply-templates select="//db:chapter[@xml:id='reference']" />
+ <xsl:apply-templates select="/db:book/db:chapter[contains(@xml:id, 'reference')]" />
</xsl:template>
- <xsl:template match="//db:chapter">
+ <xsl:template match="/">
<itemizedlist>
<!-- Pull out the purpose section for each ref entry and strip whitespace and put in a variable to be tagged unto each function comment -->
<xsl:for-each select='//db:refentry'>
diff --git a/doc/xsl/list_box_functions.xml.xsl b/doc/xsl/list_box_functions.xml.xsl
index 4f714a2c4..f121d6948 100644
--- a/doc/xsl/list_box_functions.xml.xsl
+++ b/doc/xsl/list_box_functions.xml.xsl
@@ -13,12 +13,12 @@
******************************************************************** -->
<xsl:output method="xml" indent="yes" encoding="utf-8" />
- <!-- We deal only with the reference chapter -->
+ <!-- We deal only with the reference chapters -->
<xsl:template match="/">
- <xsl:apply-templates select="/db:book/db:chapter[@xml:id='reference']" />
+ <xsl:apply-templates select="/db:book/db:chapter[contains(@xml:id, 'reference')]" />
</xsl:template>
- <xsl:template match="//db:chapter">
+ <xsl:template match="/">
<itemizedlist>
<!-- Pull out the purpose section for each ref entry and strip whitespace and put in a variable to be tagged unto each function comment -->
diff --git a/doc/xsl/list_curved_geometry_functions.xml.xsl b/doc/xsl/list_curved_geometry_functions.xml.xsl
index 8ea4ed12e..5e5a06149 100644
--- a/doc/xsl/list_curved_geometry_functions.xml.xsl
+++ b/doc/xsl/list_curved_geometry_functions.xml.xsl
@@ -13,12 +13,13 @@
******************************************************************** -->
<xsl:output method="xml" indent="yes" encoding="utf-8" />
- <!-- We deal only with the reference chapter -->
+ <!-- We deal only with the reference chapters -->
<xsl:template match="/">
- <xsl:apply-templates select="/db:book/db:chapter[@xml:id='reference']" />
+ <xsl:apply-templates select="/db:book/db:chapter[contains(@xml:id, 'reference')]" />
</xsl:template>
- <xsl:template match="//db:chapter">
+
+ <xsl:template match="/">
<itemizedlist>
<!-- Pull out the purpose section for each ref entry and strip whitespace and put in a variable to be tagged unto each function comment -->
<xsl:for-each select='//db:refentry'>
diff --git a/doc/xsl/list_dump_functions.xml.xsl b/doc/xsl/list_dump_functions.xml.xsl
index 43612c736..efce19214 100644
--- a/doc/xsl/list_dump_functions.xml.xsl
+++ b/doc/xsl/list_dump_functions.xml.xsl
@@ -13,12 +13,13 @@
******************************************************************** -->
<xsl:output method="xml" indent="yes" encoding="utf-8" />
- <!-- We deal only with the reference chapter -->
+ <!-- We deal only with the reference chapters -->
<xsl:template match="/">
- <xsl:apply-templates select="/db:book/db:chapter[@xml:id='reference']" />
+ <xsl:apply-templates select="/db:book/db:chapter[contains(@xml:id, 'reference')]" />
</xsl:template>
- <xsl:template match="//db:chapter">
+
+ <xsl:template match="/">
<itemizedlist>
<!-- Pull out the purpose section for each ref entry and strip whitespace and put in a variable to be tagged unto each function comment -->
diff --git a/doc/xsl/list_geography_functions.xml.xsl b/doc/xsl/list_geography_functions.xml.xsl
index de2f0f33d..ddca40d7c 100644
--- a/doc/xsl/list_geography_functions.xml.xsl
+++ b/doc/xsl/list_geography_functions.xml.xsl
@@ -13,12 +13,13 @@
******************************************************************** -->
<xsl:output method="xml" indent="yes" encoding="utf-8" />
- <!-- We deal only with the reference chapter -->
+ <!-- We deal only with the reference chapters -->
<xsl:template match="/">
- <xsl:apply-templates select="/db:book/db:chapter[@xml:id='reference']" />
+ <xsl:apply-templates select="/db:book/db:chapter[contains(@xml:id, 'reference')]" />
</xsl:template>
- <xsl:template match="//db:chapter">
+
+ <xsl:template match="/">
<itemizedlist>
<!-- Pull out the purpose section for each ref entry and strip whitespace and put in a variable to be tagged unto each function comment -->
diff --git a/doc/xsl/list_new_functions.xml.xsl b/doc/xsl/list_new_functions.xml.xsl
index ac0f1cb8a..aabea424e 100644
--- a/doc/xsl/list_new_functions.xml.xsl
+++ b/doc/xsl/list_new_functions.xml.xsl
@@ -13,12 +13,12 @@
******************************************************************** -->
<xsl:output method="xml" indent="yes" encoding="utf-8" />
- <!-- We deal only with the reference chapter -->
+ <!-- We deal only with the reference chapters -->
<xsl:template match="/">
- <xsl:apply-templates select="/db:book/db:chapter[@xml:id='reference']" />
+ <xsl:apply-templates select="/db:book/db:chapter[contains(@xml:id, 'reference')]" />
</xsl:template>
- <xsl:template match="//db:chapter">
+ <xsl:template match="/">
<xsl:variable name="chap" select="." />
diff --git a/doc/xsl/list_curved_geometry_functions.xml.xsl b/doc/xsl/list_polyhedral_functions.xml.xsl
similarity index 88%
copy from doc/xsl/list_curved_geometry_functions.xml.xsl
copy to doc/xsl/list_polyhedral_functions.xml.xsl
index 8ea4ed12e..0061d859b 100644
--- a/doc/xsl/list_curved_geometry_functions.xml.xsl
+++ b/doc/xsl/list_polyhedral_functions.xml.xsl
@@ -13,12 +13,13 @@
******************************************************************** -->
<xsl:output method="xml" indent="yes" encoding="utf-8" />
- <!-- We deal only with the reference chapter -->
+ <!-- We deal only with the reference chapters -->
<xsl:template match="/">
- <xsl:apply-templates select="/db:book/db:chapter[@xml:id='reference']" />
+ <xsl:apply-templates select="/db:book/db:chapter[contains(@xml:id, 'reference')]" />
</xsl:template>
- <xsl:template match="//db:chapter">
+
+ <xsl:template match="/">
<itemizedlist>
<!-- Pull out the purpose section for each ref entry and strip whitespace and put in a variable to be tagged unto each function comment -->
<xsl:for-each select='//db:refentry'>
@@ -36,7 +37,7 @@
<!-- For each section if there is note that it implements Circular String catalog it -->
<xsl:for-each select="db:refsection">
<xsl:choose>
- <xsl:when test="descendant::node()[@conformance='curve']">
+ <xsl:when test="descendant::node()[@conformance='polyhedral']">
<listitem><simpara><link linkend="{$refid}"><xsl:value-of select="$refname" /></link> - <xsl:value-of select="$comment" /></simpara></listitem>
</xsl:when>
</xsl:choose>
diff --git a/doc/xsl/list_raster_functions.xml.xsl b/doc/xsl/list_raster_functions.xml.xsl
index 3095581e3..ec561f5a7 100644
--- a/doc/xsl/list_raster_functions.xml.xsl
+++ b/doc/xsl/list_raster_functions.xml.xsl
@@ -13,12 +13,12 @@
******************************************************************** -->
<xsl:output method="xml" indent="yes" encoding="utf-8" />
- <!-- We deal only with the reference chapter -->
+ <!-- We deal only with the reference chapters -->
<xsl:template match="/">
- <xsl:apply-templates select="/db:book/db:chapter[@xml:id='reference']" />
+ <xsl:apply-templates select="/db:book/db:chapter[contains(@xml:id, 'reference')]" />
</xsl:template>
- <xsl:template match="//db:chapter">
+ <xsl:template match="/">
<itemizedlist>
<!-- Pull out the purpose section for each ref entry and strip whitespace and put in a variable to be tagged unto each function comment -->
<xsl:for-each select='//db:refentry'>
diff --git a/doc/xsl/list_sqlmm_functions.xml.xsl b/doc/xsl/list_sqlmm_functions.xml.xsl
index 0030a1345..620b74e62 100644
--- a/doc/xsl/list_sqlmm_functions.xml.xsl
+++ b/doc/xsl/list_sqlmm_functions.xml.xsl
@@ -13,12 +13,12 @@
******************************************************************** -->
<xsl:output method="xml" indent="yes" encoding="utf-8" />
- <!-- We deal only with the reference chapter -->
+ <!-- We deal only with the reference chapters -->
<xsl:template match="/">
- <xsl:apply-templates select="/db:book/db:chapter[@xml:id='reference']" />
+ <xsl:apply-templates select="/db:book/db:chapter[contains(@xml:id, 'reference')]" />
</xsl:template>
- <xsl:template match="//db:chapter">
+ <xsl:template match="/">
<itemizedlist>
<!-- Pull out the purpose section for each ref entry and strip whitespace and put in a variable to be tagged unto each function comment -->
<xsl:for-each select='//db:refentry'>
diff --git a/doc/xsl/list_window_functions.xml.xsl b/doc/xsl/list_window_functions.xml.xsl
index 45d5bee47..5104817e7 100644
--- a/doc/xsl/list_window_functions.xml.xsl
+++ b/doc/xsl/list_window_functions.xml.xsl
@@ -13,12 +13,12 @@
******************************************************************** -->
<xsl:output method="xml" indent="yes" encoding="utf-8" />
- <!-- We deal only with the reference chapter -->
+ <!-- We deal only with the reference chapters -->
<xsl:template match="/">
- <xsl:apply-templates select="/db:book/db:chapter[@xml:id='reference']" />
+ <xsl:apply-templates select="/db:book/db:chapter[contains(@xml:id, 'reference')]" />
</xsl:template>
- <xsl:template match="//db:chapter">
+ <xsl:template match="/">
<xsl:if test="//db:funcprototype[contains(db:paramdef/db:type,' winset')]">
<itemizedlist>
<!-- Pull out the purpose section for each ref entry and strip whitespace and put in a variable to be tagged unto each function comment -->
commit b4cf3d95d83de80bf62a07e64215ed7a499cbd9a
Author: Regina Obe <lr at pcorp.us>
Date: Mon Sep 16 15:52:27 2024 -0400
Reenable postgis raster testing for windows PG17
diff --git a/ci/winnie/regress_postgis.sh b/ci/winnie/regress_postgis.sh
index 94e6cb76b..68bb41988 100644
--- a/ci/winnie/regress_postgis.sh
+++ b/ci/winnie/regress_postgis.sh
@@ -60,11 +60,6 @@ sh autogen.sh
# excluding topology cause it's erroring out on some tests
EXTRA_CONFIGURE_ARGS="${EXTRA_CONFIGURE_ARGS} --without-topology"
-if [ $PG_VER == "17" ]; then
- #skipping raster cause it's failing on cunit when building with new chain
- EXTRA_CONFIGURE_ARGS="${EXTRA_CONFIGURE_ARGS} --without-raster"
-fi;
-
if [ -n "$PCRE_VER" ]; then
export PATH="${PROJECTS}/pcre/rel-${PCRE_VER}w${OS_BUILD}${GCC_TYPE}/include:${PROJECTS}/pcre/rel-${PCRE_VER}w${OS_BUILD}${GCC_TYPE}/lib:${PATH}"
fi
-----------------------------------------------------------------------
Summary of changes:
ci/winnie/regress_postgis.sh | 5 -----
doc/Makefile.in | 3 ++-
doc/postgis.xml | 2 +-
doc/reference_sfcgal.xml | 2 +-
doc/xsl/list_3d_functions.xml.xsl | 6 +++---
doc/xsl/list_aggregates.xml.xsl | 6 +++---
doc/xsl/list_box_functions.xml.xsl | 6 +++---
doc/xsl/list_curved_geometry_functions.xml.xsl | 7 ++++---
doc/xsl/list_dump_functions.xml.xsl | 7 ++++---
doc/xsl/list_geography_functions.xml.xsl | 7 ++++---
doc/xsl/list_new_functions.xml.xsl | 6 +++---
...metry_functions.xml.xsl => list_polyhedral_functions.xml.xsl} | 9 +++++----
doc/xsl/list_raster_functions.xml.xsl | 6 +++---
doc/xsl/list_sqlmm_functions.xml.xsl | 6 +++---
doc/xsl/list_window_functions.xml.xsl | 6 +++---
15 files changed, 42 insertions(+), 42 deletions(-)
copy doc/xsl/{list_curved_geometry_functions.xml.xsl => list_polyhedral_functions.xml.xsl} (88%)
hooks/post-receive
--
PostGIS
More information about the postgis-tickets
mailing list