mirror of https://github.com/EspoTek/Labrador.git
Uses make install
This commit is contained in:
Chris Esposito
parent
e9138dfa5b
commit
6223662616
17
.travis.yml
17
.travis.yml
|
|
@ -56,29 +56,22 @@ script:
|
|||
mkdir -p bin/Labrador.app/Contents/Frameworks
|
||||
cp -r bin/firmware bin/Labrador.app/Contents/MacOS
|
||||
cp -r bin/waveforms bin/Labrador.app/Contents/MacOS
|
||||
cp ../build_scripts/osx/iconfile.icns bin/Labrador.app/Contents/Resources
|
||||
cp ../build_scripts/osx/Info.plist bin/Labrador.app/Contents
|
||||
cp resources/iconfile.icns bin/Labrador.app/Contents/Resources
|
||||
cp resources/Info.plist bin/Labrador.app/Contents
|
||||
macdeployqt bin/Labrador.app -dmg -libpath=build_mac/libdfuprog/lib/
|
||||
#Linux
|
||||
elif [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
|
||||
cd Desktop_Interface
|
||||
qmake CONFIG+=release PREFIX=/usr DEFINES+=GIT_HASH_SHORT=$(git rev-parse --short HEAD)
|
||||
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 -j$(nproc) install ; find appdir/
|
||||
# NOTE: The following 5 lines should not be needed if "make install" would be made work for Labrador; see
|
||||
# https://github.com/probonopd/linuxdeployqt#using-linuxdeployqt-with-travis-ci
|
||||
sudo cp ./build_linux/libdfuprog/lib/x64/libdfuprog-*.so /usr/lib/x86_64-linux-gnu/
|
||||
mkdir -p appdir/usr/bin/ ; ldd bin/Labrador ; strip bin/Labrador ; cp bin/Labrador appdir/usr/bin/
|
||||
cp -r bin/{waveforms,firmware} appdir/usr/bin/
|
||||
mkdir -p appdir/usr/share/applications ; cp build_linux/labrador.desktop appdir/usr/share/applications
|
||||
mkdir -p appdir/usr/share/icons/hicolor/256x256/apps/ ; cp '../build_scripts/linux_deploy_labra_64-bit/labradeb/usr/share/app-install/icons/espotek-labrador.png' appdir/usr/share/icons/hicolor/256x256/apps/
|
||||
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
|
||||
./linuxdeployqt*.AppImage --appimage-extract
|
||||
rm ./appdir/AppRun ; cp ./build_linux/AppRun appdir/ ; chmod a+x ./appdir/AppRun
|
||||
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/
|
||||
fi
|
||||
|
||||
|
|
|
|||
|
|
@ -167,22 +167,44 @@ unix:!android:!macx{
|
|||
lib_deploy.path = /usr/lib
|
||||
}
|
||||
}
|
||||
|
||||
other.files += bin/firmware
|
||||
other.files += bin/waveforms
|
||||
other.path = /usr/local/bin/EspoTek-Labrador
|
||||
target.path = /usr/local/bin/EspoTek-Labrador
|
||||
symlink.path = /usr/local/bin
|
||||
symlink.extra = ln -sf /usr/local/bin/EspoTek-Labrador/Labrador /usr/local/bin/labrador
|
||||
other.path = /usr/bin/EspoTek-Labrador
|
||||
|
||||
target.path = /usr/bin/EspoTek-Labrador
|
||||
|
||||
udev.path = /etc/udev/rules.d
|
||||
udev.files = rules.d/69-labrador.rules
|
||||
|
||||
icon.files += resources/espotek-labrador.png
|
||||
icon.path = /usr/share/icons/hicolor/256x256/apps/
|
||||
|
||||
desktop.files += resources/espotek-labrador.desktop
|
||||
desktop.path = /usr/share/applications
|
||||
|
||||
symlink.path = /usr/bin
|
||||
symlink.extra = ln -sf /usr/bin/EspoTek-Labrador/Labrador /usr/bin/labrador
|
||||
|
||||
udevextra.path = /etc/udev/rules.d
|
||||
udevextra.extra = udevadm control --reload-rules && udevadm trigger
|
||||
udevextra.extra = udevadm control --reload-rules && udevadm trigger
|
||||
|
||||
equals(APPIMAGE, 1){
|
||||
other.path = /usr/bin
|
||||
target.path = /usr/bin
|
||||
}
|
||||
|
||||
INSTALLS += target
|
||||
INSTALLS += lib_deploy
|
||||
INSTALLS += other
|
||||
INSTALLS += symlink
|
||||
INSTALLS += udev
|
||||
INSTALLS += udevextra
|
||||
INSTALLS += icon
|
||||
INSTALLS += desktop
|
||||
|
||||
!equals(APPIMAGE, 1){
|
||||
INSTALLS += symlink
|
||||
INSTALLS += udevextra
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -4,5 +4,5 @@ Comment=Software Interface for Labrador Board
|
|||
Exec=Labrador
|
||||
Terminal=false
|
||||
Type=Application
|
||||
Categories=Development;Electronics;
|
||||
Categories=Education;Electronics;
|
||||
Icon=espotek-labrador
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 14 KiB |
Binary file not shown.
|
|
@ -1,72 +0,0 @@
|
|||
#!/bin/bash
|
||||
|
||||
echo
|
||||
echo
|
||||
echo "Cleaning up files..."
|
||||
echo
|
||||
|
||||
./cleanup-junk
|
||||
|
||||
echo
|
||||
echo
|
||||
echo "Copying latest dev build..."
|
||||
echo
|
||||
|
||||
#Copy across latest dev build
|
||||
|
||||
#########################################################################
|
||||
#### Change "~/Labrador-master" to your Labrador GitHub directory. ####
|
||||
#########################################################################
|
||||
cp ~/Labrador-master/Desktop_Interface/bin/Labrador Labrador
|
||||
cp -r ~/Labrador-master/Desktop_Interface/bin/waveforms waveforms
|
||||
cp -r ~/Labrador-master/Desktop_Interface/bin/firmware firmware
|
||||
|
||||
echo
|
||||
echo
|
||||
echo "Running linuxdeployqt..."
|
||||
echo
|
||||
|
||||
#Linuxdeployqt
|
||||
export PATH=$PWD/labradeb/usr/lib:$PATH
|
||||
./linuxdeployqt* Labrador -qmake=/usr/bin/qmake
|
||||
|
||||
echo
|
||||
echo
|
||||
echo "Moving linuxdeployqt files..."
|
||||
echo
|
||||
|
||||
#Move to LABRADEPLOY directory
|
||||
mkdir LABRADEPLOY
|
||||
mv lib LABRADEPLOY
|
||||
mv plugins LABRADEPLOY
|
||||
mv translations LABRADEPLOY
|
||||
mv qt.conf LABRADEPLOY
|
||||
mv Labrador LABRADEPLOY
|
||||
mv waveforms LABRADEPLOY
|
||||
mv firmware LABRADEPLOY
|
||||
|
||||
#Clean up unwanted shortcut
|
||||
rm AppRun
|
||||
|
||||
echo
|
||||
echo
|
||||
echo "Building .deb..."
|
||||
echo
|
||||
|
||||
#Replace old folder in deb
|
||||
rm -r labradeb/usr/share/espotek/labrador
|
||||
cp -r LABRADEPLOY labradeb/usr/share/espotek/labrador
|
||||
|
||||
#build the deb.
|
||||
dpkg-deb --build labradeb
|
||||
|
||||
echo
|
||||
echo
|
||||
echo "Final cleanup..."
|
||||
echo
|
||||
|
||||
./cleanup-junk
|
||||
|
||||
#install the new deb
|
||||
#./labradeb-install
|
||||
|
||||
|
|
@ -1,14 +0,0 @@
|
|||
#!/bin/bash
|
||||
|
||||
rm -r LABRADEPLOY
|
||||
rm -r Labrador
|
||||
rm -r lib
|
||||
rm -r plugins
|
||||
rm -r translations
|
||||
rm -r waveforms
|
||||
rm -r settings.set
|
||||
rm -r doc
|
||||
rm -r labradeb/usr/share/espotek/labrador
|
||||
rm AppRun
|
||||
rm qt.conf
|
||||
|
||||
|
|
@ -1,7 +0,0 @@
|
|||
#!/bin/bash
|
||||
|
||||
sudo dpkg -i labradeb.deb
|
||||
sudo udevadm control --reload-rules
|
||||
sudo udevadm trigger
|
||||
|
||||
exec /usr/share/espotek/labrador/Labrador
|
||||
|
|
@ -1,8 +0,0 @@
|
|||
Package: espotek-labrador
|
||||
Version: 1.1
|
||||
Section: base
|
||||
Priority: optional
|
||||
Architecture: i386
|
||||
Depends: libusb-1.0-0 (>= 1.0.19)
|
||||
Maintainer: Chris Esposito <admin@espotek.com>
|
||||
Description: Labrador Christmas Update 2017!
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
ENV{ID_VENDOR_ID}=="03eb", ENV{ID_MODEL_ID}=="ba94", SYMLINK="EspoTek_Labrador", MODE="0666"
|
||||
ENV{ID_VENDOR_ID}=="03eb", ENV{ID_MODEL_ID}=="2fe4", SYMLINK="ATXMEGA32A4U DFU Bootloader", MODE="0666"
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 12 KiB |
|
|
@ -1,10 +0,0 @@
|
|||
[Desktop Entry]
|
||||
Name=EspoTek Labrador
|
||||
Comment=Software Interface for Labrador Board
|
||||
Exec=/usr/share/espotek/labrador/Labrador
|
||||
Terminal=false
|
||||
Type=Application
|
||||
Categories=Electronics
|
||||
Icon=/usr/share/app-install/icons/espotek-labrador.png
|
||||
|
||||
|
||||
|
|
@ -1 +0,0 @@
|
|||
420
|
||||
Binary file not shown.
Binary file not shown.
|
|
@ -1,69 +0,0 @@
|
|||
#!/bin/bash
|
||||
|
||||
echo
|
||||
echo
|
||||
echo "Cleaning up files..."
|
||||
echo
|
||||
|
||||
./cleanup-junk
|
||||
|
||||
echo
|
||||
echo
|
||||
echo "Copying latest dev build..."
|
||||
echo
|
||||
|
||||
|
||||
#Copy across latest dev build
|
||||
cp ~/Git/Labrador/Desktop_Interface/bin/Labrador Labrador
|
||||
cp -r ~/Git/Labrador/Desktop_Interface/bin/waveforms waveforms
|
||||
cp -r ~/Git/Labrador/Desktop_Interface/bin/firmware firmware
|
||||
|
||||
echo
|
||||
echo
|
||||
echo "Running linuxdeployqt..."
|
||||
echo
|
||||
|
||||
#Linuxdeployqt
|
||||
export PATH=$PWD/labradeb/usr/lib:$PATH
|
||||
./linuxdeployqt_x64 Labrador -qmake=/usr/lib/x86_64-linux-gnu/qt5/bin/qmake
|
||||
|
||||
echo
|
||||
echo
|
||||
echo "Moving linuxdeployqt files..."
|
||||
echo
|
||||
|
||||
#Move to LABRADEPLOY directory
|
||||
mkdir LABRADEPLOY
|
||||
mv lib LABRADEPLOY
|
||||
mv plugins LABRADEPLOY
|
||||
mv translations LABRADEPLOY
|
||||
mv qt.conf LABRADEPLOY
|
||||
mv Labrador LABRADEPLOY
|
||||
mv waveforms LABRADEPLOY
|
||||
mv firmware LABRADEPLOY
|
||||
|
||||
#Clean up unwanted shortcut
|
||||
rm AppRun
|
||||
|
||||
echo
|
||||
echo
|
||||
echo "Building .deb..."
|
||||
echo
|
||||
|
||||
#Replace old folder in deb
|
||||
rm -r labradeb/usr/share/espotek/labrador
|
||||
cp -r LABRADEPLOY labradeb/usr/share/espotek/labrador
|
||||
|
||||
#build the deb.
|
||||
dpkg-deb --build labradeb
|
||||
|
||||
echo
|
||||
echo
|
||||
echo "Final cleanup..."
|
||||
echo
|
||||
|
||||
./cleanup-junk
|
||||
|
||||
#install the new deb
|
||||
#./labradeb-install
|
||||
|
||||
|
|
@ -1,14 +0,0 @@
|
|||
#!/bin/bash
|
||||
|
||||
rm -r LABRADEPLOY
|
||||
rm -r Labrador
|
||||
rm -r lib
|
||||
rm -r plugins
|
||||
rm -r translations
|
||||
rm -r waveforms
|
||||
rm -r settings.set
|
||||
rm -r doc
|
||||
rm -r labradeb/usr/share/espotek/labrador
|
||||
rm AppRun
|
||||
rm qt.conf
|
||||
|
||||
|
|
@ -1,7 +0,0 @@
|
|||
#!/bin/bash
|
||||
|
||||
sudo dpkg -i labradeb.deb
|
||||
sudo udevadm control --reload-rules
|
||||
sudo udevadm trigger
|
||||
|
||||
exec /usr/share/espotek/labrador/Labrador
|
||||
|
|
@ -1,8 +0,0 @@
|
|||
Package: espotek-labrador
|
||||
Version: 1.1
|
||||
Section: base
|
||||
Priority: optional
|
||||
Architecture: amd64
|
||||
Depends: libusb-1.0-0 (>= 1.0.19)
|
||||
Maintainer: Chris Esposito <admin@espotek.com>
|
||||
Description: EspoTek Labrador Christmas 2017 update!
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
ENV{ID_VENDOR_ID}=="03eb", ENV{ID_MODEL_ID}=="ba94", SYMLINK="EspoTek_Labrador", MODE="0666"
|
||||
ENV{ID_VENDOR_ID}=="03eb", ENV{ID_MODEL_ID}=="2fe4", SYMLINK="ATXMEGA32A4U DFU Bootloader", MODE="0666"
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 12 KiB |
|
|
@ -1,10 +0,0 @@
|
|||
[Desktop Entry]
|
||||
Name=EspoTek Labrador
|
||||
Comment=Software Interface for Labrador Board
|
||||
Exec=/usr/share/espotek/labrador/Labrador
|
||||
Terminal=false
|
||||
Type=Application
|
||||
Categories=Electronics
|
||||
Icon=/usr/share/app-install/icons/espotek-labrador.png
|
||||
|
||||
|
||||
|
|
@ -1 +0,0 @@
|
|||
420
|
||||
Binary file not shown.
Loading…
Reference in New Issue