diff --git a/src/SocExplorerEngine/SocExplorerEngine.pro b/src/SocExplorerEngine/SocExplorerEngine.pro --- a/src/SocExplorerEngine/SocExplorerEngine.pro +++ b/src/SocExplorerEngine/SocExplorerEngine.pro @@ -10,7 +10,7 @@ SOCEXPLORER_PLUGIN_LOADER="custom" SOCEXPLORER_CHAGESETNUM=$$system(hg id) isEmpty(SOCEXPLORER_CHAGESETNUM){ - SOCEXPLORER_CHAGESETNUM=2c7201cecc87+ + SOCEXPLORER_CHAGESETNUM=3440ba47d0f1+ } SOCEXPLORER_CHAGESETNUMSTR = '\\"$${SOCEXPLORER_CHAGESETNUM}\\"' SOCEXPLORER_BRANCH=$$system(hg branch) @@ -19,7 +19,7 @@ isEmpty(SOCEXPLORER_BRANCH){ } SOCEXPLORER_BRANCHSTR = '\\"$${SOCEXPLORER_BRANCH}\\"' -DEFINES += SOCEXPLORER_VERSION="\"\\\"0.5.0"\\\"\" +DEFINES += SOCEXPLORER_VERSION="\"\\\"0.6.0"\\\"\" DEFINES += SOCEXPLORER_CHAGESET=\"$${SOCEXPLORER_CHAGESETNUMSTR}\" DEFINES += SOCEXPLORER_BRANCH=\"$${SOCEXPLORER_BRANCHSTR}\" @@ -57,7 +57,6 @@ header.files = engine/socexplorerengine. proxy/socexplorerproxy.h \ engine/socexplorerxmlfile.h \ SOC/socexplorerenumdevice.h \ - plugins/genericPySysdriver.h \ XmlEngine/XMLmodel.h \ XmlEngine/XMLdata.h \ XmlEngine/xmldriver.h \ diff --git a/src/SocExplorerEngine/plugins/socexplorerplugin.h b/src/SocExplorerEngine/plugins/socexplorerplugin.h --- a/src/SocExplorerEngine/plugins/socexplorerplugin.h +++ b/src/SocExplorerEngine/plugins/socexplorerplugin.h @@ -74,7 +74,6 @@ # define SOCEXPLORER_SDK_EXPORT Q_DECL_IMPORT #endif -class genericPySysdriver; //! socexplorerplugin is the base class for any SocExplorer plugin, it gives a standard interface to communicate //! between each plugins and to interact with SocExplorer software. @@ -83,9 +82,7 @@ class SOCEXPLORER_SDK_EXPORT socexplorer { Q_OBJECT public: - //! Default plugin constructor, any plugin should call this constructor. This constructor creates a - //! default python wrapper instance. If you want to connect your own python wrapper, you have to clear - //! createPyObject option and instanciate your own genericPySysdriver derivated object. + //! Default plugin constructor, any plugin should call this constructor. socexplorerplugin(QWidget *parent = 0,bool createPyObject=true):QDockWidget(parent) { closeAction=NULL; diff --git a/src/SocExplorerEngine/plugins/socexplorerplugin.prf b/src/SocExplorerEngine/plugins/socexplorerplugin.prf --- a/src/SocExplorerEngine/plugins/socexplorerplugin.prf +++ b/src/SocExplorerEngine/plugins/socexplorerplugin.prf @@ -50,7 +50,6 @@ isEmpty( SOCEXPLORER_SDK_BUILD ){ $$[QT_INSTALL_HEADERS]/SocExplorer/pluginsInterface/socexplorerplugininterface.cpp HEADERS += \ - $$[QT_INSTALL_HEADERS]/SocExplorer/genericPySysdriver.h \ $$[QT_INSTALL_HEADERS]/SocExplorer/socexplorerplugin.h INCLUDEPATH += $$[QT_INSTALL_HEADERS]/SocExplorer/common \ @@ -61,7 +60,6 @@ isEmpty( SOCEXPLORER_SDK_BUILD ){ }else{ message( "building SocExplorer" ) HEADERS += \ - $$[QT_INSTALL_HEADERS]/SocExplorer/genericPySysdriver.h \ $$[QT_INSTALL_HEADERS]/SocExplorer/socexplorerplugin.h } diff --git a/unixcfg/SocExplorer.spec b/unixcfg/SocExplorer.spec --- a/unixcfg/SocExplorer.spec +++ b/unixcfg/SocExplorer.spec @@ -1,7 +1,7 @@ -%global upstream_name socexplorer-0.5 +%global upstream_name socexplorer-0.6 Name: socexplorer -Version: 0.5 +Version: 0.6 Release: 0%{?dist} Summary: SocExplorer is an open source generic System On Chip testing software/framework. Group: Development/Tools @@ -31,8 +31,8 @@ Requires(post): qt5-qtxmlpatterns Requires(post): elfutils-libelf Requires(post): qt5-pythonqt -Provides: socexplorer = 0.5-0 -Obsoletes: socexplorer < 0.4-8 +Provides: socexplorer = 0.6-0 +Obsoletes: socexplorer < 0.5-0 %description SocExplorer is an open source generic System On Chip testing software/framework. We write this software for the development and the validation of our instrument, the Low Frequency Receiver(LFR) for the Solar Orbiter mission. This instrument is based on an actel FPGA hosting a LEON3FT processor and some peripherals. To make it more collaborative, we use a plugin based system, the main executable is SocExplorer then all the functionality are provided by plugins. Like this everybody can provide his set of plugins to handle a new SOC or just a new peripheral. SocExplorer uses PythonQt to allow user to automate some tasks such as loading some plugins, configuring them and talking with his device. @@ -304,6 +304,10 @@ desktop-file-validate $RPM_BUILD_ROOT%{_ %changelog +* Thu Apr 2 2015 Alexis Jeandet - 0.6 +-Uses r80 as source. +-Removed GenericPySysdriver interface, now socexplorer plugins can be subclassed in python. + * Thu Mar 26 2015 Alexis Jeandet - 0.5 -Uses r77 as source.