HG_REPOSITORIES/LPP/INSTRUMENTATION/SocExplorerPlugins Commit - r67:262a79eb1d04

Ready for packaging

jeandet -

r67:262a79eb1d04 socexplorer-plugins-0.6-3 default

parent child

Context file:

r67:262a79eb1d04

SocExplorer-plugins.spec +6 -2

-            %global upstream_name socexplorer-plugins-0.6-2
+            %global upstream_name socexplorer-plugins-0.6-3
             Name:           socexplorer-plugins
             Version:        0.6
-            Release:        2%{?dist}
+            Release:        3%{?dist}
             Summary:        Base plugins for SocExplorer.
             Group:          Development/Tools
             License:        GPLv2
             URL:            https://hephaistos.lpp.polytechnique.fr/redmine/projects/socexplorer
             Source0:        https://hephaistos.lpp.polytechnique.fr/redmine/attachments/download/381/%{upstream_name}.zip
             BuildRequires:  python2-devel
             BuildRequires:  qt5-qtbase-devel
             BuildRequires:  qt5-qtwebkit-devel
             BuildRequires:  qt5-qttools-static
             BuildRequires:  qt5-qttools-devel
             BuildRequires:  qt5-qtsvg-devel
             BuildRequires:  qt5-qtxmlpatterns-devel
             BuildRequires:  elfutils-libelf-devel
             BuildRequires:  qt5-pythonqt-devel
             BuildRequires:  socexplorer-devel = 0.6
             Requires:  socexplorer = 0.6
             Requires:  qt5-pythonqt
             Requires:  python2
             Requires:  qt5-qtwebkit
             Requires:  qt5-qttools
             Requires:  qt5-qtsvg
             Requires:  qt5-qtxmlpatterns
             Requires:  elfutils-libelf
             %description
             SocExplorer is an open source generic System On Chip testing software/framework. This package contains the base plugins for SocExplorer such as AHBUARTplugin for connecting to any grlib based design with an AHBUART.
             You will get:
               - AHB UART plugin
               - APB UART plugin
               - AMBA plugin
               - DSU3 plugin
               - Generic rw plugin
               - Memcheck & Memectr plugins
             %prep
             %setup -q -n %{upstream_name}
             %build
             %{_qt5_qmake}
             make %{?_smp_mflags}
             %install
             make install INSTALL_ROOT=%{buildroot}
             %post -p /sbin/ldconfig
             %postun -p /sbin/ldconfig
             %files
                %{_qt5_libdir}/SocExplorer/plugins/libApbUartPlugin.so*
                %{_qt5_libdir}/SocExplorer/plugins/libahbuartplugin.so*
                %{_qt5_libdir}/SocExplorer/plugins/libambaplugin.so*
                %{_qt5_libdir}/SocExplorer/plugins/libdsu3plugin.so*
                %{_qt5_libdir}/SocExplorer/plugins/libgenericrwplugin.so*
                %{_qt5_libdir}/SocExplorer/plugins/libmemcheckplugin.so*
                %{_qt5_libdir}/SocExplorer/plugins/libmemctrlrplugin.so*
+               %{_qt5_libdir}/SocExplorer/plugins/libspwplugin.so*
             %changelog
+            * Tue Sep 8  2015 Alexis Jeandet <alexis.jeandet@member.fsf.org> - 0.6
+            - Added spwplugin, improved AHB plugn'play decoding, fixed GUI bug on spwplugin.
             * Fri Apr 3  2015 Alexis Jeandet <alexis.jeandet@member.fsf.org> - 0.6
             - Improved ds3plugin.
             * Fri Apr 3  2015 Alexis Jeandet <alexis.jeandet@member.fsf.org> - 0.6
             - Fix some remaining mistakes.
             * Thu Apr 2  2015 Alexis Jeandet <alexis.jeandet@member.fsf.org> - 0.6
             -Uses r53 as source.
             -Removed GenericPySysdriver interface, now socexplorer plugins can be subclassed in python.
             * Thu Mar 26  2015 Alexis Jeandet <alexis.jeandet@member.fsf.org> - 0.5
             -Uses r51 as source.
             * Wed Mar 25  2015 Alexis Jeandet <alexis.jeandet@member.fsf.org> - 0.4
             -Uses r50 as source.
             * Fri Mar 20  2015 Alexis Jeandet <alexis.jeandet@member.fsf.org> - 0.4
             -Uses r49 as source.
             * Mon Mar 9  2015 Alexis Jeandet <alexis.jeandet@member.fsf.org> - 0.4
             -Uses r48 as source.
             * Wed Feb 18 2015 Alexis Jeandet <alexis.jeandet@member.fsf.org> - 0.4
             -Uses r45 as source.
             * Tue Feb 10 2015 Alexis Jeandet <alexis.jeandet@member.fsf.org> - 0.4
             -Uses r44 as source.
             * Tue Dec 30 2014 Alexis Jeandet <alexis.jeandet@member.fsf.org> - 0.4
             - Uses r42 as source.
             * Sat Jun 28 2014 Alexis Jeandet <alexis.jeandet@member.fsf.org> - 0.4
             - Initial Fedora packaging

spwplugin/spwplugin.pro +3 -3

             #
             # Project created by QtCreator 2011-09-20T08:15:30
             #
             #-------------------------------------------------
             CONFIG += socexplorerplugin
             QT += network webkit
             greaterThan(QT_MAJOR_VERSION, 4): QT += webkitwidgets
             QMAKE_CXXFLAGS +=  -std=c++11
             QMAKE_CFLAGS +=  -std=c++11
             win32:CONFIG += dll
             win32:CONFIG -= static
             VERSION=0.6.1
             TARGET = spwplugin
             DEFINES += PLUGIN=spwplugin
             DEFINES += PLUGINHEADER="\"\\\"spwplugin.h"\\\"\"
             DEFINES += driver_Name="\"\\\"SpwPlugin"\\\"\"
             DEFINES += driver_Author="\"\\\"Alexis Jeandet alexis.jeandet@member.fsf.org; Paul Leroy paul.leroy@lpp.polytechnique.fr"\\\"\"
             DEFINES += driver_Description="\"\\\"This plugin allows you to use spacewire's RMAP protocol with Stardundee USB brick v1"\\\"\"
             DEFINES += driver_can_be_root=1
             DEFINES += driver_can_be_child=0
             DEFINES += driver_VID=0
             DEFINES += driver_PID=0
-            STARTDUNDEEPATH=/home/spacewire/usb/spw_usb_driver_v2.68/
+            #STARTDUNDEEPATH=/home/spacewire/usb/spw_usb_driver_v2.68/
-            LIBS += $$STARTDUNDEEPATH/lib/x86_64/libSpaceWireUSBAPI.so \
+            #LIBS += $$STARTDUNDEEPATH/lib/x86_64/libSpaceWireUSBAPI.so \
-                $$STARTDUNDEEPATH/lib/x86_64/libConfigLibraryUSB.so
+            #    $$STARTDUNDEEPATH/lib/x86_64/libConfigLibraryUSB.so
             INCLUDEPATH += \
                     $${PWD} \
                     $$STARTDUNDEEPATH/inc \
                     StarDundee \
                     SpwTcpPacketServer \
                     GR-ESB
             HEADERS += \
                 spwplugin.h \
                 StarDundee/stardundeespw_usb.h \
                 abstractspwbridge.h \
                 spw.h \
                 StarDundee/stardundeegui.h \
                 SpwTcpPacketServer/spwtcppacketserver.h \
                 GR-ESB/gr_esb_bridge.h \
                 GR-ESB/gr_esb_ui.h \
                 SpwTcpPacketServer/incomingpacketparser.h \
                 StarDundee/fakestardundeespwusb_lib.h \
                 StarDundee/fakestardundeespwusbgui.h
             SOURCES += \
                 spwplugin.cpp \
                 StarDundee/stardundeespw_usb.cpp \
                 abstractspwbridge.cpp \
                 StarDundee/stardundeegui.cpp \
                 SpwTcpPacketServer/spwtcppacketserver.cpp \
                 GR-ESB/gr_esb_bridge.cpp \
                 GR-ESB/gr_esb_ui.cpp \
                 SpwTcpPacketServer/incomingpacketparser.cpp \
                 StarDundee/fakestardundeespwusb_lib.cpp \
                 StarDundee/fakestardundeespwusbgui.cpp
             FORMS += \
                 StarDundee/stardundeeGUI.ui \
                 SpwTcpPacketServer/spwtcppacketserver.ui \
                 GR-ESB/gr_esb_ui.ui \
                 StarDundee/fakestardundeespwusbgui.ui
             RESOURCES += \
                 spwRessources.qrc

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages