mirrors
/
Labrador
mirror of https://github.com/EspoTek/Labrador.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cleaner icon and desktop structure; added to makefile

This commit is contained in:
Chris Esposito 2019-04-23 18:50:09 +10:00
parent f33b2b16d9
commit e8a817fe4d
25 changed files with 11 additions and 220 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

@ -56,8 +56,8 @@ 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

8
Desktop_Interface/Labrador.pro
View File

@ -176,7 +176,11 @@ unix:!android:!macx{
udev.path = /etc/udev/rules.d
udev.files = rules.d/69-labrador.rules
udevextra.path = /etc/udev/rules.d
udevextra.extra = udevadm control --reload-rules && udevadm trigger
udevextra.extra = udevadm control --reload-rules && udevadm trigger
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
INSTALLS += target
INSTALLS += lib_deploy
INSTALLS += other
@ -184,6 +188,8 @@ unix:!android:!macx{
!equals(PORTABLE, 1){
INSTALLS += symlink
INSTALLS += udevextra
INSTALLS += icon
INSTALLS += desktop
}
}

0
build_scripts/osx/Info.plist → Desktop_Interface/resources/Info.plist
View File

4
build_scripts/linux_deploy_labra_32-bit/labradeb/usr/share/applications/espotek-labrador.desktop → Desktop_Interface/resources/espotek-labrador.desktop
View File

@ -1,10 +1,10 @@
[Desktop Entry]
Name=EspoTek Labrador
Comment=Software Interface for Labrador Board
Exec=/usr/share/espotek/labrador/Labrador
Exec=/usr/local/bin/EspoTek-Labrador/Labrador
Terminal=false
Type=Application
Categories=Electronics
Icon=/usr/share/app-install/icons/espotek-labrador.png
Icon=/usr/share/icons/hicolor/256x256/apps/espotek-labrador.png

BIN
Desktop_Interface/resources/espotek-labrador.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 14 KiB

0
build_scripts/osx/iconfile.icns → Desktop_Interface/resources/iconfile.icns
View File

BIN
build_scripts/linux_deploy_labra_32-bit/a.out
View File

Binary file not shown.

72
build_scripts/linux_deploy_labra_32-bit/autodeploy
View File

@ -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

14
build_scripts/linux_deploy_labra_32-bit/cleanup-junk
View File

@ -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

7
build_scripts/linux_deploy_labra_32-bit/labradeb-install
View File

@ -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

8
build_scripts/linux_deploy_labra_32-bit/labradeb/DEBIAN/control
View File

@ -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!

2
build_scripts/linux_deploy_labra_32-bit/labradeb/etc/udev/rules.d/69-labrador.rules
View File

@ -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"

BIN
build_scripts/linux_deploy_labra_32-bit/labradeb/usr/share/app-install/icons/espotek-labrador.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 12 KiB

1
build_scripts/linux_deploy_labra_32-bit/labradeb/usr/share/applications/settings.set
View File

@ -1 +0,0 @@
420

BIN
build_scripts/linux_deploy_labra_32-bit/linuxdeployqt_32bit
View File

Binary file not shown.

BIN
build_scripts/linux_deploy_labra_64-bit/a.out
View File

Binary file not shown.

69
build_scripts/linux_deploy_labra_64-bit/autodeploy
View File

@ -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

14
build_scripts/linux_deploy_labra_64-bit/cleanup-junk
View File

@ -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

7
build_scripts/linux_deploy_labra_64-bit/labradeb-install
View File

@ -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

8
build_scripts/linux_deploy_labra_64-bit/labradeb/DEBIAN/control
View File

@ -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!

2
build_scripts/linux_deploy_labra_64-bit/labradeb/etc/udev/rules.d/69-labrador.rules
View File

@ -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"

BIN
build_scripts/linux_deploy_labra_64-bit/labradeb/usr/share/app-install/icons/espotek-labrador.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 12 KiB

10
build_scripts/linux_deploy_labra_64-bit/labradeb/usr/share/applications/espotek-labrador.desktop
View File

@ -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
build_scripts/linux_deploy_labra_64-bit/labradeb/usr/share/applications/settings.set
View File

@ -1 +0,0 @@
420

BIN
build_scripts/linux_deploy_labra_64-bit/linuxdeployqt_x64
View File

Binary file not shown.