diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 14447a38dc8eacbe4120bcdc5930ad6f491e124f..6ad790bddcad7d8dde0d33f32750ccac23e38e96 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -54,11 +54,11 @@ stages:
paths:
- build/*/*.log #CMake log
- log/*.txt # Others
- - build/CookBook-*-html.tar.gz
- - build/Documentation/Cookbook/latex/CookBook-*.pdf
- - build/Documentation/Doxygen/OTB-Doxygen-*.tar.bz2
- - build_packages/OTB-*.run
- - build_packages/OTB-*.zip
+ - CookBook-*-html.tar.gz
+ - CookBook-*.pdf
+ - OTB-Doxygen-*.tar.bz2
+ - OTB-*.run
+ - OTB-*.zip
- build/compile_commands.json
- build/ctest_report.xml
- build/cppcheck_report.xml
@@ -111,12 +111,16 @@ ubuntu-xdk-prepare:
script:
- ctest -VV -S CI/prepare_superbuild.cmake -DIMAGE_NAME:string=otb-ubuntu-superbuild-base
-ubuntu-xdk-build:
+ubuntu-xdk-build-doc:
extends: .common-build
image: $BUILD_IMAGE_REGISTRY/otb-ubuntu-superbuild-base:18.04
script:
- xvfb-run -a -n 1 -s "-screen 0 1024x768x24 -dpi 96" ctest -V -S CI/main_superbuild.cmake -DIMAGE_NAME:string=ubuntu-18.04-llvm-xdk
+ - mv build/CookBook-*-html.tar.gz . || true
+ - mv build/Documentation/Cookbook/latex/CookBook-*.pdf . || true
+ - mv build/Documentation/Doxygen/OTB-Doxygen-*.tar.bz2 . || true
- xvfb-run -a -n 1 -s "-screen 0 1024x768x24 -dpi 96" ctest -V -S CI/main_packages.cmake -DIMAGE_NAME:string=otb-ubuntu-superbuild-base -DNAME_SUFFIX:string=-glibc-2.27
+ - mv build_packages/OTB-*.run . || true
dependencies:
- ubuntu-xdk-prepare
@@ -133,6 +137,7 @@ centos-xdk-build:
script:
- xvfb-run -a -n 1 -s "-screen 0 1024x768x24 -dpi 96" ctest -V -S CI/main_superbuild.cmake -DIMAGE_NAME:string=otb-centos-superbuild-base
- xvfb-run -a -n 1 -s "-screen 0 1024x768x24 -dpi 96" ctest -V -S CI/main_packages.cmake -DIMAGE_NAME:string=otb-centos-superbuild-base
+ - mv build_packages/OTB-*.run . || true
dependencies:
- centos-xdk-prepare
@@ -151,6 +156,7 @@ macos-xdk-build:
script:
- ctest -V -S CI/main_superbuild.cmake -DIMAGE_NAME:string=otb-macos-superbuild
- ctest -V -S CI/main_packages.cmake -DIMAGE_NAME:string=otb-macos-superbuild
+ - mv build_packages/OTB-*.run . || true
dependencies:
- macos-xdk-prepare
@@ -190,6 +196,7 @@ windows-10-build:
- ctest -V -S CI/main_superbuild.cmake
- clcache.exe -s
- ctest -V -S CI/main_packages.cmake
+ - move "build_packages\OTB-*.zip" . || dir build_packages
dependencies:
- windows-10-prepare
@@ -214,6 +221,7 @@ windows-8-build:
- ctest -V -S CI/main_superbuild.cmake
- clcache.exe -s
- ctest -V -S CI/main_packages.cmake
+ - move "build_packages\OTB-*.zip" . || dir build_packages
dependencies:
- windows-8-prepare
@@ -305,7 +313,7 @@ deploy:
script:
- ./CI/deploy.sh $CI_COMMIT_REF_NAME $RC_NUMBER
dependencies:
- - ubuntu-xdk-build
+ - ubuntu-xdk-build-doc
- centos-xdk-build
- macos-xdk-build
- windows-8-build
diff --git a/CI/Dockerfile.nat b/CI/Dockerfile.nat
deleted file mode 100644
index 191c5eeb7c1d82041773c58b7baac49a73a1c051..0000000000000000000000000000000000000000
--- a/CI/Dockerfile.nat
+++ /dev/null
@@ -1,78 +0,0 @@
-FROM ubuntu:18.04
-MAINTAINER Sebastien Dinot <sebastien.dinot@c-s.fr>
-
-ENV DEBIAN_FRONTEND noninteractive
-
-RUN echo "Europe/Paris" > /etc/timezone
-
-# ----------------------------------------------------------------------------
-# First stage : install tools (they rarely evolve)
-# ----------------------------------------------------------------------------
-RUN apt-get update -y \
- && apt-get upgrade -y \
- && apt-get install -y --no-install-recommends \
- ca-certificates \
- curl \
- make \
- cmake \
- ninja-build \
- g++ \
- gcc \
- clang \
- clang-tidy \
- clang-format \
- ccache \
- git \
- libtool \
- swig \
- xvfb \
- && rm -rf /var/lib/apt/lists/*
-
-# ----------------------------------------------------------------------------
-# Second stage : dependencies (they evolve more often)
-# ----------------------------------------------------------------------------
-RUN apt-get update -y \
- && apt-get upgrade -y \
- && apt-get install -y --no-install-recommends \
- freeglut3-dev \
- libboost-date-time-dev \
- libboost-filesystem-dev \
- libboost-graph-dev \
- libboost-program-options-dev \
- libboost-system-dev \
- libboost-thread-dev \
- libcurl4-gnutls-dev \
- libexpat1-dev \
- libfftw3-dev \
- libgdal-dev \
- libgeotiff-dev \
- libglew-dev \
- libglfw3-dev \
- libgsl-dev \
- libinsighttoolkit4-dev \
- libkml-dev \
- libmuparser-dev \
- libmuparserx-dev \
- libopencv-core-dev \
- libopencv-ml-dev \
- libopenmpi-dev \
- libopenthreads-dev \
- libossim-dev \
- libpng-dev \
- libqt5opengl5-dev \
- libqwt-qt5-dev \
- libsvm-dev \
- libtinyxml-dev \
- qtbase5-dev \
- qttools5-dev \
- default-jdk \
- python-dev \
- python-numpy \
- python-gdal \
- python3-dev \
- python3-numpy \
- python3-gdal \
- && rm -rf /var/lib/apt/lists/*
-
-ENV PATH /usr/lib/ccache:$PATH
-ENV OTB_USE_SHARK OFF
diff --git a/CI/Dockerfile.shark3.1.4 b/CI/Dockerfile.shark3.1.4
deleted file mode 100644
index 96f52716c097c5f1ca36fa0de85710a2b619e7d8..0000000000000000000000000000000000000000
--- a/CI/Dockerfile.shark3.1.4
+++ /dev/null
@@ -1,126 +0,0 @@
-FROM ubuntu:18.04 as shark-provider
-MAINTAINER OrfeoToolbox Core Team
-
-ENV DEBIAN_FRONTEND noninteractive
-
-# ----------------------------------------------------------------------------
-# First stage : install tools
-# (based on https://github.com/Shark-ML/Shark/blob/master/.travis.yml)
-# ----------------------------------------------------------------------------
-
-RUN apt-get update -y \
- && apt-get upgrade -y \
- && apt-get install -y --no-install-recommends \
- ca-certificates \
- g++ \
- make \
- cmake \
- libboost-date-time-dev \
- libboost-filesystem-dev \
- libboost-graph-dev \
- libboost-program-options-dev \
- libboost-system-dev \
- libboost-thread-dev \
- libcurl4-gnutls-dev \
- curl \
- && rm -rf /var/lib/apt/lists/*
-
-RUN cd \tmp \
- && curl -o shark.tar.gz https://codeload.github.com/Shark-ML/Shark/tar.gz/v3.1.4 \
- && tar xzf shark.tar.gz \
- && cd Shark-3.1.4\
- && mkdir build \
- && cd build \
- && cmake -DBUILD_EXAMPLES:BOOL=OFF \
- -DBUILD_TESTING:BOOL=OFF \
- -DENABLE_HDF5:BOOL=OFF \
- -DBUILD_SHARED_LIBS=ON \
- -DENABLE_CBLAS:BOOL=OFF \
- -DENABLE_OPENMP:BOOL=OFF \
- ../. \
- && make install
-
-FROM ubuntu:18.04
-MAINTAINER Sebastien Dinot <sebastien.dinot@c-s.fr>
-
-ENV DEBIAN_FRONTEND noninteractive
-
-RUN echo "Europe/Paris" > /etc/timezone
-
-# ----------------------------------------------------------------------------
-# First stage : install tools (they rarely evolve)
-# ----------------------------------------------------------------------------
-RUN apt-get update -y \
- && apt-get upgrade -y \
- && apt-get install -y --no-install-recommends \
- ca-certificates \
- curl \
- make \
- cmake \
- ninja-build \
- g++ \
- gcc \
- clang \
- clang-tidy \
- clang-format \
- ccache \
- git \
- libtool \
- swig \
- xvfb \
- && rm -rf /var/lib/apt/lists/*
-
-# ----------------------------------------------------------------------------
-# Second stage : dependencies (they evolve more often)
-# ----------------------------------------------------------------------------
-
-RUN apt-get update -y \
- && apt-get upgrade -y \
- && apt-get install -y --no-install-recommends \
- freeglut3-dev \
- libboost-date-time-dev \
- libboost-filesystem-dev \
- libboost-graph-dev \
- libboost-program-options-dev \
- libboost-system-dev \
- libboost-thread-dev \
- libcurl4-gnutls-dev \
- libexpat1-dev \
- libfftw3-dev \
- libgdal-dev \
- libgeotiff-dev \
- libglew-dev \
- libglfw3-dev \
- libgsl-dev \
- libinsighttoolkit4-dev \
- libkml-dev \
- libmuparser-dev \
- libmuparserx-dev \
- libopencv-core-dev \
- libopencv-ml-dev \
- libopenmpi-dev \
- libopenthreads-dev \
- libossim-dev \
- libpng-dev \
- libqt5opengl5-dev \
- libqwt-qt5-dev \
- libsvm-dev \
- libtinyxml-dev \
- qtbase5-dev \
- qttools5-dev \
- default-jdk \
- python-dev \
- python-numpy \
- python-gdal \
- python3-dev \
- python3-numpy \
- python3-gdal \
- && rm -rf /var/lib/apt/lists/*
-
-COPY --from=shark-provider /usr/local/include/shark/* /usr/include/shark/
-COPY --from=shark-provider /usr/local/lib/libshark* /usr/lib/
-COPY --from=shark-provider /usr/local/bin/SharkVersion /usr/bin/
-COPY --from=shark-provider /usr/local/lib/cmake/ /usr/lib/cmake/
-
-ENV PATH /usr/lib/ccache:$PATH
-ENV OTB_USE_SHARK ON
diff --git a/CI/deploy.sh b/CI/deploy.sh
index d3b0385f05c70847526854123d27c4640956042c..e3621361d210e7d5a1f2e3081ed981768db5025d 100755
--- a/CI/deploy.sh
+++ b/CI/deploy.sh
@@ -37,27 +37,17 @@ else # On release
fi
# Push package
-ls -all build_packages/
echo "Renaming binary packages"
-# find build_packages/. -name "*.run" \
-# -exec sh -c 'mv "$1" "${1%.run}${pack_suffix}.run"' _ {} \;
-for name in $(find build_packages/. -name "OTB-*.*")
- do
+for name in $(find . -regex "./OTB-.*\(run\|zip\)"); do
len=(${#name})
mv "$name" "${name:0:$len-4}${pack_suffix}${name:$len-4}"
done
-# TO REMOVE
-###########
-ls -all build_packages/
-###########
echo "Pushing binary packages"
-scp build_packages/OTB-*.{run,zip} otbpush@otb5-vm2.orfeo-toolbox.org:${jobs_directory}/.
+scp OTB-*.{run,zip} otbpush@otb5-vm2.orfeo-toolbox.org:${jobs_directory}/.
# Push doc
echo "Pushing documentation"
-scp build/{CookBook-*-html.tar.gz,\
-/Documentation/{Cookbook/latex/CookBook-*.pdf,Doxygen/OTB-Doxygen-*.tar.bz2}} \
-otbpush@otb5-vm2.orfeo-toolbox.org:${jobs_directory}/.
+scp {CookBook-*-html.tar.gz,CookBook-*.pdf,OTB-Doxygen-*.tar.bz2} otbpush@otb5-vm2.orfeo-toolbox.org:${jobs_directory}/.
# Create zip, tar.gz and tar.xy source
echo "Creating source tarball and zip"
@@ -75,4 +65,4 @@ echo "Pushing new sources"
scp OTB-sources-$CI_COMMIT_SHORT_SHA.* \
otbpush@otb5-vm2.orfeo-toolbox.org:${jobs_directory}/
-
\ No newline at end of file
+
diff --git a/Documentation/Cookbook/rst/CompilingOTBFromSource.rst b/Documentation/Cookbook/rst/CompilingOTBFromSource.rst
index 9ea5c820ebd1d3b2fa6083f2fd9ec5afd0532c72..bec18da04a99938bb36f85f25457a4ef41b78100 100644
--- a/Documentation/Cookbook/rst/CompilingOTBFromSource.rst
+++ b/Documentation/Cookbook/rst/CompilingOTBFromSource.rst
@@ -11,7 +11,7 @@ OTB is known to work on:
* Visual Studio 2015 on Windows
-* GCC 4.x, 5.x or Clang 3.x on GNU/Linux
+* GCC 5 or higher, Clang 3.4 or higher on GNU/Linux
* AppleClang on macOS (10.8 or higher)
@@ -25,60 +25,60 @@ process:
.. table:: External libraries used in OTB
:align: center
- +------------------------------------------------------------------+-----------------------+--------------------------+
- | **Library** | **Mandatory** | **Minimum version** |
- +==================================================================+=======================+==========================+
- | `ITK <http://www.itk.org>`_ | Yes | 4.6.0 |
- +------------------------------------------------------------------+-----------------------+--------------------------+
- | `GDAL <http://www.gdal.org>`_ | Yes | 2.0 |
- +------------------------------------------------------------------+-----------------------+--------------------------+
- | `OSSIM <http://www.ossim.org>`_ | Yes | 1.8.20-3 |
- +------------------------------------------------------------------+-----------------------+--------------------------+
- | `libgeotiff <http://trac.osgeo.org/geotiff/>`_ | Yes | |
- +------------------------------------------------------------------+-----------------------+--------------------------+
- | `boost <http://www.boost.org>`_ | Yes | |
- +------------------------------------------------------------------+-----------------------+--------------------------+
- | `openthreads <http://www.openscenegraph.org>`_ | Yes | |
- +------------------------------------------------------------------+-----------------------+--------------------------+
- | `tinyXML <http://www.grinninglizard.com/tinyxml>`_ | Yes | |
- +------------------------------------------------------------------+-----------------------+--------------------------+
- | `6S <http://6s.ltdri.org>`_ | No | |
- +------------------------------------------------------------------+-----------------------+--------------------------+
- | `Curl <http://www.curl.haxx.se>`_ | No | |
- +------------------------------------------------------------------+-----------------------+--------------------------+
- | `FFTW <http://www.fftw.org>`_ | No | |
- +------------------------------------------------------------------+-----------------------+--------------------------+
- | `GLEW <http://glew.sourceforge.net/>`_ | No | |
- +------------------------------------------------------------------+-----------------------+--------------------------+
- | `GLFW <http://www.glfw.org/>`_ | No | 3 |
- +------------------------------------------------------------------+-----------------------+--------------------------+
- | `GLUT <https://www.opengl.org/resources/libraries/glut/>`_ | No | |
- +------------------------------------------------------------------+-----------------------+--------------------------+
- | `libKML <https://github.com/google/libkml>`_ | No | 1.2 |
- +------------------------------------------------------------------+-----------------------+--------------------------+
- | `libSVM <http://www.csie.ntu.edu.tw/~cjlin/libsvm>`_ | No | 2.0 |
- +------------------------------------------------------------------+-----------------------+--------------------------+
- | `MPI <https://www.open-mpi.org/>`_ | No | |
- +------------------------------------------------------------------+-----------------------+--------------------------+
- | `MuParser <http://www.muparser.sourceforge.net>`_ | No | |
- +------------------------------------------------------------------+-----------------------+--------------------------+
- | `MuParserX <http://muparserx.beltoforion.de>`_ | No | 4.0.7 |
- +------------------------------------------------------------------+-----------------------+--------------------------+
- | `OpenCV <http://opencv.org>`_ | No | 2 (3.x also supported) |
- +------------------------------------------------------------------+-----------------------+--------------------------+
- | `OPENGL <https://www.opengl.org/>`_ | No | |
- +------------------------------------------------------------------+-----------------------+--------------------------+
- | `Qt <https://www.qt.io/developers/>`_ | No | 5 |
- +------------------------------------------------------------------+-----------------------+--------------------------+
- | `QWT <http://qwt.sourceforge.net>`_ | No | 6 |
- +------------------------------------------------------------------+-----------------------+--------------------------+
- | `Shark <http://image.diku.dk/shark/>`_ | No | 3.1 |
- +------------------------------------------------------------------+-----------------------+--------------------------+
- | `SiftFast <http://libsift.sourceforge.net>`_ | No | |
- +------------------------------------------------------------------+-----------------------+--------------------------+
- | `SPTW <https://github.com/remicres/sptw.git>`_ | No | |
- +------------------------------------------------------------------+-----------------------+--------------------------+
-
+ +------------------------------------------------------------------+-----------------------+--------------------------+--------------------------+
+ | **Library** | **Mandatory** | **Minimum version** | **Superbuild Version** |
+ +==================================================================+=======================+==========================+==========================+
+ | `ITK <http://www.itk.org>`_ | Yes | 4.6.0 | 4.13 |
+ +------------------------------------------------------------------+-----------------------+--------------------------+--------------------------+
+ | `GDAL <http://www.gdal.org>`_ | Yes | 2.0 | 2.4.1 |
+ +------------------------------------------------------------------+-----------------------+--------------------------+--------------------------+
+ | `OSSIM <http://www.ossim.org>`_ | Yes | 1.8.20-3 | 1.8.20 |
+ +------------------------------------------------------------------+-----------------------+--------------------------+--------------------------+
+ | `libgeotiff <http://trac.osgeo.org/geotiff/>`_ | Yes | | 1.4.2 |
+ +------------------------------------------------------------------+-----------------------+--------------------------+--------------------------+
+ | `boost <http://www.boost.org>`_ | Yes | | 1.60 |
+ +------------------------------------------------------------------+-----------------------+--------------------------+--------------------------+
+ | `openthreads <http://www.openscenegraph.org>`_ | Yes | | 3.4.0 |
+ +------------------------------------------------------------------+-----------------------+--------------------------+--------------------------+
+ | `tinyXML <http://www.grinninglizard.com/tinyxml>`_ | Yes | | 2.6.2 |
+ +------------------------------------------------------------------+-----------------------+--------------------------+--------------------------+
+ | `6S <http://6s.ltdri.org>`_ | No | | |
+ +------------------------------------------------------------------+-----------------------+--------------------------+--------------------------+
+ | `Curl <http://www.curl.haxx.se>`_ | No | | 7.54.1 |
+ +------------------------------------------------------------------+-----------------------+--------------------------+--------------------------+
+ | `FFTW <http://www.fftw.org>`_ | No | | 3.3.8 |
+ +------------------------------------------------------------------+-----------------------+--------------------------+--------------------------+
+ | `GLEW <http://glew.sourceforge.net/>`_ | No | | 1.13 |
+ +------------------------------------------------------------------+-----------------------+--------------------------+--------------------------+
+ | `GLFW <http://www.glfw.org/>`_ | No | 3 | 3.1.2 |
+ +------------------------------------------------------------------+-----------------------+--------------------------+--------------------------+
+ | `GLUT <https://www.opengl.org/resources/libraries/glut/>`_ | No | | 2.8.1 |
+ +------------------------------------------------------------------+-----------------------+--------------------------+--------------------------+
+ | `libKML <https://github.com/google/libkml>`_ | No | 1.2 | 1.3.0 |
+ +------------------------------------------------------------------+-----------------------+--------------------------+--------------------------+
+ | `libSVM <http://www.csie.ntu.edu.tw/~cjlin/libsvm>`_ | No | 2.0 | 3.22 |
+ +------------------------------------------------------------------+-----------------------+--------------------------+--------------------------+
+ | `MPI <https://www.open-mpi.org/>`_ | No | | |
+ +------------------------------------------------------------------+-----------------------+--------------------------+--------------------------+
+ | `MuParser <http://www.muparser.sourceforge.net>`_ | No | | 2.2.5 |
+ +------------------------------------------------------------------+-----------------------+--------------------------+--------------------------+
+ | `MuParserX <http://muparserx.beltoforion.de>`_ | No | 4.0.7 | 4.0.7 |
+ +------------------------------------------------------------------+-----------------------+--------------------------+--------------------------+
+ | `OpenCV <http://opencv.org>`_ | No | 2 (3.x also supported) | 3.4.1 |
+ +------------------------------------------------------------------+-----------------------+--------------------------+--------------------------+
+ | `OPENGL <https://www.opengl.org/>`_ | No | | |
+ +------------------------------------------------------------------+-----------------------+--------------------------+--------------------------+
+ | `Qt <https://www.qt.io/developers/>`_ | No | 5 | 5.10.1 |
+ +------------------------------------------------------------------+-----------------------+--------------------------+--------------------------+
+ | `QWT <http://qwt.sourceforge.net>`_ | No | 6 | 6.1.3 |
+ +------------------------------------------------------------------+-----------------------+--------------------------+--------------------------+
+ | `Shark <http://image.diku.dk/shark/>`_ | No | 4 | 4.0 |
+ +------------------------------------------------------------------+-----------------------+--------------------------+--------------------------+
+ | `SiftFast <http://libsift.sourceforge.net>`_ | No | | |
+ +------------------------------------------------------------------+-----------------------+--------------------------+--------------------------+
+ | `SPTW <https://github.com/remicres/sptw.git>`_ | No | | |
+ +------------------------------------------------------------------+-----------------------+--------------------------+--------------------------+
+
GNU/Linux and macOS
-------------------
diff --git a/Modules/Remote/diapotb.remote.cmake b/Modules/Remote/diapotb.remote.cmake
index c679c41bdabb67ad4218279bc93b331d49387e3f..cc771e7f1d620088b347badb112eb4572b23719d 100644
--- a/Modules/Remote/diapotb.remote.cmake
+++ b/Modules/Remote/diapotb.remote.cmake
@@ -2,5 +2,5 @@
otb_fetch_module(DiapOTBModule
"OTB module for SAR processing in Diapason."
GIT_REPOSITORY https://gitlab.orfeo-toolbox.org/remote_modules/diapotb.git
- GIT_TAG master
+ GIT_TAG d38457a019d2ef15a47d04c21f235c9e9fe4acd5
)