razzaline/tahoma2d
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

Merge pull request #1373 from shun-iwasawa/fix_travis

Browse source 
Added libmypaint to Travis CI setup
This commit is contained in:
Jeremy Bullock 2017-08-04 00:49:30 -06:00 committed by GitHub
commit 64c7be4340
4 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ci-scripts/linux/travis-install.sh
View file

@ -1,6 +1,7 @@
sudo add-apt-repository --yes ppa:beineri/opt-qt562-trusty
sudo add-apt-repository --yes ppa:achadwick/mypaint-testing
sudo apt-get update
sudo apt-get install -y liblzo2-dev liblz4-dev libfreetype6-dev libpng-dev libsdl2-dev libglew-dev freeglut3-dev qt56script libsuperlu3-dev libpng-dev qt56svg qt56tools qt56multimedia wget libusb-1.0-0-dev libboost-all-dev liblzma-dev
sudo apt-get install -y liblzo2-dev liblz4-dev libfreetype6-dev libpng-dev libsdl2-dev libglew-dev freeglut3-dev qt56script libsuperlu3-dev libpng-dev qt56svg qt56tools qt56multimedia wget libusb-1.0-0-dev libboost-all-dev liblzma-dev libjson-c-dev libmypaint-dev
# someone forgot to include liblz4.pc with the package, use the version from xenial, as it only depends on libc
wget http://mirrors.kernel.org/ubuntu/pool/main/l/lz4/liblz4-1_0.0~r131-2ubuntu2_amd64.deb -O liblz4.deb
wget http://mirrors.kernel.org/ubuntu/pool/main/l/lz4/liblz4-dev_0.0~r131-2ubuntu2_amd64.deb -O liblz4-dev.deb

2
ci-scripts/osx/travis-install.sh
View file

@ -1,5 +1,5 @@
#!/bin/bash
brew update
brew install qt55 glew lz4 lzo libusb
brew install qt55 glew lz4 lzo libusb libmypaint
brew tap tcr/tcr
brew install clang-format

0
thirdparty/libmypaint/license/gettext-0.19.7/gettext-runtime/intl/COPYING.LIB → thirdparty/libmypaint/license/gettext-0.19.7/gettext-runtime/intl/COPYING_LIB vendored
View file

0
thirdparty/libmypaint/license/libiconv-1.15/COPYING.LIB → thirdparty/libmypaint/license/libiconv-1.15/COPYING_LIB vendored
View file