Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
otb
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Main Repositories
otb
Commits
4672276e
Commit
4672276e
authored
3 years ago
by
Cédric Traizet
Browse files
Options
Downloads
Patches
Plain Diff
BUG: correct version name during the superbuild archive generation
parent
bdb2d080
No related branches found
No related tags found
3 merge requests
!820
Release 7.3 (integration into develop)
,
!819
Release 7.3 (integration into master)
,
!818
Release 7.3 (integration into develop)
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
Utilities/Maintenance/SuperbuildDownloadList.sh
+8
-5
8 additions, 5 deletions
Utilities/Maintenance/SuperbuildDownloadList.sh
with
8 additions
and
5 deletions
Utilities/Maintenance/SuperbuildDownloadList.sh
+
8
−
5
View file @
4672276e
...
...
@@ -38,13 +38,16 @@ CUR_DIR="$( cd "$( dirname "$0" )" && pwd )"
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
)
GIT_BRANCH
=
$(
git rev-parse
--abbrev-ref
HEAD
)
# the version is the branch name for develop and release-X.Y branches and the commit short hash for other branches
if
[[
${
GIT_BRANCH
}
=
~ develop|release-+[0-9]+
\.
[
0-9]
]]
;
then
VERSION
=
${
GIT_BRANCH
}
else
VERSION
=
"develop"
VERSION
=
$(
git rev-parse
--short
HEAD
)
fi
CMAKE_FILES
=
$(
find
"
${
SB_CMAKE_DIR
}
"
-maxdepth
1
-type
f
-name
"External_*"
)
DOWNLOAD_NAMES
=
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment