Skip to content

Commit ab601fd

Browse files
KangLinKangLin
committed
Script: remove qt5
1 parent 0310040 commit ab601fd

4 files changed

Lines changed: 31 additions & 107 deletions

File tree

‎Package/debian/control‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,11 @@ Section: main
33
Priority: optional
44
Maintainer: Kang Lin <kl222@126.com>
55
Build-Depends: debhelper(>=13), debhelper-compat(=13), fakeroot, cmake(>=3.21),
6-
ninja-build, qt5-qmake, qtbase5-dev, qtbase5-dev-tools, qttools5-dev, libqt5multimedia5-plugins,
7-
qtmultimedia5-dev, libqt5scxml5-dev, libqt5svg5-dev, qtquickcontrols2-5-dev,
8-
libcmark-dev, libqxmpp-dev
6+
ninja-build, qmake6, qt6-tools-dev, qt6-tools-dev-tools, qt6-base-dev, qt6-base-dev-tools,
7+
qt6-qpa-plugins, qt6-svg-dev, qt6-l10n-tools, qt6-translations-l10n,
8+
libqt6sql6-mysql, libqt6sql6-odbc, libqt6sql6-sqlite, libqt6sql6-psql,
9+
qt6-scxml-dev, qt6-multimedia-dev, qt6-positioning-dev,
10+
libcmark-dev, libqxmpp-dev
911
Standards-Version:"0.1.0"
1012
Homepage: https://github.com/KangLin/rabbitim
1113
Vcs-Git: https://github.com/KangLin/rabbitim

‎Package/debian/control.template.cmake‎

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎Script/build_depend.sh‎

Lines changed: 17 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,6 @@ PACKAGE=
2929
SYSTEM_UPDATE=0
3030
BASE_LIBS=0
3131
DEFAULT_LIBS=0
32-
DEFAULT_QT5=0
33-
DEFAULT_QT6=0
3432
QT=0
3533
if [ -z "$QT_VERSION" ]; then
3634
QT_VERSION=6.10.3
@@ -108,7 +106,7 @@ parse_with_getopt() {
108106
# 后面没有冒号表示没有参数。后跟有一个冒号表示有参数。跟两个冒号表示有可选参数。
109107
# -l 或 --long 选项后面是可接受的长选项，用逗号分开，冒号的意义同短选项。
110108
# -n 选项后接选项解析错误时提示的脚本名字
111-
OPTS=help,install:,source:,tools:,build:,verbose::,package:,package-tool:,system_update::,system-update::,base::,default::,default-qt5::,default-qt6::,macos::,qt::,rabbitcommon::,qxmpp::,qzxing::,zxing-cpp::
109+
OPTS=help,install:,source:,tools:,build:,verbose::,package:,package-tool:,system_update::,system-update::,base::,default::,macos::,qt::,rabbitcommon::,qxmpp::,qzxing::,zxing-cpp::
112110

113111
# Parse arguments using getopt
114112
# -o: short options
@@ -200,28 +198,6 @@ parse_with_getopt() {
200198
esac
201199
shift 2
202200
;;
203-
--default-qt5)
204-
case "$2" in
205-
"")
206-
DEFAULT_QT5=1
207-
;;
208-
*)
209-
DEFAULT_QT5="$2"
210-
;;
211-
esac
212-
shift 2
213-
;;
214-
--default-qt6)
215-
case "$2" in
216-
"")
217-
DEFAULT_QT6=1
218-
;;
219-
*)
220-
DEFAULT_QT6="$2"
221-
;;
222-
esac
223-
shift 2
224-
;;
225201
--rabbitcommon)
226202
case "$2" in
227203
"")
@@ -517,23 +493,16 @@ fi
517493
if [ $DEFAULT_LIBS -eq 1 ]; then
518494
echo_status "Install default dependency libraries ......"
519495
if [ "$PACKAGE_TOOL" = "apt" ]; then
520-
if [ $DEFAULT_QT5 -eq 1 ]; then
521-
if [ $QT -ne 1 ]; then
522-
package_install qt5-qmake qtbase5-dev qtbase5-dev-tools qttools5-dev \
523-
qtmultimedia5-dev libqt5scxml5-dev libqt5svg5-dev libqt5gstreamer-dev \
524-
qtquickcontrols2-5-dev libqt5multimedia5-plugins qtdeclarative5-dev
525-
fi
526-
else
527-
if [ $QT -ne 1 ]; then
528-
package_install qmake6 qt6-tools-dev qt6-tools-dev-tools \
529-
qt6-base-dev qt6-base-dev-tools qt6-qpa-plugins \
530-
qt6-svg-dev qt6-l10n-tools qt6-translations-l10n \
531-
qt6-scxml-dev qt6-multimedia-dev qt6-positioning-dev \
532-
libqt6sql6-mysql libqt6sql6-sqlite libqt6sql6-odbc libqt6sql6-psql \
533-
qt6-speech-dev
534-
fi
535-
package_install libqxmpp-dev
536-
fi
496+
497+
package_install qmake6 qt6-tools-dev qt6-tools-dev-tools \
498+
qt6-base-dev qt6-base-dev-tools qt6-qpa-plugins \
499+
qt6-svg-dev qt6-l10n-tools qt6-translations-l10n \
500+
qt6-scxml-dev qt6-multimedia-dev qt6-positioning-dev \
501+
libqt6sql6-mysql libqt6sql6-sqlite libqt6sql6-odbc libqt6sql6-psql \
502+
qt6-speech-dev
503+
504+
package_install libqxmpp-dev
505+
537506
if [ $ZXING_CPP -ne 1 ]; then
538507
package_install libzxing-dev
539508
fi
@@ -542,13 +511,9 @@ if [ $DEFAULT_LIBS -eq 1 ]; then
542511

543512
if [ "$PACKAGE_TOOL" = "dnf" ]; then
544513
if [ $QT -ne 1 ]; then
545-
if [ $DEFAULT_QT5 -eq 1 ]; then
546-
echo ""
547-
else
548-
package_install qt6-qttools-devel qt6-qtbase-devel qt6-qtmultimedia-devel \
549-
qt6-qt5compat-devel qt6-qtmultimedia-devel qt6-qtscxml-devel \
550-
qt6-qtsvg-devel qt6-qtpositioning-devel
551-
fi
514+
package_install qt6-qttools-devel qt6-qtbase-devel qt6-qtmultimedia-devel \
515+
qt6-qt5compat-devel qt6-qtmultimedia-devel qt6-qtscxml-devel \
516+
qt6-qtsvg-devel qt6-qtpositioning-devel
552517
fi
553518

554519
dnf builddep -y ${REPO_ROOT}/Package/rpm/rabbitim.spec
@@ -609,13 +574,9 @@ if [ $QXMPP -eq 1 ]; then
609574
echo_status "Install QXMPP ......"
610575
pushd "$SOURCE_DIR"
611576

612-
if [ $DEFAULT_QT5 -eq 1 ]; then
613-
QXMPP_INSTALL_DIR="${INSTALL_DIR}/${LIB_PATH}/cmake/QXmpp"
614-
QXMPP_VERSION=v1.10.2
615-
else
616-
QXMPP_INSTALL_DIR="${INSTALL_DIR}/${LIB_PATH}/cmake/QXmppQt6"
617-
QXMPP_VERSION=v1.15.1
618-
fi
577+
QXMPP_INSTALL_DIR="${INSTALL_DIR}/${LIB_PATH}/cmake/QXmppQt6"
578+
QXMPP_VERSION=v1.15.1
579+
619580
if [ ! -d ${QXMPP_INSTALL_DIR} ]; then
620581
if [ ! -d qxmpp ]; then
621582
git clone -b ${QXMPP_VERSION} --depth=1 https://invent.kde.org/libraries/qxmpp.git

‎Script/build_linux.sh‎

Lines changed: 9 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ DOCKER=0
2121
DEB=0
2222
RPM=0
2323
APPIMAGE=0
24-
DEFAULT_QT=
2524

2625
if [ -z "$QT_VERSION" ]; then
2726
QT_VERSION=6.10.3
@@ -84,7 +83,7 @@ parse_with_getopt() {
8483
# 后面没有冒号表示没有参数。后跟有一个冒号表示有参数。跟两个冒号表示有可选参数。
8584
# -l 或 --long 选项后面是可接受的长选项，用逗号分开，冒号的意义同短选项。
8685
# -n 选项后接选项解析错误时提示的脚本名字
87-
OPTS=help,verbose::,docker::,deb::,rpm::,appimage::,macos::,docker-image:,docker-platform::,qt:,qt5:,qt6:,install:,source:,tools:,build:
86+
OPTS=help,verbose::,docker::,deb::,rpm::,appimage::,macos::,docker-image:,docker-platform::,qt:,install:,source:,tools:,build:
8887
ARGS=`getopt -o h,v:: -l $OPTS -n $(basename $0) -- "$@"`
8988
if [ $? != 0 ]; then
9089
echo_error "exec getopt fail: $?"
@@ -195,22 +194,6 @@ parse_with_getopt() {
195194
esac
196195
shift 2
197196
;;
198-
--qt5)
199-
case "$2" in
200-
*)
201-
DEFAULT_QT="--default-qt5"
202-
;;
203-
esac
204-
shift 2
205-
;;
206-
--qt6)
207-
case "$2" in
208-
*)
209-
DEFAULT_QT="--default-qt6"
210-
;;
211-
esac
212-
shift 2
213-
;;
214197
--) # 当解析到“选项和参数“与“non-option parameters“的分隔符时终止
215198
shift
216199
break
@@ -399,7 +382,7 @@ if [ $DOCKER -eq 1 ]; then
399382
else
400383
export SOURCE_CODE_DIR=/home
401384
fi
402-
\${SOURCE_CODE_DIR}/RabbitIm/Script/build_linux.sh --deb --install=/home/install --tools=/home/tools --verbose=${BUILD_VERBOSE} ${DEFAULT_QT}
385+
\${SOURCE_CODE_DIR}/RabbitIm/Script/build_linux.sh --deb --install=/home/install --tools=/home/tools --verbose=${BUILD_VERBOSE}
403386
cp \${SOURCE_CODE_DIR}/rabbitim*.deb /home/build/
404387
"
405388
fi
@@ -431,7 +414,7 @@ if [ $DOCKER -eq 1 ]; then
431414
else
432415
export SOURCE_CODE_DIR=/home
433416
fi
434-
\${SOURCE_CODE_DIR}/RabbitIm/Script/build_linux.sh --appimage --install=/home/install --tools=/home/tools --verbose=${BUILD_VERBOSE} ${DEFAULT_QT}
417+
\${SOURCE_CODE_DIR}/RabbitIm/Script/build_linux.sh --appimage --install=/home/install --tools=/home/tools --verbose=${BUILD_VERBOSE}
435418
# Create install script
436419
echo \"== Create install script ......\"
437420
mkdir -p /home/build/install
@@ -469,13 +452,8 @@ pushd $REPO_ROOT/Script
469452
if [ $DEB -eq 1 ]; then
470453
echo_status "build deb package ......"
471454

472-
if [ "$DEFAULT_QT"="--default-qt5" ]; then
473-
depend_para="--qzxing"
474-
export CMAKE_CONFIG_PARAS="$CMAKE_CONFIG_PARAS -DINSTALL_QZXING=ON"
475-
else
476-
depend_para="--zxing-cpp"
477-
fi
478-
./build_depend.sh --system_update --base --default ${DEFAULT_QT} \
455+
depend_para="--zxing-cpp"
456+
./build_depend.sh --system_update --base --default \
479457
--rabbitcommon ${depend_para} \
480458
--install=${INSTALL_DIR} \
481459
--source=${SOURCE_DIR} \
@@ -521,19 +499,15 @@ if [ $APPIMAGE -eq 1 ]; then
521499
*)
522500
esac
523501

524-
if [ "$DEFAULT_QT"="--default-qt5" ]; then
525-
depend_para="--qzxing"
526-
export CMAKE_CONFIG_PARAS="$CMAKE_CONFIG_PARAS -DINSTALL_QZXING=ON"
527-
else
528-
depend_para="--zxing-cpp"
529-
fi
502+
depend_para="--zxing-cpp"
503+
530504
export RabbitCommon_ROOT=${SOURCE_DIR}/RabbitCommon
531505
export BUILD_FREERDP=ON
532506
export PKG_CONFIG_PATH=${INSTALL_DIR}/${LIB_PATH}/pkgconfig:$PKG_CONFIG_PATH
533507
export LD_LIBRARY_PATH=${INSTALL_DIR}/${LIB_PATH}:$LD_LIBRARY_PATH
534508
export CMAKE_PREFIX_PATH=${INSTALL_DIR}:${CMAKE_PREFIX_PATH}
535509

536-
./build_depend.sh --system_update --base --default ${DEFAULT_QT} \
510+
./build_depend.sh --system_update --base --default \
537511
--rabbitcommon ${depend_para} \
538512
--install=${INSTALL_DIR} \
539513
--source=${SOURCE_DIR} \
@@ -553,12 +527,7 @@ fi
553527
if [ $RPM -eq 1 ]; then
554528
echo_status "build rpm package ......"
555529
#dnf builddep -y ${REPO_ROOT}/Package/rpm/RabbitIm.spec
556-
if [ "$DEFAULT_QT"="--default-qt5" ]; then
557-
depend_para="--qzxing"
558-
export CMAKE_CONFIG_PARAS="$CMAKE_CONFIG_PARAS -DINSTALL_QZXING=ON"
559-
else
560-
depend_para="--zxing-cpp"
561-
fi
530+
depend_para="--zxing-cpp"
562531
./build_depend.sh --system_update --base --default --package-tool=dnf \
563532
--rabbitcommon ${depend_para} \
564533
--install=${INSTALL_DIR} \

0 commit comments

Comments
 (0)