# HG changeset patch # User Alexis Jeandet # Date 2015-03-26 15:49:21 # Node ID 820d90d5d23258bf98e56cc3c6ce8de2786c62ec # Parent 2c7201cecc873cc1b1e16c19eb75332b8552210f Added plugin vresion management. Some old stuff cleaning. diff --git a/Qt_Creator_Wizard/SocExplorerPlugin/project.pro b/Qt_Creator_Wizard/SocExplorerPlugin/project.pro --- a/Qt_Creator_Wizard/SocExplorerPlugin/project.pro +++ b/Qt_Creator_Wizard/SocExplorerPlugin/project.pro @@ -6,17 +6,12 @@ CONFIG += socexplorerplugin win32:CONFIG += dll win32:CONFIG -= static -CONFIG(debug, debug|release) { - DEBUG_EXT = _d -} else { - DEBUG_EXT = -} +VERSION=0.1.0 TARGET = %ProjectName%$${DEBUG_EXT} DEFINES += PLUGIN=%ProjectName% DEFINES += PLUGINHEADER="\"\\\"%ProjectName%.h"\\\"\" DEFINES += driver_Name="\"\\\"%driver_Name%"\\\"\" DEFINES += driver_Author="\"\\\"%driver_Author% %driver_Mail%"\\\"\" -DEFINES += driver_Version="\"\\\"%driver_Version%"\\\"\" DEFINES += driver_Description="\"\\\"%driver_Description%"\\\"\" DEFINES += driver_can_be_root=%ISROOT% DEFINES += driver_can_be_child=%ISCHILD% 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=7e54838aea98+ + SOCEXPLORER_CHAGESETNUM=2c7201cecc87+ } SOCEXPLORER_CHAGESETNUMSTR = '\\"$${SOCEXPLORER_CHAGESETNUM}\\"' SOCEXPLORER_BRANCH=$$system(hg branch) @@ -19,7 +19,7 @@ isEmpty(SOCEXPLORER_BRANCH){ } SOCEXPLORER_BRANCHSTR = '\\"$${SOCEXPLORER_BRANCH}\\"' -DEFINES += SOCEXPLORER_VERSION="\"\\\"0.4.8"\\\"\" +DEFINES += SOCEXPLORER_VERSION="\"\\\"0.5.0"\\\"\" DEFINES += SOCEXPLORER_CHAGESET=\"$${SOCEXPLORER_CHAGESETNUMSTR}\" DEFINES += SOCEXPLORER_BRANCH=\"$${SOCEXPLORER_BRANCHSTR}\" 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 @@ -1,4 +1,5 @@ +DEFINES += driver_Version="\"\\\"$$VERSION"\\\"\" win32 { DEFINES += WIN32 @@ -34,11 +35,6 @@ isEmpty( SOCEXPLORER_SDK_BUILD ){ OBJECTS_DIR = obj MOC_DIR = moc DESTDIR = bin -# CONFIG(debug, debug|release) { -# DEBUG_EXT = _d -# } else { -# DEBUG_EXT = -# } unix{ target.path = $${SOCEXPLORER_PLUGINS_INSTALL_PATH} INSTALLS += target diff --git a/src/src.pro b/src/src.pro --- a/src/src.pro +++ b/src/src.pro @@ -77,20 +77,6 @@ SOURCES += main.cpp\ regsExplorer/regsexplorercfg.cpp \ aboutsocexplorer.cpp -# regWidget/xmltagtextedit.cpp \ -# regWidget/xmltaglabeledit.cpp \ -# regWidget/xmlelementslistwidget.cpp \ -# regWidget/xmlelementslistview.cpp \ -# regWidget/regpropeditor.cpp \ -# regWidget/registerwdgt.cpp \ -# regWidget/registereditor.cpp \ -# regWidget/registercel.cpp \ -# regWidget/periphpropeditor.cpp \ -# regWidget/peripherialregs.cpp \ -# regWidget/bitfieldpropeditor.cpp \ -# regWidget/bitfield.cpp - - HEADERS += mainwindow.h \ PyWdgt/pythonconsole.h \ PyWdgt/pythonqtscriptingconsoledandd.h \ @@ -103,18 +89,6 @@ HEADERS += mainwindow.h \ socexplorer.h \ SocExplorerEngine/plugins/socexplorerplugin.h \ aboutsocexplorer.h -# regWidget/xmltagtextedit.h \ -# regWidget/xmltaglabeledit.h \ -# regWidget/xmlelementslistwidget.h \ -# regWidget/xmlelementslistview.h \ -# regWidget/regpropeditor.h \ -# regWidget/registerwdgt.h \ -# regWidget/registereditor.h \ -# regWidget/registercel.h \ -# regWidget/periphpropeditor.h \ -# regWidget/peripherialregs.h \ -# regWidget/bitfieldpropeditor.h \ -# regWidget/bitfield.h include ( NicePyConsole/NicePyConsole.pri) diff --git a/unixcfg/SocExplorer.spec b/unixcfg/SocExplorer.spec --- a/unixcfg/SocExplorer.spec +++ b/unixcfg/SocExplorer.spec @@ -1,16 +1,13 @@ -%global upstream_name socexplorer-0.4 +%global upstream_name socexplorer-0.5 Name: socexplorer -Version: 0.4 -Release: 8%{?dist} +Version: 0.5 +Release: 0%{?dist} Summary: SocExplorer is an open source generic System On Chip testing software/framework. Group: Development/Tools License: GPLv2+ URL: https://hephaistos.lpp.polytechnique.fr/redmine/projects/socexplorer -Source0: https://hephaistos.lpp.polytechnique.fr/redmine/attachments/download/376/socexplorer-0.4.zip -# -#Patch0: socexplorer_desktop.patch - +Source0: https://hephaistos.lpp.polytechnique.fr/redmine/attachments/download/376/socexplorer-0.5.zip BuildRequires: python2-devel BuildRequires: qt5-qtbase-devel @@ -34,8 +31,8 @@ Requires(post): qt5-qtxmlpatterns Requires(post): elfutils-libelf Requires(post): qt5-pythonqt -Provides: socexplorer = 0.4-6 -Obsoletes: socexplorer < 0.4-5 +Provides: socexplorer = 0.5-0 +Obsoletes: socexplorer < 0.4-8 %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. @@ -50,7 +47,6 @@ Header files and development libraries f %prep %setup -q -n %{upstream_name} -#%patch0 -p1 -b .desktop @@ -308,6 +304,9 @@ desktop-file-validate $RPM_BUILD_ROOT%{_ %changelog +* Thu Mar 26 2015 Alexis Jeandet - 0.5 +-Uses r77 as source. + * Mon Mar 9 2015 Alexis Jeandet - 0.4 - Uses r75 as source.