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

COMP: Synchronize 2160-SarSensorModel-burst with develop

parents b2b94890 0049cd73
Pipeline #8074 failed with stages
in 68 minutes and 44 seconds
......@@ -398,7 +398,7 @@ deploy:
extends: .general
only:
- develop@orfeotoolbox/otb
- /^release-[0-9]+\.[0-9]+$/@orfeotoolbox/otb
- /^release-[0-9]+\.[0-9]+$/
before_script:
# Provision efficiently the local LFS cache before checkout
- git lfs fetch origin $CI_COMMIT_SHA
......@@ -425,12 +425,13 @@ update-archive:
extends: .general
only:
- develop
- /^release-[0-9]+\.[0-9]+$/@orfeotoolbox/otb
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:
- ./Utilities/Maintenance/SuperbuildDownloadList.sh download build_archive
- ./CI/SuperbuildDownloadList.sh download build_archive
- ./CI/deploy-archive.sh build_archive
needs:
# don't push the archive if Superbuild was not successful
......
......@@ -35,16 +35,20 @@ WGET=$(which wget)
CUR_DIR="$( cd "$( dirname "$0" )" && pwd )"
SB_CMAKE_DIR_REL=$CUR_DIR/../../SuperBuild/CMake
SB_CMAKE_DIR_REL=$CUR_DIR/../SuperBuild/CMake
SB_CMAKE_DIR=$(readlink -f "${SB_CMAKE_DIR_REL}")
cd "$CUR_DIR/../../" || echo "cannot cd to CUR_DIR/../../"
GIT_BRANCH=$(git branch | sed -n -e 's/^\* \(.*\)/\1/p')
#if a branch contains release-X.Y then xdk is taken from packages/xdk/OTB-X.Y
if [[ "$GIT_BRANCH" =~ release-* ]]; then
VERSION=$(echo "${GIT_BRANCH}"| sed 's/.*release-//'| cut -d'-' -f 1)
cd "$CUR_DIR/../" || echo "cannot cd to CUR_DIR/../"
GIT_BRANCH=$(git name-rev --name-only ${GIT_HASH})
# the version is the branch name for develop and release-X.Y branches and the commit short hash for other branches
if [[ ${CI_COMMIT_REF_NAME} =~ develop|release-+[0-9]+\.[0-9] ]] ; then
VERSION=${CI_COMMIT_REF_NAME}
else
VERSION="develop"
GIT_HASH=$(git rev-parse --short HEAD)
VERSION=${GIT_HASH}
fi
CMAKE_FILES=$(find "${SB_CMAKE_DIR}" -maxdepth 1 -type f -name "External_*")
DOWNLOAD_NAMES=
......
......@@ -25,5 +25,11 @@ build_dir=$(readlink -f "$1")
scp ${build_dir}/SuperBuild-archives-*.{tar.bz2,md5} otbpush@otb5-vm2.orfeo-toolbox.org:${jobs_directory}/.
if [ "$CI_COMMIT_REF_NAME" = "develop" ] # check if the branch name is develop or not
then # we are on develop
ssh otbpush@otb5-vm2.orfeo-toolbox.org \
mv ${jobs_directory}/SuperBuild-archives-*.{tar.bz2,md5} ${jobs_directory}/superbuild_archive
\ No newline at end of file
mv ${jobs_directory}/SuperBuild-archives-*.{tar.bz2,md5} ${jobs_directory}/superbuild_archive
else # we are on a release branch
ssh otbpush@otb5-vm2.orfeo-toolbox.org \
mv ${jobs_directory}/SuperBuild-archives-*.{tar.bz2,md5} ${jobs_directory}/staging/
fi
\ No newline at end of file
......@@ -56,8 +56,8 @@ include(ExternalProject)
#mantis: 1193
if(APPLE)
# https://cmake.org/cmake/help/v3.10/variable/CMAKE_SYSTEM_FRAMEWORK_PATH.html
# By default it contains the standard directories for the current system. It
# is not intended to be modified by the project, use CMAKE_FRAMEWORK_PATH
# By default it contains the standard directories for the current system. It
# is not intended to be modified by the project, use CMAKE_FRAMEWORK_PATH
# for this.
set(CMAKE_SYSTEM_FRAMEWORK_PATH "" CACHE PATH "" FORCE)
endif()
......@@ -133,7 +133,7 @@ set(main_project_name ${_OTBModuleMacros_DEFAULT_LABEL})
#-----------------------------------------------------------------------------
# OTB version number.
set(OTB_VERSION_MAJOR "7")
set(OTB_VERSION_MINOR "2")
set(OTB_VERSION_MINOR "3")
set(OTB_VERSION_PATCH "0")
set(OTB_VERSION_STRING "${OTB_VERSION_MAJOR}.${OTB_VERSION_MINOR}.${OTB_VERSION_PATCH}")
......
......@@ -5,6 +5,7 @@ ProductType SLC
Polarization HH
OrbitDirection Descending
BeamMode FQ9
AreaOrPoint Area
TileHintX 2822
TileHintY 185
DataType 4
......
......@@ -8,6 +8,7 @@ Swath S6
OrbitDirection ASCENDING
BeamMode SM
BeamSwath S6
AreaOrPoint Area
TileHintX 17663
TileHintY 1
DataType 11
......@@ -954,4 +955,4 @@ Extra.FACILITY_IDENTIFIER UPA_
{"GCP_Id": "922", "GCP_Info": "", "GCP_Row": "31105", "GCP_Col": "15912", "GCP_X": "-24.0138", "GCP_Y": "15.7509", "GCP_Z": "0", },
{"GCP_Id": "923", "GCP_Info": "", "GCP_Row": "31105", "GCP_Col": "16796", "GCP_X": "-23.9781", "GCP_Y": "15.7574", "GCP_Z": "0", },
{"GCP_Id": "924", "GCP_Info": "", "GCP_Row": "31105", "GCP_Col": "17662", "GCP_X": "-23.9432", "GCP_Y": "15.7638", "GCP_Z": "0", },
]}
]}
\ No newline at end of file
SensorID FORMOSAT 2
Mission Formasat 2
AreaOrPoint Point
TileHintX 3000
TileHintY 500
DataType 1
......@@ -47,4 +48,4 @@ LUT1D.ARRAY = 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
{"GCP_Id": "2", "GCP_Info": "", "GCP_Row": "1.5", "GCP_Col": "3000.5", "GCP_X": "1.41679", "GCP_Y": "43.5219", "GCP_Z": "0", },
{"GCP_Id": "3", "GCP_Info": "", "GCP_Row": "3000.5", "GCP_Col": "3000.5", "GCP_X": "1.32096", "GCP_Y": "43.313", "GCP_Z": "0", },
{"GCP_Id": "4", "GCP_Info": "", "GCP_Row": "3000.5", "GCP_Col": "1.5", "GCP_X": "0.960095", "GCP_Y": "43.3803", "GCP_Z": "0", },
]}
\ No newline at end of file
]}
SensorID IKONOS-2
AreaOrPoint Area
TileHintX 3667
TileHintY 256
DataType 3
......
SensorID QB02
Mission Quickbird
ProductType P
AreaOrPoint Area
TileHintX 27552
TileHintY 19
DataType 3
......
SensorID SPOT 5
Mission SPOT 5
AreaOrPoint Point
TileHintX 6000
TileHintY 128
DataType 1
......@@ -47,4 +48,4 @@ LUT1D.ARRAY = 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
{"GCP_Id": "2", "GCP_Info": "", "GCP_Row": "1.5", "GCP_Col": "6000.5", "GCP_X": "51.8029", "GCP_Y": "35.9172", "GCP_Z": "0", },
{"GCP_Id": "3", "GCP_Info": "", "GCP_Row": "6000.5", "GCP_Col": "6000.5", "GCP_X": "51.6467", "GCP_Y": "35.3907", "GCP_Z": "0", },
{"GCP_Id": "4", "GCP_Info": "", "GCP_Row": "6000.5", "GCP_Col": "1.5", "GCP_X": "50.9995", "GCP_Y": "35.5173", "GCP_Z": "0", },
]}
\ No newline at end of file
]}
SensorID WV02
Mission WorldView-2
ProductType Multi
AreaOrPoint Area
TileHintX 1150
TileHintY 455
DataType 3
......
This diff is collapsed.
......@@ -352,7 +352,7 @@ a subtle interplay between this method and
``GenerateInputRequestedRegion()`` is occurring here. The default
behavior of ``GenerateInputRequestedRegion()`` (at least for
:doxygen-itk:`ImageToImageFilter`) is to set the input RequestedRegion
to the output’s ReqestedRegion. Hence, by overriding the method
to the output’s RequestedRegion. Hence, by overriding the method
``EnlargeOutputRequestedRegion()`` to set the output to the
LargestPossibleRegion, effectively sets the input to this filter to the
LargestPossibleRegion (and probably causing all upstream filters to
......
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