Skip to content

Commits on Source 5

2019-10-11 13:24 Raúl Marín Rodríguez <rmrodriguez@carto.com>
* [r17906] liblwgeom/lwin_wkb.c: Memory leak in
lwpoly_from_wkb_state
References #4535
2019-10-10 17:28 Regina Obe <lr@pcorp.us>
* [r17905] doc/po/ja/release_notes.xml.po: manual fix release note
dates and numbers
2019-10-10 16:58 Raúl Marín Rodríguez <rmrodriguez@carto.com>
* [r17904] NEWS, liblwgeom/cunit/cu_in_wkb.c, liblwgeom/lwin_wkb.c:
WKB: Avoid buffer overflow
This only happens when not running under PG context, as
lwerror continues execution and that means that even after
detecting there isn't enough bytes still try to read from the
buffer
Closes #4535
Closes https://github.com/postgis/postgis/pull/495
2019-10-10 13:01 Raúl Marín Rodríguez <rmrodriguez@carto.com>
* [r17900] NEWS, liblwgeom/cunit/cu_in_wkt.c,
liblwgeom/lwin_wkt_parse.c, liblwgeom/lwin_wkt_parse.h,
liblwgeom/lwin_wkt_parse.y: Fix leak in WKT collection parser
References #4537
2019-10-10 11:09 Raúl Marín Rodríguez <rmrodriguez@carto.com>
* [r17893] NEWS, liblwgeom/cunit/cu_in_wkb.c, liblwgeom/lwin_wkb.c:
Fix leak in lwcollection_from_wkb_state
Closes #4536
Closes https://github.com/postgis/postgis/pull/493
2019-10-10 10:10 Raúl Marín Rodríguez <rmrodriguez@carto.com>
* [r17892] NEWS, liblwgeom/cunit/cu_in_wkb.c,
liblwgeom/lwcurvepoly.c, liblwgeom/lwin_wkb.c: Fix leak in
lwcurvepoly_from_wkb_state
Closes #4534
Closes https://github.com/postgis/postgis/pull/492
2019-10-08 11:48 Raúl Marín Rodríguez <rmrodriguez@carto.com>
* [r17891] configure.ac, liblwgeom/lwin_geojson.c,
postgis/lwgeom_in_geojson.c, postgis_config.h.in: Remove
HAVE_LIBJSON_C
Patch by jabakobob
References #4528
2019-10-08 11:40 Sandro Santilli <strk@kbt.io>
* [r17890] extensions/address_standardizer/Makefile.in,
extensions/postgis/Makefile.in,
extensions/postgis_raster/Makefile.in,
extensions/postgis_sfcgal/Makefile.in,
extensions/postgis_tiger_geocoder/Makefile.in,
extensions/postgis_topology/Makefile.in: Make sure "make clean"
really cleans what's created by "make"
Fixes #4531 and simplifies a little bit those Makefiles
2019-10-08 10:59 Sandro Santilli <strk@kbt.io>
* [r17889] regress/core/regress.sql,
regress/core/regress_brin_index.sql,
regress/core/regress_brin_index_3d.sql,
regress/core/regress_brin_index_geography.sql,
regress/core/regress_index.sql,
regress/core/regress_index_nulls.sql, regress/core/subdivide.sql:
Allow running core tests from any directory
Using the :regdir variable
2019-10-08 09:43 Sandro Santilli <strk@kbt.io>
* [r17888] regress/run_test.pl: Force using systemwide scripts when
run with --extension
.. rather than relying on version mismatch (current vs.
requested)
to tell where to pick scripts from ..
*might* relate to #4515
2019-10-08 06:16 Regina Obe <lr@pcorp.us>
* [r17887] Version.config, extensions/upgradeable_versions.mk: Flip
to 3.0.0rc2dev
2019-10-08 06:11 Regina Obe <lr@pcorp.us>
* [r17885] ChangeLog, ci/winnie/package_postgis.sh: Change to
package 3.8.0rc2 for windows, prepare for 3.0.0rc1 release
2019-10-08 00:48 Regina Obe <lr@pcorp.us>
* [r17884] doc/po/es/extras_topology.xml.po,
doc/po/fr/reference_accessor.xml.po: Fix pos for spanish and
french so they produce proper XML
Closes #4525
2019-10-07 23:04 Regina Obe <lr@pcorp.us>
* [r17883] HOWTO_RELEASE: Add step to pull translations from
transifex
References #4525
2019-10-07 22:58 Paul Ramsey <pramsey@cleverelephant.ca>
* [r17882] regress/run_test.pl: Remove view testing from upgrade
objects testing
References #4386
2019-10-07 22:49 Regina Obe <lr@pcorp.us>
* [r17881] doc/po/de/reference_exception.xml.po,
doc/po/es/extras.xml.po,
doc/po/es/extras_address_standardizer.xml.po,
doc/po/es/extras_historytable.xml.po,
doc/po/es/extras_tigergeocoder.xml.po,
doc/po/es/extras_topology.xml.po, doc/po/es/faq.xml.po,
doc/po/es/faq_raster.xml.po, doc/po/es/installation.xml.po,
doc/po/es/introduction.xml.po, doc/po/es/performance_tips.xml.po,
doc/po/es/postgis.xml.po, doc/po/es/reference.xml.po,
doc/po/es/reference_accessor.xml.po,
doc/po/es/reference_bbox.xml.po,
doc/po/es/reference_cluster.xml.po,
doc/po/es/reference_constructor.xml.po,
doc/po/es/reference_editor.xml.po,
doc/po/es/reference_guc.xml.po, doc/po/es/reference_input.xml.po,
doc/po/es/reference_lrs.xml.po,
doc/po/es/reference_management.xml.po,
doc/po/es/reference_measure.xml.po,
doc/po/es/reference_operator.xml.po,
doc/po/es/reference_output.xml.po,
doc/po/es/reference_processing.xml.po,
doc/po/es/reference_raster.xml.po,
doc/po/es/reference_relationship.xml.po,
doc/po/es/reference_sfcgal.xml.po,
doc/po/es/reference_srs.xml.po,
doc/po/es/reference_trajectory.xml.po,
doc/po/es/reference_transaction.xml.po,
doc/po/es/reference_transformation.xml.po,
doc/po/es/reference_troubleshooting.xml.po,
doc/po/es/reference_type.xml.po,
doc/po/es/reference_validation.xml.po,
doc/po/es/reference_version.xml.po,
doc/po/es/release_notes.xml.po, doc/po/es/reporting.xml.po,
doc/po/es/using_postgis_app.xml.po,
doc/po/es/using_postgis_dataman.xml.po,
doc/po/es/using_raster_dataman.xml.po, doc/po/fr/extras.xml.po,
doc/po/fr/extras_address_standardizer.xml.po,
doc/po/fr/extras_historytable.xml.po,
doc/po/fr/extras_tigergeocoder.xml.po,
doc/po/fr/extras_topology.xml.po, doc/po/fr/faq.xml.po,
doc/po/fr/faq_raster.xml.po, doc/po/fr/installation.xml.po,
doc/po/fr/introduction.xml.po, doc/po/fr/performance_tips.xml.po,
doc/po/fr/postgis.xml.po, doc/po/fr/reference.xml.po,
doc/po/fr/reference_accessor.xml.po,
doc/po/fr/reference_bbox.xml.po,
doc/po/fr/reference_cluster.xml.po,
doc/po/fr/reference_constructor.xml.po,
doc/po/fr/reference_editor.xml.po,
doc/po/fr/reference_guc.xml.po, doc/po/fr/reference_input.xml.po,
doc/po/fr/reference_lrs.xml.po,
doc/po/fr/reference_management.xml.po,
doc/po/fr/reference_measure.xml.po,
doc/po/fr/reference_operator.xml.po,
doc/po/fr/reference_output.xml.po,
doc/po/fr/reference_processing.xml.po,
doc/po/fr/reference_raster.xml.po,
doc/po/fr/reference_relationship.xml.po,
doc/po/fr/reference_sfcgal.xml.po,
doc/po/fr/reference_srs.xml.po,
doc/po/fr/reference_trajectory.xml.po,
doc/po/fr/reference_transaction.xml.po,
doc/po/fr/reference_transformation.xml.po,
doc/po/fr/reference_troubleshooting.xml.po,
doc/po/fr/reference_type.xml.po,
doc/po/fr/reference_validation.xml.po,
doc/po/fr/reference_version.xml.po,
doc/po/fr/release_notes.xml.po, doc/po/fr/reporting.xml.po,
doc/po/fr/using_postgis_app.xml.po,
doc/po/fr/using_postgis_dataman.xml.po,
doc/po/fr/using_raster_dataman.xml.po, doc/po/pl/extras.xml.po,
doc/po/pl/extras_address_standardizer.xml.po,
doc/po/pl/extras_historytable.xml.po,
doc/po/pl/extras_tigergeocoder.xml.po,
doc/po/pl/extras_topology.xml.po, doc/po/pl/faq.xml.po,
doc/po/pl/faq_raster.xml.po, doc/po/pl/installation.xml.po,
doc/po/pl/introduction.xml.po, doc/po/pl/performance_tips.xml.po,
doc/po/pl/postgis.xml.po, doc/po/pl/reference.xml.po,
doc/po/pl/reference_accessor.xml.po,
doc/po/pl/reference_bbox.xml.po,
doc/po/pl/reference_cluster.xml.po,
doc/po/pl/reference_constructor.xml.po,
doc/po/pl/reference_editor.xml.po,
doc/po/pl/reference_guc.xml.po, doc/po/pl/reference_input.xml.po,
doc/po/pl/reference_lrs.xml.po,
doc/po/pl/reference_management.xml.po,
doc/po/pl/reference_measure.xml.po,
doc/po/pl/reference_operator.xml.po,
doc/po/pl/reference_output.xml.po,
doc/po/pl/reference_processing.xml.po,
doc/po/pl/reference_raster.xml.po,
doc/po/pl/reference_relationship.xml.po,
doc/po/pl/reference_sfcgal.xml.po,
doc/po/pl/reference_srs.xml.po,
doc/po/pl/reference_trajectory.xml.po,
doc/po/pl/reference_transaction.xml.po,
doc/po/pl/reference_transformation.xml.po,
doc/po/pl/reference_troubleshooting.xml.po,
doc/po/pl/reference_type.xml.po,
doc/po/pl/reference_validation.xml.po,
doc/po/pl/reference_version.xml.po,
doc/po/pl/release_notes.xml.po, doc/po/pl/reporting.xml.po,
doc/po/pl/using_postgis_app.xml.po,
doc/po/pl/using_postgis_dataman.xml.po,
doc/po/pl/using_raster_dataman.xml.po: update rest of pos
2019-10-07 17:32 Paul Ramsey <pramsey@cleverelephant.ca>
* [r17879] postgis/postgis_before_upgrade.sql: Try and be a little
broader in dropping temporary old signature
References #4521
2019-10-07 11:41 Raúl Marín Rodríguez <rmrodriguez@carto.com>
 
* [r17878] configure.ac: Fix lib detection with "--with-jsondir"
PostGIS 3.0.0rc2
2019/10/13
For full changes and enhancements, refer to PostGIS 3.0.0.
This version requires PostgreSQL 9.5+-12 and GEOS >= 3.6+
Additional features enabled if you are running Proj6+ and PostgreSQL 12
Additional performance enhancements if running GEOS 3.8+
* Major highlights *
- #4534, Fix leak in lwcurvepoly_from_wkb_state (Raúl Marín)
- #4536, Fix leak in lwcollection_from_wkb_state (Raúl Marín)
- #4537, Fix leak in WKT collection parser (Raúl Marín)
- #4535, WKB: Avoid buffer overflow (Raúl Marín)
PostGIS 3.0.0rc1
2019/10/08
......
PostGIS - Geographic Information Systems Extensions to PostgreSQL
=================================================================
:Version: 3.0.0rc1
:Date: 2019-10-08
:Version: 3.0.0rc2
:Date: 2019-10-13
:Website: https://postgis.net
This distribution contains a module which implements GIS simple features, ties
......
......@@ -5,7 +5,7 @@
POSTGIS_MAJOR_VERSION=3
POSTGIS_MINOR_VERSION=0
POSTGIS_MICRO_VERSION=0rc1
POSTGIS_MICRO_VERSION=0rc2
# Liblwgeom interface versioning, reset to 0:0:0 (cur:age:rev)
# when changing POSTGIS_MINOR_VERSION
......
......@@ -689,7 +689,6 @@ HAVE_PROTOBUF
PROTOCC
PROTOBUFC_LIBS
PROTOBUFC_CFLAGS
HAVE_LIBJSON_C
HAVE_JSON
JSON_LDFLAGS
JSON_CPPFLAGS
......@@ -17326,7 +17325,6 @@ LIBS="$LIBS_SAVE"
 
CHECK_JSON=yes
HAVE_JSON=no
HAVE_JSON_C=no
 
 
# Check whether --with-json was given.
......@@ -17413,7 +17411,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_json_c_json_object_get" >&5
$as_echo "$ac_cv_lib_json_c_json_object_get" >&6; }
if test "x$ac_cv_lib_json_c_json_object_get" = xyes; then :
HAVE_JSON_C=yes; JSON_LDFLAGS="${JSON_LDFLAGS} -ljson-c"
HAVE_JSON=yes; JSON_LDFLAGS="${JSON_LDFLAGS} -ljson-c"
fi
 
 
......@@ -17580,7 +17578,7 @@ else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
 
HAVE_JSON_C=yes
HAVE_JSON=yes
JSON_CPPFLAGS="$JSONC_CFLAGS"
JSON_LDFLAGS="$JSONC_LIBS"
 
......@@ -17592,16 +17590,6 @@ fi
$as_echo "#define HAVE_LIBJSON 1" >>confdefs.h
 
fi
if test "$HAVE_JSON_C" = "yes"; then
$as_echo "#define HAVE_LIBJSON 1" >>confdefs.h
$as_echo "#define HAVE_LIBJSON_C 1" >>confdefs.h
HAVE_JSON=yes
fi
 
 
 
......
......@@ -910,7 +910,6 @@ dnl ===========================================================================
CHECK_JSON=yes
HAVE_JSON=no
HAVE_JSON_C=no
AC_ARG_WITH([json],
[AS_HELP_STRING([--without-json], [build without json-c support])],
......@@ -935,7 +934,7 @@ if test "$CHECK_JSON" != "no"; then
AC_CHECK_FILE("$JSONDIR/include/json-c/json.h",
[
JSON_CPPFLAGS="-I$JSONDIR/include/json-c"
AC_CHECK_LIB([json-c], [json_object_get], [HAVE_JSON_C=yes; JSON_LDFLAGS="${JSON_LDFLAGS} -ljson-c"])
AC_CHECK_LIB([json-c], [json_object_get], [HAVE_JSON=yes; JSON_LDFLAGS="${JSON_LDFLAGS} -ljson-c"])
],
[
AC_CHECK_FILE("$JSONDIR/include/json/json.h",
......@@ -949,7 +948,7 @@ if test "$CHECK_JSON" != "no"; then
fi
elif test ! -z "$PKG_CONFIG"; then
PKG_CHECK_MODULES([JSONC], [json-c], [
HAVE_JSON_C=yes
HAVE_JSON=yes
JSON_CPPFLAGS="$JSONC_CFLAGS"
JSON_LDFLAGS="$JSONC_LIBS"
], [])
......@@ -958,16 +957,10 @@ if test "$CHECK_JSON" != "no"; then
if test "$HAVE_JSON" = "yes"; then
AC_DEFINE([HAVE_LIBJSON], 1, [Define to 1 if libjson is present])
fi
if test "$HAVE_JSON_C" = "yes"; then
AC_DEFINE([HAVE_LIBJSON], 1, [Define to 1 if libjson is present])
AC_DEFINE([HAVE_LIBJSON_C], 1, [Define to 1 if libjson resides in a json-c subdir])
HAVE_JSON=yes
fi
AC_SUBST([JSON_CPPFLAGS])
AC_SUBST([JSON_LDFLAGS])
AC_SUBST([HAVE_JSON])
AC_SUBST([HAVE_LIBJSON_C])
fi
......
postgis (3.0.0~rc1+dfsg-1~exp2) UNRELEASED; urgency=medium
postgis (3.0.0~rc2+dfsg-1~exp1) experimental; urgency=medium
[ Christoph Berg ]
* regress/run_test.pl: Cherry-pick fix for running on installed packages.
......@@ -6,8 +6,10 @@ postgis (3.0.0~rc1+dfsg-1~exp2) UNRELEASED; urgency=medium
[ Bas Couwenberg ]
* Reinstate lsb-release build dependency for PIE on Ubuntu.
* New upstream release candidate.
* Drop run-test-extension patch, included upstream.
-- Christoph Berg <myon@debian.org> Tue, 08 Oct 2019 11:53:04 +0200
-- Bas Couwenberg <sebastic@debian.org> Sun, 13 Oct 2019 08:54:07 +0200
postgis (3.0.0~rc1+dfsg-1~exp1) experimental; urgency=medium
......
commit 03d84f8a9ac7ad9ca81cffa8d5bdf1db134d4332
Author: Sandro Santilli <strk@kbt.io>
Date: Tue Oct 8 09:43:14 2019 +0000
Force using systemwide scripts when run with --extension
.. rather than relying on version mismatch (current vs. requested)
to tell where to pick scripts from ..
*might* relate to #4515
git-svn-id: http://svn.osgeo.org/postgis/trunk@17888 b70326c6-7e19-0410-871a-916f4a2858ee
diff --git a/regress/run_test.pl b/regress/run_test.pl
index 3ce3a2d16..1693eec00 100755
--- a/regress/run_test.pl
+++ b/regress/run_test.pl
@@ -254,9 +254,9 @@ if ( ! $libver )
sub scriptdir
{
- my $version = shift;
+ my ( $version, $systemwide ) = @_;
my $scriptdir;
- if ( $version and $version ne $libver ) {
+ if ( $systemwide or ( $version and $version ne $libver ) ) {
my $pgis_majmin = $version;
$pgis_majmin =~ s/^([1-9]*\.[0-9]*).*/\1/;
$scriptdir = `pg_config --sharedir`;
@@ -756,7 +756,7 @@ sub run_simple_test
mkpath($betmpdir);
chmod 0777, $betmpdir;
- my $scriptdir = scriptdir($libver);
+ my $scriptdir = scriptdir($libver, $OPT_EXTENSIONS);
my $cmd = "psql -v \"VERBOSITY=terse\""
. " -v \"tmpfile='$tmpfile'\""
. " -v \"scriptdir=$scriptdir\""
relax-test-timing-constraints.patch
run-test-extension
......@@ -33,13 +33,13 @@ msgstr "リリースノート"
#: release_notes.xml:6
#, fuzzy, no-c-format
msgid "Release 3.0.0rc1"
msgstr "リリース2.5.0rc1"
msgstr "リリース3.0.0rc1"
#. Tag: para
#: release_notes.xml:7
#, fuzzy, no-c-format
msgid "Release date: 2019/10/08"
msgstr "リリース日: 2017/07/01"
msgstr "リリース日: 2019/10/08"
#. Tag: para
#: release_notes.xml:8 release_notes.xml:27 release_notes.xml:53
......@@ -90,13 +90,13 @@ msgstr ""
#: release_notes.xml:25
#, fuzzy, no-c-format
msgid "Release 3.0.0beta1"
msgstr "リリース 2.0.0"
msgstr "リリース 3.0.0beta1"
#. Tag: para
#: release_notes.xml:26
#, fuzzy, no-c-format
msgid "Release date: 2019/09/28"
msgstr "リリース日: 2012/06/22"
msgstr "リリース日: 2019/09/28"
#. Tag: para
#: release_notes.xml:34
......@@ -185,13 +185,13 @@ msgstr ""
#: release_notes.xml:51
#, fuzzy, no-c-format
msgid "Release 3.0.0alpha4"
msgstr "リリース 2.0.0"
msgstr "リリース 3.0.0alpha4"
#. Tag: para
#: release_notes.xml:52
#, fuzzy, no-c-format
msgid "Release date: 2019/08/11"
msgstr "リリース日: 2017/07/01"
msgstr "リリース日: 2019/08/11"
#. Tag: para
#: release_notes.xml:54
......@@ -318,13 +318,13 @@ msgstr ""
#: release_notes.xml:80
#, fuzzy, no-c-format
msgid "Release 3.0.0alpha3"
msgstr "リリース 2.0.0"
msgstr "リリース 3.0.0alpha3"
#. Tag: para
#: release_notes.xml:81
#, fuzzy, no-c-format
msgid "Release date: 2019/07/01"
msgstr "リリース日: 2017/07/01"
msgstr "リリース日: 2019/07/01"
#. Tag: para
#: release_notes.xml:83 release_notes.xml:111 release_notes.xml:130
......@@ -430,13 +430,13 @@ msgstr ""
#: release_notes.xml:108
#, fuzzy, no-c-format
msgid "Release 3.0.0alpha2"
msgstr "リリース 2.0.0"
msgstr "リリース 3.0.0alpha2"
#. Tag: para
#: release_notes.xml:109
#, fuzzy, no-c-format
msgid "Release date: 2019/06/02"
msgstr "リリース日: 2012/06/22"
msgstr "リリース日: 2019/06/02"
#. Tag: para
#: release_notes.xml:116
......@@ -468,13 +468,13 @@ msgstr ""
#: release_notes.xml:127
#, fuzzy, no-c-format
msgid "Release 3.0.0alpha1"
msgstr "リリース 2.0.0"
msgstr "リリース 3.0.0alpha1"
#. Tag: para
#: release_notes.xml:128
#, fuzzy, no-c-format
msgid "Release date: 2019/05/26"
msgstr "リリース日: 2016/09/26"
msgstr "リリース日: 2019/05/26"
#. Tag: title
#: release_notes.xml:134 release_notes.xml:148 release_notes.xml:336
......@@ -501,13 +501,13 @@ msgstr ""
#: release_notes.xml:141
#, fuzzy, no-c-format
msgid "Release 2.5.0"
msgstr "リリース 2.4.0"
msgstr "リリース 2.5.0"
#. Tag: para
#: release_notes.xml:142
#, fuzzy, no-c-format
msgid "Release date: 2018/09/23"
msgstr "リリース日: 2016/09/26"
msgstr "リリース日: 2018/09/23"
#. Tag: para
#: release_notes.xml:144
......@@ -900,13 +900,13 @@ msgstr ""
#: release_notes.xml:225
#, fuzzy, no-c-format
msgid "Release 2.4.5"
msgstr "リリース 2.4.4"
msgstr "リリース 2.4.5"
#. Tag: para
#: release_notes.xml:226
#, fuzzy, no-c-format
msgid "Release date: 2018/09/12"
msgstr "リリース日: 2018/08/19"
msgstr "リリース日: 2018/09/12"
#. Tag: para
#: release_notes.xml:227 release_notes.xml:248 release_notes.xml:280
......
......@@ -2,6 +2,24 @@
<appendix id="release_notes">
<title>Appendix</title>
<subtitle>Release Notes</subtitle>
<sect1>
<title>Release 3.0.0rc2</title>
<para>Release date: 2019/10/13</para>
<para>If compiling with PostgreSQL+JIT, LLVM >= 6 is required</para>
<para>Supported PostgreSQL versions for this release are:
PostgreSQL 9.5 - PostgreSQL 12
GEOS &gt;= 3.6. Additional features enabled if you running Proj6+ and/or PostgreSQL 12.
Performance enhancements if running GEOS 3.8+</para>
<simplesect>
<title>Major highlights</title>
<para>4534, Fix leak in lwcurvepoly_from_wkb_state (Raúl Marín)</para>
<para>4536, Fix leak in lwcollection_from_wkb_state (Raúl Marín)</para>
<para>4537, Fix leak in WKT collection parser (Raúl Marín)</para>
<para>4535, WKB: Avoid buffer overflow (Raúl Marín)</para>
</simplesect>
</sect1>
<sect1>
<title>Release 3.0.0rc1</title>
<para>Release date: 2019/10/08</para>
......
......@@ -30,7 +30,7 @@ POSTGIS_PGSQL_VERSION=96
# SQL preprocessor
SQLPP = /usr/bin/cpp -traditional-cpp -w -P
GREP=/bin/grep
EXTVERSION = 3.0.0rc1
EXTVERSION = 3.0.0rc2
MODULE_big = address_standardizer-3
MODULEPATH = $$libdir/address_standardizer-3
ifeq (no,yes)
......@@ -46,11 +46,11 @@ DATA_built = \
$(NULL)
all: sql/address_standardizer.sql sql/address_standardizer--1.0--$(EXTVERSION).sql sql/$(EXTENSION)--$(EXTVERSION).sql sql/$(EXTENSION)--ANY--$(EXTVERSION).sql \
sql/$(EXTENSION)_data_us.sql sql/address_standardizer--3.0.0rc1.sql sql/$(EXTENSION)_data_us--3.0.0rc1.sql sql/$(EXTENSION)_data_us--$(EXTVERSION)--$(EXTVERSION)next.sql \
sql/$(EXTENSION)_data_us.sql sql/address_standardizer--3.0.0rc2.sql sql/$(EXTENSION)_data_us--3.0.0rc2.sql sql/$(EXTENSION)_data_us--$(EXTVERSION)--$(EXTVERSION)next.sql \
sql/$(EXTENSION)_data_us--$(EXTVERSION)next--$(EXTVERSION).sql \
sql/test-init-extensions.sql sql/test-parseaddress.sql sql/test-standardize_address_1.sql sql/test-standardize_address_2.sql
EXTRA_CLEAN += sql/*.sql
EXTRA_CLEAN = sql/
......@@ -74,7 +74,7 @@ sql/%.sql: %.sql.in
| sed -e 's|@EXTVERSION@|$(EXTVERSION)|g' \
> $@
sql/address_standardizer--3.0.0rc1.sql: sql/address_standardizer_types.sql \
sql/address_standardizer--3.0.0rc2.sql: sql/address_standardizer_types.sql \
sql/address_standardizer_functions.sql
mkdir -p sql
cat $^ > $@
......
......@@ -50,7 +50,7 @@ all: sql/address_standardizer.sql sql/address_standardizer--1.0--$(EXTVERSION).
sql/$(EXTENSION)_data_us--$(EXTVERSION)next--$(EXTVERSION).sql \
sql/test-init-extensions.sql sql/test-parseaddress.sql sql/test-standardize_address_1.sql sql/test-standardize_address_2.sql
EXTRA_CLEAN += sql/*.sql
EXTRA_CLEAN = sql/
......
......@@ -62,8 +62,7 @@ RASTER_DROP_SCRIPTS = \
../../raster/rt_pg/rtpostgis_drop.sql \
../../raster/rt_pg/uninstall_rtpostgis.sql
SQL_BITS = $(wildcard sql/*.sql)
EXTRA_CLEAN += ${SQL_BITS} sql/*.sql
EXTRA_CLEAN = sql/
CURV_big=@POSTGIS_MAJOR_VERSION@@POSTGIS_MINOR_VERSION@
......
include ../upgradeable_versions.mk
EXTENSION = postgis_raster
EXTVERSION = 3.0.0rc1
EXTVERSION = 3.0.0rc2
MINORVERSION = 3.0
MODULEPATH = $$libdir/$(EXTENSION)-3
......@@ -54,8 +54,7 @@ EXTENSION_UPGRADE_SCRIPTS = \
EXTENSION_UNPACKAGED_UPGRADE_SCRIPTS = \
sql/rtpostgis.sql
SQL_BITS = $(wildcard sql/*.sql)
EXTRA_CLEAN += ${SQL_BITS} sql/*.sql
EXTRA_CLEAN = sql
CURV_big=30
......
......@@ -54,8 +54,7 @@ EXTENSION_UPGRADE_SCRIPTS = \
EXTENSION_UNPACKAGED_UPGRADE_SCRIPTS = \
sql/rtpostgis.sql
SQL_BITS = $(wildcard sql/*.sql)
EXTRA_CLEAN += ${SQL_BITS} sql/*.sql
EXTRA_CLEAN = sql
CURV_big=@POSTGIS_MAJOR_VERSION@@POSTGIS_MINOR_VERSION@
......
......@@ -39,8 +39,7 @@ EXTENSION_UNPACKAGED_UPGRADE_SCRIPTS = \
sql_bits/sfcgal.sql \
../../utils/create_unpackaged.pl
SQL_BITS = $(wildcard sql_bits/*.sql)
EXTRA_CLEAN += sql/*.sql ${SQL_BITS}
EXTRA_CLEAN = sql
all: sql/$(EXTENSION)--$(EXTVERSION).sql sql/$(EXTENSION)--unpackaged--$(EXTVERSION).sql sql/$(EXTENSION)--ANY--$(EXTVERSION).sql
......
......@@ -32,7 +32,7 @@ REGRESS = test-normalize_address test-upgrade
REGRESS_OPTS = --load-extension=fuzzystrmatch --load-extension=postgis --load-extension=$(EXTENSION)
SQL_BITS = $(wildcard sql_bits/*.sql)
EXTRA_CLEAN += sql/*.sql ${SQL_BITS}
EXTRA_CLEAN = sql ${SQL_BITS}
#test address standardizer if also built
ifeq (@ADDRESS_STANDARDIZER@,address_standardizer)
......
......@@ -41,7 +41,7 @@ EXTENSION_UPGRADE_SCRIPTS = \
../postgis_extension_helper_uninstall.sql
SQL_BITS = $(wildcard sql_bits/*.sql)
EXTRA_CLEAN += sql/*.sql ${SQL_BITS}
EXTRA_CLEAN = sql/ ${SQL_BITS}
all: sql/$(EXTENSION)--$(EXTVERSION).sql sql/$(EXTENSION)--unpackaged--$(EXTVERSION).sql sql/$(EXTENSION)--ANY--$(EXTVERSION).sql
......
......@@ -58,4 +58,5 @@ UPGRADEABLE_VERSIONS = \
3.0.0alpha3 \
3.0.0alpha4 \
3.0.0beta1 \
3.0.0beta2dev
3.0.0rc1 \
3.0.0rc2dev