Merge commit 'fb002d548270c32e866a6f559d2c58bfde0ca5ba'

CMakeLists.txt

@@ -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.1")
 
 # Name of C++ library
 

HOWTORELEASE.txt

@@ -30,6 +30,8 @@ Release Process
 
   - doc/download.rst point to new release
 
+  - appveyor.yml
+
   - Make and push new release branch
 
     ::
@@ -45,8 +47,18 @@ 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
 

RELEASENOTES.txt

@@ -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

appveyor.yml

@@ -51,7 +51,10 @@ build_script:
 test_script:
   - call scripts\\appveyor\\test.cmd
 
-deploy_script:
+# We need to install so the artifacts are ready
+# for deployment for the OSGeo4W build for all
+# other build types, no artifact is made
+after_test:
   - call scripts\\appveyor\\install.cmd
 
 artifacts:
@@ -67,7 +70,7 @@ deploy:
     secret_access_key:
       secure: cSqZlsaCxFwXgxJw0BLd7npMFvQk3Vbr74ZPLaBQWLKnOz1cKss9qab1SzSygwkh
     on:
-      branch: 1.6-maintenance
+      branch: 1.7-maintenance
     bucket: "pdal"
     folder: "osgeo4w/"
     artifact: pdalosgeo4w

cmake/unix_compiler_options.cmake

@@ -24,7 +24,6 @@ function(PDAL_TARGET_COMPILE_SETTINGS target)
         ${PDAL_CXX_STANDARD}
         -Wextra
         -Wpedantic
-        -Werror
         -Wall
         -Wno-unused-parameter
         -Wno-unused-variable

doc/development/release-notes/1.7.0.md

@@ -65,4 +65,7 @@
 - A build error that would be generated if Python was found but not requested has been resolved.
 - PDAL defaults to using [normal CMake interface](https://cmake.org/cmake/help/v3.11/policy/CMP0022.html) linking (#1890)
 - 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
+
 

doc/download.rst

@@ -13,23 +13,25 @@ Download
 Current Release(s)
 ------------------------------------------------------------------------------
 
-* **2018-04-05** `PDAL-1.7.0-src.tar.gz`_ `Release Notes`_ (`md5`_)
+* **2018-04-06** `PDAL-1.7.1-src.tar.gz`_ `Release Notes`_ (`md5`_)
 
-.. _`Release Notes`: https://github.com/PDAL/PDAL/releases/tag/1.7
+.. _`Release Notes`: https://github.com/PDAL/PDAL/releases/tag/1.7.1
 
-.. _`PDAL-1.7.0-src.tar.gz`: http://download.osgeo.org/pdal/PDAL-1.7.0-src.tar.gz
-.. _`md5`: http://download.osgeo.org/pdal/PDAL-1.7.0-src.tar.gz.md5
+.. _`PDAL-1.7.1-src.tar.gz`: http://download.osgeo.org/pdal/PDAL-1.7.1-src.tar.gz
+.. _`md5`: http://download.osgeo.org/pdal/PDAL-1.7.1-src.tar.gz.md5
 .. _`DebianGIS`: http://wiki.debian.org/DebianGis
 
 
 Past Releases
 ------------------------------------------------------------------------------
 
+* **2018-04-05** `PDAL-1.7.0-src.tar.gz`_
 * **2017-10-12** `PDAL-1.6.0-src.tar.gz`_
 * **2017-04-06** `PDAL-1.5.0-src.tar.gz`_
 * **2016-12-15** `PDAL-1.4.0-src.tar.gz`_
 
 
+.. _`PDAL-1.7.0-src.tar.gz`: http://download.osgeo.org/pdal/PDAL-1.7.0-src.tar.gz
 .. _`PDAL-1.6.0-src.tar.gz`: http://download.osgeo.org/pdal/PDAL-1.6.0-src.tar.gz
 .. _`PDAL-1.5.0-src.tar.gz`: http://download.osgeo.org/pdal/PDAL-1.5.0-src.tar.gz
 .. _`PDAL-1.4.0-src.tar.gz`: http://download.osgeo.org/pdal/PDAL-1.4.0-src.tar.gz

doc/index.rst

@@ -28,10 +28,10 @@ The entire website is available as a single PDF at http://pdal.io/PDAL.pdf
 News
 --------------------------------------------------------------------------------
 
-**04-05-2018**
+**04-06-2018**
 ................................................................................
 
-PDAL 1.7.0 has been released. Visit :ref:`download` to obtain a copy of the
+PDAL 1.7.1 has been released. Visit :ref:`download` to obtain a copy of the
 source code, or follow the :ref:`quickstart` to get going in a hurry with
 `Docker`_.
 

doc/project/integration.rst

@@ -16,7 +16,7 @@ Status
 .. |travisstatus| image:: https://travis-ci.org/PDAL/PDAL.png?branch=master
    :target: https://travis-ci.org/PDAL/PDAL
 
-.. |appveyorstatus| image:: https://ci.appveyor.com/api/projects/status/6dehrm0v22cw58d3/branch/master?svg=true
+.. |appveyorstatus| image:: https://ci.appveyor.com/api/projects/status/6dehrm0v22cw58d3
    :target: https://ci.appveyor.com/project/hobu/pdal
 
 .. _travis:

scripts/appveyor/install.cmd

@@ -1,13 +1,25 @@
 @echo off
 
-REM call %OSGEO4W_ROOT%\bin\o4w_env.bat
-REM call %OSGEO4W_ROOT%\bin\py3_env.bat
+
+if "%OSGEO4W_BUILD%" NEQ "ON" (
+    REM only bother with this for OSGEO4W_BUILD situation
+    echo "Not building OSGeo4W package"
+    exit /b 0
+)
+
+
+call %OSGEO4W_ROOT%\bin\o4w_env.bat
+call %OSGEO4W_ROOT%\bin\py3_env.bat
 call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64
 
-REM set PATH=%PATH%;C:\Program Files (x86)\MSBuild\14.0\Bin;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Program Files\7-Zip;C:\Program Files\Microsoft Windows Performance Toolkit\;C:\Program Files (x86)\Windows Kits\8.1\Windows Performance Toolkit\;C:\Tools\GitVersion;C:\Program Files (x86)\CMake\bin;C:\Program Files\Git\cmd;C:\Program Files\Git\usr\bin;C:\Program Files\AppVeyor\BuildAgent\
+set PATH=%PATH%;C:\Program Files (x86)\MSBuild\14.0\Bin;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Program Files\7-Zip;C:\Program Files\Microsoft Windows Performance Toolkit\;C:\Program Files (x86)\Windows Kits\8.1\Windows Performance Toolkit\;C:\Tools\GitVersion;C:\Program Files (x86)\CMake\bin;C:\Program Files\Git\cmd;C:\Program Files\Git\usr\bin;C:\Program Files\AppVeyor\BuildAgent\
+
+pushd c:\projects\pdal\build
 
 nmake /f Makefile install  DESTDIR=C:\projects\pdal\install
 
+popd
+
 pushd c:\projects\pdal\install\osgeo4w64
 
 tar jcvf ..\pdal-%APPVEYOR_REPO_COMMIT%.tar.bz2 .

scripts/docker/Dockerfile

@@ -99,6 +99,7 @@ RUN \
     rm -rf /laszip; \
     git clone https://github.com/PDAL/PDAL.git /pdal; \
     cd /pdal; \
+    git checkout 1.7-maintenance; \
     mkdir -p _build; \
     cd _build; \
     cmake .. \