Skip to content
Commits on Source (19)
Expand all Show whitespace changes
Inline Side-by-side
.appveyor.yml 0 → 100644
View file @ 09d11e80
version: 1.0.{build}
os: Visual Studio 2015
platform: x64
configuration: Release
matrix:
fast_finish: true
# Should speed up repository cloning
shallow_clone: true
clone_depth: 5
# init:
# - ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
#on_finish:
# - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
cache:
C:\Miniconda3-x64\pkgs -> appveyor.yml
install:
- set "CONDA_ROOT=C:\Miniconda3-x64"
- set PATH=%CONDA_ROOT%;%CONDA_ROOT%\\scripts;%CONDA_ROOT%\\Library\\bin;%PATH%;C:\\Program Files (x86)\\CMake\\bin
- conda config --set always_yes yes
- conda config --add channels conda-forge
- conda config --add channels anaconda
- conda update -q conda
- conda config --set auto_update_conda no
- conda update -q --all
- conda info
- python -c "import sys; print(sys.version)"
- python -c "import sys; print(sys.executable)"
- python -c "import sys; print(sys.prefix)"
- call "%CONDA_ROOT%\Scripts\activate.bat" base
- conda install cmake ninja
- call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64
- call scripts\\appveyor\\config.cmd
build_script:
- call "%CONDA_ROOT%\Scripts\activate.bat" base
- call scripts\\appveyor\\build.cmd
test_script:
- call "%CONDA_ROOT%\Scripts\activate.bat" base
- call scripts\\appveyor\\test.cmd
.gitignore 0 → 100644
View file @ 09d11e80
*.suo
*.obj
*.bak
*.dll
*.ilk
*.exp
*.lib
*.pdb
*.o
*.lo
Makefile
Makefile.in
*.la
.deps/
.libs/
aclocal.m4
autom4te.cache/
config.guess
config.log
config.status
config.sub
configure
libtool
ltmain.sh
test/geometry/Intersection
test/mvrtree/Exhaustive
test/mvrtree/Generator
regressiontest/mvrtree/MVRTreeLoad
test/mvrtree/MVRTreeQuery
test/rtree/Exhaustive
test/rtree/Generator
test/rtree/RTreeBulkLoad
test/rtree/RTreeLoad
test/rtree/RTreeQuery
test/tprtree/Exhaustive
test/tprtree/Generator
test/tprtree/TPRTreeLoad
test/tprtree/TPRTreeQuery
test/mvrtree/MVRTreeLoad
test/mvrtree/test1/data
test/mvrtree/test1/queries
test/mvrtree/test2/mix
test/rtree/test1/data
test/rtree/test1/queries
test/rtree/test2/mix
test/rtree/test3/data
test/rtree/test3/queries
test/rtree/test4/data
test/rtree/test4/queries
test/tprtree/test1/data
test/tprtree/test1/queries
test/tprtree/test2/mix
docs/build
CMakeFiles/
src/CMakeFiles/
bin/
CMakeCache.txt
cmake_install.cmake
src/cmake_install.cmake
install_manifest.txt
docs/doxygen/html/
docs/doxygen/xml
src/libspatialindex.pc
.travis.yml 0 → 100644
View file @ 09d11e80
language: cpp
sudo: required
dist: xenial
services: docker
compiler:
- g++
- clang
before_install:
- "./scripts/travis/before_install.sh"
after_success: |
if [[ "$TRAVIS_SECURE_ENV_VARS" == "true" &&
"$TRAVIS_BRANCH" == "master" &&
"$CC" == "clang" &&
-n "$encrypted_e7d7c698df9c_key" ]]
then
cd scripts/travis
./after_success.sh $TRAVIS_BUILD_DIR $encrypted_e7d7c698df9c_key \
$encrypted_e7d7c698df9c_iv
fi
script: "./scripts/travis/build.sh"
CMakeLists.txt
View file @ 09d11e80
......@@ -3,7 +3,7 @@
#
# (based originally on the libLAS files copyright Mateusz Loskot)
cmake_minimum_required(VERSION 2.6.0)
cmake_minimum_required(VERSION 2.8.4)
project(spatialindex)
#------------------------------------------------------------------------------
......@@ -18,6 +18,8 @@ mark_as_advanced(CMAKE_VERBOSE_MAKEFILE)
# Path to additional CMake modules
set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake/modules" ${CMAKE_MODULE_PATH})
cmake_policy(SET CMP0054 NEW) # Make string comparison behave like you'd expect
if (CMAKE_MAJOR_VERSION GREATER 2)
cmake_policy(SET CMP0042 OLD) # osx rpath
endif()
......@@ -26,14 +28,20 @@ endif()
#------------------------------------------------------------------------------
SET(SIDX_VERSION_MAJOR "1")
SET(SIDX_VERSION_MINOR "8")
SET(SIDX_VERSION_PATCH "5")
SET(SIDX_LIB_VERSION "4.1.0")
SET(SIDX_LIB_SOVERSION "4")
SET(SIDX_VERSION_MINOR "9")
SET(SIDX_VERSION_PATCH "0")
SET(SIDX_LIB_VERSION "5.0.0")
SET(SIDX_LIB_SOVERSION "5")
set(SIDX_VERSION_STRING "${SIDX_VERSION_MAJOR}.${SIDX_VERSION_MINOR}.${SIDX_VERSION_PATCH}")
#------------------------------------------------------------------------------
# libspatialindex general cmake options
#------------------------------------------------------------------------------
option(SIDX_BUILD_TESTS "Enables integrated test suites" ON)
# Name of C++ library
......@@ -42,7 +50,6 @@ set(SIDX_C_LIB_NAME spatialindex_c)
if(WIN32)
if (MSVC)
if (MSVC80 OR MSVC90 OR MSVC10 OR MSVC11 OR MSVC12 OR MSVC13)
if( CMAKE_SIZEOF_VOID_P EQUAL 8 )
set( SIDX_LIB_NAME "spatialindex-64" )
set( SIDX_C_LIB_NAME "spatialindex_c-64" )
......@@ -52,7 +59,6 @@ if(WIN32)
endif( CMAKE_SIZEOF_VOID_P EQUAL 8 )
endif()
endif()
endif()
set(CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE ON)
......@@ -65,9 +71,8 @@ check_function_exists(memset HAVE_MEMSET)
check_function_exists(memcpy HAVE_MEMCPY)
check_function_exists(bcopy HAVE_BCOPY)
INCLUDE (CheckIncludeFiles)
check_include_files(pthread.h HAVE_PTHREAD_H)
INCLUDE (CheckIncludeFiles)
if (HAVE_SRAND48)
add_definitions(-DHAVE_SRAND48=1)
......@@ -131,16 +136,13 @@ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${SIDX_BUILD_OUTPUT_DIRECTORY})
if(WIN32)
if (MSVC)
if (MSVC80 OR MSVC90 OR MSVC10 OR MSVC11 OR MSVC12 OR MSVC13)
add_definitions(-D_CRT_SECURE_NO_DEPRECATE)
add_definitions(-D_CRT_SECURE_NO_WARNINGS)
add_definitions(-D_CRT_NONSTDC_NO_WARNING)
add_definitions(-D_SCL_SECURE_NO_WARNINGS)
add_definitions(-DSPATIALINDEX_CREATE_DLL=1)
add_definitions(-DNOMINMAX)
set(SIDX_COMPILER_MSVC 1)
endif()
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4068")
if(CMAKE_CXX_FLAGS MATCHES "/W[0-4]")
string(REGEX REPLACE "/W[0-4]" "/W4"
......@@ -150,11 +152,6 @@ if(WIN32)
endif()
endif()
set(CMAKE_INCLUDE_PATH c:/osgeo4w/include;$ENV{CMAKE_INCLUDE_PATH})
set(CMAKE_LIBRARY_PATH c:/osgeo4w/lib;$ENV{CMAKE_LIBRARY_PATH})
set(SIDX_OS_WIN32 1)
else()
# not WIN32
......@@ -166,14 +163,14 @@ else()
if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${SIDX_COMMON_CXX_FLAGS}")
if (CMAKE_COMPILER_IS_GNUCXX)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++98 -ansi")
if (CMAKE_COMPILER_IS_GNUCXX AND NOT CMAKE_SYSTEM_NAME STREQUAL "CYGWIN")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
endif()
set(SIDX_COMPILER_GCC 1)
elseif("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang" OR "${CMAKE_CXX_COMPILER}" MATCHES "clang")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${SIDX_COMMON_CXX_FLAGS}")
set(CMAKE_CXX_FLAGS "-std=c++11 ${CMAKE_CXX_FLAGS} ${SIDX_COMMON_CXX_FLAGS}")
set(SIDX_COMPILER_CLANG 1)
endif()
endif(WIN32)
......@@ -188,6 +185,8 @@ else()
endif(APPLE)
enable_testing()
#------------------------------------------------------------------------------
# installation path settings
#------------------------------------------------------------------------------
......@@ -236,5 +235,56 @@ set(SIDX_DATA_DIR ${SIDX_DATA_SUBDIR})
#------------------------------------------------------------------------------
add_subdirectory(src)
if(SIDX_BUILD_TESTS)
add_subdirectory(test)
endif()
#------------------------------------------------------------------------------
# CPACK controls
#------------------------------------------------------------------------------
SET(CPACK_PACKAGE_VERSION_MAJOR ${PDAL_VERSION_MAJOR})
SET(CPACK_PACKAGE_VERSION_MINOR ${PDAL_VERSION_MINOR})
SET(CPACK_PACKAGE_VERSION_PATCH ${PDAL_VERSION_MINOR})
SET(CPACK_PACKAGE_NAME "libspatialindex")
SET(CPACK_SOURCE_GENERATOR "TBZ2;TGZ")
SET(CPACK_PACKAGE_VENDOR "libspatialindex Development Team")
SET(CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/COPYING")
set(CPACK_SOURCE_PACKAGE_FILE_NAME
"${CMAKE_PROJECT_NAME}-${SIDX_VERSION_STRING}-src")
set(CPACK_SOURCE_IGNORE_FILES
"/\\\\.gitattributes;/\\\\.vagrant;/\\\\.DS_Store;/CVS/;/\\\\.git/;\\\\.swp$;~$;\\\\.\\\\#;/\\\\#")
list(APPEND CPACK_SOURCE_IGNORE_FILES "CMakeScripts/")
list(APPEND CPACK_SOURCE_IGNORE_FILES "CMakeCache.txt")
list(APPEND CPACK_SOURCE_IGNORE_FILES ".xcodeproj")
list(APPEND CPACK_SOURCE_IGNORE_FILES "build.make")
list(APPEND CPACK_SOURCE_IGNORE_FILES "_CPack_Packages")
list(APPEND CPACK_SOURCE_IGNORE_FILES "cmake_install.cmake")
list(APPEND CPACK_SOURCE_IGNORE_FILES "Testing")
list(APPEND CPACK_SOURCE_IGNORE_FILES "PDAL.build/")
list(APPEND CPACK_SOURCE_IGNORE_FILES "/bin/")
list(APPEND CPACK_SOURCE_IGNORE_FILES "/lib/")
list(APPEND CPACK_SOURCE_IGNORE_FILES "/build/")
list(APPEND CPACK_SOURCE_IGNORE_FILES "Makefile")
list(APPEND CPACK_SOURCE_IGNORE_FILES "CMakeFiles")
list(APPEND CPACK_SOURCE_IGNORE_FILES "CTestTestfile.cmake")
list(APPEND CPACK_SOURCE_IGNORE_FILES "/test/data/local/")
list(APPEND CPACK_SOURCE_IGNORE_FILES "/test/unit/TestConfig.hpp$")
list(APPEND CPACK_SOURCE_IGNORE_FILES "/doc/doxygen/")
list(APPEND CPACK_SOURCE_IGNORE_FILES "/doc/build/")
list(APPEND CPACK_SOURCE_IGNORE_FILES "/doc/presentations/")
list(APPEND CPACK_SOURCE_IGNORE_FILES "/doc/_static/logo/dongle/")
list(APPEND CPACK_SOURCE_IGNORE_FILES "/cmake/examples/")
list(APPEND CPACK_SOURCE_IGNORE_FILES "pdal_features.hpp$")
list(APPEND CPACK_SOURCE_IGNORE_FILES "package.sh")
list(APPEND CPACK_SOURCE_IGNORE_FILES ".gz2")
list(APPEND CPACK_SOURCE_IGNORE_FILES ".bz2")
include(CPack)
add_custom_target(dist COMMAND ${CMAKE_MAKE_PROGRAM} package_source)
ChangeLog
View file @ 09d11e80
2019-02-05
* Howard Butler <howard@hobu.co> get gtest happy with autoconf (20:32:12)
* Howard Butler <howard@hobu.co> more 'dist' target for cmake and autotools (20:22:57)
* Howard Butler <howard@hobu.co> add 'dist' target to cmake (20:04:59)
2019-02-04
* Howard Butler <howard@hobu.co> don't ls (13:01:54)
* Howard Butler <howard@hobu.co> another doxygen cycle (12:39:24)
* Howard Butler <howard@hobu.co> doxygen dir stuff (11:37:44)
* Howard Butler <howard@hobu.co> make doxygen dir (11:09:01)
* Howard Butler <howard@hobu.co> copy doxygen output (10:47:34)
* Howard Butler <howard@hobu.co> doc updates and reorganization (09:05:14)
* Howard Butler <howard@hobu.co> Automated doc build and update (#134) (08:22:23)
2019-02-03
* Howard Butler <howard@hobu.co> ignore unknown pragmas on msvc (#133) (22:38:35)
* Howard Butler <howard@hobu.co> Merge and catch up of #116 (#132) (13:12:47)
* Howard Butler <howard@hobu.co> silence a bunch of cast-qual (#130) (10:21:54)
* Howard Butler <howard@hobu.co> autotools based Travis build (10:21:27)
2019-02-02
* Howard Butler <howard@hobu.co> remove unnecessary personal config (22:40:57)
* Howard Butler <howard@hobu.co> README is an autotools-required file (22:40:33)
* Howard Butler <howard@hobu.co> remove a bunch of dead stuff and add some docker/conda scripts (#129) (22:07:01)
* Howard Butler <howard@hobu.co> appveyor configuration based on conda (#128) (21:20:23)
* Howard Butler <howard@hobu.co> upstream Tools.h patch from conda libspatialindex feedstock (#127) (17:33:29)
* Howard Butler <howard@hobu.co> add Appveyor status badge (16:07:20)
* Howard Butler <howard@hobu.co> link to Travis instead of dummy link (15:34:24)
2019-01-29
* Julien Cabieces <julien.cabieces@oslandia.com> Correct findLeastEnlargement method to always return a correct value (11:37:38)
2018-11-19
* Elliot Saba <staticfloat@gmail.com> libstdc++/libc++ fixes for macOS and FreeBSD (#124) (09:12:07)
2018-09-29
* Howard Butler <howard@hobu.co> Merge pull request #122 from willp552/master (19:57:45)
* William Price <willp552@gmail.com> Use tabs as opposed to spaces for consistency. (09:35:09)
2018-08-08
* Howard Butler <howard@hobu.co> Merge pull request #121 from nyalldawson/fix_120 (16:00:03)
2018-07-31
* Nyall Dawson <nyall.dawson@gmail.com> Revert changes to c API (16:06:17)
2018-07-30
* Howard Butler <howard@hobu.co> Merge pull request #119 from nyalldawson/modernize (14:05:47)
2018-07-26
* Nyall Dawson <nyall.dawson@gmail.com> More unique_ptr use (17:01:19)
* Nyall Dawson <nyall.dawson@gmail.com> Convert some raw to unique ptr (16:51:54)
* Howard Butler <howard@hobu.co> Merge pull request #117 from nyalldawson/modernize (08:59:06)
2018-07-21
* Nyall Dawson <nyall.dawson@gmail.com> Fix a warning (04:15:38)
* Nyall Dawson <nyall.dawson@gmail.com> Fix warning (04:05:19)
* Nyall Dawson <nyall.dawson@gmail.com> Fix build (04:04:17)
* Nyall Dawson <nyall.dawson@gmail.com> Use noexcept (04:02:50)
* Nyall Dawson <nyall.dawson@gmail.com> Use = delete (04:02:07)
* Nyall Dawson <nyall.dawson@gmail.com> Use = default (04:01:19)
* Nyall Dawson <nyall.dawson@gmail.com> Use emplace_back instead of push_back (04:00:37)
* Nyall Dawson <nyall.dawson@gmail.com> Use default member init (03:59:51)
* Nyall Dawson <nyall.dawson@gmail.com> Replace raw string literal (03:54:27)
* Nyall Dawson <nyall.dawson@gmail.com> Replace deprecated headers (03:53:09)
* Nyall Dawson <nyall.dawson@gmail.com> 0 -> nullptr (03:52:08)
* Nyall Dawson <nyall.dawson@gmail.com> Add overrides (03:51:26)
* Nyall Dawson <nyall.dawson@gmail.com> Fix build (03:47:46)
2015-02-21
* Howard Butler <howard@hobu.co> remove broken pthread support #60 (11:10:05)
2015-02-12
* Norman Barker <norman@cloudant.com> Fixed potential memory leaks (10:27:08)
* Norman Barker <norman@cloudant.com> Travis status (10:34:36)
* Norman Barker <norman@cloudant.com> Merge pull request #50 from cloudant/simple_c_test (08:33:40)
* Norman Barker <norman@cloudant.com> Merge pull request #51 from cloudant/sidx_test (08:33:30)
2014-11-29
* Howard Butler <howard@hobu.co> auto-up some iterators (20:04:40)
2014-11-27
* Howard Butler <howard@hobu.co> remove Tools::SmartPointer in exchange for C++11 std::shared_ptr (14:25:27)
2018-05-29
* Howard Butler <howard@hobu.co> Merge remote-tracking branch 'origin/master' into capi-fixes (10:21:34)
* Howard Butler <howard@hobu.co> bump version numbers (10:21:28)
2018-04-26
* Howard Butler <howard@hobu.co> Merge pull request #114 from michael-herwig/master (10:58:17)
* Michael Herwig <michael.herwig@hotmail.de> added summary to changelog (05:34:40)
* Michael Herwig <michael.herwig@hotmail.de> Added silent tr1 depecreation flag vor msvc compiler >= 1900 (05:30:27)
* Michael Herwig <michael.herwig@hotmail.de> Added <cinttypes> include for proper compilation using msvc15 (05:23:48)
* Michael Herwig <michael.herwig@hotmail.de> Added cmake option for conditional test integration (05:19:21)
2017-12-05
* Howard Butler <howard@hobu.co> Merge pull request #111 from QuLogic/scanbuild (09:41:26)
* Elliott Sales de Andrade <quantum.analyst@gmail.com> Fix leaks in tests. (01:27:11)
* Elliott Sales de Andrade <quantum.analyst@gmail.com> Fix possible memory leaks with unexpected returns. (01:05:35)
* Elliott Sales de Andrade <quantum.analyst@gmail.com> Re-arrange loop to avoid double-free warning. (00:55:54)
* Elliott Sales de Andrade <quantum.analyst@gmail.com> Fix possible NULL-dereference. (00:48:28)
2017-11-29
* Howard Butler <howard@hobu.co> Merge pull request #108 from QuLogic/fix-oob (10:28:43)
2017-11-28
* Elliott Sales de Andrade <quantum.analyst@gmail.com> Fix array allocation in Index_GetLeaves. (04:03:40)
2017-10-17
* Howard Butler <howard@hobu.co> Merge pull request #106 from r-barnes/patch-2 (13:43:04)
2017-10-16
* Richard Barnes <rbarnes@umn.edu> Update introduction.txt (11:29:24)
2017-08-22
* Howard Butler <howard@hobu.co> Merge pull request #101 from tpetazzoni/configure-optim-fix (09:44:32)
2017-08-14
* Thomas Petazzoni <thomas.petazzoni@free-electrons.com> configure.ac: do not force -O2 (16:36:36)
2017-04-20
* Howard Butler <howard@hobu.co> Merge pull request #94 from libspatialindex/capi-fixes (11:35:39)
2017-03-03
* Howard Butler <howard@hobu.co> modify C API internals to match C API definition in headers (fixes #92) (10:52:35)
2016-12-19
* Howard Butler <howard@hobu.co> reset path to fix #91 when generating autoconf stuff (11:38:49)
2016-08-23
* Howard Butler <howard@hobu.co> tmpstamp function (13:42:21)
* Howard Butler <howard@hobu.co> add travis config for libspatialindex (13:38:37)
2016-08-22
* Howard Butler <howard@hobu.co> don't install gtest (16:24:15)
* Howard Butler <howard@hobu.co> whitespace cleanup (16:24:06)
* Howard Butler <howard@hobu.co> build libsidxtest for both autotools and cmake (13:19:33)
* Howard Butler <howard@hobu.co> embed gtest in the source tree for use in testing (12:05:36)
* Howard Butler <howard@hobu.co> Merge pull request #74 from sasavilic/master (10:52:58)
* Howard Butler <howard@hobu.co> Merge pull request #84 from naihil/msvs2010_stdint (10:52:23)
2016-03-17
* Anatoliy Golubev <darth.naihil@gmail.com> Use stdint.h for MSVS 2010 too (04:22:01)
2016-02-29
* Howard Butler <howard@hobu.co> Merge pull request #82 from miklos1/master (13:59:36)
* Miklos Homolya <m.homolya14@imperial.ac.uk> fix C API (09:01:24)
2016-02-02
* Howard Butler <howard@hobu.co> Merge pull request #81 from Hemofektik/master (08:52:57)
* Richard Schubert <rs@directx9.de> fixed stat use for MSVC to use _stat64 instead to support files larger than 2GB (02:38:35)
2016-01-29
* Howard Butler <howard@hobu.co> Merge pull request #80 from Hemofektik/master (06:42:30)
* Richard Schubert <rs@directx9.de> fixed CMakeLists.txt to support MSVC14 (Visual Studio 2015) (04:18:39)
2015-12-07
* Howard Butler <howard@hobu.co> Merge pull request #79 from cloudant/fix-rtree-multi-entry-deletes (11:05:16)
2015-12-04
* Paul J. Davis <paul.joseph.davis@gmail.com> Fix RTree deletions (16:19:19)
2015-11-23
* Howard Butler <howard@hobu.co> another tweak for #78 (09:41:35)
* Howard Butler <howard@hobu.co> shut up MSVC about dll linkage warnings #78 (08:51:14)
2015-11-20
* Howard Butler <howard@hobu.co> attempt to fix #78 -- MSVC stdint.h for MSVC versions > 1700 (12:57:14)
2015-07-16
* Sasa Vilic <svilic@ubimet.com> Making error passing over C interface reentrant for GCC implementation (05:17:51)
2015-04-25
* Howard Butler <howard@hobu.co> Merge pull request #68 from cloudant/fix-adjust-tree (16:34:58)
* Howard Butler <howard@hobu.co> Merge pull request #72 from zippy1981/patch-1 (16:34:37)
2015-04-23
* Justin Dearing <zippy1981@gmail.com> Update .gitignore (17:55:34)
2015-04-09
* Howard Butler <howard@hobu.co> Merge pull request #70 from TheSkorm/patch-1 (08:55:27)
* Michael Wheeler <git@michael-wheeler.org> Small typo in DiskStorageManager.cc (06:38:54)
2015-03-17
* Paul J. Davis <paul.joseph.davis@gmail.com> Fix RTree::Index::adjustTree (12:00:33)
2015-03-03
* Howard Butler <howard@hobu.co> Merge pull request #67 from sciencectn/master (09:42:23)
2015-03-02
* Chris Taylor <sciencectn@gmail.com> Made a few changes so it would compile on Cygwin. (23:30:24)
2015-02-23
* Howard Butler <howard@hobu.co> Merge pull request #56 from cloudant/fix-root-mbr-on-condense (16:25:19)
* Howard Butler <howard@hobu.co> Merge pull request #61 from cloudant/55-fix-region-touches-region (16:25:07)
* Howard Butler <howard@hobu.co> Merge pull request #62 from cloudant/57-fix-index-adjust-tree (16:25:02)
* Howard Butler <howard@hobu.co> Merge pull request #63 from cloudant/58-fix-rstar-reinsert (16:24:52)
* Norman Barker <norman@cloudant.com> Merge pull request #53 from cloudant/fix-rstar-reinsert (15:07:44)
2015-02-20
* Paul J. Davis <paul.joseph.davis@gmail.com> Fix adjustTree during R*-tree reinserts (16:04:19)
* Paul J. Davis <paul.joseph.davis@gmail.com> Fix Index::adjustTree/4 (16:01:13)
* Paul J. Davis <paul.joseph.davis@gmail.com> Fix Region::touchesRegion (15:59:23)
* Paul J. Davis <paul.joseph.davis@gmail.com> Update the root MBR during condenseTree (01:45:46)
2015-02-18
* Paul J. Davis <paul.joseph.davis@gmail.com> Fix Node::reinsertData selection criteria (12:48:18)
2015-02-11
* Norman Barker <norman@cloudant.com> Initial gtest tests (12:24:21)
* Norman Barker <norman@cloudant.com> Initial Travis build file (09:35:02)
* Norman Barker <norman@cloudant.com> Simple RTree CAPI example (08:34:10)
2015-02-05
* Howard Butler <howard@hobu.co> Merge pull request #49 from cloudant/fix-mvrtree-locks (08:09:28)
2015-02-04
* Paul J. Davis <paul.joseph.davis@gmail.com> Fix the locking calls in MVRTree.cc (19:59:55)
2015-01-14
* Howard Butler <howard@hobu.co> Merge pull request #47 from cloudant/flush-index-headers (15:56:05)
2014-12-17
* Paul J. Davis <paul.joseph.davis@gmail.com> Add a flush function to each index type (22:17:17)
2014-11-02
* Howard Butler <howard@hobu.co> Set IndexIdentifier on getIndexProperties for MVRTree and TPRTree (21:05:53)
2014-11-01
* Howard Butler <howard@hobu.co> modify fix for #40 to keep IndexIdentifier around when getting Index properties (11:49:48)
* Howard Butler <howard@hobu.co> point download to 1.8.5 release (11:22:42)
* Howard Butler <howard@hobu.co> more automake tweak (11:11:38)
* Howard Butler <howard@hobu.co> automake tweaks (11:08:19)
* Howard Butler <hobu@hobu.co> add my windows config example (10:40:38)
* Howard Butler <howard@hobu.co> update HOWTORELEASE notes (09:21:25)
* Howard Butler <howard@hobu.co> Increment versioning to 1.8.5 in preparation for release (09:19:25)
2014-10-31
* Howard Butler <howard@hobu.co> CAPI: revert #40, which could cause inconsistent object lifetime behavior (23:53:04)
* Howard Butler <howard@hobu.co> missed a variable substitution on SIDX_LIB_VERSION (21:38:14)
......
HOWTORELEASE.txt 0 → 100644
View file @ 09d11e80
Steps for Making a libspatialindex Release
==============================================================================
:Author: Howard Butler
:Contact: howard@hobu.co
This document describes the process for releasing a new version of libspatialindex.
General Notes
------------------------------------------------------------------------------
Release Process
1) Increment Version Numbers
- configure.ac
* sidx_version_major
* sidx_version_minor
* sidx_version_micro
- include/spatialindex/Version.h
* SIDX_VERSION_MAJOR
* SIDX_VERSION_MINOR
* SIDX_VERSION_REV
* SIDX_RELEASE_NAME
- CMakeLists.txt
* SET(SIDX_VERSION_MAJOR "1")
* SET(SIDX_VERSION_MINOR "7")
* SET(SIDX_VERSION_PATCH "0")
* SET(SIDX_LIB_VERSION "4.0.0")
* SET(SIDX_LIB_SOVERSION "4")
- Makefile.am
* version-info 3:2:0
- Update SO versions
* https://github.com/libspatialindex/libspatialindex/pull/44#issuecomment-57088783
2) Update README to include any relevant info about the release that
might have changed.
3) Update ChangeLog with git2cl
* git2cl . > ChangeLog
4) Verify tests are passing on Travis and AppVeyor
5) Tag the release
6) Invoke `package-release.sh`
::
cd libspatialindex
./package-release.sh
8) Update https://github.com/libspatialindex/libspatialindex/releases
INSTALL.WIN deleted 100644 → 0
View file @ f8819c24
Visual Studio 2005:
You have to open the spatialindex.sln solution from the IDE and build.
Unfortunatelly, vcbuild.exe does not work as expected, hence you cannot
build the DLL from the command line.
Visutal Studio 2008:
Either use the IDE or use vcbuild to compile from the command line:
To create 32bit DLL:
1. Open a Visual Studio command prompt (or open any shell
and run vcvars32.bat).
2a. Release build:
Run vcbuild.exe /useenv spatialindex.sln "Release|Win32"
2b. Debug build:
Run vcbuild.exe /useenv spatialindex.sln "Debug|Win32"
To create 64bit DLL:
1. Open a Visual Studio x64 command prompt (or open any shell
and run vcvarsall.bat x64).
2a. Release build:
Run vcbuild.exe /useenv spatialindex.sln "Release|x64"
2b. Debug build:
Run vcbuild.exe /useenv spatialindex.sln "Debug|x64"
Enjoy!
Makefile.am
View file @ 09d11e80
......@@ -7,6 +7,7 @@ lib_LTLIBRARIES = libspatialindex.la libspatialindex_c.la
libspatialindex_la_SOURCES =
libspatialindex_la_LIBADD = \
src/spatialindex/liblibrary.la \
src/capi/libsidxc.la \
src/storagemanager/libstoragemanager.la \
src/rtree/librtree.la \
src/mvrtree/libmvrtree.la \
......@@ -18,13 +19,15 @@ libspatialindex_c_la_LIBADD = \
libspatialindex.la \
src/capi/libsidxc.la
libspatialindex_la_LDFLAGS = -version-info 4:1:0 -no-undefined -lstdc++
libspatialindex_c_la_LDFLAGS = -version-info 4:1:0 -no-undefined -lstdc++
# Dummy file to force C++ linking, see this page for more details:
# https://www.gnu.org/software/automake/manual/html_node/Libtool-Convenience-Libraries.html
nodist_EXTRA_libspatialindex_la_SOURCES = dummy.cxx
nodist_EXTRA_libspatialindex_c_la_SOURCES = dummy.cxx
EXTRA_DIST = INSTALL.WIN \
spatialindex.sln \
spatialindex-vc/spatialindex.vcproj \
CMakeLists.txt \
libspatialindex_la_LDFLAGS = -version-info 5:0:0 -no-undefined
libspatialindex_c_la_LDFLAGS = -version-info 5:0:0 -no-undefined
EXTRA_DIST = CMakeLists.txt \
src/CMakeLists.txt \
test/CMakeLists.txt \
test/mvrtree/test1/run \
......
Makefile.in deleted 100644 → 0
View file @ f8819c24
This diff is collapsed.
README
View file @ 09d11e80
*****************************************************************************
libspatialindex
*****************************************************************************
:Author: Marios Hadjieleftheriou
:Contact: mhadji@gmail.com
:Revision: 1.8.4
:Date: 09/24/2014
See http://libspatialindex.org for full documentation.
README.rst 0 → 100644
View file @ 09d11e80
.. image:: https://travis-ci.org/libspatialindex/libspatialindex.svg?branch=master
.. image:: https://ci.appveyor.com/api/projects/status/fpdtkp2this1gkg6?svg=true
*****************************************************************************
libspatialindex
*****************************************************************************
:Author: Marios Hadjieleftheriou
:Contact: mhadji@gmail.com
:Revision: 1.9.0
:Date: 03/02/2017
See http://libspatialindex.org for full documentation.
aclocal.m4 deleted 100644 → 0
View file @ f8819c24
This diff is collapsed.
autogen.sh 0 → 100755
View file @ 09d11e80
#!/bin/sh
# $Id: autogen.sh 61 2007-12-11 20:13:48Z hobu $
#
# Autotools boostrapping script
#
giveup()
{
echo
echo " Something went wrong, giving up!"
echo
exit 1
}
OSTYPE=`uname -s`
for libtoolize in glibtoolize libtoolize; do
if which $libtoolize 1>/dev/null 2>/dev/null; then
LIBTOOLIZE=`which $libtoolize 2>/dev/null`
break;
fi
done
if test "$LIBTOOLIZE" = ""; then
echo
echo " glibtoolize or libtoolize not found. Giving up!"
echo
exit 1
fi
doit()
{
#AMFLAGS="--add-missing --copy --force-missing"
AMFLAGS="--add-missing --copy"
if test "$OSTYPE" = "IRIX" -o "$OSTYPE" = "IRIX64"; then
AMFLAGS=$AMFLAGS" --include-deps";
fi
cd $1
echo "Running aclocal"
aclocal || giveup
#echo "Running autoheader"
#autoheader || giveup
echo "Running libtoolize"
$LIBTOOLIZE --force --copy || giveup
echo "Running automake"
automake $AMFLAGS # || giveup
echo "Running autoconf"
autoconf || giveup
echo "======================================"
echo "Now you are ready to run './configure'"
echo "======================================"
cd -
}
doit "test/gtest/gtest-1.7.0"
doit "."
config.guess deleted 100755 → 0
View file @ f8819c24
This diff is collapsed.
config.sub deleted 100755 → 0
View file @ f8819c24
This diff is collapsed.
configure deleted 100755 → 0
View file @ f8819c24
This diff is collapsed.
configure.ac
View file @ 09d11e80
......@@ -4,8 +4,8 @@
AC_PREREQ(2.59)
m4_define([sidx_version_major], [1])
m4_define([sidx_version_minor], [8])
m4_define([sidx_version_micro], [5])
m4_define([sidx_version_minor], [9])
m4_define([sidx_version_micro], [0])
m4_define([sidx_version],
[sidx_version_major.sidx_version_minor.sidx_version_micro])
......@@ -16,7 +16,7 @@ AC_CONFIG_MACRO_DIR([m4])
debug_default="no"
CFLAGS="-Wall -Wno-long-long -pedantic $CFLAGS"
CXXFLAGS="-Wall -Wno-long-long -pedantic -std=c++98 $CXXFLAGS"
CXXFLAGS="-Wall -Wno-long-long -pedantic -std=c++11 $CXXFLAGS"
# Checks for programs.
AC_PROG_CXX
......@@ -32,12 +32,6 @@ AC_CHECK_HEADERS(fcntl.h,, [AC_MSG_ERROR([cannot find fcntl.h, bailing out])])
AC_CHECK_HEADERS(unistd.h,, [AC_MSG_ERROR([cannot find unistd.h, bailing out])])
AC_CHECK_HEADERS(sys/types.h,, [AC_MSG_ERROR([cannot find sys/types.h, bailing out])])
AC_CHECK_HEADERS(sys/stat.h,, [AC_MSG_ERROR([cannot find sys/stat.h, bailing out])])
AC_CHECK_HEADERS(pthread.h, [
#ifndef ANDROID
LIBS="$LIBS -lpthread"
#endif])
AC_CHECK_HEADERS(sys/resource.h,, [AC_MSG_ERROR([cannot find sys/resource.h, bailing out])])
AC_CHECK_HEADERS(sys/time.h,, [AC_MSG_ERROR([cannot find sys/time.h, bailing out])])
AC_CHECK_HEADERS(stdint.h,, [AC_MSG_ERROR([cannot find stdint.h, bailing out])])
......@@ -53,7 +47,7 @@ if test "x$enable_debug" = "xyes"; then
CXXFLAGS="$CXXFLAGS -g -DDEBUG"
AC_MSG_RESULT(checking wether debug information is enabled... yes)
else
CXXFLAGS="$CXXFLAGS -O2 -DNDEBUG"
CXXFLAGS="$CXXFLAGS -DNDEBUG"
AC_MSG_RESULT(checking wether debug information is enabled... no)
fi
......@@ -62,6 +56,7 @@ AC_CHECK_FUNCS([gettimeofday memset memcpy bcopy srand48])
AM_CONDITIONAL([RAND_IS_CONFIG], [test "x$HAVE_SRAND48" = xtrue])
AC_CONFIG_FILES([ Makefile
include/Makefile
src/Makefile
......@@ -77,7 +72,9 @@ AC_CONFIG_FILES([ Makefile
test/geometry/Makefile
test/rtree/Makefile
test/mvrtree/Makefile
test/tprtree/Makefile])
test/tprtree/Makefile
test/gtest/Makefile])
AC_OUTPUT
AC_CONFIG_SUBDIRS([test/gtest/gtest-1.7.0/])
AC_OUTPUT
debian/changelog
View file @ 09d11e80
spatialindex (1.8.5-8) UNRELEASED; urgency=medium
spatialindex (1.9.0-1) unstable; urgency=medium
* New upstream release.
* Drop Breaks/Replaces on non-v5 packages, no longer required.
* Update symbols for other architectures.
* Strip pre-releases from symbols version.
* Move from experimental to unstable.
-- Bas Couwenberg <sebastic@debian.org> Fri, 08 Feb 2019 17:28:57 +0100
spatialindex (1.9.0~rc1-1~exp1) experimental; urgency=medium
* New upstream release candidate.
* Bump Standards-Version to 4.3.0, no changes.
* Add Build-Depends-Package field to symbols files.
* Update watch file to use GitHub releases.
* Update copyright file, changes:
- Add Norman Barker to copyright holders
- Add license & copyright for gtest sources
- Update Upstream-Contact & Source URL
* Update Homepage URL to use libspatialindex.org.
* Rename library packages for SONAME bump.
* Drop patches, applied upstream.
* Add lintian overrides for hardening-no-fortify-functions.
* Update symbols for amd64.
-- Bas Couwenberg <sebastic@debian.org> Sat, 04 Aug 2018 14:47:58 +0200
-- Bas Couwenberg <sebastic@debian.org> Wed, 06 Feb 2019 07:13:41 +0100
spatialindex (1.8.5-7) unstable; urgency=medium
......
debian/control
View file @ 09d11e80
......@@ -11,17 +11,15 @@ Build-Depends: debhelper (>= 9.20160114),
Standards-Version: 4.3.0
Vcs-Browser: https://salsa.debian.org/debian-gis-team/libspatialindex
Vcs-Git: https://salsa.debian.org/debian-gis-team/libspatialindex.git
Homepage: http://libspatialindex.github.io/
Homepage: https://libspatialindex.org/
Package: libspatialindex4v5
Package: libspatialindex5
Architecture: any
Multi-Arch: same
Section: libs
Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends},
${misc:Depends}
Breaks: libspatialindex4 (<< 1.8.5-2)
Replaces: libspatialindex4 (<< 1.8.5-2)
Description: General framework for developing spatial indices
Spatialindex is a C++ library that provides a framework for
developing spatial indices. Currently it defines generic interfaces,
......@@ -30,15 +28,13 @@ Description: General framework for developing spatial indices
.
This package contains the SpatialIndex shared library.
Package: libspatialindex-c4v5
Package: libspatialindex-c5
Architecture: any
Multi-Arch: same
Section: libs
Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends},
${misc:Depends}
Breaks: libspatialindex-c4 (<< 1.8.5-2)
Replaces: libspatialindex-c4 (<< 1.8.5-2)
Description: General framework for developing spatial indices - C library
Spatialindex is a C++ library that provides a framework for
developing spatial indices. Currently it defines generic interfaces,
......@@ -51,8 +47,8 @@ Package: libspatialindex-dev
Architecture: any
Multi-Arch: same
Section: libdevel
Depends: libspatialindex4v5 (= ${binary:Version}),
libspatialindex-c4v5 (= ${binary:Version}),
Depends: libspatialindex5 (= ${binary:Version}),
libspatialindex-c5 (= ${binary:Version}),
${misc:Depends}
Recommends: pkg-config
Description: General framework for developing spatial indices - development files
......
debian/copyright
View file @ 09d11e80
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: libspatialindex
Upstream-Contact: Marios Hadjieleftheriou <mhadji@gmail.com>
Source: https://download.osgeo.org/libspatialindex/
Upstream-Contact: libspatialindex <libspatialindex@groups.io>
Source: https://github.com/libspatialindex/libspatialindex
Files: *
Copyright: 2002-2004, Marios Hadjieleftheriou
2010, Leonard Norrgård
2010, Matthias (nitro)
2009, 2011, 2014, Howard Butler
2015, Norman Barker
License: MIT
Files: ltmain.sh
Copyright: 1996-2001, 2003-2011, Free Software Foundation, Inc.
License: GPL-2+ with Libtool exception
Files: m4/libtool.m4
m4/lt~obsolete.m4
m4/ltoptions.m4
m4/ltsugar.m4
m4/ltversion.m4
Copyright: 1996-2001, 2003-2011, Free Software Foundation, Inc.
License: fsf-unlimited
Files: Makefile.in
include/Makefile.in
src/Makefile.in
src/capi/Makefile.in
src/mvrtree/Makefile.in
src/rtree/Makefile.in
src/spatialindex/Makefile.in
src/storagemanager/Makefile.in
src/tools/Makefile.in
src/tprtree/Makefile.in
test/Makefile.in
test/geometry/Makefile.in
test/mvrtree/Makefile.in
test/rtree/Makefile.in
test/tprtree/Makefile.in
Copyright: 1994-2013, Free Software Foundation, Inc.
License: fsf-unlimited-disclaimer
Files: src/tools/rand48.cc
Copyright: 1993, Martin Birgmeier
License: rand48
Files: test/gtest/*
Copyright: 2003, 2005-2010, 2013, Google Inc.
License: BSD-3-Clause
License: MIT
Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"),
......@@ -75,44 +50,29 @@ License: rand48
of any kind. I shall in no event be liable for anything that happens
to anyone/anything when using this software.
License: fsf-unlimited
This file is free software; the Free Software Foundation gives
unlimited permission to copy and/or distribute it, with or without
modifications, as long as this notice is preserved.
License: fsf-unlimited-disclaimer
This Makefile.in is free software; the Free Software Foundation
gives unlimited permission to copy and/or distribute it,
with or without modifications, as long as this notice is preserved.
.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY, to the extent permitted by law; without
even the implied warranty of MERCHANTABILITY or FITNESS FOR A
PARTICULAR PURPOSE.
License: GPL-2+ with Libtool exception
GNU Libtool is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
License: BSD-3-Clause
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
.
As a special exception to the GNU General Public License,
if you distribute this file as part of a program or library that
is built using GNU Libtool, you may include this file under the
same distribution terms that you use for the rest of that program.
1) Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimer.
.
GNU Libtool is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
2) Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.
.
You should have received a copy of the GNU General Public License
along with GNU Libtool; see the file COPYING. If not, a copy
can be downloaded from http://www.gnu.org/licenses/gpl.html,
or obtained by writing to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
3) Neither the name of the ORGANIZATION nor the names of its contributors may
be used to endorse or promote products derived from this software without
specific prior written permission.
.
On Debian systems, the full text of the GNU General Public
License version 2 can be found in the file
`/usr/share/common-licenses/GPL-2'.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.