X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=contrib%2Fpulseview_cross.nsi;h=7e9dd923c5d1f5ed1383bce086abb3075999b22d;hp=d59b47872d9754f7dbf90fade8e188c78422ce0c;hb=77243b3e8c8a8b3c7742d4d4064ea236d1d81496;hpb=d8823c8cc5eb8539ec4dc087539f531fea421429

diff --git a/contrib/pulseview_cross.nsi b/contrib/pulseview_cross.nsi
index d59b4787..7e9dd923 100644
--- a/contrib/pulseview_cross.nsi
+++ b/contrib/pulseview_cross.nsi
@@ -134,6 +134,13 @@ Section "PulseView (required)" Section1
 	# PulseView (statically linked, includes all libs).
 	File "${CROSS}/bin/pulseview.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"
 
@@ -154,6 +161,7 @@ Section "PulseView (required)" Section1
 	CreateDirectory "$SMPROGRAMS\sigrok\PulseView"
 
 	# Create a shortcut for the PulseView application.
+	SetOutPath "$INSTDIR"
 	CreateShortCut "$SMPROGRAMS\sigrok\PulseView\PulseView.lnk" \
 		"$INSTDIR\pulseview.exe" "" "$INSTDIR\pulseview.exe" \
 		0 SW_SHOWNORMAL \
@@ -217,13 +225,16 @@ Section "Uninstall"
 	# Delete the application, the application data, and related libs.
 	Delete "$INSTDIR\COPYING"
 	Delete "$INSTDIR\pulseview.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"
@@ -246,7 +257,7 @@ SectionEnd
 
 # --- Component selection section descriptions --------------------------------
 
-LangString DESC_Section1 ${LANG_ENGLISH} "This installs the PulseView sigrok GUI."
+LangString DESC_Section1 ${LANG_ENGLISH} "This installs the PulseView sigrok GUI, 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