Bas Couwenberg pushed to branch upstream at Debian GIS Project / geos
Commits: 93152145 by Bas Couwenberg at 2019-10-11T04:49:20Z New upstream version 3.8.0 - - - - - 9 changed files: - ChangeLog - NEWS - README.md - Version.txt - capi/geos_c.h - doc/Doxyfile - swig/geos.i - tests/xmltester/CMakeLists.txt - tests/xmltester/XMLTester.cpp Changes: ===================================== ChangeLog ===================================== @@ -1,3 +1,24 @@ +2019-10-10 Paul Ramsey <[email protected]> + + * NEWS, Version.txt: Release version numbers and NEWS + +2019-10-09 Paul Ramsey <[email protected]> + + * README.md: MD edit + +2019-10-08 Daniel Baston <[email protected]> + + * tests/xmltester/CMakeLists.txt, tests/xmltester/XMLTester.cpp: + Provide more XML test output on failure + +2019-10-08 Paul Ramsey <[email protected]> + + * Version.txt: Bump versions after release + +2019-10-08 Paul Ramsey <[email protected]> + + * tests/xmltester/Makefile.am: Add new XML tests to autoconf build + 2019-10-08 Daniel Baston <[email protected]> * src/operation/union/OverlapUnion.cpp, ===================================== NEWS ===================================== @@ -1,5 +1,5 @@ Changes in 3.8.0 -2019-MM-DD +2019-10-10 - New things: - CAPI: GEOSBuildArea (#952, Even Rouault) ===================================== README.md ===================================== @@ -14,8 +14,8 @@ More information is available the [project homepage](https://trac.osgeo.org/geos | branch / CI | Debbie | Winnie | Dronie | Travis CI | GitLab CI | AppVeyor | Bessie | Bessie32 | |:--- |:--- |:--- |:--- |:--- |:--- |:--- |:--- |:--- | -| master | [](https://debbie.postgis.net/view/GEOS/job/GEOS_Master/) | [](https://winnie.postgis.net:444/view/GEOS/job/GEOS_Master/) | [](https://dronie.osgeo.org/geos/geos?branch=master) | [](https://travis-ci.com/libgeos/geos?branch=master) | [](https://gitlab.com/geos/libgeos/commits/master) | [](https://ci.appveyor.com/project/dbaston/geos/branch/master) | [](https://debbie.postgis.net/view/GEOS/job/GEOS_Worker_Run/label=bessie) | [](https://debbie.postgis.net/view/GEOS/job/GEOS_Worker_Run/label=bessie32) || -| 3.7 | [](https://debbie.postgis.net/view/GEOS/job/GEOS_Branch_3.7/) | [](https://winnie.postgis.net:444/view/GEOS/job/GEOS_Branch_3.7/) | [](https://dronie.osgeo.org/geos/geos?branch=3.7) | [](https://travis-ci.com/libgeos/geos?branch=3.7) | [](https://gitlab.com/geos/libgeos/commits/3.7) | [](https://ci.appveyor.com/project/dbaston/geos/branch/3.7) || +| master | [](https://debbie.postgis.net/view/GEOS/job/GEOS_Master/) | [](https://winnie.postgis.net:444/view/GEOS/job/GEOS_Master/) | [](https://dronie.osgeo.org/geos/geos?branch=master) | [](https://travis-ci.com/libgeos/geos?branch=master) | [](https://gitlab.com/geos/libgeos/commits/master) | [](https://ci.appveyor.com/project/dbaston/geos/branch/master) | [](https://debbie.postgis.net/view/GEOS/job/GEOS_Worker_Run/label=bessie) | [](https://debbie.postgis.net/view/GEOS/job/GEOS_Worker_Run/label=bessie32) | +| 3.7 | [](https://debbie.postgis.net/view/GEOS/job/GEOS_Branch_3.7/) | [](https://winnie.postgis.net:444/view/GEOS/job/GEOS_Branch_3.7/) | [](https://dronie.osgeo.org/geos/geos?branch=3.7) | [](https://travis-ci.com/libgeos/geos?branch=3.7) | [](https://gitlab.com/geos/libgeos/commits/3.7) | [](https://ci.appveyor.com/project/dbaston/geos/branch/3.7) | | 3.6 | [](https://debbie.postgis.net/view/GEOS/job/GEOS_Branch_3.6/) | [](https://winnie.postgis.net:444/view/GEOS/job/GEOS_Branch_3.6/) | [](https://dronie.osgeo.org/geos/geos?branch=svn-3.6) | [](https://travis-ci.com/libgeos/geos?branch=svn-3.6) | [](https://gitlab.com/geos/libgeos/commits/svn-3.6) | [](https://ci.appveyor.com/project/dbaston/geos/branch/svn-3.6) | ## Build/install ===================================== Version.txt ===================================== @@ -5,7 +5,7 @@ GEOS_VERSION_MINOR=8 GEOS_VERSION_PATCH=0 # OPTIONS: "", "dev", "rc1" etc. -GEOS_PATCH_WORD=rc3 +GEOS_PATCH_WORD= # GEOS CAPI Versions # ===================================== capi/geos_c.h ===================================== @@ -58,10 +58,10 @@ extern "C" { #define GEOS_VERSION_MINOR 8 #endif #ifndef GEOS_VERSION_PATCH -#define GEOS_VERSION_PATCH 0rc3 +#define GEOS_VERSION_PATCH 0 #endif #ifndef GEOS_VERSION -#define GEOS_VERSION "3.8.0rc3" +#define GEOS_VERSION "3.8.0" #endif #ifndef GEOS_JTS_PORT #define GEOS_JTS_PORT "1.13.0" @@ -70,7 +70,7 @@ extern "C" { #define GEOS_CAPI_VERSION_MAJOR 1 #define GEOS_CAPI_VERSION_MINOR 13 #define GEOS_CAPI_VERSION_PATCH 1 -#define GEOS_CAPI_VERSION "3.8.0rc3-CAPI-1.13.1" +#define GEOS_CAPI_VERSION "3.8.0-CAPI-1.13.1" #define GEOS_CAPI_FIRST_INTERFACE GEOS_CAPI_VERSION_MAJOR #define GEOS_CAPI_LAST_INTERFACE (GEOS_CAPI_VERSION_MAJOR+GEOS_CAPI_VERSION_MINOR) ===================================== doc/Doxyfile ===================================== @@ -38,7 +38,7 @@ PROJECT_NAME = GEOS # could be handy for archiving the generated documentation or if some version # control system is used. -PROJECT_NUMBER = 3.8.0rc3 +PROJECT_NUMBER = 3.8.0 # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer a ===================================== swig/geos.i ===================================== @@ -29,8 +29,8 @@ the whole c api. */ #define GEOS_VERSION_MAJOR 3 #define GEOS_VERSION_MINOR 8 -#define GEOS_VERSION_PATCH 0rc3 -#define GEOS_VERSION "3.8.0rc3" +#define GEOS_VERSION_PATCH 0 +#define GEOS_VERSION "3.8.0" #define GEOS_JTS_PORT "1.13.0" #define GEOS_CAPI_VERSION_MAJOR 1 @@ -38,7 +38,7 @@ #define GEOS_CAPI_VERSION_PATCH 1 #define GEOS_CAPI_FIRST_INTERFACE GEOS_CAPI_VERSION_MAJOR #define GEOS_CAPI_LAST_INTERFACE (GEOS_CAPI_VERSION_MAJOR+GEOS_CAPI_VERSION_MINOR) -#define GEOS_CAPI_VERSION "3.8.0rc3-CAPI-1.13.1" +#define GEOS_CAPI_VERSION "3.8.0-CAPI-1.13.1" /* Supported geometry types */ enum GEOSGeomTypes { ===================================== tests/xmltester/CMakeLists.txt ===================================== @@ -28,7 +28,7 @@ foreach(_testdir general issue misc robust validate) file(GLOB_RECURSE _testfiles ${CMAKE_CURRENT_LIST_DIR}/tests/${_testdir}/*.xml CONFIGURE_DEPEND) foreach(_testfile ${_testfiles}) get_filename_component(_testname ${_testfile} NAME_WE) - add_test(NAME ${_testdir}-${_testname} COMMAND test_xmltester --test-valid-output ${_testfile}) + add_test(NAME ${_testdir}-${_testname} COMMAND test_xmltester -v --test-valid-output ${_testfile}) endforeach() endforeach() unset(_testdir) ===================================== tests/xmltester/XMLTester.cpp ===================================== @@ -367,8 +367,9 @@ XMLTester::printTest(bool success, const std::string& expected_result, const std std::cout << ": " << (success ? "ok." : "failed."); std::cout << " (" << std::setprecision(15) << java_math_round(prof.getTot() / 1000) << " ms)" << std::endl; - // print geometry etc for -v -v and above - if (verbose > 1) { + // print geometry on failure for -v + // print geometry no matter what for -v -v and above + if (verbose > 1 || (verbose == 1 && !success)) { std::cout << "\tDescription: " << curr_case_desc << std::endl; if(gA) { View it on GitLab: https://salsa.debian.org/debian-gis-team/geos/commit/93152145e1ad29684b7e0fbb871899856e3cc2b3 -- View it on GitLab: https://salsa.debian.org/debian-gis-team/geos/commit/93152145e1ad29684b7e0fbb871899856e3cc2b3 You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ Pkg-grass-devel mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-grass-devel
