@@ -132,13 +132,13 @@ Section "PulseView (required)" Section1
132
132
File "${CROSS}/python32.dll"
133
133
File "${CROSS}/python32.zip"
134
134
135
+ SetOutPath "$INSTDIR\share"
136
+
135
137
# Protocol decoders.
136
- SetOutPath "$INSTDIR\decoders"
137
- File /r /x "__pycache__" "${CROSS}/share/libsigrokdecode/decoders/*"
138
+ File /r /x "__pycache__" /x "*.pyc" "${CROSS}/share/libsigrokdecode"
138
139
139
140
# Firmware files.
140
- SetOutPath "$INSTDIR\firmware"
141
- File /r "${CROSS}/share/sigrok-firmware/*"
141
+ File /r "${CROSS}/share/sigrok-firmware"
142
142
143
143
# Example *.sr files.
144
144
SetOutPath "$INSTDIR\examples"
@@ -214,19 +214,18 @@ Section "Uninstall"
214
214
Delete "$INSTDIR\python32.dll"
215
215
Delete "$INSTDIR\python32.zip"
216
216
217
- # Delete all decoders and everything else in decoders /.
217
+ # Delete all decoders and everything else in libsigrokdecode /.
218
218
# There could be *.pyc files or __pycache__ subdirs and so on.
219
- RMDir /r "$INSTDIR\decoders\* "
219
+ RMDir /r "$INSTDIR\share\libsigrokdecode "
220
220
221
221
# Delete the firmware files.
222
- RMDir /r "$INSTDIR\firmware\* "
222
+ RMDir /r "$INSTDIR\share\sigrok-firmware "
223
223
224
224
# Delete the example *.sr files.
225
225
RMDir /r "$INSTDIR\examples\*"
226
226
227
227
# Delete the install directory and its sub-directories.
228
- RMDir "$INSTDIR\decoders"
229
- RMDir "$INSTDIR\firmware"
228
+ RMDir "$INSTDIR\share"
230
229
RMDir "$INSTDIR\examples"
231
230
RMDir "$INSTDIR"
232
231
0 commit comments