diff --git a/.travis.yml b/.travis.yml index ea8246f8d..7d1b6fb11 100644 --- a/.travis.yml +++ b/.travis.yml @@ -61,39 +61,18 @@ script: mkdir build; cd build; cmake .. -DCMAKE_INSTALL_PREFIX=/usr; - make -j$(nproc) && make install DESTDIR=../Glest; - cd ..; - rm -rf build; - git clone https://github.com/glest/glest-data.git; - mkdir build; - cd build; - cmake ../glest-data -DCMAKE_INSTALL_PREFIX=/usr; - make && make install DESTDIR=../Glest; - cd ..; - rm -rf build; - # Remove useless metainfo. - rm Glest/usr/share/metainfo/io.glest.Editor.appdata.xml; - find Glest/; - export LD_LIBRARY_PATH=/usr/lib/x86_64-linux-gnu/pulseaudio/:/usr/lib/i386-linux-gnu/pulseaudio/:$LD_LIBRARY_PATH - 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 - export VERSION="2.0" # linuxdeployqt uses this for naming the file - ./linuxdeployqt-continuous-x86_64.AppImage Glest/usr/share/applications/io.glest.Glest.desktop -appimage - -# Remove useless metainfo. -rm Glest/usr/share/metainfo/io.glest.Editor.appdata.xml + fi - if [ "$TRAVIS_OS_NAME" = "linux" ] && [ "$(echo "$CC" | grep 'clang')" != "" ]; then mkdir build; cd build; - cmake .. -DCMAKE_INSTALL_PREFIX=$PWD/local; + cmake .. -DCMAKE_INSTALL_PREFIX=/usr; make && make install; fi - if [ "$TRAVIS_OS_NAME" = "osx" ]; then mkdir build; cd build; - cmake .. -DCMAKE_INSTALL_PREFIX=$PWD/local; + cmake .. -DCMAKE_INSTALL_PREFIX=/usr; make && make install; echo 'Dependencies:'; otool -L glest; @@ -101,9 +80,28 @@ rm Glest/usr/share/metainfo/io.glest.Editor.appdata.xml - if [ "$TRAVIS_OS_NAME" = "linux" ] && [ "$(echo "$CC" | grep 'clang')" = "" ] && [ $Tr_Compiler_Version = "6" ]; then mkdir build; cd build; - cmake .. -DFORCE_EMBEDDED_LIBS=ON -DCMAKE_INSTALL_PREFIX=$PWD/local; + cmake .. -DFORCE_EMBEDDED_LIBS=ON -DCMAKE_INSTALL_PREFIX=/usr; make && make install; fi + - make -j$(nproc) && make install DESTDIR=../Glest; + cd ..; + rm -rf build; + git clone https://github.com/glest/glest-data.git; + mkdir build; + cd build; + cmake ../glest-data -DCMAKE_INSTALL_PREFIX=/usr; + make && make install DESTDIR=../Glest; + cd ..; + rm -rf build; + # Remove useless metainfo. + rm Glest/usr/share/metainfo/io.glest.Editor.appdata.xml; + find Glest/; + export LD_LIBRARY_PATH=/usr/lib/x86_64-linux-gnu/pulseaudio/:/usr/lib/i386-linux-gnu/pulseaudio/:$LD_LIBRARY_PATH; + 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; + export VERSION="2.0"; # linuxdeployqt uses this for naming the file + ./linuxdeployqt-continuous-x86_64.AppImage Glest/usr/share/applications/io.glest.Glest.desktop -appimage; # https://docs.travis-ci.com/user/notifications/#IRC-notification notifications: