Work on deploy scripts

emericg · Sep 28, 2018 · 4051cd1 · 4051cd1
1 parent 84f810a
commit 4051cd1
Show file tree

Hide file tree

Showing 5 changed files with 85 additions and 25 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,6 +2,7 @@
 build/*
 bin/*
 contribs/*
+appdir/*
 
 # QtCreator temporary project files
 OffloadBuddy.config

diff --git a/.travis.yml b/.travis.yml
@@ -29,6 +29,8 @@ install:
       brew install libexif;
       brew install ffmpeg;
       brew install libtool;
+      brew install gettext;
+      brew link --force gettext;
     fi
 
 before_script:
@@ -38,31 +40,8 @@ before_script:
   - qmake DEFINES+=USE_CONTRIBS CONFIG+=release PREFIX=/usr
 
 script:
-  - |-
   - make -j$(nproc)
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
-      make INSTALL_ROOT=appdir -j$(nproc) install; find appdir/;
-      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=$(git rev-parse --short HEAD);
-      mkdir -p appdir/usr/plugins/imageformats/ appdir/usr/plugins/iconengines/;
-      cp /opt/qt511/plugins/imageformats/libqsvg.so appdir/usr/plugins/imageformats/;
-      cp /opt/qt511/plugins/iconengines/libqsvgicon.so appdir/usr/plugins/iconengines/;
-      ./linuxdeployqt-continuous-x86_64.AppImage appdir/usr/share/applications/*.desktop -qmldir=qml/ -bundle-non-qt-libs -extra-plugins=imageformats/libqsvg.so,iconengines/libqsvgicon.so;
-      ./linuxdeployqt-continuous-x86_64.AppImage appdir/usr/share/applications/*.desktop -qmldir=qml/ -appimage;
-    fi
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
-      make install;
-    fi
 
 after_success:
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
-      find appdir -executable -type f -exec ldd {} \; | grep " => /usr" | cut -d " " -f 2-3 | sort | uniq;
-      curl --upload-file OffloadBuddy*.AppImage https://transfer.sh/OffloadBuddy-git.$(git rev-parse --short HEAD)-linux64.AppImage;
-    fi
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
-      cd bin/;
-      zip -r -X OffloadBuddy.zip OffloadBuddy.app;
-      curl --upload-file OffloadBuddy*.zip https://transfer.sh/OffloadBuddy-git.$(git rev-parse --short HEAD)-macOS.zip;
-    fi
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then deploy_linux.sh; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then deploy_macos.sh; fi
diff --git a/deploy_linux.sh b/deploy_linux.sh
@@ -0,0 +1,41 @@
+#!/usr/bin/env bash
+
+echo "> OffloadBuddy packager"
+
+export VERSION=$(git rev-parse --short HEAD);
+
+## APP INSTALL #################################################################
+
+make INSTALL_ROOT=appdir -j$(nproc) install; find appdir/;
+
+## PACKAGE #####################################################################
+
+# get linuxdeployqt
+if [ ! -x contribs/src/linuxdeployqt-continuous-x86_64.AppImage ]; then
+  wget -c -nv "https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage" -P contribs/src/;
+fi
+chmod a+x contribs/src/linuxdeployqt-continuous-x86_64.AppImage;
+
+unset LD_LIBRARY_PATH; unset QT_PLUGIN_PATH; #unset QTDIR;
+if [ ! -z QTDIR ]; then
+  QTDIR=/usr/lib/qt
+fi
+USRDIR=/usr
+if [ -d appdir/usr/local ]; then
+  USRDIR=/usr/local
+fi
+
+# run linuxdeployqt
+mkdir -p appdir/$USRDIR/plugins/imageformats/ appdir/$USRDIR/plugins/iconengines/;
+cp $QTDIR/plugins/imageformats/libqsvg.so appdir/$USRDIR/plugins/imageformats/;
+cp $QTDIR/plugins/iconengines/libqsvgicon.so appdir/$USRDIR/plugins/iconengines/;
+./contribs/src/linuxdeployqt-continuous-x86_64.AppImage appdir/$USRDIR/share/applications/*.desktop -qmldir=qml/ -bundle-non-qt-libs -extra-plugins=imageformats/libqsvg.so,iconengines/libqsvgicon.so;
+
+# run appimage packager
+./contribs/src/linuxdeployqt-continuous-x86_64.AppImage appdir/$USRDIR/share/applications/*.desktop -qmldir=qml/ -appimage;
+
+## UPLOAD ######################################################################
+
+# upload to transfer.sh
+find appdir -executable -type f -exec ldd {} \; | grep " => $USRDIR" | cut -d " " -f 2-3 | sort | uniq;
+#curl --upload-file OffloadBuddy*.AppImage https://transfer.sh/OffloadBuddy-git.$VERSION-linux64.AppImage;
diff --git a/deploy_macos.sh b/deploy_macos.sh
@@ -0,0 +1,21 @@
+#!/usr/bin/env bash
+
+echo "> OffloadBuddy packager"
+
+export VERSION=$(git rev-parse --short HEAD);
+
+## APP INSTALL #################################################################
+
+make install
+
+## PACKAGE #####################################################################
+
+# already run by the make install
+#macdeployqt bin/OffloadBuddy.app
+
+cd bin/;
+zip -r -X OffloadBuddy.zip OffloadBuddy.app;
+
+## UPLOAD ######################################################################
+
+curl --upload-file OffloadBuddy*.zip https://transfer.sh/OffloadBuddy-git.$VERSION-macOS.zip;
diff --git a/deploy_windows.sh b/deploy_windows.sh
@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+
+echo "> OffloadBuddy packager"
+
+export VERSION=$(git rev-parse --short HEAD);
+
+## PACKAGE #####################################################################
+
+windeployqt bin/ --qmldir qml/
+mv contribs/windows_x86_64/usr/lib/libexif.dll bin/
+mv contribs/windows_x86_64/usr/lib/minivideo.dll bin/
+
+mv bin OffloadBuddy-$VERSION-win64
+7z a OffloadBuddy-$VERSION-win64.zip OffloadBuddy-$VERSION-win64
+
+## UPLOAD ######################################################################
+
+curl --upload-file OffloadBuddy*.zip https://transfer.sh/OffloadBuddy-git.$VERSION-win64.zip;