[Git][debian-gis-team/pdal][upstream] New upstream version 1.7.1

Bas Couwenberg gitlab at salsa.debian.org
Mon Apr 9 10:55:17 UTC 2018 

Bas Couwenberg pushed to branch upstream at Debian GIS Project / pdal


Commits:
cd643925 by Bas Couwenberg at 2018-04-06T22:02:18+02:00
New upstream version 1.7.1
- - - - -


28 changed files:

- CMakeLists.txt
- CPackConfig.cmake
- CPackSourceConfig.cmake
- HOWTORELEASE.txt
- PDALConfig.cmake
- PDALConfigVersion.cmake
- PDALTargets.cmake
- RELEASENOTES.txt
- apps/pdal-config
- apps/pdal.pc
- appveyor.yml
- doc/development/release-notes/1.7.0.md
- doc/download.rst
- doc/pipeline.rst
- doc/project/integration.rst
- filters/VoxelCenterNearestNeighborFilter.cpp
- filters/VoxelCentroidNearestNeighborFilter.cpp
- include/pdal/pdal_features.hpp
- io/GeotiffSupport.cpp
- io/GeotiffSupport.hpp
- io/HeaderVal.hpp
- io/LasHeader.cpp
- io/LasWriter.cpp
- pdal/gitsha.cpp
- plugins/python/io/CMakeLists.txt
- plugins/python/plang/Environment.cpp
- scripts/appveyor/install.cmd
- scripts/docker/Dockerfile


Changes:

=====================================
CMakeLists.txt
=====================================
--- a/CMakeLists.txt
+++ b/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
 


=====================================
CPackConfig.cmake
=====================================
--- a/CPackConfig.cmake
+++ b/CPackConfig.cmake
@@ -62,7 +62,7 @@ SET(CPACK_SOURCE_CYGWIN "")
 SET(CPACK_SOURCE_GENERATOR "TBZ2;TGZ")
 SET(CPACK_SOURCE_IGNORE_FILES "/\\.gitattributes;/\\.vagrant;/\\.DS_Store;/CVS/;/\\.git/;\\.swp$;~$;\\.\\#;/\\#;CMakeScripts/;CMakeCache.txt;.xcodeproj;build.make;_CPack_Packages;cmake_install.cmake;Testing;PDAL.build/;/bin/;/lib/;/build/;Makefile;CMakeFiles;CTestTestfile.cmake;/test/data/local/;/doc/doxygen/;/doc/build/;/doc/presentations/;/doc/_static/logo/dongle/;/cmake/examples/;/include/pdal/pdal_defines.h;.gz2;.bz2")
 SET(CPACK_SOURCE_OUTPUT_CONFIG_FILE "/PDAL/CPackSourceConfig.cmake")
-SET(CPACK_SOURCE_PACKAGE_FILE_NAME "PDAL-1.7.0-src")
+SET(CPACK_SOURCE_PACKAGE_FILE_NAME "PDAL-1.7.1-src")
 SET(CPACK_SOURCE_TBZ2 "")
 SET(CPACK_SOURCE_TGZ "")
 SET(CPACK_SOURCE_TXZ "")


=====================================
CPackSourceConfig.cmake
=====================================
--- a/CPackSourceConfig.cmake
+++ b/CPackSourceConfig.cmake
@@ -45,7 +45,7 @@ SET(CPACK_OUTPUT_CONFIG_FILE "/PDAL/CPackConfig.cmake")
 SET(CPACK_PACKAGE_DEFAULT_LOCATION "/")
 SET(CPACK_PACKAGE_DESCRIPTION_FILE "/usr/share/cmake-3.5/Templates/CPack.GenericDescription.txt")
 SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "PDAL built using CMake")
-SET(CPACK_PACKAGE_FILE_NAME "PDAL-1.7.0-src")
+SET(CPACK_PACKAGE_FILE_NAME "PDAL-1.7.1-src")
 SET(CPACK_PACKAGE_INSTALL_DIRECTORY "PDAL 1.7.7")
 SET(CPACK_PACKAGE_INSTALL_REGISTRY_KEY "PDAL 1.7.7")
 SET(CPACK_PACKAGE_NAME "PDAL")
@@ -65,7 +65,7 @@ SET(CPACK_SOURCE_GENERATOR "TBZ2;TGZ")
 SET(CPACK_SOURCE_IGNORE_FILES "/\\.gitattributes;/\\.vagrant;/\\.DS_Store;/CVS/;/\\.git/;\\.swp$;~$;\\.\\#;/\\#;CMakeScripts/;CMakeCache.txt;.xcodeproj;build.make;_CPack_Packages;cmake_install.cmake;Testing;PDAL.build/;/bin/;/lib/;/build/;Makefile;CMakeFiles;CTestTestfile.cmake;/test/data/local/;/doc/doxygen/;/doc/build/;/doc/presentations/;/doc/_static/logo/dongle/;/cmake/examples/;/include/pdal/pdal_defines.h;.gz2;.bz2")
 SET(CPACK_SOURCE_INSTALLED_DIRECTORIES "/PDAL;/")
 SET(CPACK_SOURCE_OUTPUT_CONFIG_FILE "/PDAL/CPackSourceConfig.cmake")
-SET(CPACK_SOURCE_PACKAGE_FILE_NAME "PDAL-1.7.0-src")
+SET(CPACK_SOURCE_PACKAGE_FILE_NAME "PDAL-1.7.1-src")
 SET(CPACK_SOURCE_TBZ2 "")
 SET(CPACK_SOURCE_TGZ "")
 SET(CPACK_SOURCE_TOPLEVEL_TAG "Linux-Source")


=====================================
HOWTORELEASE.txt
=====================================
--- 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,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
 


=====================================
PDALConfig.cmake
=====================================
--- a/PDALConfig.cmake
+++ b/PDALConfig.cmake
@@ -26,7 +26,7 @@ endmacro()
 
 set(PDAL_VERSION_MAJOR 1)
 set(PDAL_VERSION_MINOR 7)
-set(PDAL_VERSION_PATCH 0)
+set(PDAL_VERSION_PATCH 1)
 
 set(PDAL_INCLUDE_DIRS)
 set(PDAL_LIBRARY_DIRS)


=====================================
PDALConfigVersion.cmake
=====================================
--- a/PDALConfigVersion.cmake
+++ b/PDALConfigVersion.cmake
@@ -9,16 +9,16 @@
 # The variable CVF_VERSION must be set before calling configure_file().
 
 
-set(PACKAGE_VERSION "1.7.0")
+set(PACKAGE_VERSION "1.7.1")
 
 if(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION)
   set(PACKAGE_VERSION_COMPATIBLE FALSE)
 else()
 
-  if("1.7.0" MATCHES "^([0-9]+)\\.")
+  if("1.7.1" MATCHES "^([0-9]+)\\.")
     set(CVF_VERSION_MAJOR "${CMAKE_MATCH_1}")
   else()
-    set(CVF_VERSION_MAJOR "1.7.0")
+    set(CVF_VERSION_MAJOR "1.7.1")
   endif()
 
   if(PACKAGE_FIND_VERSION_MAJOR STREQUAL CVF_VERSION_MAJOR)


=====================================
PDALTargets.cmake
=====================================
--- a/PDALTargets.cmake
+++ b/PDALTargets.cmake
@@ -59,14 +59,14 @@ set_target_properties(pdal_util PROPERTIES
 set_property(TARGET pdal_base APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
 set_target_properties(pdal_base PROPERTIES
   IMPORTED_LINK_DEPENDENT_LIBRARIES_NOCONFIG "pdal_util"
-  IMPORTED_LOCATION_NOCONFIG "/PDAL/lib/libpdal_base.so.7.0.0"
+  IMPORTED_LOCATION_NOCONFIG "/PDAL/lib/libpdal_base.so.7.0.1"
   IMPORTED_SONAME_NOCONFIG "libpdal_base.so.6"
   )
 
 # Import target "pdal_util" for configuration ""
 set_property(TARGET pdal_util APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
 set_target_properties(pdal_util PROPERTIES
-  IMPORTED_LOCATION_NOCONFIG "/PDAL/lib/libpdal_util.so.7.0.0"
+  IMPORTED_LOCATION_NOCONFIG "/PDAL/lib/libpdal_util.so.7.0.1"
   IMPORTED_SONAME_NOCONFIG "libpdal_util.so.6"
   )
 


=====================================
RELEASENOTES.txt
=====================================
--- a/RELEASENOTES.txt
+++ b/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


=====================================
apps/pdal-config
=====================================
--- a/apps/pdal-config
+++ b/apps/pdal-config
@@ -58,7 +58,7 @@ case $1 in
     ;;
 
   --version)
-    echo 1.7.0
+    echo 1.7.1
     ;;
 
   --python-version)


=====================================
apps/pdal.pc
=====================================
--- a/apps/pdal.pc
+++ b/apps/pdal.pc
@@ -6,7 +6,7 @@ includedir=/usr/local/include
 Name: PDAL
 Description: Point Data Abstraction Library
 Requires:   gdal libxml-2.0 geos
-Version: 1.7.0
+Version: 1.7.1
 Libs: -L${libdir} -lpdalcpp
 Cflags: -I${includedir}/pdal  
 


=====================================
appveyor.yml
=====================================
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -67,7 +67,7 @@ deploy:
     secret_access_key:
       secure: cSqZlsaCxFwXgxJw0BLd7npMFvQk3Vbr74ZPLaBQWLKnOz1cKss9qab1SzSygwkh
     on:
-      branch: 1.6-maintenance
+      branch: 1.7-maintenance
     bucket: "pdal"
     folder: "osgeo4w/"
     artifact: pdalosgeo4w


=====================================
doc/development/release-notes/1.7.0.md
=====================================
--- a/doc/development/release-notes/1.7.0.md
+++ b/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
=====================================
--- a/doc/download.rst
+++ b/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/pipeline.rst
=====================================
--- a/doc/pipeline.rst
+++ b/doc/pipeline.rst
@@ -129,7 +129,8 @@ reduces memory requirements.
 When using :ref:`pdal translate<translate_command>` or
 :ref:`pdal pipeline<pipeline_command>`
 PDAL uses stream mode if possible.  If stream mode can't use used
-the applications fall back to standard mode processing.
+the applications fall back to standard mode processing.  Users can explicitly
+choose to use standard mode by using the ``--nostream`` option.
 
 Users of the PDAL API can explicitly control the selection of the PDAL
 processing mode.


=====================================
doc/project/integration.rst
=====================================
--- a/doc/project/integration.rst
+++ b/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:


=====================================
filters/VoxelCenterNearestNeighborFilter.cpp
=====================================
--- a/filters/VoxelCenterNearestNeighborFilter.cpp
+++ b/filters/VoxelCenterNearestNeighborFilter.cpp
@@ -79,9 +79,9 @@ PointViewSet VoxelCenterNearestNeighborFilter::run(PointViewPtr view)
         double y = view->getFieldAs<double>(Dimension::Id::Y, id);
         double x = view->getFieldAs<double>(Dimension::Id::X, id);
         double z = view->getFieldAs<double>(Dimension::Id::Z, id);
-        size_t r = static_cast<size_t>(floor(y - bounds.miny) / m_cell);
-        size_t c = static_cast<size_t>(floor(x - bounds.minx) / m_cell);
-        size_t d = static_cast<size_t>(floor(z - bounds.minz) / m_cell);
+        size_t r = static_cast<size_t>((y - bounds.miny) / m_cell);
+        size_t c = static_cast<size_t>((x - bounds.minx) / m_cell);
+        size_t d = static_cast<size_t>((z - bounds.minz) / m_cell);
         populated_voxels.emplace(std::make_tuple(r, c, d));
     }
 


=====================================
filters/VoxelCentroidNearestNeighborFilter.cpp
=====================================
--- a/filters/VoxelCentroidNearestNeighborFilter.cpp
+++ b/filters/VoxelCentroidNearestNeighborFilter.cpp
@@ -83,9 +83,9 @@ PointViewSet VoxelCentroidNearestNeighborFilter::run(PointViewPtr view)
         double y = view->getFieldAs<double>(Dimension::Id::Y, id);
         double x = view->getFieldAs<double>(Dimension::Id::X, id);
         double z = view->getFieldAs<double>(Dimension::Id::Z, id);
-        size_t r = static_cast<size_t>(floor(y - bounds.miny) / m_cell);
-        size_t c = static_cast<size_t>(floor(x - bounds.minx) / m_cell);
-        size_t d = static_cast<size_t>(floor(z - bounds.minz) / m_cell);
+        size_t r = static_cast<size_t>((y - bounds.miny) / m_cell);
+        size_t c = static_cast<size_t>((x - bounds.minx) / m_cell);
+        size_t d = static_cast<size_t>((z - bounds.minz) / m_cell);
         populated_voxel_ids[std::make_tuple(r, c, d)].push_back(id);
     }
 


=====================================
include/pdal/pdal_features.hpp
=====================================
--- a/include/pdal/pdal_features.hpp
+++ b/include/pdal/pdal_features.hpp
@@ -11,9 +11,9 @@
  */
 #define PDAL_VERSION_MAJOR 1
 #define PDAL_VERSION_MINOR 7
-#define PDAL_VERSION_PATCH 0
+#define PDAL_VERSION_PATCH 1
 
-#define PDAL_VERSION_STRING "1.7.0"
+#define PDAL_VERSION_STRING "1.7.1"
 
 /* (note this will look yucky until we get to major>=1) */
 #define PDAL_VERSION_INTEGER ((PDAL_VERSION_MAJOR*100*100)+(PDAL_VERSION_MINOR*100)+PDAL_VERSION_PATCH)


=====================================
io/GeotiffSupport.cpp
=====================================
--- a/io/GeotiffSupport.cpp
+++ b/io/GeotiffSupport.cpp
@@ -123,6 +123,9 @@ GeotiffSrs::GeotiffSrs(const std::vector<uint8_t>& directoryRec,
     }
 
     ctx.gtiff = GTIFNewSimpleTags(ctx.tiff);
+    if (!ctx.gtiff)
+        throw Geotiff::error("Couldn't create Geotiff tags from "
+            "Geotiff definition.");
 
     GTIFDefn sGTIFDefn;
     if (GTIFGetDefn(ctx.gtiff, &sGTIFDefn))
@@ -144,7 +147,7 @@ GeotiffTags::GeotiffTags(const SpatialReference& srs)
 
     // Set tiff tags from WKT
     if (!GTIFSetFromOGISDefn(ctx.gtiff, srs.getWKT().c_str()))
-        throw error("Could not set m_gtiff from WKT");
+        throw Geotiff::error("Could not set m_gtiff from WKT");
     GTIFWriteKeys(ctx.gtiff);
 
     auto sizeFromType = [](int type, int count) -> size_t


=====================================
io/GeotiffSupport.hpp
=====================================
--- a/io/GeotiffSupport.hpp
+++ b/io/GeotiffSupport.hpp
@@ -39,6 +39,15 @@
 namespace pdal
 {
 
+namespace Geotiff
+{
+    struct error : public std::runtime_error
+    {
+        error(const std::string& err) : std::runtime_error(err)
+        {}
+    };
+}
+
 class GeotiffSrs
 {
 public:
@@ -54,12 +63,6 @@ private:
 class GeotiffTags
 {
 public:
-    struct error : public std::runtime_error
-    {
-        error(const std::string& err) : std::runtime_error(err)
-        {}
-    };
-
     GeotiffTags(const SpatialReference& srs);
 
     std::vector<uint8_t>& directoryData()


=====================================
io/HeaderVal.hpp
=====================================
--- a/io/HeaderVal.hpp
+++ b/io/HeaderVal.hpp
@@ -49,7 +49,7 @@ protected:
     BaseHeaderVal() : m_val(T()), m_valSet(false)
     {}
 
-    BaseHeaderVal(const T& t) : m_defVal(t), m_valSet(false)
+    BaseHeaderVal(const T& t) : m_val(T()), m_defVal(t), m_valSet(false)
     {}
 
 public:


=====================================
io/LasHeader.cpp
=====================================
--- a/io/LasHeader.cpp
+++ b/io/LasHeader.cpp
@@ -218,6 +218,11 @@ void LasHeader::setSrs()
         else
             setSrsFromGeotiff();
     }
+    catch (Geotiff::error err)
+    {
+        m_log->get(LogLevel::Error) << "Could not create an SRS: " <<
+            err.what() << std::endl;
+    }
     catch (...)
     {
         m_log->get(LogLevel::Error) << "Could not create an SRS" << std::endl;


=====================================
io/LasWriter.cpp
=====================================
--- a/io/LasWriter.cpp
+++ b/io/LasWriter.cpp
@@ -495,7 +495,7 @@ void LasWriter::addGeotiffVlrs()
         addVlr(TRANSFORM_USER_ID, GEOTIFF_ASCII_RECORD_ID,
                 "GeoTiff GeoAsciiParamsTag", tags.asciiData());
     }
-    catch (GeotiffTags::error& err)
+    catch (Geotiff::error& err)
     {
         throwError(err.what());
     }


=====================================
pdal/gitsha.cpp
=====================================
--- a/pdal/gitsha.cpp
+++ b/pdal/gitsha.cpp
@@ -1,3 +1,3 @@
 #include <pdal/gitsha.h>
-#define GIT_SHA1 "c5816ac474aed534573172cdb578a534291737b4"
+#define GIT_SHA1 "34350aacbaad6ffa4a26b864665aa81a8df4a8a7"
 const char g_GIT_SHA1[] = GIT_SHA1;


=====================================
plugins/python/io/CMakeLists.txt
=====================================
--- a/plugins/python/io/CMakeLists.txt
+++ b/plugins/python/io/CMakeLists.txt
@@ -12,6 +12,15 @@ target_include_directories(${numpy_reader} PRIVATE
 target_link_libraries(${numpy_reader} PUBLIC
     ${PYTHON_LIBRARY})
 
+# Install headers so Python extension
+# can use them later
+
+install(DIRECTORY .
+    DESTINATION  include/pdal/io
+    FILES_MATCHING PATTERN "*.hpp"
+    PATTERN "CMakeFiles" EXCLUDE
+)
+
 if (WITH_TESTS)
     PDAL_ADD_TEST(pdal_io_numpy_test
         FILES


=====================================
plugins/python/plang/Environment.cpp
=====================================
--- a/plugins/python/plang/Environment.cpp
+++ b/plugins/python/plang/Environment.cpp
@@ -52,10 +52,10 @@
 #undef tolower
 #undef isspace
 
-// See ticket #1010.  This function runs when libplang is loaded.  It makes
-// sure python symbols can be found by extention module .so's since on some
-// platforms (notably Ubuntu), they aren't linked with libpython even though
-// they depend on it.  If a platform doesn't support
+// See ticket #1010.  This function runs when a shared lib containing this
+// object is loaded.  It makes sure python symbols can be found by extention
+// module .so's since on some platforms (notably Ubuntu), they aren't linked
+// with libpython even though they depend on it.  If a platform doesn't support
 // __attribute__ ((constructor)) this does nothing.  We'll have to deal with
 // those as they come up.
 #ifndef _WIN32


=====================================
scripts/appveyor/install.cmd
=====================================
--- a/scripts/appveyor/install.cmd
+++ b/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
=====================================
--- a/scripts/docker/Dockerfile
+++ b/scripts/docker/Dockerfile
@@ -8,7 +8,6 @@ RUN \
         alpine-sdk \
         unzip \
         cmake \
-        eigen-dev at edgecommunity \
         hexer-dev \
         nitro-dev \
         gdal-dev \
@@ -36,6 +35,7 @@ RUN \
         zlib-dev \
     ; \
     apk add --no-cache \
+        eigen-dev at edgecommunity \
         hexer \
         nitro \
         gdal \
@@ -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 .. \



View it on GitLab: https://salsa.debian.org/debian-gis-team/pdal/commit/cd6439255fd6e95378903d96f3248ba002f2c474

---
View it on GitLab: https://salsa.debian.org/debian-gis-team/pdal/commit/cd6439255fd6e95378903d96f3248ba002f2c474
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.alioth.debian.org/pipermail/pkg-grass-devel/attachments/20180409/9d8ca9f4/attachment-0001.html>

More information about the Pkg-grass-devel mailing list