Remove brew from macosx travis.
This commit is contained in:
parent
78f78de0f8
commit
1d1ce833c3
|
@ -4,25 +4,31 @@ git fetch --tags
|
||||||
|
|
||||||
if test "$TRAVIS_OS_NAME" = "osx"; then
|
if test "$TRAVIS_OS_NAME" = "osx"; then
|
||||||
# Mac OS X.
|
# Mac OS X.
|
||||||
brew update
|
|
||||||
# brew install p7zip
|
|
||||||
# brew link --force p7zip
|
|
||||||
brew install curl
|
|
||||||
brew link --force curl
|
|
||||||
brew uninstall gnu-sed
|
|
||||||
brew install gnu-sed
|
|
||||||
brew link --force gnu-sed
|
|
||||||
|
|
||||||
pip3 install aqtinstall
|
pip3 install aqtinstall
|
||||||
|
|
||||||
|
# Install Qt.
|
||||||
|
QTPATH="$(pwd)/Qt"
|
||||||
|
QTVERSION="5.15.2"
|
||||||
|
QTBIN="$QTPATH/$QTVERSION/clang_64/bin"
|
||||||
|
|
||||||
|
echo "Qt bin directory is: $QTBIN"
|
||||||
|
echo "Qt will be installed to: $QTPATH"
|
||||||
|
|
||||||
|
aqt install -O "$QTPATH" 5.15.2 mac desktop clang_64 -m qtwebengine
|
||||||
|
|
||||||
|
export QT_PLUGIN_PATH="$QTPATH/$QTVERSION/clang_64/plugins"
|
||||||
|
export PATH="$QTBIN:$PATH"
|
||||||
|
|
||||||
|
qmake --version
|
||||||
elif test "$TRAVIS_OS_NAME" = "linux"; then
|
elif test "$TRAVIS_OS_NAME" = "linux"; then
|
||||||
# Linux.
|
# Linux.
|
||||||
sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
|
sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
|
||||||
sudo add-apt-repository ppa:beineri/opt-qt-5.14.2-xenial -y
|
sudo add-apt-repository ppa:beineri/opt-qt-5.14.2-xenial -y
|
||||||
|
|
||||||
sudo apt-get update
|
sudo apt-get update
|
||||||
sudo apt-get -y install gcc-7 g++-7 qt514tools qt514base qt514webengine qt514svg
|
sudo apt-get -y install gcc-7 g++-7 qt514tools qt514base qt514webengine qt514svg
|
||||||
sudo apt-get -y install openssl libssl-dev libgl1-mesa-dev
|
sudo apt-get -y install openssl libssl-dev libgl1-mesa-dev
|
||||||
|
|
||||||
sudo update-alternatives --remove-all gcc
|
sudo update-alternatives --remove-all gcc
|
||||||
sudo update-alternatives --remove-all g++
|
sudo update-alternatives --remove-all g++
|
||||||
sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-7 50
|
sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-7 50
|
||||||
|
|
|
@ -1,17 +1,13 @@
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
ls -lha
|
|
||||||
|
|
||||||
# Setup Qt build environment.
|
|
||||||
source /opt/qt514/bin/qt514-env.sh
|
source /opt/qt514/bin/qt514-env.sh
|
||||||
mkdir rssguard-build && cd rssguard-build
|
|
||||||
|
|
||||||
# Build application.
|
# Build application.
|
||||||
#lrelease -compress ../rssguard.pro
|
mkdir rssguard-build && cd rssguard-build
|
||||||
qmake .. "USE_WEBENGINE=$USE_WEBENGINE"
|
qmake .. "USE_WEBENGINE=$USE_WEBENGINE"
|
||||||
make
|
make
|
||||||
make install
|
make install
|
||||||
cd src/rssguard
|
cd "src/rssguard"
|
||||||
|
|
||||||
# Obtain linuxdeployqt.
|
# Obtain linuxdeployqt.
|
||||||
wget -c https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage
|
wget -c https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage
|
||||||
|
@ -44,5 +40,4 @@ else
|
||||||
fi
|
fi
|
||||||
|
|
||||||
mv "$imagename" "$imagenewname"
|
mv "$imagename" "$imagenewname"
|
||||||
|
ls
|
||||||
ls
|
|
|
@ -1,27 +1,10 @@
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
|
||||||
# Install Qt.
|
|
||||||
QTPATH="$(pwd)/Qt"
|
|
||||||
QTVERSION="5.15.2"
|
|
||||||
QTBIN="$QTPATH/$QTVERSION/clang_64/bin"
|
|
||||||
|
|
||||||
echo "Qt bin directory is: $QTBIN"
|
|
||||||
echo "Qt will be installed to: $QTPATH"
|
|
||||||
|
|
||||||
aqt install -O "$QTPATH" 5.15.2 mac desktop clang_64 -m qtwebengine
|
|
||||||
|
|
||||||
export QT_PLUGIN_PATH="$QTPATH/$QTVERSION/clang_64/plugins"
|
|
||||||
export PATH="$QTBIN:$PATH"
|
|
||||||
|
|
||||||
qmake --version
|
|
||||||
|
|
||||||
# Build application.
|
# Build application.
|
||||||
mkdir rssguard-build && cd rssguard-build
|
mkdir rssguard-build && cd rssguard-build
|
||||||
qmake .. "USE_WEBENGINE=$USE_WEBENGINE"
|
qmake .. "USE_WEBENGINE=$USE_WEBENGINE"
|
||||||
make
|
make
|
||||||
make install
|
make install
|
||||||
|
|
||||||
# Make DMG image.
|
|
||||||
cd "src/rssguard"
|
cd "src/rssguard"
|
||||||
|
|
||||||
# Fix .dylib linking.
|
# Fix .dylib linking.
|
||||||
|
|
Loading…
Reference in New Issue