[postgis-tickets] [SCM] PostGIS; Spatial objects for PostgreSQL. branch master updated. 368d524d1118b9c6921b14cf74d19cc801e3cc5e
git at osgeo.org
git at osgeo.org
Wed Oct 30 02:14:45 PDT 2019
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; Spatial objects for PostgreSQL.".
The branch, master has been updated
via 368d524d1118b9c6921b14cf74d19cc801e3cc5e (commit)
via f98c360da8df4af93f1516546360afbb77e872ff (commit)
via ac76be3953a2c70b7ff0bce8838b711845a3ffd4 (commit)
from 191568eaf59c60c89e229ad3f09efcc7c41887e7 (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 368d524d1118b9c6921b14cf74d19cc801e3cc5e
Author: Sandro Santilli <strk at kbt.io>
Date: Wed Oct 30 09:59:51 2019 +0100
[run_test.pl] Use postgis_lib_revision() when available
diff --git a/regress/run_test.pl b/regress/run_test.pl
index ccbfea2..5bf3227 100755
--- a/regress/run_test.pl
+++ b/regress/run_test.pl
@@ -416,14 +416,15 @@ if ( $OPT_DUMPRESTORE )
my $geosver = sql("select postgis_geos_version()");
my $projver = sql("select postgis_proj_version()");
-# TODO: call postgis_lib_revision() instead of postgis_svn_version
-# if $libver >= 3.1.0
-my $librev = sql("select postgis_svn_version()");
my $libbuilddate = sql("select postgis_lib_build_date()");
my $pgsqlver = sql("select version()");
my $gdalver = sql("select postgis_gdal_version()") if $OPT_WITH_RASTER;
my $sfcgalver = sql("select postgis_sfcgal_version()") if $OPT_WITH_SFCGAL;
my $scriptver = sql("select postgis_scripts_installed()");
+# postgis_lib_revision was introduced in 3.1.0
+my $librev = semver_lessthan($scriptver, "3.1.0") ?
+ sql("select postgis_svn_version()") :
+ sql("select postgis_lib_revision()");
my $raster_scriptver = sql("select postgis_raster_scripts_installed()")
if ( $OPT_WITH_RASTER );
commit f98c360da8df4af93f1516546360afbb77e872ff
Author: Sandro Santilli <strk at kbt.io>
Date: Wed Oct 30 09:47:45 2019 +0100
Drop svn references from revision reading script and docs
[ci skip]
diff --git a/liblwgeom/cunit/README b/liblwgeom/cunit/README
index 978653c..dc6bbca 100644
--- a/liblwgeom/cunit/README
+++ b/liblwgeom/cunit/README
@@ -80,7 +80,7 @@ Add a new line for your test:
PG_ADD_TEST(<your test function name>);
-The tests will be run in the order they appear in the list.
+The tests will be run in the order they appear in the list.
CU_TEST_INFO_NULL must always be the last entry.
2.3 Add any necessary init / cleanup code.
@@ -102,8 +102,8 @@ Do the following steps to create a whole new test suite (new .c file).
3.1 Create the file.
-Create the new file (remember to add to svn as well). The naming convention
-is cu_<suite name>.c.
+Create the new file (remember to add to repository as well).
+The naming convention is cu_<suite name>.c.
Make sure to import:
diff --git a/utils/repo_revision.pl b/utils/repo_revision.pl
index cceeb2e..4d4f243 100755
--- a/utils/repo_revision.pl
+++ b/utils/repo_revision.pl
@@ -11,7 +11,7 @@ my $rev_file = $top_srcdir.'/postgis_revision.h';
my $target = 'local';
$target = $ARGV[0] if $ARGV[0];
-# Read the svn revision number
+# Read the revision number
my $rev = &read_rev($target);
# Write it
@@ -31,7 +31,7 @@ sub read_rev_git {
# TODO: test on old systems, I think I saw some `which`
# implementations returning "nothing found" or something
- # like that, making the later if ( ! $svn_exe ) always false
+ # like that, making the later if ( ! $git_exe ) always false
#
my $git_exe = `which git`;
if ( ! $git_exe ) {
commit ac76be3953a2c70b7ff0bce8838b711845a3ffd4
Author: Sandro Santilli <strk at kbt.io>
Date: Wed Oct 30 09:46:56 2019 +0100
[winnie] Drop svn references from winnie recipe
[ci skip]
diff --git a/ci/winnie/package_postgis.sh b/ci/winnie/package_postgis.sh
index 0b31ae6..3113e66 100644
--- a/ci/winnie/package_postgis.sh
+++ b/ci/winnie/package_postgis.sh
@@ -74,7 +74,7 @@ export PATHOLD=$PATH
WEB=/home/www/postgis/htdocs
DWN=${WEB}/download
-export PATHOLD="/mingw/bin:/mingw/include:/c/Windows/system32:/c/Windows:.:/bin:/include:/usr/local/bin:/c/ming${OS_BUILD}}${GCC_TYPE}/svn"
+export PATHOLD="/mingw/bin:/mingw/include:/c/Windows/system32:/c/Windows:.:/bin:/include:/usr/local/bin"
#export PG_VER=9.2beta2
echo PATH BEFORE: $PATH
@@ -100,13 +100,12 @@ export REL_PGVER=${PG_VER//./} #strip the period
export RELDIR=${PROJECTS}/postgis/builds/${POSTGIS_MINOR_VER}
export RELVERDIR=postgis-pg${REL_PGVER}-binaries-${POSTGIS_MICRO_VER}w${OS_BUILD}${GCC_TYPE}
export PATH="${PATHOLD}:${PGPATH}/bin:${PGPATH}/lib"
-export PCRE_VER=8.33
+export PCRE_VER=8.33
#PATH="${PGPATH}/bin:${PGPATH}/lib:${PROJECTS}/xsltproc:${PROJECTS}/gtkw${OS_BUILD}${GCC_TYPE}/bin:${PROJECTS}/gtkw${OS_BUILD}/bin:${PROJECTS}/geos/rel-${GEOS_VER}w${OS_BUILD}${GCC_TYPE}/bin:${PROJECTS}/rel-libiconv-${ICON_VER}w${OS_BUILD}${GCC_TYPE}/include:${PROJECTS}/rel-libiconv-1.13.1w${OS_BUILD}${GCC_TYPE}/bin:${PATH}"
#echo PATH AFTER: $PATH
outdir="${RELDIR}/${RELVERDIR}"
package="${RELDIR}/${RELVERDIR}.zip"
verfile="${RELDIR}/${RELVERDIR}/version.txt"
-#svnurl="http://svn.osgeo.org/postgis/trunk"
rm -rf $outdir
rm $package
mkdir -p $outdir
@@ -206,10 +205,6 @@ cp doc/*_comments.sql ${RELDIR}/${RELVERDIR}/share/contrib/postgis-${POSTGIS_MIN
cp postgis/*.sql ${RELDIR}/${RELVERDIR}/share/contrib/postgis-${POSTGIS_MINOR_VER}
cp raster/rt_pg/*.sql ${RELDIR}/${RELVERDIR}/share/contrib/postgis-${POSTGIS_MINOR_VER}
cp utils/*.pl ${RELDIR}/${RELVERDIR}/utils
-#add extras
-#svn export "${svnurl}/extras" ${RELDIR}/${RELVERDIR}/share/contrib/postgis-${POSTGIS_MINOR_VER}/extras
-#cp raster/rt_pg/rtpostgis.sql ${RELDIR}/${RELVERDIR}/share/contrib/postgis-${POSTGIS_MINOR_VER}
-#cp raster/rt_pg/rtpostgis_upgrade_20_minor.sql ${RELDIR}/${RELVERDIR}/share/contrib/postgis-${POSTGIS_MINOR_VER}
cp raster/loader/.libs/raster2pgsql.exe ${RELDIR}/${RELVERDIR}/bin
cp liblwgeom/.libs/*.dll ${RELDIR}/${RELVERDIR}/bin
@@ -254,4 +249,4 @@ cd ${RELDIR}
zip -r $package ${RELVERDIR}
#scp $package robe at www.refractions.net:${DWN}/${REL_PGVER}/buildbot/${RELVERDIR}.zip
cp $package ${PROJECTS}/postgis/win_web/download/windows/pg${REL_PGVER}/buildbot
-cd ${POSTGIS_SRC}
\ No newline at end of file
+cd ${POSTGIS_SRC}
-----------------------------------------------------------------------
Summary of changes:
ci/winnie/package_postgis.sh | 11 +++--------
liblwgeom/cunit/README | 6 +++---
regress/run_test.pl | 7 ++++---
utils/repo_revision.pl | 4 ++--
4 files changed, 12 insertions(+), 16 deletions(-)
hooks/post-receive
--
PostGIS; Spatial objects for PostgreSQL.
More information about the postgis-tickets
mailing list