From: Uwe Hermann <redacted>
Date: Wed, 1 Jan 2014 18:09:58 +0000 (+0100)
Subject: nsis: Also put firmware files into the installer.
X-Git-Tag: sigrok-cli-0.5.0~54
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=01833aec90b5339a2b8d12867c261346f1498356;p=sigrok-cli.git

nsis: Also put firmware files into the installer.
---

diff --git a/contrib/sigrok-cli_cross.nsi.in b/contrib/sigrok-cli_cross.nsi.in
index 5ea9bb5..f9a76b1 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.
+	File /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.