Installer: Whitespace consistency fixes.

[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 2e3ac337054167f48746507acefc0064cb083d5a..196a10740a599eed437c71484d23f801ca673118 100644 (file)
--- a/contrib/sigrok-cli_cross.nsi.in
+++ b/contrib/sigrok-cli_cross.nsi.in
@@ -110,7 +110,6 @@ RequestExecutionLevel admin
 # --- Default section ---------------------------------------------------------
 
 Section "@PACKAGE_NAME@ (required)" Section1
-
        # This section is gray (can't be disabled) in the component list.
        SectionIn RO
 
@@ -128,8 +127,8 @@ Section "@PACKAGE_NAME@ (required)" Section1
        File "${CROSS}/zadig_xp.exe"
 
        # Python
-       File "${CROSS}/python36.dll"
-       File "${CROSS}/python36.zip"
+       File "${CROSS}/python34.dll"
+       File "${CROSS}/python34.zip"
 
        SetOutPath "$INSTDIR\share"
 
@@ -139,10 +138,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"
 
@@ -161,17 +156,17 @@ Section "@PACKAGE_NAME@ (required)" Section1
                SW_SHOWNORMAL "" "Run @PACKAGE_NAME@"
 
        # Create a shortcut for the uninstaller.
-       CreateShortCut "$SMPROGRAMS\sigrok\@PACKAGE_NAME@\Uninstall.lnk" \
+       CreateShortCut "$SMPROGRAMS\sigrok\@PACKAGE_NAME@\Uninstall @PACKAGE_NAME@.lnk" \
                "$INSTDIR\Uninstall.exe" "" "$INSTDIR\Uninstall.exe" 0 \
                SW_SHOWNORMAL "" "Uninstall @PACKAGE_NAME@"
 
        # Create a shortcut for the Zadig executable.
-       CreateShortCut "$SMPROGRAMS\sigrok\@PACKAGE_NAME@\Zadig.lnk" \
+       CreateShortCut "$SMPROGRAMS\sigrok\@PACKAGE_NAME@\Zadig (@PACKAGE_NAME@).lnk" \
                "$INSTDIR\zadig.exe" "" "$INSTDIR\zadig.exe" 0 \
                SW_SHOWNORMAL "" "Zadig"
 
        # Create a shortcut for the Zadig executable (for Win XP).
-       CreateShortCut "$SMPROGRAMS\sigrok\@PACKAGE_NAME@\Zadig (Win XP).lnk" \
+       CreateShortCut "$SMPROGRAMS\sigrok\@PACKAGE_NAME@\Zadig (@PACKAGE_NAME@, Win XP).lnk" \
                "$INSTDIR\zadig_xp.exe" "" "$INSTDIR\zadig_xp.exe" 0 \
                SW_SHOWNORMAL "" "Zadig (Win XP)"
 
@@ -199,14 +194,38 @@ Section "@PACKAGE_NAME@ (required)" Section1
        WriteRegDWORD HKLM "${REGSTR}" "NoRepair" 1
 
        # TODO: Add sigrok-cli directory to the PATH env. variable.
+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 (@PACKAGE_NAME@).lnk" \
+               "$INSTDIR\examples" "" "$INSTDIR\examples" 0 \
+               SW_SHOWNORMAL "" ""
 SectionEnd
 
 
 # --- Uninstaller section -----------------------------------------------------
 
 Section "Uninstall"
-
        # Always delete the uninstaller first (yes, this really works).
        Delete "$INSTDIR\Uninstall.exe"
 
@@ -215,8 +234,8 @@ Section "Uninstall"
        Delete "$INSTDIR\@PACKAGE_NAME@.exe"
        Delete "$INSTDIR\zadig.exe"
        Delete "$INSTDIR\zadig_xp.exe"
-       Delete "$INSTDIR\python36.dll"
-       Delete "$INSTDIR\python36.zip"
+       Delete "$INSTDIR\python34.dll"
+       Delete "$INSTDIR\python34.zip"
 
        # Delete all decoders and everything else in libsigrokdecode/.
        # There could be *.pyc files or __pycache__ subdirs and so on.
@@ -235,9 +254,10 @@ Section "Uninstall"
 
        # Delete the links from the start menu.
        Delete "$SMPROGRAMS\sigrok\@PACKAGE_NAME@\sigrok command-line tool.lnk"
-       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@\Uninstall @PACKAGE_NAME@.lnk"
+       Delete "$SMPROGRAMS\sigrok\@PACKAGE_NAME@\Zadig (@PACKAGE_NAME@).lnk"
+       Delete "$SMPROGRAMS\sigrok\@PACKAGE_NAME@\Zadig (@PACKAGE_NAME@, Win XP).lnk"
+       Delete "$SMPROGRAMS\sigrok\@PACKAGE_NAME@\Examples (@PACKAGE_NAME@).lnk"
 
        # Delete the sub-directory in the start menu.
        RMDir "$SMPROGRAMS\sigrok\@PACKAGE_NAME@"
@@ -245,15 +265,16 @@ Section "Uninstall"
 
        # Delete the registry key(s).
        DeleteRegKey HKLM "${REGSTR}"
-
 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