Skip to content

Commit ca429a7

Browse files
tromaintromain
committed
Merge branch 'develop' into remove-visualization-modules
2 parents 858b880 + c8cde1f commit ca429a7

File tree

51 files changed

+383
-619
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+383
-619
lines changed

‎.gitlab-ci.yml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ stages:
5151
- build
5252
- report
5353
- deploy
54+
- docker
5455

5556
.general:
5657
retry:
@@ -422,3 +423,18 @@ release-container:
422423
--form ref=master
423424
--form variables[OTB_TAG]=$CI_COMMIT_TAG
424425
https://gitlab.orfeo-toolbox.org/api/v4/projects/126/trigger/pipeline
426+
427+
release-docker:
428+
image:
429+
name: gcr.io/kaniko-project/executor:debug
430+
entrypoint: [""]
431+
stage: docker
432+
only:
433+
refs:
434+
- /^release-[0-9]+\.[0-9]+$/
435+
script:
436+
- /kaniko/executor --cleanup
437+
--verbosity warn
438+
--context $CI_PROJECT_DIR/Docker
439+
--dockerfile $CI_PROJECT_DIR/Docker/Dockerfile
440+
--destination $CI_REGISTRY_IMAGE/orfeotoolbox/otb:$CI_COMMIT_BRANCH

‎CI/headers_check.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,8 @@
129129
'./CMake/exportheader.cmake.in',
130130
'./CMake/pre-commit',
131131
'./CMake/qt.conf.in',
132+
'./Docker/Dockerfile',
133+
'./Docker/system-dependencies.txt',
132134
'./Documentation/Cookbook/Art/residual_registration-figure.tex',
133135
'./Documentation/Cookbook/rst/Makefile.in',
134136
'./Documentation/Cookbook/rst/conf.py.in',

‎Docker/Dockerfile

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
#
2+
# Copyright (C) 2005-2022 Centre National d'Etudes Spatiales (CNES)
3+
#
4+
# This file is part of Orfeo Toolbox
5+
#
6+
# https://www.orfeo-toolbox.org/
7+
#
8+
# Licensed under the Apache License, Version 2.0 (the "License");
9+
# you may not use this file except in compliance with the License.
10+
# You may obtain a copy of the License at
11+
#
12+
# http://www.apache.org/licenses/LICENSE-2.0
13+
#
14+
# Unless required by applicable law or agreed to in writing, software
15+
# distributed under the License is distributed on an "AS IS" BASIS,
16+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
17+
# See the License for the specific language governing permissions and
18+
# limitations under the License.
19+
#
20+
FROM ubuntu:20.04
21+
ARG OTB_RELEASE=8.0.0
22+
23+
# Install system dependencies
24+
COPY system-dependencies.txt .
25+
RUN apt-get update -y \
26+
&& apt-get upgrade -y \
27+
&& cat system-dependencies.txt | DEBIAN_FRONTEND=noninteractive xargs apt-get install -y --no-install-recommends \
28+
&& apt-get clean \
29+
&& rm -rf /var/lib/apt/lists/* system-dependencies.txt
30+
31+
# Install pre-compiled OTB binaries
32+
RUN curl https://www.orfeo-toolbox.org/packages/archives/OTB/OTB-$OTB_RELEASE-Linux64.run -o OTB-$OTB_RELEASE-Linux64.run \
33+
&& chmod +x OTB-$OTB_RELEASE-Linux64.run \
34+
&& ./OTB-$OTB_RELEASE-Linux64.run --target /opt/otb \
35+
&& rm OTB-$OTB_RELEASE-Linux64.run
36+
37+
# Symlink Python library to a known path for OTB
38+
RUN ln -s /usr/lib/x86_64-linux-gnu/libpython3.8.so /opt/otb/lib/libpython3.8.so.rh-python38-1.0
39+
40+
# Persistant env
41+
ENV CMAKE_PREFIX_PATH=/opt/otb
42+
ENV PYTHONPATH=/opt/otb/lib/python
43+
ENV GDAL_DRIVER_PATH=disable
44+
ENV GDAL_DATA=/opt/otb/share/gdal
45+
ENV PROJ_LIB=/opt/otb/share/proj
46+
ENV PATH=/opt/otb/bin:$PATH
47+
ENV OTB_APPLICATION_PATH=/opt/otb/lib/otb/applications
48+
ENV LC_NUMERIC=C
49+
50+
# Default command when using 'docker run' or 'docker create'
51+
CMD /bin/bash

‎Docker/system-dependencies.txt

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
ca-certificates
2+
curl
3+
libxcb1
4+
libxcb-composite0
5+
libxcb-glx0
6+
libxcb-icccm4
7+
libxcb-image0
8+
libxcb-keysyms1
9+
libxcb-randr0
10+
libxcb-render0
11+
libxcb-render-util0
12+
libxcb-util1
13+
libxcb-shm0
14+
libxcb-xfixes0
15+
libxcb-xinerama0
16+
libxcb-xinput0
17+
libxcb-xkb1
18+
libxcb-shape0
19+
libx11-xcb1
20+
libglu1-mesa
21+
libxrender1
22+
libxi6
23+
libxkbcommon0
24+
libxkbcommon-x11-0
25+
libxinerama1
26+
python3
27+
python3-dev
28+
python3-numpy
29+
libtool
30+
libopengl0

‎Documentation/Cookbook/Art/plugins_config.png

122 KB
Loading

‎Documentation/Cookbook/_static/html/versions.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
<dd><a href="https://www.orfeo-toolbox.org/CookBook-7.3/">7.3.0</a></dd>
1717
<dd><a href="https://www.orfeo-toolbox.org/CookBook-7.4/">7.4.0</a></dd>
1818
<dd><a href="https://www.orfeo-toolbox.org/CookBook-8.0/">8.0.1</a></dd>
19+
<dd><a href="https://www.orfeo-toolbox.org/CookBook-8.1/">8.1.0</a></dd>
1920
<dd><a href="https://www.orfeo-toolbox.org/CookBook-develop/">develop</a></dd>
2021
</dl>
2122
</div>

‎Documentation/Cookbook/rst/CompilingOTBFromSource.rst

Lines changed: 36 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,40 +27,70 @@ process:
2727
+------------------------------------------------------------------+-----------------------+----------------------------+--------------------------+
2828
| **Library** | **Mandatory** | **Minimum version** | **Superbuild Version** |
2929
+------------------------------------------------------------------+-----------------------+----------------------------+--------------------------+
30+
| `Boost <http://www.boost.org>`_ | Yes | | 1.72.0 |
31+
+------------------------------------------------------------------+-----------------------+----------------------------+--------------------------+
32+
| `Expat <https://sourceforge.net/projects/expat/>`_ | Yes | | 2.4.8 |
33+
+------------------------------------------------------------------+-----------------------+----------------------------+--------------------------+
34+
| `FreeType <https://freetype.org/>`_ | Yes | | 2.6.0 |
35+
+------------------------------------------------------------------+-----------------------+----------------------------+--------------------------+
36+
| `Geos <https://libgeos.org/>`_ | Yes | | 3.9.3 / 3.6.5 (windows) |
37+
+------------------------------------------------------------------+-----------------------+----------------------------+--------------------------+
3038
| `ITK <http://www.itk.org>`_ | Yes | 4.6.0 | 4.13.3 |
3139
+------------------------------------------------------------------+-----------------------+----------------------------+--------------------------+
32-
| `GDAL <http://www.gdal.org>`_ | Yes | 2.4.1 | 3.4.2 |
40+
| `GDAL <http://www.gdal.org>`_ | Yes | 2.4.1 | 3.4.2 / 3.2.2 (windows) |
41+
+------------------------------------------------------------------+-----------------------+----------------------------+--------------------------+
42+
| `HDF4 <https://www.hdfgroup.org/solutions/hdf4/>`_ | Yes | | 4.2.13 |
43+
+------------------------------------------------------------------+-----------------------+----------------------------+--------------------------+
44+
| `HDF5 <https://www.hdfgroup.org/solutions/hdf5/>`_ | Yes | | 1.10.1 |
45+
+------------------------------------------------------------------+-----------------------+----------------------------+--------------------------+
46+
| `libgeotiff <http://trac.osgeo.org/geotiff/>`_ | Yes | | 1.7.1 |
47+
+------------------------------------------------------------------+-----------------------+----------------------------+--------------------------+
48+
| `libjpeg-turbo <http://sourceforge.net/projects/libjpeg-turbo>`_ | Yes | | 1.5.3 |
3349
+------------------------------------------------------------------+-----------------------+----------------------------+--------------------------+
34-
| `libgeotiff <http://trac.osgeo.org/geotiff/>`_ | Yes | | 1.7.0 |
50+
| `libpng <https://downloads.sourceforge.net/project/libpng>`_ | Yes | | 1.6.37 |
3551
+------------------------------------------------------------------+-----------------------+----------------------------+--------------------------+
36-
| `boost <http://www.boost.org>`_ | Yes | | 1.72.0 |
52+
| `libtiff <http://www.libtiff.org/>`_ | Yes | | 4.4.0 |
53+
+------------------------------------------------------------------+-----------------------+----------------------------+--------------------------+
54+
| `NetCDF <https://github.com/Unidata/netcdf-c>`_ | Yes | | 4.7.4 |
55+
+------------------------------------------------------------------+-----------------------+----------------------------+--------------------------+
56+
| `Noto Fonts <https://fonts.google.com/noto>`_ | Yes | | |
57+
+------------------------------------------------------------------+-----------------------+----------------------------+--------------------------+
58+
| `OpenJPEG <https://github.com/uclouvain/openjpeg>`_ | Yes | | 2.3.1 |
59+
+------------------------------------------------------------------+-----------------------+----------------------------+--------------------------+
60+
| `PROJ <https://proj.org/>`_ | Yes | | 8.2.0 / 6.2.1 (windows) |
61+
+------------------------------------------------------------------+-----------------------+----------------------------+--------------------------+
62+
| `SQLITE <https://www.sqlite.org>`_ | Yes | | 3.36.0 / 3.8.8 (windows) |
3763
+------------------------------------------------------------------+-----------------------+----------------------------+--------------------------+
3864
| `tinyXML <http://www.grinninglizard.com/tinyxml>`_ | Yes | | 2.6.2 |
3965
+------------------------------------------------------------------+-----------------------+----------------------------+--------------------------+
66+
| `ZLIB <https://zlib.net>`_ | Yes | | 1.2.12 |
67+
+------------------------------------------------------------------+-----------------------+----------------------------+--------------------------+
4068
| `6S <http://6s.ltdri.org>`_ | No | | |
4169
+------------------------------------------------------------------+-----------------------+----------------------------+--------------------------+
4270
| `Curl <http://www.curl.haxx.se>`_ | No | | 7.54.1 |
4371
+------------------------------------------------------------------+-----------------------+----------------------------+--------------------------+
44-
| `FFTW <http://www.fftw.org>`_ | No | | 3.3.9 |
72+
| `FFTW <http://www.fftw.org>`_ | No | | 3.3.10 |
4573
+------------------------------------------------------------------+-----------------------+----------------------------+--------------------------+
4674
| `libKML <https://github.com/google/libkml>`_ | No | 1.2 | 1.3.0 |
4775
+------------------------------------------------------------------+-----------------------+----------------------------+--------------------------+
48-
| `libSVM <http://www.csie.ntu.edu.tw/~cjlin/libsvm>`_ | No | 2.0 | 3.22 |
76+
| `libSVM <http://www.csie.ntu.edu.tw/~cjlin/libsvm>`_ | No | 2.0 | 3.25 |
4977
+------------------------------------------------------------------+-----------------------+----------------------------+--------------------------+
5078
| `MPI <https://www.open-mpi.org/>`_ | No | | |
5179
+------------------------------------------------------------------+-----------------------+----------------------------+--------------------------+
5280
| `MuParser <http://www.muparser.sourceforge.net>`_ | No | | 2.3.2 |
5381
+------------------------------------------------------------------+-----------------------+----------------------------+--------------------------+
5482
| `MuParserX <http://muparserx.beltoforion.de>`_ | No | 4.0.7 | 4.0.8 |
5583
+------------------------------------------------------------------+-----------------------+----------------------------+--------------------------+
56-
| `OpenCV <http://opencv.org>`_ | No | 3.0.0 | 4.5.1 |
84+
| `OpenCV <http://opencv.org>`_ | No | 3.0.0 | 4.6.0 |
5785
+------------------------------------------------------------------+-----------------------+----------------------------+--------------------------+
5886
| `Shark <http://image.diku.dk/shark/>`_ | No | 4 | 4.0 |
5987
+------------------------------------------------------------------+-----------------------+----------------------------+--------------------------+
6088
| `SiftFast <http://libsift.sourceforge.net>`_ | No | | |
6189
+------------------------------------------------------------------+-----------------------+----------------------------+--------------------------+
6290
| `SPTW <https://github.com/remicres/sptw.git>`_ | No | | |
6391
+------------------------------------------------------------------+-----------------------+----------------------------+--------------------------+
92+
| `SWIG <https://www.swig.org/>`_ | No | | 4.0.2 |
93+
+------------------------------------------------------------------+-----------------------+----------------------------+--------------------------+
6494

6595
GNU/Linux and macOS
6696
-------------------

‎Documentation/Cookbook/rst/QGISInterface.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ You can configure OTB for QGIS according to the:
1212

1313
.. image:: Art/plugins.png
1414

15+
.. image:: Art/plugins_config.png
16+
1517

1618
Compatibility between QGIS and OTB versions
1719
-------------------------------------------

‎Documentation/Cookbook/rst/ReleaseNote8.rst

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
What is new with OTB 8.0
22
========================
33

4+
.. note:: To see the complete list of updates, see the `RELEASE NOTES
5+
<https://gitlab.orfeo-toolbox.org/orfeotoolbox/otb/-/blob/develop/RELEASE_NOTES.txt>`_.
6+
47
OSSIM is used for geometric **sensor modelling** and **metadata
58
parsing**. It has been a dependency of the OTB since its
69
beginning. Then adapter classes have been added to hide OSSIM headers

‎Documentation/Cookbook/rst/RemoteModules.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,7 @@ the applications of your module will be installed in the same folder as OTB appl
152152
153153
mkdir /Path/to/Module/build && cd /Path/to/Module/build
154154
cmake -DOTB_DIR=/PathTo/OTB/install -DOTB_BUILD_MODULE_AS_STANDALONE=ON
155+
-DCMAKE_CXX_FLAGS=-D_GLIBCXX_USE_CXX11_ABI=0
155156
-DCMAKE_INSTALL_PREFIX=/theModulePath/install -DCMAKE_INSTALL_RPATH=/theModulePath/install/lib
156157
-DCMAKE_INSTALL_RPATH_USE_LINK_PATH=TRUE ../
157158
make install

‎Modules/Adapters/GdalAdapters/test/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ otb_add_test(NAME TvOGRExtendedFilename
6767
otb_add_test(NAME TvOGRExtendedFilenameGDALCreate
6868
COMMAND otbOGRTestDriver
6969
otbOGRExtendedFileNameGDALCreate
70-
${TEMP}/test_OGRExtendedFilenameGDALCreate.shp?gdal:co:creationOption=OPTION
70+
${TEMP}/test_OGRExtendedFilenameGDALCreate.shp?&gdal:co:creationOption=OPTION
7171
)
7272

7373
otb_add_test(NAME TvOGRExtendedFilenameGDALLayer

‎Modules/Applications/AppProjection/app/CMakeLists.txt

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,6 @@ otb_create_application(
2828
SOURCES otbConvertCartoToGeoPoint.cxx
2929
LINK_LIBRARIES ${${otb-module}_LIBRARIES})
3030

31-
# TODO refactor this application
32-
#otb_create_application(
33-
# NAME GenerateRPCSensorModel
34-
# SOURCES otbGenerateRPCSensorModel.cxx
35-
# LINK_LIBRARIES ${${otb-module}_LIBRARIES})
36-
3731
otb_create_application(
3832
NAME GridBasedImageResampling
3933
SOURCES otbGridBasedImageResampling.cxx

0 commit comments

Comments
 (0)