Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
jami-project
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Requirements
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
savoirfairelinux
jami-project
Commits
210cac64
Commit
210cac64
authored
3 years ago
by
Ming Rui Zhang
Committed by
Sébastien Blin
3 years ago
Browse files
Options
Downloads
Patches
Plain Diff
scripts: update install.sh for qt 6
Change-Id: Id48d3b322171f7e8fe1b240f37f10e9e5843530e
parent
37be4c3b
No related branches found
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
scripts/install.sh
+20
-25
20 additions, 25 deletions
scripts/install.sh
with
20 additions
and
25 deletions
scripts/install.sh
+
20
−
25
View file @
210cac64
...
@@ -15,14 +15,14 @@ export OSTYPE
...
@@ -15,14 +15,14 @@ export OSTYPE
set
-ex
set
-ex
# Qt_MIN_VER required for client-qt
# Qt_MIN_VER required for client-qt
QT
5
_MIN_VER
=
"
5.14
"
QT
6
_MIN_VER
=
"
6.2
"
debug
=
debug
=
global
=
false
global
=
false
static
=
''
static
=
''
client
=
''
client
=
''
qt
5
ver
=
''
qt
6
ver
=
''
qt
5
path
=
''
qt
6
path
=
''
proc
=
'1'
proc
=
'1'
priv_install
=
true
priv_install
=
true
enable_libwrap
=
true
enable_libwrap
=
true
...
@@ -42,10 +42,10 @@ while getopts gsc:dq:Q:P:p:uW OPT; do
...
@@ -42,10 +42,10 @@ while getopts gsc:dq:Q:P:p:uW OPT; do
debug
=
true
debug
=
true
;;
;;
q
)
q
)
qt
5
ver
=
"
${
OPTARG
}
"
qt
6
ver
=
"
${
OPTARG
}
"
;;
;;
Q
)
Q
)
qt
5
path
=
"
${
OPTARG
}
"
qt
6
path
=
"
${
OPTARG
}
"
;;
;;
P
)
P
)
prefix
=
"
${
OPTARG
}
"
prefix
=
"
${
OPTARG
}
"
...
@@ -124,26 +124,26 @@ make -j"${proc}" V=1
...
@@ -124,26 +124,26 @@ make -j"${proc}" V=1
make_install
"
${
global
}
"
"
${
priv_install
}
"
make_install
"
${
global
}
"
"
${
priv_install
}
"
# For the client-qt, verify system's version if no path provided
# For the client-qt, verify system's version if no path provided
if
[
"
${
client
}
"
=
"client-qt"
]
&&
[
-z
"
$qt
5
path
"
]
;
then
if
[
"
${
client
}
"
=
"client-qt"
]
&&
[
-z
"
$qt
6
path
"
]
;
then
sys_qt
5
ver
=
""
sys_qt
6
ver
=
""
if
command
-v
qmake &> /dev/null
;
then
if
command
-v
qmake &> /dev/null
;
then
sys_qt
5
ver
=
$(
qmake
-v
)
sys_qt
6
ver
=
$(
qmake
-v
)
elif
command
-v
qmake-qt
5
&> /dev/null
;
then
elif
command
-v
qmake-qt
6
&> /dev/null
;
then
sys_qt
5
ver
=
$(
qmake-qt
5
-v
)
# Fedora
sys_qt
6
ver
=
$(
qmake-qt
6
-v
)
# Fedora
else
else
echo
"No valid Qt found"
;
exit
1
;
echo
"No valid Qt found"
;
exit
1
;
fi
fi
sys_qt
5
ver
=
${
sys_qt
5
ver
#*Qt version
}
sys_qt
6
ver
=
${
sys_qt
6
ver
#*Qt version
}
sys_qt
5
ver
=
${
sys_qt
5
ver
%\ in\ *
}
sys_qt
6
ver
=
${
sys_qt
6
ver
%\ in\ *
}
installed_qt
5
ver
=
$(
echo
"
$sys_qt
5
ver
"
|
cut
-d
'.'
-f
2
)
installed_qt
6
ver
=
$(
echo
"
$sys_qt
6
ver
"
|
cut
-d
'.'
-f
2
)
required_qt
5
ver
=
$(
echo
$QT
5
_MIN_VER
|
cut
-d
'.'
-f
2
)
required_qt
6
ver
=
$(
echo
$QT
6
_MIN_VER
|
cut
-d
'.'
-f
2
)
if
[[
$installed_qt
5
ver
-ge
$required_qt
5
ver
]]
;
then
if
[[
$installed_qt
6
ver
-ge
$required_qt
6
ver
]]
;
then
# Disable qt
5
path and qt
5
ver in order to use system's Qt
# Disable qt
6
path and qt
6
ver in order to use system's Qt
qt
5
path
=
""
qt
6
path
=
""
qt
5
ver
=
""
qt
6
ver
=
""
else
else
echo
"No valid Qt found"
;
exit
1
;
echo
"No valid Qt found"
;
exit
1
;
fi
fi
...
@@ -154,10 +154,8 @@ cd "${TOP}/lrc"
...
@@ -154,10 +154,8 @@ cd "${TOP}/lrc"
mkdir
-p
"
${
BUILDDIR
}
"
mkdir
-p
"
${
BUILDDIR
}
"
cd
"
${
BUILDDIR
}
"
cd
"
${
BUILDDIR
}
"
# Compute LRC CMake flags
# Compute LRC CMake flags
lrc_cmake_flags
=(
-DCMAKE_PREFIX_PATH
=
"
${
CMAKE_PREFIX_PATH
}
"
lrc_cmake_flags
=(
-DCMAKE_PREFIX_PATH
=
"
${
qt6path
}
"
-DCMAKE_BUILD_TYPE
=
"
${
BUILD_TYPE
}
"
-DCMAKE_BUILD_TYPE
=
"
${
BUILD_TYPE
}
"
-DQT5_VER
=
"
${
qt5ver
}
"
-DQT5_PATH
=
"
${
qt5path
}
"
-DENABLE_LIBWRAP
=
"
${
enable_libwrap
}
"
-DENABLE_LIBWRAP
=
"
${
enable_libwrap
}
"
$static
)
$static
)
if
[
"
${
global
}
"
=
"true"
]
;
then
if
[
"
${
global
}
"
=
"true"
]
;
then
...
@@ -177,12 +175,9 @@ mkdir -p "${BUILDDIR}"
...
@@ -177,12 +175,9 @@ mkdir -p "${BUILDDIR}"
cd
"
${
BUILDDIR
}
"
cd
"
${
BUILDDIR
}
"
client_cmake_flags
=(
-DCMAKE_BUILD_TYPE
=
"
${
BUILD_TYPE
}
"
client_cmake_flags
=(
-DCMAKE_BUILD_TYPE
=
"
${
BUILD_TYPE
}
"
-DCMAKE_PREFIX_PATH
=
"
${
CMAKE_PREFIX_PATH
}
"
)
-DCMAKE_PREFIX_PATH
=
"
${
qt6path
}
"
)
if
[
"
${
client
}
"
=
"client-qt"
]
;
then
if
[
"
${
client
}
"
=
"client-qt"
]
;
then
# Compute Qt client CMake flags.
client_cmake_flags+
=(
-DQT5_VER
=
"
${
qt5ver
}
"
-DQT5_PATH
=
"
${
qt5path
}
"
)
if
[
"
${
global
}
"
=
"true"
]
;
then
if
[
"
${
global
}
"
=
"true"
]
;
then
client_cmake_flags+
=(
${
prefix
:+
"-DCMAKE_INSTALL_PREFIX=
$prefix
"
}
client_cmake_flags+
=(
${
prefix
:+
"-DCMAKE_INSTALL_PREFIX=
$prefix
"
}
$static
)
$static
)
...
...
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