X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-cli.git;a=blobdiff_plain;f=contrib%2Fsigrok-cli_cross.nsi.in;h=402327c3f71a26de0e2594b9b617bc0e92e5d422;hp=f9a76b150476ac393467411d6142754fbd5fd278;hb=7d8068f88f58f3998a9c74956e385a1e906001e8;hpb=01833aec90b5339a2b8d12867c261346f1498356

diff --git a/contrib/sigrok-cli_cross.nsi.in b/contrib/sigrok-cli_cross.nsi.in
index f9a76b1..402327c 100644
--- a/contrib/sigrok-cli_cross.nsi.in
+++ b/contrib/sigrok-cli_cross.nsi.in
@@ -134,6 +134,13 @@ Section "@PACKAGE_NAME@ (required)" Section1
 	# sigrok-cli.
 	File "${CROSS}/bin/@PACKAGE_NAME@.exe"
 
+	# libusb0.dll (needed for libusb-0.1).
+	File "${CROSS}/libusb0.dll"
+
+	# Zadig (used for installing libusb-win32 and WinUSB drivers).
+	File "${CROSS}/zadig.exe"
+	File "${CROSS}/zadig_xp.exe"
+
 	# Install the file(s) specified below into the specified directory.
 	SetOutPath "$INSTDIR\decoders"
 
@@ -223,13 +230,16 @@ Section "Uninstall"
 	# Delete the application, the application data, and related libs.
 	Delete "$INSTDIR\COPYING"
 	Delete "$INSTDIR\@PACKAGE_NAME@.exe"
+	Delete "$INSTDIR\libusb0.dll"
+	Delete "$INSTDIR\zadig.exe"
+	Delete "$INSTDIR\zadig_xp.exe"
 
 	# Delete all decoders and everything else in decoders/.
 	# There could be *.pyc files or __pycache__ subdirs and so on.
 	RMDir /r "$INSTDIR\decoders\*"
 
 	# Delete the firmware files.
-	File /r "$INSTDIR\firmware\*"
+	RMDir /r "$INSTDIR\firmware\*"
 
 	# Delete the install directory and its sub-directories.
 	RMDir "$INSTDIR\decoders"
@@ -252,7 +262,7 @@ SectionEnd
 
 # --- Component selection section descriptions --------------------------------
 
-LangString DESC_Section1 ${LANG_ENGLISH} "This installs the sigrok command-line tool, the protocol decoders, and all required libraries."
+LangString DESC_Section1 ${LANG_ENGLISH} "This installs the sigrok command-line tool, some firmware files, the protocol decoders, and all required libraries."
 LangString DESC_Section2 ${LANG_ENGLISH} "This installs Python 3.2 in its default location of c:\Python32. If you already have Python 3.2 installed, you don't need to re-install it."
 
 !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN