procyberian/tdesktop
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 5

Fix travis / appveyor CI builds.

Browse source
This commit is contained in:
John Preston 2017-09-06 15:09:21 +03:00
parent b8d1b8d6c1
commit 74e46f7b80
3 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.appveyor/install.bat
View file

@ -5,7 +5,7 @@ SET LIB_DIR=%BUILD_DIR%\Libraries
SET SRC_DIR=%BUILD_DIR%\tdesktop SET SRC_DIR=%BUILD_DIR%\tdesktop
SET QT_VERSION=5_6_2 SET QT_VERSION=5_6_2
call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86 call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Auxiliary\Build\vcvarsall.bat" x86
call:configureBuild call:configureBuild
call:getDependencies call:getDependencies

5
.travis/build.sh
View file

@ -542,6 +542,11 @@ buildCustomQt() {
git apply "$QT_PATCH" git apply "$QT_PATCH"
cd .. cd ..
cd "$EXTERNAL/qt${QT_VERSION}/qtbase/src/plugins/platforminputcontexts"
git clone https://github.com/telegramdesktop/fcitx.git
git clone https://github.com/telegramdesktop/hime.git
cd ../../../..
./configure -prefix $QT_PATH -release -opensource -confirm-license -qt-zlib \ ./configure -prefix $QT_PATH -release -opensource -confirm-license -qt-zlib \
-qt-libpng -qt-libjpeg -qt-freetype -qt-harfbuzz -qt-pcre -qt-xcb \ -qt-libpng -qt-libjpeg -qt-freetype -qt-harfbuzz -qt-pcre -qt-xcb \
-qt-xkbcommon-x11 -no-opengl -no-gtkstyle -static \ -qt-xkbcommon-x11 -no-opengl -no-gtkstyle -static \

2
appveyor.yml
View file

@ -1,4 +1,4 @@
image: Visual Studio 2015 image: Visual Studio 2017
clone_folder: C:\TBuild\tdesktop clone_folder: C:\TBuild\tdesktop
test: off test: off
deploy: off deploy: off