Commit aba54299 authored by Bas Couwenberg's avatar Bas Couwenberg

Merge tag 'upstream/1.9.0_rc1' into experimental

Upstream version 1.9.0~rc1
parents 9b4ad7a7 05c1c8a8
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
*.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
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"
......@@ -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,15 +50,13 @@ 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" )
else( CMAKE_SIZEOF_VOID_P EQUAL 8 )
set( SIDX_LIB_NAME "spatialindex-32" )
set( SIDX_C_LIB_NAME "spatialindex_c-32" )
endif( CMAKE_SIZEOF_VOID_P EQUAL 8 )
endif()
if( CMAKE_SIZEOF_VOID_P EQUAL 8 )
set( SIDX_LIB_NAME "spatialindex-64" )
set( SIDX_C_LIB_NAME "spatialindex_c-64" )
else( CMAKE_SIZEOF_VOID_P EQUAL 8 )
set( SIDX_LIB_NAME "spatialindex-32" )
set( SIDX_C_LIB_NAME "spatialindex_c-32" )
endif( CMAKE_SIZEOF_VOID_P EQUAL 8 )
endif()
endif()
......@@ -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()
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(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)
add_subdirectory(test)
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)
This diff is collapsed.
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
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!
......@@ -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 \
......
This diff is collapsed.
*****************************************************************************
libspatialindex
*****************************************************************************
:Author: Marios Hadjieleftheriou
:Contact: mhadji@gmail.com
:Revision: 1.8.4
:Date: 09/24/2014
See http://libspatialindex.org for full documentation.
.. 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.
This diff is collapsed.
#!/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 "."
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -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/])