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

Merge branch 'integration_release-7.4' into 'develop'

Release 7.4 (integration into develop)

See merge request !847
parents f419981f de6d1745
Pipeline #8583 passed with stages
in 4 minutes and 17 seconds
......@@ -48,7 +48,7 @@ class CDashException(Exception):
pass
"""
Handler class to retrieve build informations
Handler class to retrieve build information
"""
class Handler:
def __init__ (self):
......@@ -112,7 +112,7 @@ class Handler:
def GetBuildId (self, **kwargs):
"""
This function is returning the buildid. Dict can be passed with the
different informations
different information
"""
site = self.site
stamp = self.stamp
......
......@@ -140,6 +140,7 @@ excludedfiles = set([
'./Packaging/Files/qt.conf',
'./Packaging/Files/template.app/Contents/Info.plist',
'./Packaging/LICENSE',
'./Packaging/patchelf_remove_warning.diff',
'./Packaging/howto_update_makeself',
'./Packaging/otb_update_makeself',
'./SuperBuild/LICENSE',
......
......@@ -88,7 +88,7 @@ macro(get_xdk)
message( "clone_res = ${clone_res}" )
message( "clone_out = ${clone_out}" )
message( "clone_err = ${clone_err}" )
message( FATAL_ERROR "Problem in retreiving the archive")
message( FATAL_ERROR "Problem in retrieving the archive")
endif()
execute_process(
......
......@@ -191,7 +191,7 @@
#
# The macro ``SOMELIB_EXPORT_TEMPLATE`` should be used when declaring template
# classes or functions. The macro ``SOMELIB_EXPORT_EXPLICIT_TEMPLATE`` should be
# used when compiling explicit instanciations of template classes/functions.
# used when compiling explicit instantiations of template classes/functions.
include(CheckCCompilerFlag)
include(CheckCXXCompilerFlag)
......
......@@ -98,7 +98,7 @@ foreach(otb-module ${OTB_MODULES_ALL})
endforeach()
#----------------------------------------------------------------------
# Construct direct dependees (first-level) of each module
# Construct direct dependencies (first-level) of each module
foreach(otb-module1 ${OTB_MODULES_ALL})
foreach(otb-module2 ${OTB_MODULES_ALL})
list(FIND OTB_MODULE_${otb-module2}_DEPENDS ${otb-module1} _find_output)
......
......@@ -133,7 +133,7 @@ set(main_project_name ${_OTBModuleMacros_DEFAULT_LABEL})
#-----------------------------------------------------------------------------
# OTB version number.
set(OTB_VERSION_MAJOR "7")
set(OTB_VERSION_MINOR "3")
set(OTB_VERSION_MINOR "4")
set(OTB_VERSION_PATCH "0")
set(OTB_VERSION_STRING "${OTB_VERSION_MAJOR}.${OTB_VERSION_MINOR}.${OTB_VERSION_PATCH}")
......
SensorID SAR
SensorID RADARSAT-2
Mission RADARSAT-2
Instrument RADARSAT-2
ProductType SLC
......
SensorID SAR
SensorID SENTINEL-1A
Mission S1A
Instrument S1A
ProductType SLC
......
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