Merge branch 'develop' into remove-softwareguide

.gitlab-ci.yml

@@ -18,8 +18,10 @@ variables:
   GIT_STRATEGY: "clone"
 
 before_script:
+  # make sure LFS hooks are installed
+  - git lfs install
   # Provision efficiently the local LFS cache before checkout
-  - git lfs fetch origin $CI_COMMIT_REF_NAME
+  - git lfs fetch origin $CI_COMMIT_SHA
   # Checkout the expected branch
   - git checkout $CI_COMMIT_REF_NAME
 
@@ -41,9 +43,26 @@ native-build:
   script:
     - ctest -VV -S CI/main_ci.cmake -DIMAGE_NAME:string=ubuntu-18.04-gcc
 
-build:ubuntu-llvm:
+debian-build:
+  extends: .general
+  only: [merge_requests]
+  stage: build
+  image: $BUILD_IMAGE_REGISTRY/otb-debian-native:unstable
+  script:
+    - ctest -VV -S CI/main_ci.cmake -DIMAGE_NAME:string=debian-unstable-gcc
+
+.common-build:
   extends: .general
   stage: build
   image: $BUILD_IMAGE_REGISTRY/otb-ubuntu-shark:18.04
   script:
     - ctest -VV -S CI/main_ci.cmake -DIMAGE_NAME:string=ubuntu-18.04-llvm-shark
+
+build:ubuntu-llvm:
+  only: [merge_requests]
+  extends: .common-build
+
+build:ubuntu-llvm-wip:
+  except: [merge_requests]
+  extends: .common-build
+

CI/debian-unstable-gcc.cmake

+#
+# Copyright (C) 2005-2019 Centre National d'Etudes Spatiales (CNES)
+#
+# This file is part of Orfeo Toolbox
+#
+#     https://www.orfeo-toolbox.org/
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# Configuration options for debian-unstable-gcc
+
+set(site_option
+"opencv_INCLUDE_DIR:PATH=/usr/include
+OTB_USE_MPI:BOOL=OFF
+OTB_USE_SHARK:BOOL=OFF
+")

CONTRIBUTING.md

@@ -58,7 +58,7 @@ then send a merge request.
 Note that we also accept PRs on our [GitHub mirror](https://github.com/orfeotoolbox/OTB)
 which we will manually merge.
 
-Feature branches are tested on multiple platforms on the OTB test infrastructure (a.k.a the [Dashboard](https://dash.orfeo-toolbox.org/)). They appear in the FeatureBranches section. 
+Feature branches are tested on multiple platforms on the OTB test infrastructure (a.k.a the [Dashboard](https://cdash.orfeo-toolbox.org/)). They appear in the FeatureBranches section. 
 
 Caveat: even if the Dashboard build on develop branch is broken, it is not
 allowed to push fixes directly on develop. The developer trying to fix the
@@ -124,7 +124,7 @@ Again, the second branch name is optional.
 
 For users without push access to [otb-devutils repository](https://gitlab.orfeo-toolbox.org/orfeotoolbox/otb-devutils.git), the modification can be asked through a merge requests to this repository.
 
-Once the feature branch is registered for testing, it should appear in the *FeatureBranches* section of the [OTB dashboard](https://dash.orfeo-toolbox.org/index.php?project=OTB) next day (remember tests are run on a nightly basis).
+Once the feature branch is registered for testing, it should appear in the *FeatureBranches* section of the [OTB dashboard](https://cdash.orfeo-toolbox.org/index.php?project=OTB) next day (remember tests are run on a nightly basis).
 
 Do not forget to remove the feature branch for testing once it has been merged.
 

CTestConfig.cmake

@@ -22,6 +22,6 @@ set(CTEST_PROJECT_NAME "OTB")
 set(CTEST_NIGHTLY_START_TIME "20:00:00 CEST")
 
 set(CTEST_DROP_METHOD "https")
-set(CTEST_DROP_SITE "dash.orfeo-toolbox.org")
+set(CTEST_DROP_SITE "cdash.orfeo-toolbox.org")
 set(CTEST_DROP_LOCATION "/submit.php?project=OTB")
 set(CTEST_DROP_SITE_CDASH TRUE)

Modules/Adapters/GdalAdapters/include/otbOGRFieldWrapper.hxx

@@ -232,7 +232,11 @@ template
  */
 template
   < typename T
+#if GDAL_VERSION_NUM >= 2030000
+  , void ( OGRFeature::*ptr_to_function )(int, int, const T*)
+#else
   , void ( OGRFeature::*ptr_to_function )(int, int, T*) // not const-correct
+#endif
   , typename ActualParamType = std::vector<T>
   , bool Is_contiguous = boost::is_contiguous<ActualParamType>::value
   > class TagDispatchMemberContainerSetterPtr;
@@ -241,7 +245,11 @@ template
  */
 template
   < typename T
+#if GDAL_VERSION_NUM >= 2030000
+  , void ( OGRFeature::*ptr_to_function )(int, int, const T*)
+#else
   , void ( OGRFeature::*ptr_to_function )(int, int, T*) // not const-correct
+#endif
   , typename ActualParamType
   > class TagDispatchMemberContainerSetterPtr<T, ptr_to_function, ActualParamType, true>
     {
@@ -257,7 +265,11 @@ template
  */
 template
   < typename T
+#if GDAL_VERSION_NUM >= 2030000
+  , void ( OGRFeature::*ptr_to_function )(int, int, const T*)
+#else
   , void ( OGRFeature::*ptr_to_function )(int, int, T*) // not const-correct
+#endif
   , typename ActualParamType
   > class TagDispatchMemberContainerSetterPtr<T, ptr_to_function, ActualParamType, false>
     {

Modules/Core/Functor/include/otbDotProductImageFilter.h

@@ -58,7 +58,7 @@ public:
 
   OutputType operator()(const InputType& in)
   {
-    assert(in.Size() == m.Size());
+    assert(in.Size() == m_Vector.Size());
     OutputType result = 0;
     for (unsigned int i = 0; i < in.Size(); ++i)
     {

Packaging/CTestConfig.cmake

@@ -21,7 +21,7 @@
 set(CTEST_PROJECT_NAME "OTB")
 set(CTEST_NIGHTLY_START_TIME "20:00:00 CEST")
 set(CTEST_DROP_METHOD "https")
-set(CTEST_DROP_SITE "dash.orfeo-toolbox.org")
+set(CTEST_DROP_SITE "cdash.orfeo-toolbox.org")
 set(CTEST_DROP_LOCATION "/submit.php?project=OTB")
 set(CTEST_DROP_SITE_CDASH TRUE)
 set(CTEST_CUSTOM_MAXIMUM_FAILED_TEST_OUTPUT_SIZE 409600)

README.md

@@ -25,7 +25,7 @@ not a black box!
 * [Downloads](https://www.orfeo-toolbox.org/download/)
 * [Public git repositories](https://gitlab.orfeo-toolbox.org/orfeotoolbox/otb)
 * [GitHub mirror](https://github.com/orfeotoolbox/)
-* [Build status](http://dash.orfeo-toolbox.org/index.php?project=OTB)
+* [Build status](http://cdash.orfeo-toolbox.org/index.php?project=OTB)
 * [Bug tracker](https://gitlab.orfeo-toolbox.org/orfeotoolbox/otb/issues?label_name%5B%5D=bug)
 * [Wiki](http://wiki.orfeo-toolbox.org/index.php/Main_Page)
 * [Task tracking](https://gitlab.orfeo-toolbox.org/orfeotoolbox/otb/issues)

SuperBuild/CTestConfig.cmake

@@ -28,6 +28,6 @@ set(CTEST_PROJECT_NAME "OTB")
 set(CTEST_NIGHTLY_START_TIME "20:00:00 CEST")
 
 set(CTEST_DROP_METHOD "https")
-set(CTEST_DROP_SITE "dash.orfeo-toolbox.org")
+set(CTEST_DROP_SITE "cdash.orfeo-toolbox.org")
 set(CTEST_DROP_LOCATION "/submit.php?project=OTB")
 set(CTEST_DROP_SITE_CDASH TRUE)