projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cmake: add check for explicit linking against libatomic
[pulseview.git]
/
contrib
/
pulseview_cross.nsi.in
diff --git
a/contrib/pulseview_cross.nsi.in
b/contrib/pulseview_cross.nsi.in
index 576cfca63a527bebcc15d3e60f576dffae8217ee..6c0475cb62e013dddfe94412d06d25bc92855dde 100644
(file)
--- a/
contrib/pulseview_cross.nsi.in
+++ b/
contrib/pulseview_cross.nsi.in
@@
-132,13
+132,13
@@
Section "PulseView (required)" Section1
File "${CROSS}/python32.dll"
File "${CROSS}/python32.zip"
File "${CROSS}/python32.dll"
File "${CROSS}/python32.zip"
+ SetOutPath "$INSTDIR\share"
+
# Protocol decoders.
# Protocol decoders.
- SetOutPath "$INSTDIR\decoders"
- File /r /x "__pycache__" "${CROSS}/share/libsigrokdecode/decoders/*"
+ File /r /x "__pycache__" /x "*.pyc" "${CROSS}/share/libsigrokdecode"
# Firmware files.
# Firmware files.
- SetOutPath "$INSTDIR\firmware"
- File /r "${CROSS}/share/sigrok-firmware/*"
+ File /r "${CROSS}/share/sigrok-firmware"
# Example *.sr files.
SetOutPath "$INSTDIR\examples"
# Example *.sr files.
SetOutPath "$INSTDIR\examples"
@@
-214,19
+214,18
@@
Section "Uninstall"
Delete "$INSTDIR\python32.dll"
Delete "$INSTDIR\python32.zip"
Delete "$INSTDIR\python32.dll"
Delete "$INSTDIR\python32.zip"
- # Delete all decoders and everything else in
decoders
/.
+ # Delete all decoders and everything else in
libsigrokdecode
/.
# There could be *.pyc files or __pycache__ subdirs and so on.
# There could be *.pyc files or __pycache__ subdirs and so on.
- RMDir /r "$INSTDIR\
decoders\*
"
+ RMDir /r "$INSTDIR\
share\libsigrokdecode
"
# Delete the firmware files.
# Delete the firmware files.
- RMDir /r "$INSTDIR\
firmware\*
"
+ RMDir /r "$INSTDIR\
share\sigrok-firmware
"
# Delete the example *.sr files.
RMDir /r "$INSTDIR\examples\*"
# Delete the install directory and its sub-directories.
# Delete the example *.sr files.
RMDir /r "$INSTDIR\examples\*"
# Delete the install directory and its sub-directories.
- RMDir "$INSTDIR\decoders"
- RMDir "$INSTDIR\firmware"
+ RMDir "$INSTDIR\share"
RMDir "$INSTDIR\examples"
RMDir "$INSTDIR"
RMDir "$INSTDIR\examples"
RMDir "$INSTDIR"