Skip to content

Commit 6041a79

Browse files
committed
Travis CI: build with system QCA library in Ubuntu Bionic
+ Update build dependencies.
1 parent 38ce6d0 commit 6041a79

File tree

3 files changed

+37
-7
lines changed

3 files changed

+37
-7
lines changed

linux/build-in-ubuntu.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ BUILD_OPTIONS="-DCMAKE_INSTALL_PREFIX=/usr \
3535
-DUSE_HUNSPELL=ON \
3636
-DUSE_KEYCHAIN=ON \
3737
-DUSE_SPARKLE=OFF \
38-
-DBUNDLED_QCA=ON \
38+
-DBUNDLED_QCA=OFF \
3939
-DBUNDLED_USRSCTP=ON \
4040
-DBUILD_DEV_PLUGINS=OFF \
4141
-DVERBOSE_PROGRAM_NAME=ON \

tests/travis-ci/build-and-test.sh

+8-3
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,17 @@ then
2727
ls -alp /usr/lib/psi*/plugins/*
2828
du -shc /usr/lib/psi*/plugins/*
2929
fi
30-
fi
31-
32-
if [ "${TARGET}" = "macos64" ]
30+
elif [ "${TARGET}" = "macos64" ]
3331
then
3432
./mac/build-using-homebrew.sh
3533

3634
ls -alp ../Psi*.dmg
3735
du -shc ../Psi*.dmg
36+
elif [ "${TARGET}" = "windows64" ]
37+
then
38+
./win32/build-using-mxe.sh
39+
else
40+
echo "Unknown target!"
41+
exit 1
3842
fi
43+

tests/travis-ci/install-build-depends.sh

+28-3
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,7 @@ then
3838
then
3939
sudo apt-get install -qq qtwebengine5-dev
4040
fi
41-
fi
42-
43-
if [ "${TARGET}" = "macos64" ]
41+
elif [ "${TARGET}" = "macos64" ]
4442
then
4543
# export HOMEBREW_NO_AUTO_UPDATE=1
4644
export HOMEBREW_NO_BOTTLE_SOURCE_FALLBACK=1
@@ -55,5 +53,32 @@ then
5553
libsignal-protocol-c \
5654
"
5755
brew install ${PACKAGES}
56+
elif [ "${TARGET}" = "windows64" ]
57+
then
58+
# Add MXE repository:
59+
sudo apt-get -y install software-properties-common lsb-release
60+
sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 86B72ED9
61+
sudo add-apt-repository \
62+
"deb [arch=amd64] https://pkg.mxe.cc/repos/apt `lsb_release -sc` main"
63+
64+
export PREFIX="mxe-x86-64-w64-mingw32.shared"
65+
sudo apt-get update -qq
66+
sudo apt-get install -qq cmake \
67+
${PREFIX}-hunspell \
68+
${PREFIX}-minizip \
69+
${PREFIX}-libotr \
70+
${PREFIX}-libsignal-protocol-c \
71+
${PREFIX}-tidy-html5 \
72+
${PREFIX}-qtbase \
73+
${PREFIX}-qttools \
74+
${PREFIX}-qttranslations \
75+
${PREFIX}-qtmultimedia \
76+
${PREFIX}-qtwebkit \
77+
${PREFIX}-gstreamer \
78+
${PREFIX}-gst-plugins-bad \
79+
${PREFIX}-gst-plugins-good
80+
else
81+
echo "Unknown target!"
82+
exit 1
5883
fi
5984

0 commit comments

Comments
 (0)