From 4967add412aeab0f761f258278dfacea8c325a1c Mon Sep 17 00:00:00 2001 From: manongjohn Date: Thu, 6 Aug 2020 23:40:23 -0400 Subject: [PATCH] Tahoma Linux builds via Travis (#113) * Tahoma Linux builds via Travis * Update Linux Travis to install Qt 5.9 * Correct Tahoma appdata --- ci-scripts/linux/travis-build.sh | 2 +- ci-scripts/linux/travis-buildpkg.sh | 48 ++++++++++++++++++ ci-scripts/linux/travis-install.sh | 4 +- toonz/sources/xdg-data/CMakeLists.txt | 6 +-- .../xdg-data/io.github.Tahoma.appdata.xml | 31 +++++++++++ .../sources/xdg-data/io.github.Tahoma.desktop | 8 +++ toonz/sources/xdg-data/io.github.Tahoma.png | Bin 0 -> 1227 bytes 7 files changed, 93 insertions(+), 6 deletions(-) create mode 100755 ci-scripts/linux/travis-buildpkg.sh create mode 100644 toonz/sources/xdg-data/io.github.Tahoma.appdata.xml create mode 100644 toonz/sources/xdg-data/io.github.Tahoma.desktop create mode 100644 toonz/sources/xdg-data/io.github.Tahoma.png diff --git a/ci-scripts/linux/travis-build.sh b/ci-scripts/linux/travis-build.sh index 2075c183..b006f0cb 100755 --- a/ci-scripts/linux/travis-build.sh +++ b/ci-scripts/linux/travis-build.sh @@ -3,7 +3,7 @@ pushd thirdparty/tiff-4.0.3 CFLAGS="-fPIC" CXXFLAGS="-fPIC" ./configure --disable-jbig && make popd cd toonz && mkdir build && cd build -source /opt/qt514/bin/qt514-env.sh +source /opt/qt59/bin/qt59-env.sh cmake ../sources \ -DWITH_SYSTEM_SUPERLU:BOOL=OFF # according to https://docs.travis-ci.com/user/ci-environment/#Virtualization-environments diff --git a/ci-scripts/linux/travis-buildpkg.sh b/ci-scripts/linux/travis-buildpkg.sh new file mode 100755 index 00000000..8ce9eff7 --- /dev/null +++ b/ci-scripts/linux/travis-buildpkg.sh @@ -0,0 +1,48 @@ +#!/bin/bash +source /opt/qt59/bin/qt59-env.sh + +echo ">>> Temporary install of Tahoma" +export BUILDDIR=$(pwd)/toonz/build +cd $BUILDDIR +sudo make install + +echo ">>> Creating appDir" +mkdir -p appdir/usr + +echo ">>> Copy and configure Tahoma installation in appDir" +cp -r /opt/tahoma/* appdir/usr +cp appdir/usr/share/applications/*.desktop appdir +cp appdir/usr/share/icons/hicolor/*/apps/*.png appdir +mv appdir/usr/lib/tahoma/* appdir/usr/lib +rmdir appdir/usr/lib/tahoma + +echo ">>> Creating Tahoma directory" +mkdir Tahoma + +echo ">>> Copying stuff to Tahoma/tahomastuff" + +mv appdir/usr/share/tahoma/stuff Tahoma/tahomastuff +chmod -R 777 Tahoma/tahomastuff +rmdir appdir/usr/share/tahoma + +echo ">>> Creating Tahoma/Tahoma.AppImage" + +wget -c "https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage" +chmod a+x linuxdeployqt*.AppImage + +export LD_LIBRARY_PATH=appdir/usr/lib/tahoma +./linuxdeployqt*.AppImage appdir/usr/bin/Tahoma -bundle-non-qt-libs -verbose=0 -always-overwrite \ + -executable=appdir/usr/bin/lzocompress \ + -executable=appdir/usr/bin/lzodecompress \ + -executable=appdir/usr/bin/tcleanup \ + -executable=appdir/usr/bin/tcomposer \ + -executable=appdir/usr/bin/tconverter \ + -executable=appdir/usr/bin/tfarmcontroller \ + -executable=appdir/usr/bin/tfarmserver +./linuxdeployqt*.AppImage appdir/usr/bin/Tahoma -appimage + +mv Tahoma*.AppImage Tahoma/Tahoma.AppImage + +echo ">>> Creating Tahoma Linux package" + +tar zcf Tahoma-linux.tar.gz Tahoma diff --git a/ci-scripts/linux/travis-install.sh b/ci-scripts/linux/travis-install.sh index af5c9280..e835c5d2 100755 --- a/ci-scripts/linux/travis-install.sh +++ b/ci-scripts/linux/travis-install.sh @@ -1,8 +1,8 @@ -sudo add-apt-repository --yes ppa:beineri/opt-qt-5.14.1-xenial +sudo add-apt-repository --yes ppa:beineri/opt-qt597-xenial sudo add-apt-repository --yes ppa:achadwick/mypaint-testing sudo add-apt-repository --yes ppa:litenstein/opencv3-xenial sudo apt-get update -sudo apt-get install -y cmake liblzo2-dev liblz4-dev libfreetype6-dev libpng-dev libegl1-mesa-dev libgles2-mesa-dev libglew-dev freeglut3-dev qt514script libsuperlu-dev qt514svg qt514tools qt514multimedia wget libusb-1.0-0-dev libboost-all-dev liblzma-dev libjson-c-dev libmypaint-dev libjpeg-turbo8-dev libopencv-dev libglib2.0-dev qt514serialport +sudo apt-get install -y cmake liblzo2-dev liblz4-dev libfreetype6-dev libpng-dev libegl1-mesa-dev libgles2-mesa-dev libglew-dev freeglut3-dev qt59script libsuperlu-dev qt59svg qt59tools qt59multimedia wget libusb-1.0-0-dev libboost-all-dev liblzma-dev libjson-c-dev libmypaint-dev libjpeg-turbo8-dev libopencv-dev libglib2.0-dev qt59serialport # 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 diff --git a/toonz/sources/xdg-data/CMakeLists.txt b/toonz/sources/xdg-data/CMakeLists.txt index 2ea97868..ab0a6158 100644 --- a/toonz/sources/xdg-data/CMakeLists.txt +++ b/toonz/sources/xdg-data/CMakeLists.txt @@ -1,3 +1,3 @@ -install(FILES io.github.OpenToonz.appdata.xml DESTINATION ${CMAKE_INSTALL_PREFIX}/share/metainfo) -install(FILES io.github.OpenToonz.desktop DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications) -install(FILES io.github.OpenToonz.png DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/256x256/apps) +install(FILES io.github.Tahoma.appdata.xml DESTINATION ${CMAKE_INSTALL_PREFIX}/share/metainfo) +install(FILES io.github.Tahoma.desktop DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications) +install(FILES io.github.Tahoma.png DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/256x256/apps) diff --git a/toonz/sources/xdg-data/io.github.Tahoma.appdata.xml b/toonz/sources/xdg-data/io.github.Tahoma.appdata.xml new file mode 100644 index 00000000..468dd4ac --- /dev/null +++ b/toonz/sources/xdg-data/io.github.Tahoma.appdata.xml @@ -0,0 +1,31 @@ + + + io.github.Tahoma + io.github.Tahoma.desktop + Tahoma + CC0-1.0 + BSD-3-Clause + Tahoma + 2D animation + +

+ This is software for producing 2D and stop motion animation. +

+

+ Tahoma is based on OpenToonz which itself is based on "Toonz", + developed by Digital Video S.p.A. in Italy and customized by + Studio Ghibli. +

+ + https://tahoma2d.org + https://github.com/turtletooth/tahoma/issues + + + https://raw.githubusercontent.com/flathub/io.github.Tahoma/master/screenshot1.png + + + + + + + diff --git a/toonz/sources/xdg-data/io.github.Tahoma.desktop b/toonz/sources/xdg-data/io.github.Tahoma.desktop new file mode 100644 index 00000000..c2ec6706 --- /dev/null +++ b/toonz/sources/xdg-data/io.github.Tahoma.desktop @@ -0,0 +1,8 @@ +[Desktop Entry] +Type=Application +Name=Tahoma +Comment=2D animation +Icon=io.github.Tahoma +Exec=tahoma +Categories=Graphics; +Terminal=false diff --git a/toonz/sources/xdg-data/io.github.Tahoma.png b/toonz/sources/xdg-data/io.github.Tahoma.png new file mode 100644 index 0000000000000000000000000000000000000000..59e0d4e80b416423fbde07466add3f692d229d6d GIT binary patch literal 1227 zcmV;+1T_1JP)C0005PP)t-s^@1Pt ze<9CSKE5nr(GY*_c_zk5NWdd%+Y5%~2aMuvF2Oxg#2Rzr2#VBQIleJn%oBU@d?U+H zL%%0x)(wN_aw@|^O~M{--wBA@W;4JySI8H4jpWx^kB-U*1{4UOdpjNK58(HxJ)D3HJ|k>m-C*%Xe>AdkZ#pEz&KaO7k0uvQr{1azcO3P6nnuhkjz4M-CI+_GK|qlY~f=`@p~x7H-y$uW9Di= z^nfDDK6~0&Sn6>$!7z@`MRDI>PVaau)EbV&G>OwqXXIu@^L`}AI)Kj^AHT%t3eDTU6K;j?qbN;bKa~Hiy+uWzTo#MQ(p)syvzUq0>nu~K~#9!?brERO+gq3 z@DsvhOO!QP3f(x7U6MjbvXxNDzGUAjvI~)t?f-S$d)<4MnR8~&nR(ym@x0%k=Xt)L zU%qGNSQcUmrc9lN*Iqb%#!SW-QhU*?*>hMr80~ZC6|-ER%jcIYSjgM~Z7(fbw3zt< z*S=)wvgIronDW1SWBdTLXZMB#$nOmUP`;v=Ma5WoU~iy+3eMi(04w=>g8>w*TD?ZT zTsOekTcujNPC(?|i~?l#W(-hOvQ}zuW&jms>((b|PY6)kn`VIe-gE+D?M)jX?%wnO z66`HGAmQE;0-XCT;okVEmTK3sw_s8=8#daJ<=XbHWq}b;}`}7vJ6v zA2GH!LE!cl4glC&2%xCd%-)WA_9g<9w;eN49^9J`fYw-&+ho z`-6x5^5q;r)1&C;oEY%ypWoB@DfZ$NK1kdv6GU-=4i80Hi_y0uX=z1Rwwb2tWV=5P$## pAOHafKmY;|fB*y_00I7Iz#m&e