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

[sigrok-cli.git] / contrib / sigrok-cli_cross.nsi.in

diff --git a/contrib/sigrok-cli_cross.nsi.in b/contrib/sigrok-cli_cross.nsi.in
index c8c2f7998d667f66af7603c45da9b941c0f61d6d..d55f91916e4bdc3bd6215470f887a8dcbd1aff91 100644 (file)
--- a/contrib/sigrok-cli_cross.nsi.in
+++ b/contrib/sigrok-cli_cross.nsi.in
@@ -137,18 +137,22 @@ Section "@PACKAGE_NAME@ (required)" Section1
        # libusb0.dll (needed for libusb-0.1).
        File "${CROSS}/libusb0.dll"
 
-       # Install the file(s) specified below into the specified directory.
-       SetOutPath "$INSTDIR\decoders"
+       # Zadig (used for installing libusb-win32 and WinUSB drivers).
+       File "${CROSS}/zadig.exe"
+       File "${CROSS}/zadig_xp.exe"
 
        # 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"
 
@@ -158,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." \
@@ -227,6 +231,8 @@ Section "Uninstall"
        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.
@@ -235,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.
@@ -256,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