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

diff --git a/contrib/sigrok-cli_cross.nsi.in b/contrib/sigrok-cli_cross.nsi.in
index 5ea9bb5..91680d4 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,24 @@ 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"
 
-	# Protocol decoders
+	# Protocol decoders.
 	File /r /x "__pycache__" "${CROSS}/share/libsigrokdecode/decoders/*"
 
+	# Install the file(s) specified below into the specified directory.
+	SetOutPath "$INSTDIR\firmware"
+
+	# Firmware files.
+	File /r "${CROSS}/share/sigrok-firmware/*"
+
 	# Generate the uninstaller executable.
 	WriteUninstaller "$INSTDIR\Uninstall.exe"
 
@@ -222,8 +228,12 @@ Section "Uninstall"
 	# 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 install directory and its sub-directories.
 	RMDir "$INSTDIR\decoders"
+	RMDir "$INSTDIR\firmware"
 	RMDir "$INSTDIR"
 
 	# Delete the links from the start menu.
@@ -242,7 +252,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