From d8bdced9c86283c4a786a5d9835f72bad6e79943 Mon Sep 17 00:00:00 2001 From: Howard Butler Date: Wed, 31 Jan 2018 14:38:11 -0600 Subject: [PATCH 1/5] doc warnings fixes --- doc/{development => project}/alpine.rst | 0 doc/project/contributors.rst | 6 +++--- doc/project/docker.rst | 4 ++-- doc/tutorial/index.rst | 21 ++------------------- 4 files changed, 7 insertions(+), 24 deletions(-) rename doc/{development => project}/alpine.rst (100%) diff --git a/doc/development/alpine.rst b/doc/project/alpine.rst similarity index 100% rename from doc/development/alpine.rst rename to doc/project/alpine.rst diff --git a/doc/project/contributors.rst b/doc/project/contributors.rst index 365241e45e..11aef5833e 100644 --- a/doc/project/contributors.rst +++ b/doc/project/contributors.rst @@ -52,7 +52,7 @@ capabilities to the PDAL project, including :ref:`Poisson sampling Funding Contributors -------------------------------------------------------------------------------- -.. image:: ./rsgis_logo.png +.. image:: ../development/rsgis_logo.png :target: http://www.erdc.usace.army.mil/Locations/CRREL.aspx The US Army Corps of Engineers Remote Sensing / GIS Center of Expertise at @@ -61,10 +61,10 @@ management systems. `CRREL`_'s `GRiD`_ project manages LiDAR and point cloud data for a multitude of U.S. Army Corps missions. Find out more about GRiD in this `LiDAR Magazine article`_. -.. image:: ./nsf1.png +.. image:: ../development/nsf1.png :target: http://www.nsf.gov -.. image:: ./uoh.png +.. image:: ../development/uoh.png :target: http://www.uh.edu `NSF `_, in collaboration with `Dr. Craig Glennie diff --git a/doc/project/docker.rst b/doc/project/docker.rst index 0b999ab765..cabaa4ef3a 100644 --- a/doc/project/docker.rst +++ b/doc/project/docker.rst @@ -21,8 +21,8 @@ building of `Docker`_ containers. PDAL keeps three Docker containers current. .. note:: - Containers are built upon the `Dependences`_ container, but the - `Dependences`_ container is not pinned to specific Xenial or PDAL release + Containers are built upon the `Dependencies`_ container, but the + `Dependencies`_ container is not pinned to specific Xenial or PDAL release times. It corresponds to where ever the ``dependencies`` tag of the PDAL source tree at https://github.com/PDAL/PDAL resides diff --git a/doc/tutorial/index.rst b/doc/tutorial/index.rst index 5faa8b77ef..9922e2a6d0 100644 --- a/doc/tutorial/index.rst +++ b/doc/tutorial/index.rst @@ -19,25 +19,8 @@ This section provides a collection of tutorials on how to use the PDAL reading las pcl_block_tutorial - pcl_ground - clipping-with-shapefile - calculating-normalized-heights - dart-throwing + pcl_ground/index + clipping/index ground-filters -Developing ----------- - -.. toctree:: - :maxdepth: 1 - - writing-filter - writing-kernel - writing-reader - writing-writer - liblas_to_pdal - pcl_ground/index - clipping/index - sampling/index - python-filtering From fa745a4b07806ac57d72f29d49b6fda4b59db9ac Mon Sep 17 00:00:00 2001 From: Mateusz Loskot Date: Thu, 1 Feb 2018 14:47:23 +0100 Subject: [PATCH 2/5] Remove superfluous semi-colon following CREATE_STATIC_PLUGIN (#1798) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes GCC 5.6.0 error: extra ‘;’ [-Werror=pedantic] --- io/OGRWriterV1.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/io/OGRWriterV1.cpp b/io/OGRWriterV1.cpp index 9af4cbc669..ec7ae58c11 100644 --- a/io/OGRWriterV1.cpp +++ b/io/OGRWriterV1.cpp @@ -58,7 +58,7 @@ static PluginInfo const s_info = PluginInfo( "http://pdal.io/stages/writers.ogr.html"); -CREATE_STATIC_PLUGIN(1, 0, OGRWriter, Writer, s_info); +CREATE_STATIC_PLUGIN(1, 0, OGRWriter, Writer, s_info) OGRWriter::OGRWriter() : m_driver(nullptr), m_ds(nullptr), m_layer(nullptr), m_feature(nullptr) From d6dbf82764cb04d607c0784b0ac327ff9e4e92c8 Mon Sep 17 00:00:00 2001 From: Howard Butler Date: Wed, 31 Jan 2018 16:59:08 -0600 Subject: [PATCH 3/5] add missing file --- doc/project/index.rst | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 doc/project/index.rst diff --git a/doc/project/index.rst b/doc/project/index.rst new file mode 100644 index 0000000000..8916b61ff3 --- /dev/null +++ b/doc/project/index.rst @@ -0,0 +1,22 @@ +.. _project: + +****************************************************************************** +Project +****************************************************************************** + + +Project resources, such as how to update the docs, where the test +frameworks are, who develops the software, and conventions to use when +developing new code can be found in this section. + +.. toctree:: + :maxdepth: 2 + + conventions + contributors + docs + docker + alpine + testing + integration + From 2b988cee6be144cc367e1452dd70772c02b28075 Mon Sep 17 00:00:00 2001 From: Andrew Bell Date: Thu, 1 Feb 2018 10:15:09 -0500 Subject: [PATCH 4/5] Add missed features dependency. --- test/unit/ConfigTest.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/test/unit/ConfigTest.cpp b/test/unit/ConfigTest.cpp index a23d71215a..10c9d16a67 100644 --- a/test/unit/ConfigTest.cpp +++ b/test/unit/ConfigTest.cpp @@ -34,6 +34,7 @@ #include +#include #include using namespace pdal; From e304603042eb2104ad222b13a2ac099455cebc1e Mon Sep 17 00:00:00 2001 From: chambbj Date: Mon, 5 Feb 2018 16:50:11 -0500 Subject: [PATCH 5/5] Update Alpine version to 3.7 for Travis (#1799) We have been pushing Docker images built on Alpine v3.7, but our Travis config has been stuck back on v3.6. These should match. --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6e0fce0007..dd8451f057 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,10 +6,10 @@ sudo: required services: docker before_install: - - docker pull alpine:3.6 + - docker pull alpine:3.7 script: - - docker run -v $TRAVIS_BUILD_DIR:/pdal -t alpine:3.6 /bin/sh -c "/pdal/scripts/ci/script.sh" + - docker run -v $TRAVIS_BUILD_DIR:/pdal -t alpine:3.7 /bin/sh -c "/pdal/scripts/ci/script.sh" after_success: - echo "secure travis:" "$TRAVIS_SECURE_ENV_VARS"