##// END OF EJS Templates
HG_REPOSITORIES » LPP » INSTRUMENTATION » SocExplorer
RSS
Added plugin vresion management....
jeandet -
r77:820d90d5d232 default
parent child
Show More
Show file before | Show file after | Hide comments
@@ -6,17 +6,12
6 6 CONFIG += socexplorerplugin
7 7 win32:CONFIG += dll
8 8 win32:CONFIG -= static
9 CONFIG(debug, debug|release) {
10 DEBUG_EXT = _d
11 } else {
12 DEBUG_EXT =
13 }
9 VERSION=0.1.0
14 10 TARGET = %ProjectName%$${DEBUG_EXT}
15 11 DEFINES += PLUGIN=%ProjectName%
16 12 DEFINES += PLUGINHEADER="\"\\\"%ProjectName%.h"\\\"\"
17 13 DEFINES += driver_Name="\"\\\"%driver_Name%"\\\"\"
18 14 DEFINES += driver_Author="\"\\\"%driver_Author% %driver_Mail%"\\\"\"
19 DEFINES += driver_Version="\"\\\"%driver_Version%"\\\"\"
20 15 DEFINES += driver_Description="\"\\\"%driver_Description%"\\\"\"
21 16 DEFINES += driver_can_be_root=%ISROOT%
22 17 DEFINES += driver_can_be_child=%ISCHILD%
Show file before | Show file after | Hide comments
@@ -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=7e54838aea98+
13 SOCEXPLORER_CHAGESETNUM=2c7201cecc87+
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.4.8"\\\"\"
22 DEFINES += SOCEXPLORER_VERSION="\"\\\"0.5.0"\\\"\"
23 23 DEFINES += SOCEXPLORER_CHAGESET=\"$${SOCEXPLORER_CHAGESETNUMSTR}\"
24 24 DEFINES += SOCEXPLORER_BRANCH=\"$${SOCEXPLORER_BRANCHSTR}\"
25 25
Show file before | Show file after | Hide comments
@@ -1,4 +1,5
1 1
2 DEFINES += driver_Version="\"\\\"$$VERSION"\\\"\"
2 3
3 4 win32 {
4 5 DEFINES += WIN32
@@ -34,11 +35,6 isEmpty( SOCEXPLORER_SDK_BUILD ){
34 35 OBJECTS_DIR = obj
35 36 MOC_DIR = moc
36 37 DESTDIR = bin
37 # CONFIG(debug, debug|release) {
38 # DEBUG_EXT = _d
39 # } else {
40 # DEBUG_EXT =
41 # }
42 38 unix{
43 39 target.path = $${SOCEXPLORER_PLUGINS_INSTALL_PATH}
44 40 INSTALLS += target
Show file before | Show file after | Hide comments
@@ -77,20 +77,6 SOURCES += main.cpp\
77 77 regsExplorer/regsexplorercfg.cpp \
78 78 aboutsocexplorer.cpp
79 79
80 # regWidget/xmltagtextedit.cpp \
81 # regWidget/xmltaglabeledit.cpp \
82 # regWidget/xmlelementslistwidget.cpp \
83 # regWidget/xmlelementslistview.cpp \
84 # regWidget/regpropeditor.cpp \
85 # regWidget/registerwdgt.cpp \
86 # regWidget/registereditor.cpp \
87 # regWidget/registercel.cpp \
88 # regWidget/periphpropeditor.cpp \
89 # regWidget/peripherialregs.cpp \
90 # regWidget/bitfieldpropeditor.cpp \
91 # regWidget/bitfield.cpp
92
93
94 80 HEADERS += mainwindow.h \
95 81 PyWdgt/pythonconsole.h \
96 82 PyWdgt/pythonqtscriptingconsoledandd.h \
@@ -103,18 +89,6 HEADERS += mainwindow.h \
103 89 socexplorer.h \
104 90 SocExplorerEngine/plugins/socexplorerplugin.h \
105 91 aboutsocexplorer.h
106 # regWidget/xmltagtextedit.h \
107 # regWidget/xmltaglabeledit.h \
108 # regWidget/xmlelementslistwidget.h \
109 # regWidget/xmlelementslistview.h \
110 # regWidget/regpropeditor.h \
111 # regWidget/registerwdgt.h \
112 # regWidget/registereditor.h \
113 # regWidget/registercel.h \
114 # regWidget/periphpropeditor.h \
115 # regWidget/peripherialregs.h \
116 # regWidget/bitfieldpropeditor.h \
117 # regWidget/bitfield.h
118 92
119 93
120 94 include ( NicePyConsole/NicePyConsole.pri)
Show file before | Show file after | Hide comments
@@ -1,16 +1,13
1 %global upstream_name socexplorer-0.4
1 %global upstream_name socexplorer-0.5
2 2
3 3 Name: socexplorer
4 Version: 0.4
5 Release: 8%{?dist}
4 Version: 0.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
8 8 License: GPLv2+
9 9 URL: https://hephaistos.lpp.polytechnique.fr/redmine/projects/socexplorer
10 Source0: https://hephaistos.lpp.polytechnique.fr/redmine/attachments/download/376/socexplorer-0.4.zip
11 #
12 #Patch0: socexplorer_desktop.patch
13
10 Source0: https://hephaistos.lpp.polytechnique.fr/redmine/attachments/download/376/socexplorer-0.5.zip
14 11
15 12 BuildRequires: python2-devel
16 13 BuildRequires: qt5-qtbase-devel
@@ -34,8 +31,8 Requires(post): qt5-qtxmlpatterns
34 31 Requires(post): elfutils-libelf
35 32 Requires(post): qt5-pythonqt
36 33
37 Provides: socexplorer = 0.4-6
38 Obsoletes: socexplorer < 0.4-5
34 Provides: socexplorer = 0.5-0
35 Obsoletes: socexplorer < 0.4-8
39 36
40 37 %description
41 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.
@@ -50,7 +47,6 Header files and development libraries f
50 47
51 48 %prep
52 49 %setup -q -n %{upstream_name}
53 #%patch0 -p1 -b .desktop
54 50
55 51
56 52
@@ -308,6 +304,9 desktop-file-validate $RPM_BUILD_ROOT%{_
308 304
309 305
310 306 %changelog
307 * Thu Mar 26 2015 Alexis Jeandet <alexis.jeandet@member.fsf.org> - 0.5
308 -Uses r77 as source.
309
311 310 * Mon Mar 9 2015 Alexis Jeandet <alexis.jeandet@member.fsf.org> - 0.4
312 311 - Uses r75 as source.
313 312
General Comments 0
You need to be logged in to leave comments. Login now