Session: Fix issue #67 by improving error handling

[pulseview.git] / contrib / pulseview_cross.nsi.in

diff --git a/contrib/pulseview_cross.nsi.in b/contrib/pulseview_cross.nsi.in
index af5c1c68073c251d5492b617b35aa49aff5e7412..1cbd9eb1630741384d80756ab3fe0f51a8b8f9c6 100644 (file)
--- a/contrib/pulseview_cross.nsi.in
+++ b/contrib/pulseview_cross.nsi.in
@@ -1,7 +1,7 @@
 ##
 ## This file is part of the PulseView project.
 ##
-## Copyright (C) 2013-2014 Uwe Hermann <uwe@hermann-uwe.de>
+## Copyright (C) 2013-2020 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
@@ -43,7 +43,11 @@ Name "PulseView"
 OutFile "pulseview-@PV_VERSION_STRING@-installer.exe"
 
 # Where to install the application.
-InstallDir "$PROGRAMFILES\sigrok\PulseView"
+!ifdef PE64
+       InstallDir "$PROGRAMFILES64\sigrok\PulseView"
+!else
+       InstallDir "$PROGRAMFILES\sigrok\PulseView"
+!endif
 
 # Request admin privileges for Windows Vista and Windows 7.
 # http://nsis.sourceforge.net/Docs/Chapter4.html
@@ -56,7 +60,7 @@ RequestExecutionLevel admin
 # --- MUI interface configuration ---------------------------------------------
 
 # Use the following icon for the installer EXE file.
-!define MUI_ICON "@PROJECT_SOURCE_DIR@/icons/sigrok-logo-notext.ico"
+!define MUI_ICON "@PROJECT_SOURCE_DIR@/icons/pulseview.ico"
 
 # Show a nice image at the top of each installer page.
 !define MUI_HEADERIMAGE
@@ -81,7 +85,7 @@ RequestExecutionLevel admin
 !define SHCNF_IDLIST 0
 
 
-# --- Functions ---------------------------------------------------------------
+# --- Functions/Macros --------------------------------------------------------
 
 Function register_sr_files
        ${registerExtension} "$INSTDIR\pulseview.exe" ".sr" "sigrok session file"
@@ -90,6 +94,12 @@ Function register_sr_files
        System::Call 'Shell32::SHChangeNotify(i ${SHCNE_ASSOCCHANGED}, i ${SHCNF_IDLIST}, i 0, i 0)'
 FunctionEnd
 
+# Inspired by http://nsis.sourceforge.net/Create_Internet_Shorcuts_during_installation
+!Macro "CreateURL" "URLFile" "URLSite" "URLDesc"
+       WriteINIStr "$INSTDIR\${URLFile}.URL" "InternetShortcut" "URL" "${URLSite}"
+       CreateShortCut "$SMPROGRAMS\sigrok\PulseView\${URLFile}.lnk" "$INSTDIR\${URLFile}.url" "" \
+               "$INSTDIR\pulseview.exe" 0 "SW_SHOWNORMAL" "" "${URLDesc}"
+!MacroEnd
 
 # --- MUI pages ---------------------------------------------------------------
 
@@ -135,7 +145,6 @@ FunctionEnd
 # --- Default section ---------------------------------------------------------
 
 Section "PulseView (required)" Section1
-
        # This section is gray (can't be disabled) in the component list.
        SectionIn RO
 
@@ -155,6 +164,7 @@ Section "PulseView (required)" Section1
        # Python
        File "${CROSS}/python34.dll"
        File "${CROSS}/python34.zip"
+       File "${CROSS}/*.pyd"
 
        SetOutPath "$INSTDIR\share"
 
@@ -178,6 +188,18 @@ Section "PulseView (required)" Section1
                0 SW_SHOWNORMAL \
                "" "Open-source, portable sigrok GUI"
 
+       # Create a shortcut for the PulseView application in "safe mode".
+       CreateShortCut "$SMPROGRAMS\sigrok\PulseView\PulseView (Safe Mode).lnk" \
+               "$INSTDIR\pulseview.exe" "-c -D" "$INSTDIR\pulseview.exe" \
+               0 SW_SHOWNORMAL \
+               "" "Open-source, portable sigrok GUI (Safe Mode)"
+
+       # Create a shortcut for the PulseView application running in debug mode.
+       CreateShortCut "$SMPROGRAMS\sigrok\PulseView\PulseView (Debug).lnk" \
+               "$INSTDIR\pulseview.exe" "-l 5" "$INSTDIR\pulseview.exe" \
+               0 SW_SHOWNORMAL \
+               "" "Open-source, portable sigrok GUI (debug log level)"
+
        # Create a shortcut for the uninstaller.
        CreateShortCut "$SMPROGRAMS\sigrok\PulseView\Uninstall PulseView.lnk" \
                "$INSTDIR\Uninstall.exe" "" "$INSTDIR\Uninstall.exe" 0 \
@@ -193,13 +215,17 @@ Section "PulseView (required)" Section1
                "$INSTDIR\zadig_xp.exe" "" "$INSTDIR\zadig_xp.exe" 0 \
                SW_SHOWNORMAL "" "Zadig (PulseView, Win XP)"
 
+       # Create shortcuts to the HTML and PDF manuals, respectively.
+       !InsertMacro "CreateURL" "PulseView HTML manual" "https://sigrok.org/doc/pulseview/@PV_MANUAL_VERSION@/manual.html" "PulseView HTML manual"
+       !InsertMacro "CreateURL" "PulseView PDF manual" "https://sigrok.org/doc/pulseview/@PV_MANUAL_VERSION@/manual.pdf" "PulseView PDF manual"
+
        # Create registry keys for "Add/remove programs" in the control panel.
        WriteRegStr HKLM "${REGSTR}" "DisplayName" "PulseView"
        WriteRegStr HKLM "${REGSTR}" "UninstallString" \
                "$\"$INSTDIR\Uninstall.exe$\""
        WriteRegStr HKLM "${REGSTR}" "InstallLocation" "$\"$INSTDIR$\""
        WriteRegStr HKLM "${REGSTR}" "DisplayIcon" \
-               "$\"$INSTDIR\sigrok-logo-notext.ico$\""
+               "$\"$INSTDIR\pulseview.ico$\""
        WriteRegStr HKLM "${REGSTR}" "Publisher" "sigrok"
        WriteRegStr HKLM "${REGSTR}" "HelpLink" \
                "http://sigrok.org/wiki/PulseView"
@@ -215,7 +241,6 @@ Section "PulseView (required)" Section1
        # Display "Remove" instead of "Modify/Remove" in the control panel.
        WriteRegDWORD HKLM "${REGSTR}" "NoModify" 1
        WriteRegDWORD HKLM "${REGSTR}" "NoRepair" 1
-
 SectionEnd
 
 Section /o "Example data" Section2
@@ -239,7 +264,7 @@ Section /o "Example data" Section2
        File "${CROSS}/share/sigrok-dumps/z80/kc85/kc85-20mhz.sr"
 
        # Create a shortcut for the example data folder.
-       CreateShortCut "$SMPROGRAMS\sigrok\PulseView\Examples.lnk" \
+       CreateShortCut "$SMPROGRAMS\sigrok\PulseView\Examples (PulseView).lnk" \
                "$INSTDIR\examples" "" "$INSTDIR\examples" 0 \
                SW_SHOWNORMAL "" ""
 SectionEnd
@@ -248,7 +273,6 @@ SectionEnd
 # --- Uninstaller section -----------------------------------------------------
 
 Section "Uninstall"
-
        # Always delete the uninstaller first (yes, this really works).
        Delete "$INSTDIR\Uninstall.exe"
 
@@ -259,6 +283,7 @@ Section "Uninstall"
        Delete "$INSTDIR\zadig_xp.exe"
        Delete "$INSTDIR\python34.dll"
        Delete "$INSTDIR\python34.zip"
+       Delete "$INSTDIR\*.pyd"
 
        # Delete all decoders and everything else in libsigrokdecode/.
        # There could be *.pyc files or __pycache__ subdirs and so on.
@@ -270,6 +295,10 @@ Section "Uninstall"
        # Delete the example *.sr files.
        RMDir /r "$INSTDIR\examples\*"
 
+       # Delete the URL files for the manual.
+       Delete "$INSTDIR\PulseView HTML manual.url"
+       Delete "$INSTDIR\PulseView PDF manual.url"
+
        # Delete the install directory and its sub-directories.
        RMDir "$INSTDIR\share"
        RMDir "$INSTDIR\examples"
@@ -277,9 +306,16 @@ Section "Uninstall"
 
        # Delete the links from the start menu.
        Delete "$SMPROGRAMS\sigrok\PulseView\PulseView.lnk"
+       Delete "$SMPROGRAMS\sigrok\PulseView\PulseView (Safe Mode).lnk"
+       Delete "$SMPROGRAMS\sigrok\PulseView\PulseView (Debug).lnk"
        Delete "$SMPROGRAMS\sigrok\PulseView\Uninstall PulseView.lnk"
        Delete "$SMPROGRAMS\sigrok\PulseView\Zadig (PulseView).lnk"
        Delete "$SMPROGRAMS\sigrok\PulseView\Zadig (PulseView, Win XP).lnk"
+       Delete "$SMPROGRAMS\sigrok\PulseView\Examples (PulseView).lnk"
+
+       # Delete the links to the manual.
+       Delete "$SMPROGRAMS\sigrok\PulseView\PulseView HTML manual.lnk"
+       Delete "$SMPROGRAMS\sigrok\PulseView\PulseView PDF manual.lnk"
 
        # Delete the sub-directory in the start menu.
        RMDir "$SMPROGRAMS\sigrok\PulseView"