Installer: Place set of example .sr files in separate section

diff --git a/contrib/sigrok-cli_cross.nsi.in b/contrib/sigrok-cli_cross.nsi.in
index 6e8df6c2e33cf2783b5dd1c267aaaaaadfd490b9..ed4320950256148e76c5c609b769d275f7b97545 100644 (file)
--- a/contrib/sigrok-cli_cross.nsi.in
+++ b/contrib/sigrok-cli_cross.nsi.in
@@ -139,10 +139,6 @@ Section "@PACKAGE_NAME@ (required)" Section1
        # Firmware files.
        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"
 
@@ -202,6 +198,32 @@ Section "@PACKAGE_NAME@ (required)" Section1
 
 SectionEnd
 
+Section /o "Example data" Section2
+       # Example *.sr files.
+       SetOutPath "$INSTDIR\examples"
+
+       File "${CROSS}/share/sigrok-dumps/arm_trace/stm32f105/trace_example.sr"
+       File "${CROSS}/share/sigrok-dumps/am230x/am2301/am2301_1mhz.sr"
+       File "${CROSS}/share/sigrok-dumps/avr_isp/atmega88/isp_atmega88_erase_chip.sr"
+       File "${CROSS}/share/sigrok-dumps/can/microchip_mcp2515dm-bm/mcp2515dm-bm-125kbits_msg_222_5bytes.sr"
+       File "${CROSS}/share/sigrok-dumps/dcf77/pollin_dcf1_module/dcf77_120s.sr"
+       File "${CROSS}/share/sigrok-dumps/i2c/eeprom_24xx/microchip_24lc02b/hantek_6022be_powerup.sr"
+       File "${CROSS}/share/sigrok-dumps/i2c/eeprom_24xx/microchip_24lc64/sainsmart_dds120_powerup_scl_sda_analog.sr"
+       File "${CROSS}/share/sigrok-dumps/i2c/potentiometer/analog_devices_ad5258/ad5258_read_once_write_continuously_triangle.sr"
+       File "${CROSS}/share/sigrok-dumps/mdio/lan8720a/lan8720a_read_write_read.sr"
+       File "${CROSS}/share/sigrok-dumps/onewire/owfs/ds28ea00.sr"
+       File "${CROSS}/share/sigrok-dumps/sdcard/sd_mode/rcar-h2/cmd23_cmd18.sr"
+       File "${CROSS}/share/sigrok-dumps/spi/mx25l1605d/mx25l1605d_read.sr"
+       File "${CROSS}/share/sigrok-dumps/uart/gps/mtk3339/mtk3339_8n1_9600.sr"
+       File "${CROSS}/share/sigrok-dumps/usb/hid/mouse/olimex_stm32-h103_usb_hid/olimex_stm32-h103_usb_hid.sr"
+       File "${CROSS}/share/sigrok-dumps/z80/kc85/kc85-20mhz.sr"
+
+       # Create a shortcut for the example data folder.
+       CreateShortCut "$SMPROGRAMS\sigrok\@PACKAGE_NAME@\Examples.lnk" \
+               "$INSTDIR\examples" "" "$INSTDIR\examples" 0 \
+               SW_SHOWNORMAL "" ""
+SectionEnd
+
 
 # --- Uninstaller section -----------------------------------------------------
 
@@ -238,6 +260,7 @@ Section "Uninstall"
        Delete "$SMPROGRAMS\sigrok\@PACKAGE_NAME@\Uninstall.lnk"
        Delete "$SMPROGRAMS\sigrok\@PACKAGE_NAME@\Zadig.lnk"
        Delete "$SMPROGRAMS\sigrok\@PACKAGE_NAME@\Zadig (Win XP).lnk"
+       Delete "$SMPROGRAMS\sigrok\@PACKAGE_NAME@\Examples.lnk"
 
        # Delete the sub-directory in the start menu.
        RMDir "$SMPROGRAMS\sigrok\@PACKAGE_NAME@"
@@ -251,9 +274,11 @@ SectionEnd
 
 # --- Component selection section descriptions --------------------------------
 
-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_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 some example files that you can use to try out the features sigrok has to offer."
 
 !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
-!insertmacro MUI_DESCRIPTION_TEXT ${Section1} $(DESC_Section1)
+       !insertmacro MUI_DESCRIPTION_TEXT ${Section1} $(DESC_Section1)
+       !insertmacro MUI_DESCRIPTION_TEXT ${Section2} $(DESC_Section2)
 !insertmacro MUI_FUNCTION_DESCRIPTION_END