From a0a17e904faeff7fb21ddffa71102da2b051c8a5 Mon Sep 17 00:00:00 2001 From: Chris Esposito Date: Thu, 19 Jul 2018 16:38:42 +1000 Subject: [PATCH] make install works --- Desktop_Interface/Labrador.pro | 23 +++++++++++++++++++++ Desktop_Interface/rules.d/69-labrador.rules | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 Desktop_Interface/rules.d/69-labrador.rules diff --git a/Desktop_Interface/Labrador.pro b/Desktop_Interface/Labrador.pro index 2f16e7df..e64a9e0a 100644 --- a/Desktop_Interface/Labrador.pro +++ b/Desktop_Interface/Labrador.pro @@ -131,6 +131,9 @@ unix:!android:!macx{ QMAKE_CXXFLAGS += -fsigned-char DEFINES += "PLATFORM_RASPBERRY_PI" #All ARM-Linux GCC treats char as unsigned by default??? + lib_deploy.files = $$PWD/build_linux/libdfuprog/lib/arnm/libdfuprog-0.9.so + lib_deploy.path = /usr/lib + } else { contains(QT_ARCH, i386) { message("Building for Linux (x86)") @@ -142,6 +145,9 @@ unix:!android:!macx{ unix:!android:!macx:LIBS += -L$$PWD/build_linux/libdfuprog/lib/x86 -ldfuprog-0.9 unix:!android:!macx:INCLUDEPATH += $$PWD/build_linux/libdfuprog/include unix:!android:!macx:DEPENDPATH += $$PWD/build_linux/libdfuprog/include + lib_deploy.files = $$PWD/build_linux/libdfuprog/lib/x86/libdfuprog-0.9.so + lib_deploy.path = /usr/lib + } else { message("Building for Linux (x64)") #libusb include @@ -153,8 +159,25 @@ unix:!android:!macx{ unix:!android:!macx:LIBS += -L$$PWD/build_linux/libdfuprog/lib/x64 -ldfuprog-0.9 unix:!android:!macx:INCLUDEPATH += $$PWD/build_linux/libdfuprog/include unix:!android:!macx:DEPENDPATH += $$PWD/build_linux/libdfuprog/include + lib_deploy.files = $$PWD/build_linux/libdfuprog/lib/x64/libdfuprog-0.9.so + 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 + 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 + INSTALLS += target + INSTALLS += lib_deploy + INSTALLS += other + INSTALLS += symlink + INSTALLS += udev } diff --git a/Desktop_Interface/rules.d/69-labrador.rules b/Desktop_Interface/rules.d/69-labrador.rules new file mode 100644 index 00000000..d52fc7d6 --- /dev/null +++ b/Desktop_Interface/rules.d/69-labrador.rules @@ -0,0 +1,2 @@ +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"