Restore the default of "pulseview foo.sr" opening the file.

[pulseview.git] / contrib / pulseview_cross.nsi

diff --git a/contrib/pulseview_cross.nsi b/contrib/pulseview_cross.nsi
index c674be794480d767a1029697b1b47829ce2f1f06..a550d50bc066066eabc058a6b2d38392a2ba97c4 100644 (file)
--- a/contrib/pulseview_cross.nsi
+++ b/contrib/pulseview_cross.nsi
@@ -38,7 +38,7 @@
 Name "PulseView"
 
 # Filename of the installer executable.
-OutFile "pulseview-0.1.0-installer.exe"
+OutFile "pulseview-0.2.0-installer.exe"
 
 # Where to install the application.
 InstallDir "$PROGRAMFILES\sigrok\PulseView"
@@ -128,10 +128,7 @@ Section "PulseView (required)" Section1
        # PulseView (statically linked, includes all libs).
        File "${CROSS}/bin/pulseview.exe"
 
-       # libusb0.dll (needed for libusb-0.1).
-       File "${CROSS}/libusb0.dll"
-
-       # Zadig (used for installing libusb-win32 and WinUSB drivers).
+       # Zadig (used for installing WinUSB drivers).
        File "${CROSS}/zadig.exe"
        File "${CROSS}/zadig_xp.exe"
 
@@ -170,6 +167,16 @@ Section "PulseView (required)" Section1
                "$INSTDIR\Uninstall.exe" "" "$INSTDIR\Uninstall.exe" 0 \
                SW_SHOWNORMAL "" "Uninstall PulseView"
 
+       # Create a shortcut for the Zadig executable.
+       CreateShortCut "$SMPROGRAMS\sigrok\PulseView\Zadig.lnk" \
+               "$INSTDIR\zadig.exe" "" "$INSTDIR\zadig.exe" 0 \
+               SW_SHOWNORMAL "" "Zadig"
+
+       # Create a shortcut for the Zadig executable (for Win XP).
+       CreateShortCut "$SMPROGRAMS\sigrok\PulseView\Zadig (Win XP).lnk" \
+               "$INSTDIR\zadig_xp.exe" "" "$INSTDIR\zadig_xp.exe" 0 \
+               SW_SHOWNORMAL "" "Zadig (Win XP)"
+
        # Create registry keys for "Add/remove programs" in the control panel.
        WriteRegStr HKLM "${REGSTR}" "DisplayName" "PulseView"
        WriteRegStr HKLM "${REGSTR}" "UninstallString" \
@@ -183,7 +190,7 @@ Section "PulseView (required)" Section1
        WriteRegStr HKLM "${REGSTR}" "URLUpdateInfo" \
                "http://sigrok.org/wiki/Downloads"
        WriteRegStr HKLM "${REGSTR}" "URLInfoAbout" "http://sigrok.org"
-       WriteRegStr HKLM "${REGSTR}" "DisplayVersion" "0.1.0"
+       WriteRegStr HKLM "${REGSTR}" "DisplayVersion" "0.2.0"
        WriteRegStr HKLM "${REGSTR}" "Contact" \
                "sigrok-devel@lists.sourceforge.org"
        WriteRegStr HKLM "${REGSTR}" "Comments" \
@@ -206,7 +213,6 @@ Section "Uninstall"
        # Delete the application, the application data, and related libs.
        Delete "$INSTDIR\COPYING"
        Delete "$INSTDIR\pulseview.exe"
-       Delete "$INSTDIR\libusb0.dll"
        Delete "$INSTDIR\zadig.exe"
        Delete "$INSTDIR\zadig_xp.exe"
        Delete "$INSTDIR\python32.dll"
@@ -231,6 +237,8 @@ Section "Uninstall"
        # Delete the links from the start menu.
        Delete "$SMPROGRAMS\sigrok\PulseView\PulseView.lnk"
        Delete "$SMPROGRAMS\sigrok\PulseView\Uninstall.lnk"
+       Delete "$SMPROGRAMS\sigrok\PulseView\Zadig.lnk"
+       Delete "$SMPROGRAMS\sigrok\PulseView\Zadig (Win XP).lnk"
 
        # Delete the sub-directory in the start menu.
        RMDir "$SMPROGRAMS\sigrok\PulseView"