[postgis-tickets] [SCM] PostGIS branch master updated. 3.3.0rc2-1164-g94b0b0b82
git at osgeo.org
git at osgeo.org
Thu Jul 6 05:03:27 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 94b0b0b827eeda70a01dd7a4eb578d0625d8db5c (commit)
from f5f62d7ba9a0671ec162e7e05b803b51ffb7bfc6 (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 94b0b0b827eeda70a01dd7a4eb578d0625d8db5c
Author: Sandro Santilli <strk at kbt.io>
Date: Thu Jul 6 14:01:47 2023 +0200
Pass postgis_version to xsl files via --stringparam
Removes the need to continuously update the xsl upon version change
and fixes sfcgal_cheatsheet.html.xsl post_gis_day_cards.html.xsl which
were left behind at 3.3
diff --git a/doc/Makefile.in b/doc/Makefile.in
index ee76e90cb..b48b8acdf 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -74,6 +74,9 @@ XSLT_PATH= \
XSLTPROC_PATH_OPT= \
--path $(XSLT_PATH)
+XSLTPROC_CUSTOM_VARS = \
+ --stringparam postgis_version $(POSTGIS_MAJOR_VERSION).$(POSTGIS_MINOR_VERSION)
+
XSLTPROC_COMMONOPTS= \
$(XSLTPROC_PATH_OPT) \
--param section.autolabel 1 \
@@ -299,8 +302,9 @@ $(GENERATED_COMMENT_FILES): %.sql: xsl/%.sql.xsl $(XML_INPUTS) postgis-out.xml
$(XSLTPROC) --novalid $(XSLTPROC_PATH_OPT) -o $@ $< postgis-out.xml
$(GENERATED_CHEATSHEET_FILES): html/%$(DOCSUFFIX).html: xsl/%.html.xsl $(XML_INPUTS) postgis-out.xml
- $(XSLTPROC) --novalid $(XSLTPROC_PATH_OPT) -o $@ $< postgis-out.xml
+ $(XSLTPROC) --novalid $(XSLTPROC_PATH_OPT) $(XSLTPROC_CUSTOM_VARS) -o $@ $< postgis-out.xml
+# TODO: use a postgis_release_version variable passed via --stringparam
postgis-out.xml: postgis.xml Makefile
$(PERL) -lpe "s'@@LAST_RELEASE_VERSION@@'${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}.${POSTGIS_MICRO_VERSION}'g;s'@@POSTGIS_DOWNLOAD_URL@@'${POSTGIS_DOWNLOAD_URL}'g;" $< > $@
diff --git a/doc/xsl/post_gis_day_cards.html.xsl b/doc/xsl/post_gis_day_cards.html.xsl
index 3273115ba..289219d21 100644
--- a/doc/xsl/post_gis_day_cards.html.xsl
+++ b/doc/xsl/post_gis_day_cards.html.xsl
@@ -7,7 +7,6 @@
Purpose: This is an xsl transform that generates PostGIS flash cards
******************************************************************** -->
<xsl:output method="text" />
- <xsl:variable name='postgis_version'>3.3</xsl:variable>
<xsl:variable name='new_tag'>Availability: <xsl:value-of select="$postgis_version" /></xsl:variable>
<xsl:variable name='enhanced_tag'>Enhanced: <xsl:value-of select="$postgis_version" /></xsl:variable>
diff --git a/doc/xsl/postgis_cheatsheet.html.xsl b/doc/xsl/postgis_cheatsheet.html.xsl
index fd67baae2..6dfe3fcd5 100644
--- a/doc/xsl/postgis_cheatsheet.html.xsl
+++ b/doc/xsl/postgis_cheatsheet.html.xsl
@@ -8,7 +8,6 @@
statements from postgis xml doc reference
******************************************************************** -->
<xsl:output method="text" />
- <xsl:variable name='postgis_version'>3.4</xsl:variable>
<xsl:variable name='new_tag'>Availability: <xsl:value-of select="$postgis_version" /></xsl:variable>
<xsl:variable name='enhanced_tag'>Enhanced: <xsl:value-of select="$postgis_version" /></xsl:variable>
<xsl:variable name='include_examples'>false</xsl:variable>
diff --git a/doc/xsl/raster_cheatsheet.html.xsl b/doc/xsl/raster_cheatsheet.html.xsl
index f97fefdcb..197122502 100644
--- a/doc/xsl/raster_cheatsheet.html.xsl
+++ b/doc/xsl/raster_cheatsheet.html.xsl
@@ -8,7 +8,6 @@
statements from postgis xml doc reference
******************************************************************** -->
<xsl:output method="text" />
- <xsl:variable name='postgis_version'>3.4</xsl:variable>
<xsl:variable name='new_tag'>Availability: <xsl:value-of select="$postgis_version" /></xsl:variable>
<xsl:variable name='enhanced_tag'>Enhanced: <xsl:value-of select="$postgis_version" /></xsl:variable>
<xsl:variable name='include_examples'>false</xsl:variable>
diff --git a/doc/xsl/sfcgal_cheatsheet.html.xsl b/doc/xsl/sfcgal_cheatsheet.html.xsl
index ca5606d91..7b12512ec 100644
--- a/doc/xsl/sfcgal_cheatsheet.html.xsl
+++ b/doc/xsl/sfcgal_cheatsheet.html.xsl
@@ -8,7 +8,6 @@
statements from postgis xml doc reference
******************************************************************** -->
<xsl:output method="text" />
- <xsl:variable name='postgis_version'>3.3</xsl:variable>
<xsl:variable name='new_tag'>Availability: <xsl:value-of select="$postgis_version" /></xsl:variable>
<xsl:variable name='enhanced_tag'>Enhanced: <xsl:value-of select="$postgis_version" /></xsl:variable>
<xsl:variable name='include_examples'>false</xsl:variable>
diff --git a/doc/xsl/tiger_geocoder_cheatsheet.html.xsl b/doc/xsl/tiger_geocoder_cheatsheet.html.xsl
index b0205298d..208c3b793 100644
--- a/doc/xsl/tiger_geocoder_cheatsheet.html.xsl
+++ b/doc/xsl/tiger_geocoder_cheatsheet.html.xsl
@@ -8,7 +8,6 @@
statements from postgis xml doc reference
******************************************************************** -->
<xsl:output method="text" />
- <xsl:variable name='postgis_version'>3.4</xsl:variable>
<xsl:variable name='new_tag'>Availability: <xsl:value-of select="$postgis_version" /></xsl:variable>
<xsl:variable name='enhanced_tag'>Enhanced: <xsl:value-of select="$postgis_version" /></xsl:variable>
<xsl:variable name='include_examples'>true</xsl:variable>
diff --git a/doc/xsl/topology_cheatsheet.html.xsl b/doc/xsl/topology_cheatsheet.html.xsl
index 6aea9cf65..e960ce99a 100644
--- a/doc/xsl/topology_cheatsheet.html.xsl
+++ b/doc/xsl/topology_cheatsheet.html.xsl
@@ -8,7 +8,6 @@
statements from postgis xml doc reference
******************************************************************** -->
<xsl:output method="text" />
- <xsl:variable name='postgis_version'>3.4</xsl:variable>
<xsl:variable name='new_tag'>Availability: <xsl:value-of select="$postgis_version" /></xsl:variable>
<xsl:variable name='enhanced_tag'>Enhanced: <xsl:value-of select="$postgis_version" /></xsl:variable>
<xsl:variable name='include_examples'>false</xsl:variable>
-----------------------------------------------------------------------
Summary of changes:
doc/Makefile.in | 6 +++++-
doc/xsl/post_gis_day_cards.html.xsl | 1 -
doc/xsl/postgis_cheatsheet.html.xsl | 1 -
doc/xsl/raster_cheatsheet.html.xsl | 1 -
doc/xsl/sfcgal_cheatsheet.html.xsl | 1 -
doc/xsl/tiger_geocoder_cheatsheet.html.xsl | 1 -
doc/xsl/topology_cheatsheet.html.xsl | 1 -
7 files changed, 5 insertions(+), 7 deletions(-)
hooks/post-receive
--
PostGIS
More information about the postgis-tickets
mailing list