Merge branch 'master' of https://github.com/PDAL/PDAL

PDAL · Sep 26, 2018 · 6ca8358 · 6ca8358
2 parents 87dcc72 + c29473f
commit 6ca8358
Show file tree

Hide file tree

Showing 1,039 changed files with 50,800 additions and 88,228 deletions.
diff --git a/.gitignore b/.gitignore
@@ -40,6 +40,7 @@ Debug/
 Release/
 RelWithDebInfo/
 ipch/
+CMakeSettings.json
 *.sln
 *.vcxproj
 *.vcxproj.filters
@@ -64,6 +65,11 @@ ipch/
 .idea
 *.iml
 
+#
+# Vim backup
+#
+*.*~
+
 #
 # doxygen cruft
 #

diff --git a/.travis.yml b/.travis.yml
@@ -6,10 +6,10 @@ sudo: required
 services: docker
 
 before_install:
-  - docker pull alpine:3.7
+  - docker pull pdal/dependencies:alpine
 
 script:
-  - docker run -v $TRAVIS_BUILD_DIR:/pdal -t alpine:3.7 /bin/sh -c "/pdal/scripts/ci/script.sh"
+  - docker run -v $TRAVIS_BUILD_DIR:/pdal -t pdal/dependencies:alpine /bin/sh -c "/pdal/scripts/ci/script.sh"
 
 after_success:
   - echo "secure travis:" "$TRAVIS_SECURE_ENV_VARS"

diff --git a/CITATION b/CITATION
@@ -0,0 +1,13 @@
+To cite PDAL in publications use:
+
+  PDAL contributors (2018). PDAL: The Point Data Abstraction Library
+  URL https://pdal.io/.
+
+A BibTeX entry for LaTeX users is
+
+  @Manual{,
+    title = {{PDAL}: The Point Data Abstraction Library},
+    author = {{PDAL contributors}},
+    year = {2018},
+    url = {https://pdal.io/},
+  }
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -3,7 +3,7 @@
 #
 # (based originally on the libLAS files copyright Mateusz Loskot)
 
-cmake_minimum_required(VERSION 2.8.12)
+cmake_minimum_required(VERSION 3.5)
 
 project(PDAL CXX C)
 string(TOLOWER ${PROJECT_NAME} PROJECT_NAME_LOWER)
@@ -28,14 +28,14 @@ mark_as_advanced(CMAKE_VERBOSE_MAKEFILE)
 
 # the next line is the ONLY place in the entire pdal system where
 # the version info is hard-coded
-set(PDAL_VERSION_STRING "1.7.0" CACHE STRING "PDAL version" FORCE)
+set(PDAL_VERSION_STRING "1.7.1" CACHE STRING "PDAL version" FORCE)
 
 DISSECT_VERSION()
 GET_OS_INFO()
 SET_INSTALL_DIRS()
 
 set(PDAL_API_VERSION "6")
-set(PDAL_BUILD_VERSION "7.0.0")
+set(PDAL_BUILD_VERSION "7.0.2")
 
 # Name of C++ library
 
@@ -216,6 +216,7 @@ if (NOT PDAL_HAVE_LIBXML2)
     file(GLOB XML_SRCS
         io/Ilvis2MetadataReader.cpp
         io/Ilvis2Metadata.cpp
+        io/Ilvis2Reader.cpp
         ${PDAL_SRC_DIR}/DbWriter.cpp
         ${PDAL_SRC_DIR}/DbReader.cpp
         ${PDAL_SRC_DIR}/XMLSchema.cpp)
@@ -257,13 +258,13 @@ target_include_directories(${PDAL_BASE_LIB_NAME}
         ${PDAL_VENDOR_DIR}/pdalboost
         ${PDAL_JSONCPP_INCLUDE_DIR}
         ${LIBXML2_INCLUDE_DIR}
-        ${ZSTD_INCLUDE_DIR}
+        ${ZSTD_INCLUDE_DIRS}
     INTERFACE
         ${GDAL_INCLUDE_DIR}
         ${LASZIP_INCLUDE_DIR}
 )
 target_link_libraries(${PDAL_BASE_LIB_NAME}
-    PUBLIC
+    PRIVATE
         ${CMAKE_THREAD_LIBS_INIT}
         ${GDAL_LIBRARY}
         ${GEOS_LIBRARY}
@@ -272,15 +273,13 @@ target_link_libraries(${PDAL_BASE_LIB_NAME}
         ${LIBXML2_LIBRARIES}
         ${ZLIB_LIBRARIES}
         ${LIBLZMA_LIBRARIES}
-        ${ZSTD_STATIC_LIB}
+        ${ZSTD_LIBRARIES}
         ${CURL_LIBRARIES}
         ${WINSOCK_LIBRARY}
-    PRIVATE
         ${PDAL_REEXPORT}
         ${PDAL_UTIL_LIB_NAME}
         ${PDAL_ARBITER_LIB_NAME}
         ${PDAL_KAZHDAN_LIB_NAME}
-    ${JSON_CPP_LINK_TYPE}
         ${PDAL_JSONCPP_LIB_NAME}
     INTERFACE
         ${PDAL_LIBDIR}
@@ -313,12 +312,35 @@ endif()
 #
 # Installation
 #
+
+#
+# Only install compression headers if we're building with the particular
+# compression type.
+#
+if (NOT PDAL_HAVE_ZSTD)
+    set(ZSTD_EXCLUDES PATTERN pdal/compression/Zstd* EXCLUDE)
+endif()
+if (NOT PDAL_HAVE_ZLIB)
+    set(ZLIB_EXCLUDES PATTERN pdal/compression/Deflate* EXCLUDE)
+endif()
+if (NOT PDAL_HAVE_LZMA)
+    set(LZMA_EXCLUDES PATTERN pdal/compression/Lzma* EXCLUDE)
+endif()
+if (NOT PDAL_HAVE_LAZPERF)
+    set(LAZPERF_EXCLUDES PATTERN pdal/compression/LazPerf* EXCLUDE)
+endif()
+
 install(DIRECTORY ${PDAL_INCLUDE_DIR}/pdal
     DESTINATION include
     FILES_MATCHING PATTERN "*.hpp"
     PATTERN "gitsha.h"
     PATTERN "pdal/private" EXCLUDE
+    ${ZSTD_EXCLUDES}
+    ${ZLIB_EXCLUDES}
+    ${LZMA_EXCLUDES}
+    ${LAZPERF_EXCLUDES}
 )
+
 install(DIRECTORY ${PDAL_KERNELS_DIR}
     DESTINATION include/pdal
     FILES_MATCHING PATTERN "*.hpp"

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -17,7 +17,7 @@ We use Github's [pull requests](https://help.github.com/articles/using-pull-requ
 * Check for unnecessary whitespace with `git diff --check` before committing.
 * Make sure your commit messages are in the [proper format](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html).
 * Make sure you have added the necessary tests for your changes.
-* [Run _all_ the tests](http://www.pdal.io/development/testing.html) to assure nothing else was accidentally broken.
+* [Run _all_ the tests](http://pdal.io/development/testing.html) to assure nothing else was accidentally broken.
 
 ## Submitting Changes
 
@@ -35,7 +35,7 @@ Fixes #123.
 
 ## Additional Resources
 
-* [PDAL's coding conventions](http://www.pdal.io/development/conventions.html)
+* [PDAL's coding conventions](http://pdal.io/development/conventions.html)
 * [General GitHub documentation](http://help.github.com/)
 * [GitHub pull request documentation](http://help.github.com/send-pull-requests/)
 * #pdal IRC channel on freenode.org

diff --git a/HOWTORELEASE.txt b/HOWTORELEASE.txt
@@ -30,6 +30,8 @@ Release Process
 
   - doc/download.rst point to new release
 
+  - appveyor.yml
+
   - Make and push new release branch
 
     ::
@@ -45,12 +47,28 @@ Release Process
   - Make DockerHub build entry for new release branch.
 
 
-2) Update README to include any relevant info about the release that
-   might have changed.
+2) Write and update release notes. Use the PDAL "releases" section to create one.
+   Write the document in Markdown for convenience on GitHub.
+
+   - Manually store a copy of it in ./doc/development/release-notes/1.7.0.md
+     for future reference.
+
+   - Convert it to reStructuredText using pandoc and add the output to the
+     RELEASENOTES.txt document
+
+     ::
+
+        pandoc --from markdown --to rst --output=1.7.rst doc/development/release-notes/1.7.0.md
 
 3) Update ChangeLog with git2cl
 
   * git2cl . > ChangeLog
+  * Delete any lines with "Merge" in them
+
+    ::
+
+         git2cl . > Changelog
+         gsed -i '/Merge/d' ./ChangeLog
 
 4) Build and run the tests.  Really.
 
@@ -131,3 +149,28 @@ Release Process
     ::
 
         http://upload.osgeo.org/cgi-bin/osgeo4w-promote.sh
+
+12) Update Alpine package
+
+  - The PDAL Alpine package lives at
+    https://github.com/alpinelinux/aports/blob/master/testing/pdal/APKBUILD.
+    Pull requests can be made against the alpinelinux/aports repository. If the
+    build configuration alone is changing, with no version increase, simply
+    increment the build number `pkgrel`. If the `pkgver` is changing, then
+    reset `pkgrel` to 0.
+  - Pull requests should have a commit message of the following form
+    `testing/pdal: <description>`.
+
+13) Update Conda package
+
+  - For PDAL releases that bump version number, but do not change dependencies
+    or build configurations, the `regro-cf-autotick-bot` should automatically
+    create a pull request at https://github.com/conda-forge/pdal-feedstock.
+    Once the builds succeed, the PR can be merged and the updated package will
+    soon be available in the `conda-forge` channel. If the PR does not build
+    successfully, updates to the PR can be pushed to the bot's branch. Version
+    bumps should reset the build number to zero.
+  - Updates that alter the build configuration but do not bump the version
+    number should be submitted as PRs from a fork of the
+    https://github.com/conda-forge/pdal-feedstock repository. In these cases,
+    the build number should be incremented.
diff --git a/README.md b/README.md
@@ -6,4 +6,4 @@ PDAL
 [![Build Status](https://travis-ci.org/PDAL/PDAL.png?branch=master)](https://travis-ci.org/PDAL/PDAL)
 [![AppVeyor Build Status](https://ci.appveyor.com/api/projects/status/6dehrm0v22cw58d3/branch/master?svg=true)](https://ci.appveyor.com/project/hobu/pdal)
 
-See http://www.pdal.io/ for more info
+See https://pdal.io/ for more info
diff --git a/RELEASENOTES.txt b/RELEASENOTES.txt
@@ -57,7 +57,7 @@ Enhancements
    files.
 -  ``pdal info`` now provides the ``--enumerate`` option. See the
    documentation for
-   `filters.stats <https://www.pdal.io/stages/filters.stats.html>`__ for
+   `filters.stats <https://pdal.io/stages/filters.stats.html>`__ for
    details.
 -  Added a general option ``--logtiming`` to cause log output to contain
    the elapsed time from the start of the program. (#1882)
@@ -130,6 +130,9 @@ Bug fixes
 -  Fixed an issue where dimensions from ``readers.pcd`` and
    ``writers.pcd`` could get confused with dimensions from
    ``readers.sbet`` and ``writers.sbet``.
+-  Fixed index computation in ``filters.voxelcentroidnearestneighbor``
+   and ``filters.voxelcenternearestneighbor`` #1901
+-  Fixed libdl linking #1900
 
 ================================================================================
 1.6.0
@@ -336,12 +339,12 @@ Enhancements
 -  ``filters.pmf`` and ``filters.smrf`` improved performance #1531 and
    #1541
 -  ``filters.assign`` now supports
-   `Range <https://www.pdal.io/stages/filters.range.html>`__-based
+   `Range <https://pdal.io/stages/filters.range.html>`__-based
    filters
 -  ``filters.outlier`` now accepts a user-specified ``class`` to
    override the default value of ``7`` for points deemed outliers. #1545
 -  ``filters.pmf`` and ``filters.smrf`` now accept a
-   `Range <https://www.pdal.io/stages/ranges.html#ranges>`__ via the
+   `Range <https://pdal.io/stages/ranges.html#ranges>`__ via the
    ``ignore`` option to specify values that should be excluded from
    ground segmentation. #1545
 -  ``filters.pmf`` and ``filters.smrf`` now consider only last returns

diff --git a/apps/CMakeLists.txt b/apps/CMakeLists.txt
@@ -16,8 +16,15 @@ if (APPLE AND PDAL_BUNDLE)
 else (APPLE AND PDAL_BUNDLE)
     add_executable(${PDAL_APP} pdal.cpp)
 endif(APPLE AND PDAL_BUNDLE)
-target_link_libraries(${PDAL_APP} PRIVATE
-    ${PDAL_BASE_LIB_NAME} ${PDAL_UTIL_LIB_NAME})
+pdal_target_compile_settings(${PDAL_APP})
+target_link_libraries(${PDAL_APP}
+    PRIVATE
+        ${PDAL_BASE_LIB_NAME}
+        ${PDAL_UTIL_LIB_NAME}
+        ${PDAL_JSONCPP_LIB_NAME}
+        ${GDAL_LIBRARY}
+        ${WINSOCK_LIBRARY}
+)
 target_include_directories(${PDAL_APP} PRIVATE
     ${PDAL_JSONCPP_INCLUDE_DIR}
     ${PDAL_INCLUDE_DIR}
@@ -72,14 +79,14 @@ if(UNIX OR APPLE)
         DESTINATION
             "${PDAL_OUTPUT_BIN_DIR}/"
         FILE_PERMISSIONS
-            OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE
+	    OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE
             WORLD_READ WORLD_EXECUTE)
 
     install(PROGRAMS "${PDAL_OUTPUT_BIN_DIR}/pdal-config"
         DESTINATION
             "${CMAKE_INSTALL_PREFIX}/bin"
         PERMISSIONS
-            OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE
+            OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE
             WORLD_READ WORLD_EXECUTE)
 
 elseif(WIN32)
@@ -91,14 +98,14 @@ elseif(WIN32)
          DESTINATION
             "${PDAL_OUTPUT_BIN_DIR}/"
          FILE_PERMISSIONS
-            OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE
+            OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE
             WORLD_READ WORLD_EXECUTE)
 
     install(PROGRAMS "${PDAL_OUTPUT_BIN_DIR}/pdal-config.bat"
         DESTINATION
             "${CMAKE_INSTALL_PREFIX}/bin"
         PERMISSIONS
-            OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE
+            OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE
             WORLD_READ WORLD_EXECUTE)
 
 endif()