Moved xml soc description in /usr/share/SocExplorer.
Jeandet Alexis -
r66:a991e131f5a8 default
Not Reviewed
Show More
Add another comment
TODOs: 0 unresolved 0 Resolved
COMMENTS: 0 General 0 Inline
@@ -24,15 +24,16
24 SocExplorer.files = unixcfg/SocExplorer.desktop
24 SocExplorer.files = unixcfg/SocExplorer.desktop
25 PluginConfPath.path = /etc/SocExplorer/plugin.conf.d/
25 PluginConfPath.path = /etc/SocExplorer/plugin.conf.d/
26 PluginConfPath.files = unixcfg/plugins.conf
26 PluginConfPath.files = unixcfg/plugins.conf
27 icon.path = /usr/share/SocExplorer
27 share.path = /usr/share/SocExplorer
28 icon.files = ressources/images/Indiana_Jones_cappello.png
28 share.files = ressources/images/Indiana_Jones_cappello.png \
29 ressources/Grlib.xml
29 Wizard.path = /usr/share/qtcreator/templates/wizards/SocExplorerPlugin
30 Wizard.path = /usr/share/qtcreator/templates/wizards/SocExplorerPlugin
30 Wizard.files = Qt_Creator_Wizard/SocExplorerPlugin/logo-lpp-cutted.png \
31 Wizard.files = Qt_Creator_Wizard/SocExplorerPlugin/logo-lpp-cutted.png \
31 Qt_Creator_Wizard/SocExplorerPlugin/plugin.cpp \
32 Qt_Creator_Wizard/SocExplorerPlugin/plugin.cpp \
32 Qt_Creator_Wizard/SocExplorerPlugin/plugin.h \
33 Qt_Creator_Wizard/SocExplorerPlugin/plugin.h \
33 Qt_Creator_Wizard/SocExplorerPlugin/project.pro \
34 Qt_Creator_Wizard/SocExplorerPlugin/project.pro \
34 Qt_Creator_Wizard/SocExplorerPlugin/wizard.xml
35 Qt_Creator_Wizard/SocExplorerPlugin/wizard.xml
35 INSTALLS+=Wizard SocExplorer icon PluginConfPath
36 INSTALLS+=Wizard SocExplorer share PluginConfPath
36 }
37 }
37 INSTALLS+=socexplorercfg
38 INSTALLS+=socexplorercfg
38
39
@@ -85,8 +85,8
85
85
86 void XMLDriver::scanXmlFiles()
86 void XMLDriver::scanXmlFiles()
87 {
87 {
88 QDir configDir(SocExplorerEngine::configFolder());
88 QDir shareDir(SocExplorerEngine::sharePath());
89 QFileInfoList list = configDir.entryInfoList();
89 QFileInfoList list = shareDir.entryInfoList();
90 for (int i = 0; i < list.size(); ++i)
90 for (int i = 0; i < list.size(); ++i)
91 {
91 {
92 QFileInfo fileInfo = list.at(i);
92 QFileInfo fileInfo = list.at(i);
@@ -93,6 +93,7
93 //static QString pluginFolder(){return QString(SOCEXPLORER_PLUGINS_INSTALL_PATH);}
93 //static QString pluginFolder(){return QString(SOCEXPLORER_PLUGINS_INSTALL_PATH);}
94 static QStringList pluginFolders();
94 static QStringList pluginFolders();
95 static QString configPath(){return QString(SOCEXPLORER_CONFIG_PATH);}
95 static QString configPath(){return QString(SOCEXPLORER_CONFIG_PATH);}
96 static QString sharePath(){return QString(SOCEXPLORER_SHARE_PATH);}
96 static int addEnumDevice(socexplorerplugin* rootPlugin,int VID,int PID,qint32 baseAddress,const QString& name);
97 static int addEnumDevice(socexplorerplugin* rootPlugin,int VID,int PID,qint32 baseAddress,const QString& name);
97 static QList<SOCModel*>* getSOCs();
98 static QList<SOCModel*>* getSOCs();
98 static QString getDevName(int VID, int PID);
99 static QString getDevName(int VID, int PID);
@@ -17,6 +17,7
17 SOCEXPLORER_INSTALL_PATH = /usr/local/SocExplorer
17 SOCEXPLORER_INSTALL_PATH = /usr/local/SocExplorer
18 SOCEXPLORER_PLUGINS_INSTALL_PATH = $$[QT_INSTALL_LIBS]"/SocExplorer/plugins"
18 SOCEXPLORER_PLUGINS_INSTALL_PATH = $$[QT_INSTALL_LIBS]"/SocExplorer/plugins"
19 DEFINES += SOCEXPLORER_CONFIG_PATH="\"\\\"/etc/SocExplorer"\\\"\"
19 DEFINES += SOCEXPLORER_CONFIG_PATH="\"\\\"/etc/SocExplorer"\\\"\"
20 DEFINES += SOCEXPLORER_SHARE_PATH="\"\\\"/usr/share/SocExplorer"\\\"\"
20 SOCEXPLORER_CONFIG_PATH=/etc/SocExplorer
21 SOCEXPLORER_CONFIG_PATH=/etc/SocExplorer
21 }
22 }
22
23
Comments 0
You need to be logged in to leave comments. Login now