##// END OF EJS Templates
HG_REPOSITORIES » LPP » INSTRUMENTATION » SocExplorer
RSS
Small fix on desktop shortcut
Jeandet Alexis -
r70:786323e1520b default
parent child
Show More
Show file before | Show file after | Hide comments
@@ -1,155 +1,161
1 SOCEXPLORER_ROOT = \"$${PWD}/../..\"
1 SOCEXPLORER_ROOT = \"$${PWD}/../..\"
2
2
3 include($${PWD}/../../build_cfg/socexplorer.pri)
3 include($${PWD}/../../build_cfg/socexplorer.pri)
4
4
5 TARGET = socexplorerengine$${DEBUG_EXT}
5 TARGET = socexplorerengine$${DEBUG_EXT}
6 TEMPLATE = lib
6 TEMPLATE = lib
7
7
8 #more verbose plugin loader to debug plugin loading issues such as dependencies issues
8 #more verbose plugin loader to debug plugin loading issues such as dependencies issues
9 SOCEXPLORER_PLUGIN_LOADER="custom"
9 SOCEXPLORER_PLUGIN_LOADER="custom"
10
10
11 SOCEXPLORER_CHAGESETNUM=$$system(hg id)
11 SOCEXPLORER_CHAGESETNUM=$$system(hg id)
12 isEmpty(SOCEXPLORER_CHAGESETNUM){
13 SOCEXPLORER_CHAGESETNUM=6e5eaa13fad9
14 }
12 SOCEXPLORER_CHAGESETNUMSTR = '\\"$${SOCEXPLORER_CHAGESETNUM}\\"'
15 SOCEXPLORER_CHAGESETNUMSTR = '\\"$${SOCEXPLORER_CHAGESETNUM}\\"'
13 SOCEXPLORER_BRANCH=$$system(hg branch)
16 SOCEXPLORER_BRANCH=$$system(hg branch)
17 isEmpty(SOCEXPLORER_BRANCH){
18 SOCEXPLORER_BRANCH=default
19 }
14 SOCEXPLORER_BRANCHSTR = '\\"$${SOCEXPLORER_BRANCH}\\"'
20 SOCEXPLORER_BRANCHSTR = '\\"$${SOCEXPLORER_BRANCH}\\"'
15
21
16 DEFINES += SOCEXPLORER_VERSION="\"\\\"0.2.2"\\\"\"
22 DEFINES += SOCEXPLORER_VERSION="\"\\\"0.4.4"\\\"\"
17 DEFINES += SOCEXPLORER_CHAGESET=\"$${SOCEXPLORER_CHAGESETNUMSTR}\"
23 DEFINES += SOCEXPLORER_CHAGESET=\"$${SOCEXPLORER_CHAGESETNUMSTR}\"
18 DEFINES += SOCEXPLORER_BRANCH=\"$${SOCEXPLORER_BRANCHSTR}\"
24 DEFINES += SOCEXPLORER_BRANCH=\"$${SOCEXPLORER_BRANCHSTR}\"
19
25
20
26
21 message("Building SOCEXPLORER changeset $${SOCEXPLORER_CHAGESETNUM}")
27 message("Building SOCEXPLORER changeset $${SOCEXPLORER_CHAGESETNUM}")
22
28
23 DEFINES += SOCEXPLORER_EXPORTS
29 DEFINES += SOCEXPLORER_EXPORTS
24
30
25 include ( plugins/socexplorerplugin.prf )
31 include ( plugins/socexplorerplugin.prf )
26 include ( PeripheralWidget/PeripheralWidget.pri)
32 include ( PeripheralWidget/PeripheralWidget.pri)
27
33
28 win32:CONFIG += dll
34 win32:CONFIG += dll
29 win32:CONFIG -= static
35 win32:CONFIG -= static
30 win32:LIBS+=-L$${SOCEXPLORER_ROOT}/bin/win32 -lsocexplorercommon$${DEBUG_EXT}
36 win32:LIBS+=-L$${SOCEXPLORER_ROOT}/bin/win32 -lsocexplorercommon$${DEBUG_EXT}
31
37
32 contains(SOCEXPLORER_PLUGIN_LOADER,"custom")
38 contains(SOCEXPLORER_PLUGIN_LOADER,"custom")
33 {
39 {
34 unix:LIBS+= -ldl
40 unix:LIBS+= -ldl
35 unix:DEFINES += SOCEXPLORER_CUSTOM_PLUGIN_LOADER
41 unix:DEFINES += SOCEXPLORER_CUSTOM_PLUGIN_LOADER
36 unix:HEADERS += \
42 unix:HEADERS += \
37 pluginloader/unix/unixpluginloader.h
43 pluginloader/unix/unixpluginloader.h
38 unix:SOURCES += \
44 unix:SOURCES += \
39 pluginloader/unix/unixpluginloader.cpp
45 pluginloader/unix/unixpluginloader.cpp
40 }
46 }
41
47
42 target.path = $$[QT_INSTALL_LIBS]
48 target.path = $$[QT_INSTALL_LIBS]
43 isEmpty(target.path) {
49 isEmpty(target.path) {
44 error(can\'t get QT_INSTALL_LIBS)
50 error(can\'t get QT_INSTALL_LIBS)
45 }
51 }
46
52
47 header.path = $$[QT_INSTALL_HEADERS]/SocExplorer
53 header.path = $$[QT_INSTALL_HEADERS]/SocExplorer
48 header.files = engine/socexplorerengine.h \
54 header.files = engine/socexplorerengine.h \
49 pluginloader/pluginscache.h \
55 pluginloader/pluginscache.h \
50 plugins/socexplorerplugin.h \
56 plugins/socexplorerplugin.h \
51 proxy/socexplorerproxy.h \
57 proxy/socexplorerproxy.h \
52 engine/socexplorerxmlfile.h \
58 engine/socexplorerxmlfile.h \
53 SOC/socexplorerenumdevice.h \
59 SOC/socexplorerenumdevice.h \
54 plugins/genericPySysdriver.h \
60 plugins/genericPySysdriver.h \
55 XmlEngine/XMLmodel.h \
61 XmlEngine/XMLmodel.h \
56 XmlEngine/XMLdata.h \
62 XmlEngine/XMLdata.h \
57 XmlEngine/xmldriver.h \
63 XmlEngine/xmldriver.h \
58 SOC/socmodel.h \
64 SOC/socmodel.h \
59 SOC/registerdata.h \
65 SOC/registerdata.h \
60 SOC/socclk.h \
66 SOC/socclk.h \
61 PeripheralWidget/src/peripheralwidget.h \
67 PeripheralWidget/src/peripheralwidget.h \
62 PeripheralWidget/src/registerwidget.h \
68 PeripheralWidget/src/registerwidget.h \
63 PeripheralWidget/src/socregsviewer.h
69 PeripheralWidget/src/socregsviewer.h
64
70
65
71
66
72
67 isEmpty(header.path) {
73 isEmpty(header.path) {
68 error(can\'t get QT_INSTALL_HEADERS)
74 error(can\'t get QT_INSTALL_HEADERS)
69 }
75 }
70
76
71 pluginif.files = pluginsInterface/*.h \
77 pluginif.files = pluginsInterface/*.h \
72 pluginsInterface/*.cpp
78 pluginsInterface/*.cpp
73
79
74 pluginif.path = $$[QT_INSTALL_HEADERS]/SocExplorer/pluginsInterface
80 pluginif.path = $$[QT_INSTALL_HEADERS]/SocExplorer/pluginsInterface
75
81
76
82
77 INSTALLS += target header pluginif
83 INSTALLS += target header pluginif
78
84
79 INCLUDEPATH += engine \
85 INCLUDEPATH += engine \
80 pluginloader \
86 pluginloader \
81 pluginsInterface \
87 pluginsInterface \
82 proxy \
88 proxy \
83 plugins \
89 plugins \
84 pluginManagerWdgt \
90 pluginManagerWdgt \
85 ../common \
91 ../common \
86 ../ \
92 ../ \
87 RegisterMVS \
93 RegisterMVS \
88 XmlEngine \
94 XmlEngine \
89 SOC \
95 SOC \
90 PeripheralWidget/src
96 PeripheralWidget/src
91
97
92
98
93 HEADERS += \
99 HEADERS += \
94 pluginloader/pluginscache.h \
100 pluginloader/pluginscache.h \
95 pluginloader/pluginloader.h \
101 pluginloader/pluginloader.h \
96 plugins/genericPySysdriver.h \
102 plugins/genericPySysdriver.h \
97 pluginManagerWdgt/plugintree.h \
103 pluginManagerWdgt/plugintree.h \
98 pluginManagerWdgt/pluginmanagerWDGT.h \
104 pluginManagerWdgt/pluginmanagerWDGT.h \
99 pluginManagerWdgt/pluginlist.h \
105 pluginManagerWdgt/pluginlist.h \
100 pluginManagerWdgt/plugininfoswdgt.h \
106 pluginManagerWdgt/plugininfoswdgt.h \
101 XmlEngine/XMLmodel.h \
107 XmlEngine/XMLmodel.h \
102 XmlEngine/XMLdata.h \
108 XmlEngine/XMLdata.h \
103 SOC/socmodel.h \
109 SOC/socmodel.h \
104 SOC/registerdata.h \
110 SOC/registerdata.h \
105 XmlEngine/xmldriver.h \
111 XmlEngine/xmldriver.h \
106 PeripheralWidget/src/peripheralwidget.h \
112 PeripheralWidget/src/peripheralwidget.h \
107 PeripheralWidget/src/registerwidget.h \
113 PeripheralWidget/src/registerwidget.h \
108 PeripheralWidget/src/socregsviewer.h \
114 PeripheralWidget/src/socregsviewer.h \
109 SOC/socclk.h \
115 SOC/socclk.h \
110 engine/socexplorerengine.h \
116 engine/socexplorerengine.h \
111 engine/socexplorerxmlfile.h \
117 engine/socexplorerxmlfile.h \
112 plugins/socexplorerplugin.h \
118 plugins/socexplorerplugin.h \
113 pluginsInterface/socexplorerplugininterface.h \
119 pluginsInterface/socexplorerplugininterface.h \
114 pluginsInterface/socexplorerplugininterface_global.h \
120 pluginsInterface/socexplorerplugininterface_global.h \
115 proxy/socexplorerproxy.h \
121 proxy/socexplorerproxy.h \
116 SOC/socexplorerenumdevice.h \
122 SOC/socexplorerenumdevice.h \
117 PySocExplorerEngine.h
123 PySocExplorerEngine.h
118
124
119
125
120
126
121
127
122
128
123
129
124 SOURCES += \
130 SOURCES += \
125 pluginloader/pluginscache.cpp \
131 pluginloader/pluginscache.cpp \
126 pluginloader/pluginloader.cpp \
132 pluginloader/pluginloader.cpp \
127 pluginManagerWdgt/plugintree.cpp \
133 pluginManagerWdgt/plugintree.cpp \
128 pluginManagerWdgt/pluginmanagerWDGT.cpp \
134 pluginManagerWdgt/pluginmanagerWDGT.cpp \
129 pluginManagerWdgt/pluginlist.cpp \
135 pluginManagerWdgt/pluginlist.cpp \
130 pluginManagerWdgt/plugininfoswdgt.cpp \
136 pluginManagerWdgt/plugininfoswdgt.cpp \
131 XmlEngine/XMLmodel.cpp \
137 XmlEngine/XMLmodel.cpp \
132 XmlEngine/XMLdata.cpp \
138 XmlEngine/XMLdata.cpp \
133 SOC/socmodel.cpp \
139 SOC/socmodel.cpp \
134 SOC/registerdata.cpp \
140 SOC/registerdata.cpp \
135 XmlEngine/xmldriver.cpp \
141 XmlEngine/xmldriver.cpp \
136 PeripheralWidget/src/peripheralwidget.cpp \
142 PeripheralWidget/src/peripheralwidget.cpp \
137 PeripheralWidget/src/registerwidget.cpp \
143 PeripheralWidget/src/registerwidget.cpp \
138 PeripheralWidget/src/socregsviewer.cpp \
144 PeripheralWidget/src/socregsviewer.cpp \
139 SOC/socclk.cpp \
145 SOC/socclk.cpp \
140 plugins/genericPySysdriver.cpp \
146 plugins/genericPySysdriver.cpp \
141 engine/socexplorerengine.cpp \
147 engine/socexplorerengine.cpp \
142 engine/socexplorerxmlfile.cpp \
148 engine/socexplorerxmlfile.cpp \
143 proxy/socexplorerproxy.cpp \
149 proxy/socexplorerproxy.cpp \
144 SOC/socexplorerenumdevice.cpp \
150 SOC/socexplorerenumdevice.cpp \
145 plugins/socexplorerplugin.cpp
151 plugins/socexplorerplugin.cpp
146
152
147
153
148 OTHER_FILES += \
154 OTHER_FILES += \
149 plugins/socexplorerplugin.cpp \
155 plugins/socexplorerplugin.cpp \
150 pluginsInterface/socexplorerplugininterface.cpp \
156 pluginsInterface/socexplorerplugininterface.cpp \
151 plugins/socexplorerplugin.prf \
157 plugins/socexplorerplugin.prf \
152 pythongenerator.sh \
158 pythongenerator.sh \
153 pythonQtgeneratorCfg.txt
159 pythonQtgeneratorCfg.txt
154
160
155
161
Show file before | Show file after | Hide comments
@@ -1,17 +1,17
1 [Desktop Entry]
1 [Desktop Entry]
2 Version=1.0
2 Version=1.0
3 Name=SocExplorer
3 Name=SocExplorer
4 Name[en_US]=SocExplorer
4 Name[en_US]=SocExplorer
5
5
6 Type=Application
6 Type=Application
7 GenericName=Soc Explorer
7 GenericName=Soc Explorer
8
8
9 Comment=Software to monitor and explore Soc devices.
9 Comment=Software to monitor and explore Soc devices.
10
10
11 Exec=socexplorer -e %U
11 Exec=socexplorer -e %U
12 Icon=/usr/share/SocExplorer/icon.png
12 Icon=/usr/share/SocExplorer/icon.png
13 Terminal=false
13 Terminal=false
14
14
15 Categories=Electronics;Engineering;
15 Categories=Electronics;Engineering;
16
16
17 MimeType=text/x-python
17 MimeType=text/x-python;
General Comments 0
You need to be logged in to leave comments. Login now