From: Uwe Hermann <redacted>
Date: Thu, 20 Mar 2014 12:15:50 +0000 (+0100)
Subject: nsis: Put sigrok-dumps *.sr files into the installer.
X-Git-Tag: sigrok-cli-0.5.0~22
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=72db8c56417114b50c2f7aa08d71a0ab79672ef4;p=sigrok-cli.git

nsis: Put sigrok-dumps *.sr files into the installer.

These are useful for people to have around for conveniently testing
various frontend features and protocol decoders etc.
---

diff --git a/contrib/sigrok-cli_cross.nsi.in b/contrib/sigrok-cli_cross.nsi.in
index cffe253..d55f919 100644
--- a/contrib/sigrok-cli_cross.nsi.in
+++ b/contrib/sigrok-cli_cross.nsi.in
@@ -141,18 +141,18 @@ Section "@PACKAGE_NAME@ (required)" Section1
 	File "${CROSS}/zadig.exe"
 	File "${CROSS}/zadig_xp.exe"
 
-	# Install the file(s) specified below into the specified directory.
-	SetOutPath "$INSTDIR\decoders"
-
 	# Protocol decoders.
+	SetOutPath "$INSTDIR\decoders"
 	File /r /x "__pycache__" "${CROSS}/share/libsigrokdecode/decoders/*"
 
-	# Install the file(s) specified below into the specified directory.
-	SetOutPath "$INSTDIR\firmware"
-
 	# 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"
 
@@ -241,9 +241,13 @@ Section "Uninstall"
 	# 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.
@@ -262,7 +266,7 @@ SectionEnd
 
 # --- Component selection section descriptions --------------------------------
 
-LangString DESC_Section1 ${LANG_ENGLISH} "This installs the sigrok command-line tool, some firmware files, 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