| @@ -10,7 +10,7 SOCEXPLORER_PLUGIN_LOADER="custom" | |||
|
|
10 | 10 | |
|
|
11 | 11 | SOCEXPLORER_CHAGESETNUM=$$system(hg id) |
|
|
12 | 12 | isEmpty(SOCEXPLORER_CHAGESETNUM){ |
|
|
13 |
SOCEXPLORER_CHAGESETNUM= |
|
|
|
13 | SOCEXPLORER_CHAGESETNUM=3440ba47d0f1+ | |
|
|
14 | 14 | } |
|
|
15 | 15 | SOCEXPLORER_CHAGESETNUMSTR = '\\"$${SOCEXPLORER_CHAGESETNUM}\\"' |
|
|
16 | 16 | SOCEXPLORER_BRANCH=$$system(hg branch) |
| @@ -19,7 +19,7 isEmpty(SOCEXPLORER_BRANCH){ | |||
|
|
19 | 19 | } |
|
|
20 | 20 | SOCEXPLORER_BRANCHSTR = '\\"$${SOCEXPLORER_BRANCH}\\"' |
|
|
21 | 21 | |
|
|
22 |
DEFINES += SOCEXPLORER_VERSION="\"\\\"0. |
|
|
|
22 | DEFINES += SOCEXPLORER_VERSION="\"\\\"0.6.0"\\\"\" | |
|
|
23 | 23 | DEFINES += SOCEXPLORER_CHAGESET=\"$${SOCEXPLORER_CHAGESETNUMSTR}\" |
|
|
24 | 24 | DEFINES += SOCEXPLORER_BRANCH=\"$${SOCEXPLORER_BRANCHSTR}\" |
|
|
25 | 25 | |
| @@ -57,7 +57,6 header.files = engine/socexplorerengine. | |||
|
|
57 | 57 | proxy/socexplorerproxy.h \ |
|
|
58 | 58 | engine/socexplorerxmlfile.h \ |
|
|
59 | 59 | SOC/socexplorerenumdevice.h \ |
|
|
60 | plugins/genericPySysdriver.h \ | |
|
|
61 | 60 | XmlEngine/XMLmodel.h \ |
|
|
62 | 61 | XmlEngine/XMLdata.h \ |
|
|
63 | 62 | XmlEngine/xmldriver.h \ |
| @@ -74,7 +74,6 | |||
|
|
74 | 74 | # define SOCEXPLORER_SDK_EXPORT Q_DECL_IMPORT |
|
|
75 | 75 | #endif |
|
|
76 | 76 | |
|
|
77 | class genericPySysdriver; | |
|
|
78 | 77 | |
|
|
79 | 78 | //! socexplorerplugin is the base class for any SocExplorer plugin, it gives a standard interface to communicate |
|
|
80 | 79 | //! between each plugins and to interact with SocExplorer software. |
| @@ -83,9 +82,7 class SOCEXPLORER_SDK_EXPORT socexplorer | |||
|
|
83 | 82 | { |
|
|
84 | 83 | Q_OBJECT |
|
|
85 | 84 | public: |
|
|
86 |
//! Default plugin constructor, any plugin should call this constructor. |
|
|
|
87 | //! default python wrapper instance. If you want to connect your own python wrapper, you have to clear | |
|
|
88 | //! createPyObject option and instanciate your own genericPySysdriver derivated object. | |
|
|
85 | //! Default plugin constructor, any plugin should call this constructor. | |
|
|
89 | 86 | socexplorerplugin(QWidget *parent = 0,bool createPyObject=true):QDockWidget(parent) |
|
|
90 | 87 | { |
|
|
91 | 88 | closeAction=NULL; |
| @@ -50,7 +50,6 isEmpty( SOCEXPLORER_SDK_BUILD ){ | |||
|
|
50 | 50 | $$[QT_INSTALL_HEADERS]/SocExplorer/pluginsInterface/socexplorerplugininterface.cpp |
|
|
51 | 51 | |
|
|
52 | 52 | HEADERS += \ |
|
|
53 | $$[QT_INSTALL_HEADERS]/SocExplorer/genericPySysdriver.h \ | |
|
|
54 | 53 | $$[QT_INSTALL_HEADERS]/SocExplorer/socexplorerplugin.h |
|
|
55 | 54 | |
|
|
56 | 55 | INCLUDEPATH += $$[QT_INSTALL_HEADERS]/SocExplorer/common \ |
| @@ -61,7 +60,6 isEmpty( SOCEXPLORER_SDK_BUILD ){ | |||
|
|
61 | 60 | }else{ |
|
|
62 | 61 | message( "building SocExplorer" ) |
|
|
63 | 62 | HEADERS += \ |
|
|
64 | $$[QT_INSTALL_HEADERS]/SocExplorer/genericPySysdriver.h \ | |
|
|
65 | 63 | $$[QT_INSTALL_HEADERS]/SocExplorer/socexplorerplugin.h |
|
|
66 | 64 | } |
|
|
67 | 65 | |
| @@ -1,7 +1,7 | |||
|
|
1 |
%global upstream_name socexplorer-0. |
|
|
|
1 | %global upstream_name socexplorer-0.6 | |
|
|
2 | 2 | |
|
|
3 | 3 | Name: socexplorer |
|
|
4 |
Version: 0. |
|
|
|
4 | Version: 0.6 | |
|
|
5 | 5 | Release: 0%{?dist} |
|
|
6 | 6 | Summary: SocExplorer is an open source generic System On Chip testing software/framework. |
|
|
7 | 7 | Group: Development/Tools |
| @@ -31,8 +31,8 Requires(post): qt5-qtxmlpatterns | |||
|
|
31 | 31 | Requires(post): elfutils-libelf |
|
|
32 | 32 | Requires(post): qt5-pythonqt |
|
|
33 | 33 | |
|
|
34 |
Provides: socexplorer = 0. |
|
|
|
35 |
Obsoletes: socexplorer < 0. |
|
|
|
34 | Provides: socexplorer = 0.6-0 | |
|
|
35 | Obsoletes: socexplorer < 0.5-0 | |
|
|
36 | 36 | |
|
|
37 | 37 | %description |
|
|
38 | 38 | 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%{_ | |||
|
|
304 | 304 | |
|
|
305 | 305 | |
|
|
306 | 306 | %changelog |
|
|
307 | * Thu Apr 2 2015 Alexis Jeandet <alexis.jeandet@member.fsf.org> - 0.6 | |
|
|
308 | -Uses r80 as source. | |
|
|
309 | -Removed GenericPySysdriver interface, now socexplorer plugins can be subclassed in python. | |
|
|
310 | ||
|
|
307 | 311 | * Thu Mar 26 2015 Alexis Jeandet <alexis.jeandet@member.fsf.org> - 0.5 |
|
|
308 | 312 | -Uses r77 as source. |
|
|
309 | 313 | |
General Comments 0
You need to be logged in to leave comments.
Login now