oak-team/oak-editor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

added missing libs for travis trusty install

Browse Source
This commit is contained in:
itsmattkc
2019-09-10 14:26:04 +10:00
parent f29b8ac3a4
commit d1ce224e8b
2 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.travis/install.sh
+2 -2
View File
@@ -2,12 +2,12 @@
if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
brew install ffmpeg qt5 grep
brew install ffmpeg qt5 grep opencolorio openimageio
export PATH="/usr/local/opt/qt/bin:/usr/local/opt/python@2/libexec/bin:$PATH"
elif [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
sudo apt-get -y install qt59base qt59multimedia qt59svg libavformat-dev libavcodec-dev libavfilter-dev libavutil-dev libswscale-dev libswresample-dev cmake
sudo apt-get -y install qt59base qt59multimedia qt59svg libavformat-dev libavcodec-dev libavfilter-dev libavutil-dev libswscale-dev libswresample-dev cmake libopencolorio-dev libopenimageio-dev
source /opt/qt*/bin/qt*-env.sh
fi
.travis/script.sh
+26 -26
View File
@@ -2,43 +2,43 @@
if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
# Generate Makefile
cmake .
# Generate Makefile
cmake .
# Make
make -j$(sysctl -n hw.ncpu)
# Make
make -j$(sysctl -n hw.ncpu)
# Move Qt deps into bundle
macdeployqt Olive.app
# Move Qt deps into bundle
macdeployqt Olive.app
# Fix other deps that macdeployqt missed
wget -c -nv https://github.com/arl/macdeployqtfix/raw/master/macdeployqtfix.py
python2 macdeployqtfix.py Olive.app/Contents/MacOS/Olive /usr/local/Cellar/qt5/5.*/
# Fix other deps that macdeployqt missed
wget -c -nv https://github.com/arl/macdeployqtfix/raw/master/macdeployqtfix.py
python2 macdeployqtfix.py Olive.app/Contents/MacOS/Olive /usr/local/Cellar/qt5/5.*/
# Distribute in zip
zip -r Olive-$(git rev-parse --short HEAD)-macOS.zip Olive.app
# Distribute in zip
zip -r Olive-$(git rev-parse --short HEAD)-macOS.zip Olive.app
elif [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
# Generate Makefile
cmake .
# Generate Makefile
cmake .
# Make
make -j$(nproc)
# Make
make -j$(nproc)
# Use `make install` on `appdir` to place files in the correct place
make INSTALL_ROOT=appdir -j$(nproc) install ; find appdir/
# Use `make install` on `appdir` to place files in the correct place
make INSTALL_ROOT=appdir -j$(nproc) install ; find appdir/
# Download linuxdeployqt
wget -c -nv "https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage"
chmod a+x linuxdeployqt-continuous-x86_64.AppImage
# Download linuxdeployqt
wget -c -nv "https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage"
chmod a+x linuxdeployqt-continuous-x86_64.AppImage
unset QTDIR; unset QT_PLUGIN_PATH ; unset LD_LIBRARY_PATH
# linuxdeployqt uses this for naming the file
export VERSION=$(git rev-parse --short HEAD)
unset QTDIR; unset QT_PLUGIN_PATH ; unset LD_LIBRARY_PATH
# linuxdeployqt uses this for naming the file
export VERSION=$(git rev-parse --short HEAD)
# Use linuxdeployqt to set up dependencies
./linuxdeployqt-continuous-x86_64.AppImage appdir/usr/share/applications/*.desktop -extra-plugins=imageformats/libqsvg.so -appimage
# Use linuxdeployqt to set up dependencies
./linuxdeployqt-continuous-x86_64.AppImage appdir/usr/share/applications/*.desktop -extra-plugins=imageformats/libqsvg.so -appimage
fi