autoreleased deb

This commit is contained in:
Chris Esposito 2019-06-23 14:48:16 +10:00
parent d1fc926e7f
commit 2851e82a82
7 changed files with 45 additions and 16 deletions

View File

@ -62,19 +62,8 @@ script:
#Linux
elif [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
cd Desktop_Interface
qmake APPIMAGE=1 CONFIG+=release PREFIX=/usr DEFINES+=GIT_HASH_SHORT=$(git rev-parse --short HEAD)
make -j$(nproc) CXX=${CXX} CC=${CC} LINK=${CXX}
make INSTALL_ROOT=appdir 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)
./linuxdeployqt-continuous-x86_64.AppImage appdir/usr/share/applications/*.desktop -bundle-non-qt-libs -verbose=2
mkdir -p appdir/usr/optional/ ; wget -c https://github.com/darealshinji/AppImageKit-checkrt/releases/download/continuous/exec-x86_64.so -O ./appdir/usr/optional/exec.so
mkdir -p appdir/usr/optional/libstdc++/ ; cp /usr/lib/x86_64-linux-gnu/libstdc++.so.6 ./appdir/usr/optional/libstdc++/
./linuxdeployqt*.AppImage --appimage-extract
rm ./appdir/AppRun ; cp ./resources/AppRun appdir/ ; chmod a+x ./appdir/AppRun
PATH=./squashfs-root/usr/bin:$PATH ./squashfs-root/usr/bin/appimagetool -g ./appdir/
./make_appimage
./make_deb
fi
after_success:
@ -91,6 +80,7 @@ after_success:
# curl --upload-file EspoTek_Labrador*.AppImage https://transfer.sh/EspoTek_Labrador-git.$(git rev-parse --short HEAD)-x86_64.AppImage
wget -c https://github.com/probonopd/uploadtool/raw/master/upload.sh
bash upload.sh EspoTek_Labrador*.AppImage*
bash upload.sh EspoTek_Labrador*.deb*
fi
branches:

View File

@ -189,10 +189,12 @@ unix:!android:!macx{
desktop.path = /usr/share/applications
symlink.path = /usr/bin
symlink.extra = ln -sf /usr/bin/EspoTek-Labrador/Labrador /usr/bin/labrador
symlink.extra = ln -sf ${INSTALL_ROOT}/usr/bin/EspoTek-Labrador/Labrador ${INSTALL_ROOT}/usr/bin/labrador
udevextra.path = /etc/udev/rules.d
!equals(DEB, 1){
udevextra.extra = udevadm control --reload-rules && udevadm trigger
}
equals(APPIMAGE, 1){
other.path = /usr/bin

15
Desktop_Interface/make_appimage Executable file
View File

@ -0,0 +1,15 @@
#!/bin/bash
qmake APPIMAGE=1 CONFIG+=release PREFIX=/usr DEFINES+=GIT_HASH_SHORT=$(git rev-parse --short HEAD)
make -j$(nproc) CXX=${CXX} CC=${CC} LINK=${CXX}
make INSTALL_ROOT=appdir 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)
./linuxdeployqt-continuous-x86_64.AppImage appdir/usr/share/applications/*.desktop -bundle-non-qt-libs -verbose=2
mkdir -p appdir/usr/optional/ ; wget -c https://github.com/darealshinji/AppImageKit-checkrt/releases/download/continuous/exec-x86_64.so -O ./appdir/usr/optional/exec.so
mkdir -p appdir/usr/optional/libstdc++/ ; cp /usr/lib/x86_64-linux-gnu/libstdc++.so.6 ./appdir/usr/optional/libstdc++/
./linuxdeployqt*.AppImage --appimage-extract
rm ./appdir/AppRun ; cp ./resources/AppRun appdir/ ; chmod a+x ./appdir/AppRun
PATH=./squashfs-root/usr/bin:$PATH ./squashfs-root/usr/bin/appimagetool -g ./appdir/

9
Desktop_Interface/make_deb Executable file
View File

@ -0,0 +1,9 @@
#!/bin/bash
qmake DEB=1 CONFIG+=release PREFIX=/usr DEFINES+=GIT_HASH_SHORT=$(git rev-parse --short HEAD)
make -j$(nproc) CXX=${CXX} CC=${CC} LINK=${CXX}
rm -R deb
make INSTALL_ROOT=deb install; find deb/
cp -r resources/debian deb/DEBIAN
dpkg-deb --build deb
mv deb.deb Espotek_Labrador-$(git rev-parse --short HEAD)-x64.deb

View File

@ -0,0 +1,12 @@
Package: espotek-labrador
Version: 2.0
Section: base
Priority: optional
Architecture: amd64
Depends: libusb-1.0-0 (>= 1.0.19), qt5-qmake
Maintainer: Chris Esposito <admin@espotek.com>
Homepage: https://espotek.com
Description: EspoTek Labrador
This package is designed to install the EspoTek Labrador software on 64-bit Ubuntu 18.04 and later (including Kubuntu, Lubuntu etc.).
.
If you use another version of Linux, or are having issues with this package, I recommend either using the .AppImage, or installing through "make install" (see https://github.com/espotek/labrador for instructions on how to do this)

View File

@ -0,0 +1 @@
udevadm control --reload-rules && udevadm trigger

View File

@ -1,7 +1,7 @@
[Desktop Entry]
Name=EspoTek Labrador
Comment=Software Interface for Labrador Board
Exec=/usr/bin/Espotek-Labrador/Labrador
Exec=/usr/bin/EspoTek-Labrador/Labrador
Terminal=false
Type=Application
Categories=Education;Electronics;