Commit d386a487 authored by Cédric Traizet's avatar Cédric Traizet
Browse files

Merge branch 'develop' into optical_imi

parents 0065726e 03b12c74
......@@ -351,43 +351,43 @@ ubuntu-xdk-report:
- job: ubuntu-xdk-qa-static-analysis
artifacts: true
#------------------------- Conda packages jobs ---------------------------------
conda-linux-build:
extends: .common
stage: build
only:
- nightly
- /^release-[0-9]+\.[0-9]+$/@orfeotoolbox/otb
image: $BUILD_IMAGE_REGISTRY/otb-conda-build:latest
allow_failure: true
script:
- export otb_tag=${CI_COMMIT_TAG:-$CI_COMMIT_SHORT_SHA}
- ./CI/conda_build.sh
after_script: []
needs:
- job: fast-build
artifacts: false
artifacts:
when: always
expire_in: 24 hrs
paths:
- conda-bld/*
# #------------------------- Conda packages jobs ---------------------------------
# conda-linux-build:
# extends: .common
# stage: build
# only:
# - nightly
# - /^release-[0-9]+\.[0-9]+$/@orfeotoolbox/otb
# image: $BUILD_IMAGE_REGISTRY/otb-conda-build:latest
# allow_failure: true
# script:
# - export otb_tag=${CI_COMMIT_TAG:-$CI_COMMIT_SHORT_SHA}
# - ./CI/conda_build.sh
# after_script: []
# needs:
# - job: fast-build
# artifacts: false
# artifacts:
# when: always
# expire_in: 24 hrs
# paths:
# - conda-bld/*
conda-linux-deploy:
extends: .general
stage: deploy
only:
- /^release-[0-9]+\.[0-9]+$/@orfeotoolbox/otb
image: $BUILD_IMAGE_REGISTRY/otb-conda-build:latest
before_script:
# Provision efficiently the local LFS cache before checkout
- git lfs fetch origin $CI_COMMIT_SHA
- git checkout -f -q $CI_COMMIT_SHA
script:
- ./CI/conda_deploy.sh
needs:
- job: conda-linux-build
artifacts: yes
# conda-linux-deploy:
# extends: .general
# stage: deploy
# only:
# - /^release-[0-9]+\.[0-9]+$/@orfeotoolbox/otb
# image: $BUILD_IMAGE_REGISTRY/otb-conda-build:latest
# before_script:
# # Provision efficiently the local LFS cache before checkout
# - git lfs fetch origin $CI_COMMIT_SHA
# - git checkout -f -q $CI_COMMIT_SHA
# script:
# - ./CI/conda_deploy.sh
# needs:
# - job: conda-linux-build
# artifacts: yes
#---------------------------- Deploy job ---------------------------------------
deploy:
......
......@@ -5,3 +5,5 @@ Can be a combination of CookBook, doxygen, blog, applications doc, websites
### Change requested
Describe precisely the changes that are required.
/label ~documentation
We are ready to release OTB version MAJOR.MINOR.PATCH. The following steps need to be done:
## Release Candidate
### 1. Branches
* [ ] **(if major or minor release)** Feature freeze: [create the new release branch](https://gitlab.orfeo-toolbox.org/orfeotoolbox/otb/wikis/Help-for-release-actions#create-release-branch)
......@@ -8,21 +10,58 @@ We are ready to release OTB version MAJOR.MINOR.PATCH. The following steps need
### 2. Housekeeping
* [ ] In this story, make a list of blocking issues for the release (if any)
* [ ] [Update the SuperBuild archive](https://gitlab.orfeo-toolbox.org/orfeotoolbox/otb/wikis/Help-for-release-actions#superbuild-archive) (if needed)
* [ ] Update release notes (walk the GitLab MR merged history and log all improvements)
* [ ] Update the date in RELEASE_NOTES.txt
* [ ] Check [SonarQube](https://sonar.orfeo-toolbox.org/dashboard?id=orfeotoolbox-otb)
* [ ] Run Debian [spelling](https://gitlab.orfeo-toolbox.org/orfeotoolbox/otb/wikis/Help-for-release-actions#spelling-check) checker
* [ ] Run shellcheck script from [OTB-Devutils/Scripts/](https://gitlab.orfeo-toolbox.org/orfeotoolbox/otb-devutils/blob/master/Scripts/run_shellcheck.sh)
* [ ] [Update translation](https://gitlab.orfeo-toolbox.org/orfeotoolbox/otb/wikis/Help-for-release-actions#translation-for-monteverdi-mapla) for Monteverdi and Mapla
* [ ] [Sanity check the binary packages](https://gitlab.orfeo-toolbox.org/orfeotoolbox/otb/wikis/Help-for-release-actions#standalone-packages-sanity-check)
* [ ] Windows
* [ ] Linux
* [ ] Mac
* [ ] Test QGIS on qgis docker image
### 3. Actual release
Once all blocking issues are closed, and the previous steps are done:
* [ ] [Tag the release candidate](https://gitlab.orfeo-toolbox.org/orfeotoolbox/otb/wikis/Help-for-release-actions#release-tag)
* [ ] Update GIT_TAG for all official remote modules (if needed)
### 4. Publish and plan next release
* [ ] [Prepare and upload source packages](https://gitlab.orfeo-toolbox.org/orfeotoolbox/otb/wikis/Help-for-release-actions#prepare-and-upload-source-packages)
* [ ] [Promote staging packages](https://gitlab.orfeo-toolbox.org/orfeotoolbox/otb/wikis/Help-for-release-actions#promote-staging-packages)
* [ ] [Update documentation](https://gitlab.orfeo-toolbox.org/orfeotoolbox/otb/wikis/Help-for-release-actions#update-documentation)
* [ ] Cookbook
* [ ] Doxygen
* [ ] [Update the SuperBuild archive](https://gitlab.orfeo-toolbox.org/orfeotoolbox/otb/wikis/Help-for-release-actions#superbuild-archive)
* [ ] Release Candidate announcement on the forum
## Release
### 1. Branches
* [ ] Make sure the version number in `CMakeLists.txt` is MAJOR.MINOR.PATCH
### 2. Housekeeping
* [ ] In this story, make a list of blocking issues for the release (if any)
* [ ] Fix compilation warnings on CI
* [ ] Update release notes (walk the GitLab MR merged history and log all improvements)
* [ ] Update the date in RELEASE_NOTES.txt
* [ ] Check [SonarQube](https://sonar.orfeo-toolbox.org/dashboard?id=orfeotoolbox-otb)
* [ ] Run Debian [spelling](https://gitlab.orfeo-toolbox.org/orfeotoolbox/otb/wikis/Help-for-release-actions#spelling-check) checker
* [ ] Run shellcheck script from [OTB-Devutils/Scripts/](https://gitlab.orfeo-toolbox.org/orfeotoolbox/otb-devutils/blob/master/Scripts/run_shellcheck.sh)
* [ ] [Update translation](https://gitlab.orfeo-toolbox.org/orfeotoolbox/otb/wikis/Help-for-release-actions#translation-for-monteverdi-mapla) for Monteverdi and Mapla
* [ ] [Sanity check the binary packages](https://gitlab.orfeo-toolbox.org/orfeotoolbox/otb/wikis/Help-for-release-actions#standalone-packages-sanity-check)
* [ ] Windows
* [ ] Linux
* [ ] Mac
* [ ] Windows
* [ ] Linux
* [ ] Mac
* [ ] Test QGIS on qgis docker image
### 3. Actual release
Once all blocking issues are closed, and the previous steps are done:
* [ ] [Tag the release or RC](https://gitlab.orfeo-toolbox.org/orfeotoolbox/otb/wikis/Help-for-release-actions#release-tag)
* [ ] [Tag the release](https://gitlab.orfeo-toolbox.org/orfeotoolbox/otb/wikis/Help-for-release-actions#release-tag)
* [ ] **(if major or minor release)**: Merge the release into develop
* [ ] **(if it's the latest release)**: Merge the release into master
* [ ] **(if patch release)**: Backport fixes
......@@ -36,11 +75,12 @@ Once all blocking issues are closed, and the previous steps are done:
* [ ] Doxygen
* [ ] WordPress page "Home" and "Download" pages
* [ ] Upload OTB source archive to [Zenodo](https://zenodo.org/) to create a unique Digital Object Identifier (DOI)
* [ ] Send email to mailing list to announce the release
* [ ] Release announcement on the blog
* [ ] Announcement on social networks (twitter, google+)
* [ ] [Update the SuperBuild archive](https://gitlab.orfeo-toolbox.org/orfeotoolbox/otb/wikis/Help-for-release-actions#superbuild-archive)
* [ ] Release announcement
* [ ] On the [forum](https://forum.orfeo-toolbox.org/)
* [ ] On the [blog](https://www.orfeo-toolbox.org/blog/)
* [ ] On [Twitter](https://twitter.com/orfeotoolbox)
* [ ] Forward announcement to news_item@osgeo.org ([OSGeo news](https://www.osgeo.org/foundation-news/))
* [ ] Plan the next release (nominate new release manager, setup PSC meeting on IRC)
* [ ] Remove public branches related to MR or bugfix merged before the release
/label ~story
......@@ -12,6 +12,7 @@ Aurélie Emilien <aurelie.emilien@c-s.fr>
Aurélie Emilien <aurelie.emilien@c-s.fr> Aurelie Emilien <aurelie.emilien@c-s.fr>
Bas Couwenberg <sebastic@debian.org>
Bas Couwenberg <sebastic@debian.org> Bas Couwenberg <sebastic@xs4all.nl>
Brad Hards <bradh@frogmouth.net>
Carole Amiot <carole.amiot@cnes.fr>
Carole Amiot <carole.amiot@cnes.fr> Carole Amiot <carole.amiot@thales-services.fr>
Caroline Ruffel <caroline.ruffel@c-s.fr>
......@@ -58,7 +59,8 @@ Julien Michel <julien.michel@cnes.fr> Julien Michel <julien.
Julien Osman <julien.osman@csgroup.eu> Julien Osman <julien.osman@c-s.fr>
Laurențiu Nicola <lnicola@dend.ro> Laurentiu Nicola <lnicola@dend.ro>
Laurențiu Nicola <lnicola@dend.ro> Laurențiu Nicola <grayshade@gmail.com>
Luc Hermitte <luc.hermitte@c-s.fr> Luc Hermitte <luc.hermitte@cnes.fr>
Luc Hermitte <luc.hermitte@csgroup.eu> Luc Hermitte <luc.hermitte@cnes.fr>
Luc Hermitte <luc.hermitte@csgroup.eu> Luc Hermitte <luc.hermitte@c-s.fr>
Ludovic Hussonnois <ludovic.hussonnois@c-s.fr>
Manuel Grizonnet <manuel.grizonnet@cnes.fr>
Manuel Grizonnet <manuel.grizonnet@cnes.fr> Grizonnet Manuel <manuel.grizonnet@cnes.fr>
......
......@@ -70,7 +70,7 @@ if(XDK_PATH)
set(cmake_configure_option
"${cmake_configure_option}
CMAKE_PREFIX_PATH=${XDK_PATH}")
foreach(remote_module OTBTemporalGapFilling SertitObject otbGRM DiapOTBModule)
foreach(remote_module OTBTemporalGapFilling SertitObject otbGRM DiapOTBModule S1TilingSupportApplications)
set(cmake_configure_option
"${cmake_configure_option}
Module_${remote_module}:BOOL=ON")
......
#
# Copyright (C) 2005-2020 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.
#
# This cmake module is based on a module written by Nuno Fachada, below is the
# original header of the module:
#
# This cmake module sets the project version and partial version
# variables by analysing the git tag and commit history. It expects git
......@@ -32,7 +55,7 @@
# Author: Nuno Fachada
function(get_package_name root_repo_dir project_version_string)
function(get_package_name root_repo_dir project project_version_string)
if(EXISTS "${root_repo_dir}/.git")
find_package(Git)
......@@ -40,12 +63,6 @@ function(get_package_name root_repo_dir project_version_string)
message(ERROR "git not found. Make sure git can be found in your PATH")
return()
endif()
message(STATUS "PROJECT_NAME: ${PROJECT_NAME}")
message(STATUS "VERSION MINOR: ${${PROJECT_NAME}_VERSION_MAJOR}")
message(STATUS "VERSION MAJOR: ${${PROJECT_NAME}_VERSION_MINOR}")
message(STATUS "VERSION PATCH: ${${PROJECT_NAME}_VERSION_PATCH}")
if(DEFINED ENV{CI_COMMIT_REF_NAME})
set(branch_name "$ENV{CI_COMMIT_REF_NAME}")
......@@ -65,7 +82,7 @@ function(get_package_name root_repo_dir project_version_string)
if("${branch_name}" MATCHES "^release-[0-9]+\\.[0-9]+\$")
set(${project_version_string} "${${PROJECT_NAME}_VERSION_MAJOR}.${${PROJECT_NAME}_VERSION_MINOR}.${${PROJECT_NAME}_VERSION_PATCH}" PARENT_SCOPE)
set(${project_version_string} "${${project}_VERSION_MAJOR}.${${project}_VERSION_MINOR}.${${project}_VERSION_PATCH}" PARENT_SCOPE)
else()
if(DEFINED ENV{CI_COMMIT_SHORT_SHA})
......@@ -73,9 +90,9 @@ function(get_package_name root_repo_dir project_version_string)
else()
execute_process(COMMAND ${GIT_EXECUTABLE} rev-parse --short HEAD
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
OUTPUT_VARIABLE ${PROJECT_NAME}_COMMIT_SHA_STRING
OUTPUT_VARIABLE ${project}_COMMIT_SHA_STRING
OUTPUT_STRIP_TRAILING_WHITESPACE)
set(${project_version_string} "${branch_name}-${${PROJECT_NAME}_COMMIT_SHA_STRING}" PARENT_SCOPE)
set(${project_version_string} "${branch_name}-${${project}_COMMIT_SHA_STRING}" PARENT_SCOPE)
endif()
endif()
......@@ -99,7 +116,7 @@ function(get_package_name root_repo_dir project_version_string)
message(STATUS "M: ${_VERSION_MAJOR}, m: ${_VERSION_MINOR}, p: ${_VERSION_PATCH}")
set(${project_version_string} "${PROJECT_VERSION_STRING}" PARENT_SCOPE)
set(${project_version_string} "${PROJECT_VERSION_STRING}" PARENT_SCOPE)
endif()
......
......@@ -133,14 +133,11 @@ set(main_project_name ${_OTBModuleMacros_DEFAULT_LABEL})
#-----------------------------------------------------------------------------
# OTB version number.
set(OTB_VERSION_MAJOR "7")
set(OTB_VERSION_MINOR "1")
set(OTB_VERSION_MINOR "2")
set(OTB_VERSION_PATCH "0")
set(OTB_VERSION_STRING "${OTB_VERSION_MAJOR}.${OTB_VERSION_MINOR}.${OTB_VERSION_PATCH}")
get_package_name(${OTB_SOURCE_DIR} OTB_VERSION_STRING2)
message(STATUS "## ${OTB_VERSION_STRING2} ##")
get_package_name(${OTB_SOURCE_DIR} ${PROJECT_NAME} OTB_VERSION_STRING2)
# Monteverdi version number (follows OTB)
set( Monteverdi_VERSION_MAJOR ${OTB_VERSION_MAJOR} )
......
ENVI
samples = 1441
lines = 721
bands = 1
header offset = 24
file type = ENVI Standard
data type = 4
interleave = bsq
sensor type = Unknown
byte order = 1
wavelength units = Unknown
map info = {Geographic Lat/Lon, 1, 1,-0.125, 90.125, 0.25, 0.25,WGS-84}
coordinate system string = {GEOGCS["GCS_WGS_1984",DATUM["D_WGS_1984",SPHEROID["WGS_1984",6378137,298.257223563]],PRIMEM["Greenwich",0],UNIT["Degree",0.017453292519943295]]}
band names = {
Band 1}
ENVI
samples = 1441
lines = 721
bands = 1
header offset = 24
file type = ENVI Standard
data type = 4
interleave = bsq
sensor type = Unknown
byte order = 1
wavelength units = Unknown
map info = {Geographic Lat/Lon, 1, 1,-0.125, 90.125, 0.25, 0.25,WGS-84}
coordinate system string = {GEOGCS["GCS_WGS_1984",DATUM["D_WGS_1984",SPHEROID["WGS_1984",6378137,298.257223563]],PRIMEM["Greenwich",0],UNIT["Degree",0.017453292519943295]]}
band names = {
Band 1}
......@@ -12,6 +12,7 @@
<dd><a href="https://www.orfeo-toolbox.org/CookBook-6.6.1/">6.6.1</a></dd>
<dd><a href="https://www.orfeo-toolbox.org/CookBook-7.0/">7.0.0</a></dd>
<dd><a href="https://www.orfeo-toolbox.org/CookBook-7.1/">7.1.0</a></dd>
<dd><a href="https://www.orfeo-toolbox.org/CookBook-7.2/">7.2.0</a></dd>
<dd><a href="https://www.orfeo-toolbox.org/CookBook-develop/">develop</a></dd>
</dl>
</div>
......
......@@ -235,7 +235,7 @@ placed exactly at the same position in the screenshots).
.. _BM:
.. figure:: Art/MonteverdiImages/BM.png
:numref:`BM`: Comparision of histograms before and after applying BandMath.
:numref:`BM`: Comparison of histograms before and after applying BandMath.
Segmentation
~~~~~~~~~~~~
......
......@@ -20,17 +20,17 @@
/* Example usage:
./DEMToRainbowExample Output/DEMToRainbowImageGenerator.png 6.5 45.5 500 500 0.002 -0.002 Input/DEM_srtm
./DEMToRainbowExample Output/DEMToRainbowImageGenerator.png 6.5 45.5 500 500 0.002 -0.002 Input/DEM/srtm_directory_srtm
*/
/* Example usage:
./DEMToRainbowExample Output/DEMToHotImageGenerator.png 6.5 45.5 500 500 0.002 -0.002 Input/DEM_srtm hot
./DEMToRainbowExample Output/DEMToHotImageGenerator.png 6.5 45.5 500 500 0.002 -0.002 Input/DEM/srtm_directory hot
*/
/* Example usage:
./DEMToRainbowExample Output/DEMToReliefImageGenerator.png 6.5 45.5 500 500 0.002 -0.002 Input/DEM_srtm relief
./DEMToRainbowExample Output/DEMToReliefImageGenerator.png 6.5 45.5 500 500 0.002 -0.002 Input/DEM/srtm_directory relief
*/
#include "otbImageFileReader.h"
......@@ -70,7 +70,7 @@ int main(int argc, char* argv[])
using SpacingType = DEMToImageGeneratorType::SpacingType;
using PointType = DEMToImageGeneratorType::PointType;
otb::DEMHandler::Instance()->OpenDEMDirectory(argv[8]);
otb::DEMHandler::GetInstance().OpenDEMDirectory(argv[8]);
PointType origin;
origin[0] = ::atof(argv[2]);
......
......@@ -20,7 +20,7 @@
/* Example usage:
./HillShadingExample Output/HillShadingExample.png Output/HillShadingColorExample.png 6.5 45.5 500 500 0.002 -0.002 Input/DEM_srtm
./HillShadingExample Output/HillShadingExample.png Output/HillShadingColorExample.png 6.5 45.5 500 500 0.002 -0.002 Input/DEM/srtm_directory
*/
......@@ -71,7 +71,7 @@ int main(int argc, char* argv[])
using SpacingType = DEMToImageGeneratorType::SpacingType;
using PointType = DEMToImageGeneratorType::PointType;
otb::DEMHandler::Instance()->OpenDEMDirectory(argv[9]);
otb::DEMHandler::GetInstance().OpenDEMDirectory(argv[9]);
PointType origin;
origin[0] = ::atof(argv[3]);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment