[postgis-tickets] [SCM] PostGIS branch master updated. 3.3.0rc2-902-g9ea7418ef
git at osgeo.org
git at osgeo.org
Wed May 17 04:37:44 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 9ea7418efd73a964327c73447c6feaf98fc41db6 (commit)
via 4b5eebc5556000586497e850bb1c3579bf913c02 (commit)
via 0d8a0c88a74da999134bdb18a6935db1160e0d56 (commit)
via cc3cb675883706af22dbfa2d1088c7202910a2d8 (commit)
from 994b97db9af7d193469bf0036a5808e7dafa522b (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 9ea7418efd73a964327c73447c6feaf98fc41db6
Author: Sandro Santilli <strk at kbt.io>
Date: Wed May 17 13:37:28 2023 +0200
Allow passing a custom name for the garden db
diff --git a/regress/Makefile.in b/regress/Makefile.in
index 41f1ebe62..070f1388a 100644
--- a/regress/Makefile.in
+++ b/regress/Makefile.in
@@ -23,6 +23,12 @@ POSTGIS_MAJOR_VERSION=@POSTGIS_MAJOR_VERSION@
POSTGIS_MINOR_VERSION=@POSTGIS_MINOR_VERSION@
POSTGIS_MICRO_VERSION=@POSTGIS_MICRO_VERSION@
+# To use a custom database name, run:
+#
+# make garden GARDENDB=custom_db_name
+#
+GARDENDB=postgis_garden
+
# Where we put our regression installation
# See https://trac.osgeo.org/postgis/ticket/5066
ifeq ($(MINGWBUILD),1)
@@ -94,16 +100,16 @@ staged-install:
$(PERL) -pi -e 's,\$$libdir,$(REGRESS_INSTALLDIR)/lib,g' $(REGRESS_INSTALLDIR)/share/contrib/postgis/*.sql
garden: staged-install
- createdb postgis_garden
- psql -qX -v ON_ERROR_STOP=true -d postgis_garden < $(REGRESS_INSTALLDIR)/share/contrib/postgis/postgis.sql
- psql -qX -v ON_ERROR_STOP=true -d postgis_garden < $(REGRESS_INSTALLDIR)/share/contrib/postgis/spatial_ref_sys.sql
- psql -qX -v ON_ERROR_STOP=true -d postgis_garden < $(REGRESS_INSTALLDIR)/share/contrib/postgis/rtpostgis.sql
+ createdb $(GARDENDB)
+ psql -qX -v ON_ERROR_STOP=true -d $(GARDENDB) < $(REGRESS_INSTALLDIR)/share/contrib/postgis/postgis.sql
+ psql -qX -v ON_ERROR_STOP=true -d $(GARDENDB) < $(REGRESS_INSTALLDIR)/share/contrib/postgis/spatial_ref_sys.sql
+ psql -qX -v ON_ERROR_STOP=true -d $(GARDENDB) < $(REGRESS_INSTALLDIR)/share/contrib/postgis/rtpostgis.sql
@echo '-------------------------------------------------'
@echo 'Regression tests in progress (it will take time)'
@echo 'Result output: ./regress/postgis_garden_result.txt'
@echo '-------------------------------------------------'
- psql -X -ad postgis_garden < ../doc/postgis_gardentest_${POSTGIS_MAJOR_VERSION}${POSTGIS_MINOR_VERSION}.sql > postgis_garden_result.txt 2>&1
+ psql -X -ad $(GARDENDB) < ../doc/postgis_gardentest_${POSTGIS_MAJOR_VERSION}${POSTGIS_MINOR_VERSION}.sql > postgis_garden_result.txt 2>&1
tail postgis_garden_result.txt
- psql -X -ad postgis_garden < ../doc/raster_gardentest_${POSTGIS_MAJOR_VERSION}${POSTGIS_MINOR_VERSION}.sql > raster_garden_result.txt 2>&1
+ psql -X -ad $(GARDENDB) < ../doc/raster_gardentest_${POSTGIS_MAJOR_VERSION}${POSTGIS_MINOR_VERSION}.sql > raster_garden_result.txt 2>&1
tail raster_garden_result.txt
- #dropdb postgis_garden
+ #dropdb $(GARDENDB)
commit 4b5eebc5556000586497e850bb1c3579bf913c02
Author: Sandro Santilli <strk at kbt.io>
Date: Wed May 17 13:12:30 2023 +0200
Stop using createlang plpgsql, not needed since PostgreSQL 9.0
diff --git a/extras/template_gis/postgres_lib.sh.in b/extras/template_gis/postgres_lib.sh.in
index 2daf29812..331d66fd1 100644
--- a/extras/template_gis/postgres_lib.sh.in
+++ b/extras/template_gis/postgres_lib.sh.in
@@ -81,14 +81,11 @@ function template_mk()
if [ -n "$GRID" ]; then
psql -d $TDB -c "UPDATE pg_database SET datdba = $GRID WHERE datname = '$TDB';" 2>&1 | cat > /dev/null
fi
- if [ -x @bindir@/createlang ]; then
- @bindir@/createlang plpgsql $TDB 2>&1 | cat > /dev/null
- fi
for script in $SCRIPTS ; do
psql -d $TDB -f $script 2>&1 | cat > /dev/null
done
#pseudo tables for postgresql 7.2 and 7.4. feel free to add more, for other postgresql versions
- PSEUDO_TABLES="'pg_xactlock', 'sql_features', 'sql_implementation_info', 'sql_languages',
+ PSEUDO_TABLES="'pg_xactlock', 'sql_features', 'sql_implementation_info', 'sql_languages',
'sql_packages', 'sql_sizing', 'sql_sizing_profiles'"
TABLES=`psql -d $TDB -At -c "select tablename from pg_tables where tablename not in ($PSEUDO_TABLES);"`
if [ -n "$GRID" ]; then
diff --git a/raster/scripts/python/Makefile.rt.sample b/raster/scripts/python/Makefile.rt.sample
index a9d0514bc..afb83d13c 100644
--- a/raster/scripts/python/Makefile.rt.sample
+++ b/raster/scripts/python/Makefile.rt.sample
@@ -61,7 +61,6 @@ create:
ifdef DBNAME
@echo "****** Creating database '$(DBNAME)'..."
@createdb --tablespace=tablespace2 $(DBNAME) > /dev/null $(ERROUT);
- @createlang plpgsql $(DBNAME) > /dev/null $(ERROUT);
@echo "****** Loading PostGIS into '$(DBNAME)'..."
@psql -d $(DBNAME) -f $(POSTGIS)/postgis.sql > /dev/null $(ERROUT);
@psql -d $(DBNAME) -f $(POSTGIS)/spatial_ref_sys.sql > /dev/null $(ERROUT);
diff --git a/regress/Makefile.in b/regress/Makefile.in
index 3678a7477..41f1ebe62 100644
--- a/regress/Makefile.in
+++ b/regress/Makefile.in
@@ -95,7 +95,6 @@ staged-install:
garden: staged-install
createdb postgis_garden
- createlang plpgsql postgis_garden || true #tolerate an error here
psql -qX -v ON_ERROR_STOP=true -d postgis_garden < $(REGRESS_INSTALLDIR)/share/contrib/postgis/postgis.sql
psql -qX -v ON_ERROR_STOP=true -d postgis_garden < $(REGRESS_INSTALLDIR)/share/contrib/postgis/spatial_ref_sys.sql
psql -qX -v ON_ERROR_STOP=true -d postgis_garden < $(REGRESS_INSTALLDIR)/share/contrib/postgis/rtpostgis.sql
diff --git a/regress/test_index_concurrency b/regress/test_index_concurrency
index 9692affef..0ba8ccebe 100755
--- a/regress/test_index_concurrency
+++ b/regress/test_index_concurrency
@@ -18,18 +18,17 @@ if [ "$1" = "prepare" ]; then
echo ""
createdb > /dev/null
- createlang plpgsql > /dev/null
psql -f ../lwpostgis.sql > /dev/null 2>&1
- psql -f regress_lots_of_points.sql
- psql -c "CREATE INDEX quick_gist on test using gist (the_geom)"
+ psql -f regress_lots_of_points.sql
+ psql -c "CREATE INDEX quick_gist on test using gist (the_geom)"
else
if [ "$1" = "run" ]; then
# Concurrent clients:
psql -c "update test set num=-num WHERE the_geom && 'BOX3D(125 125,135 135)'::box3d" &
psql -c "update test set num=-num WHERE the_geom && 'BOX3D(125 125,135 135)'::box3d" &
psql -c "update test set num=-num WHERE the_geom && 'BOX3D(125 125,135 135)'::box3d" &
-
+
wait
else
if [ "$1" = "drop" ]; then
commit 0d8a0c88a74da999134bdb18a6935db1160e0d56
Author: Sandro Santilli <strk at kbt.io>
Date: Wed May 17 13:04:45 2023 +0200
Make garden output quiet
diff --git a/regress/Makefile.in b/regress/Makefile.in
index 7aad562f5..3678a7477 100644
--- a/regress/Makefile.in
+++ b/regress/Makefile.in
@@ -96,15 +96,15 @@ staged-install:
garden: staged-install
createdb postgis_garden
createlang plpgsql postgis_garden || true #tolerate an error here
- psql --no-psqlrc --variable ON_ERROR_STOP=true -d postgis_garden < $(REGRESS_INSTALLDIR)/share/contrib/postgis/postgis.sql && \
- psql --no-psqlrc --variable ON_ERROR_STOP=true -d postgis_garden < $(REGRESS_INSTALLDIR)/share/contrib/postgis/spatial_ref_sys.sql || true # tolerate an error here
- psql --no-psqlrc --variable ON_ERROR_STOP=true -d postgis_garden < $(REGRESS_INSTALLDIR)/share/contrib/postgis/rtpostgis.sql || true #tolerate an error here
+ psql -qX -v ON_ERROR_STOP=true -d postgis_garden < $(REGRESS_INSTALLDIR)/share/contrib/postgis/postgis.sql
+ psql -qX -v ON_ERROR_STOP=true -d postgis_garden < $(REGRESS_INSTALLDIR)/share/contrib/postgis/spatial_ref_sys.sql
+ psql -qX -v ON_ERROR_STOP=true -d postgis_garden < $(REGRESS_INSTALLDIR)/share/contrib/postgis/rtpostgis.sql
@echo '-------------------------------------------------'
@echo 'Regression tests in progress (it will take time)'
@echo 'Result output: ./regress/postgis_garden_result.txt'
@echo '-------------------------------------------------'
- psql --no-psqlrc -ad postgis_garden < ../doc/postgis_gardentest_${POSTGIS_MAJOR_VERSION}${POSTGIS_MINOR_VERSION}.sql > postgis_garden_result.txt 2>&1
+ psql -X -ad postgis_garden < ../doc/postgis_gardentest_${POSTGIS_MAJOR_VERSION}${POSTGIS_MINOR_VERSION}.sql > postgis_garden_result.txt 2>&1
tail postgis_garden_result.txt
- psql --no-psqlrc -ad postgis_garden < ../doc/raster_gardentest_${POSTGIS_MAJOR_VERSION}${POSTGIS_MINOR_VERSION}.sql > raster_garden_result.txt 2>&1
+ psql -X -ad postgis_garden < ../doc/raster_gardentest_${POSTGIS_MAJOR_VERSION}${POSTGIS_MINOR_VERSION}.sql > raster_garden_result.txt 2>&1
tail raster_garden_result.txt
#dropdb postgis_garden
commit cc3cb675883706af22dbfa2d1088c7202910a2d8
Author: Sandro Santilli <strk at kbt.io>
Date: Wed May 17 12:58:40 2023 +0200
Fix make garden from out-of-tree builds
Closes #5383
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 18f7130fe..38c2c52a7 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -424,12 +424,11 @@ uninstall: comments-uninstall
ifeq ($(XSLTPROC),)
garden: requirements_not_met_xsltproc
else
-garden: xsl/postgis_gardentest.sql.xsl $(XML_INPUTS)
- $(XSLTPROC) -o postgis_gardentest_${POSTGIS_MAJOR_VERSION}${POSTGIS_MINOR_VERSION}.sql xsl/postgis_gardentest.sql.xsl postgis-out.xml
- $(XSLTPROC) -o raster_gardentest_${POSTGIS_MAJOR_VERSION}${POSTGIS_MINOR_VERSION}.sql xsl/raster_gardentest.sql.xsl postgis-out.xml
+garden: postgis_gardentest_${POSTGIS_MAJOR_VERSION}${POSTGIS_MINOR_VERSION}.sql raster_gardentest_${POSTGIS_MAJOR_VERSION}${POSTGIS_MINOR_VERSION}.sql
endif
-
+%_gardentest_${POSTGIS_MAJOR_VERSION}${POSTGIS_MINOR_VERSION}.sql: xsl/postgis_gardentest.sql.xsl postgis-out.xml
+ $(XSLTPROC) -o $@ --path $(srcdir) $^
check: check-unit
check-regress:
-----------------------------------------------------------------------
Summary of changes:
doc/Makefile.in | 7 +++----
extras/template_gis/postgres_lib.sh.in | 5 +----
raster/scripts/python/Makefile.rt.sample | 1 -
regress/Makefile.in | 21 +++++++++++++--------
regress/test_index_concurrency | 7 +++----
5 files changed, 20 insertions(+), 21 deletions(-)
hooks/post-receive
--
PostGIS
More information about the postgis-tickets
mailing list