X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-cli.git;a=blobdiff_plain;f=contrib%2Fsigrok-cli_cross.nsi.in;h=d55f91916e4bdc3bd6215470f887a8dcbd1aff91;hp=5ea9bb56726ea53d2e95614fe80f49eb2f1ec18a;hb=72db8c56417114b50c2f7aa08d71a0ab79672ef4;hpb=e71b3ff7687695c6d61d751d06785f95bb6c606a

diff --git a/contrib/sigrok-cli_cross.nsi.in b/contrib/sigrok-cli_cross.nsi.in
index 5ea9bb5..d55f919 100644
--- a/contrib/sigrok-cli_cross.nsi.in
+++ b/contrib/sigrok-cli_cross.nsi.in
@@ -1,7 +1,7 @@
 ##
 ## This file is part of the sigrok-cli project.
 ##
-## Copyright (C) 2011-2013 Uwe Hermann <uwe@hermann-uwe.de>
+## Copyright (C) 2011-2014 Uwe Hermann <uwe@hermann-uwe.de>
 ##
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -128,18 +128,31 @@ Section "@PACKAGE_NAME@ (required)" Section1
 	# Install the file(s) specified below into the specified directory.
 	SetOutPath "$INSTDIR"
 
-	# License file
+	# License file.
 	File "../COPYING"
 
-	# sigrok-cli
+	# sigrok-cli.
 	File "${CROSS}/bin/@PACKAGE_NAME@.exe"
 
-	# Install the file(s) specified below into the specified directory.
-	SetOutPath "$INSTDIR\decoders"
+	# 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"
 
-	# Protocol decoders
+	# Protocol decoders.
+	SetOutPath "$INSTDIR\decoders"
 	File /r /x "__pycache__" "${CROSS}/share/libsigrokdecode/decoders/*"
 
+	# Firmware files.
+	SetOutPath "$INSTDIR\firmware"
+	File /r "${CROSS}/share/sigrok-firmware/*"
+
+	# Example *.sr files.
+	SetOutPath "$INSTDIR\examples"
+	File /r "${CROSS}/share/sigrok-dumps/*"
+
 	# Generate the uninstaller executable.
 	WriteUninstaller "$INSTDIR\Uninstall.exe"
 
@@ -149,8 +162,8 @@ Section "@PACKAGE_NAME@ (required)" Section1
 
 	# Create a shortcut for sigrok-cli (this merely opens a "DOS box").
 	# Set the working directory (where the user will be placed into when
-	# the DOS box starts) to the user's Desktop directory.
-	SetOutPath "$DESKTOP"
+	# the DOS box starts) to the installation directory.
+	SetOutPath "$INSTDIR"
 	CreateShortCut "$SMPROGRAMS\sigrok\@PACKAGE_NAME@\sigrok command-line tool.lnk" \
 		"$SYSDIR\cmd.exe" \
 		"/K echo For instructions run @PACKAGE_NAME@ --help." \
@@ -217,13 +230,24 @@ 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.
+	RMDir /r "$INSTDIR\firmware\*"
+
+	# 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\examples"
 	RMDir "$INSTDIR"
 
 	# Delete the links from the start menu.
@@ -242,7 +266,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, some example files, 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