X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=contrib%2Fpulseview_cross.nsi;h=ed2f317158ce5a9737616cb8732dc6e94545c252;hp=3c4b355c1004edef40a1c4dcc07a152f8df09b48;hb=88fc05658247e71b8a3bfa8871d74bf923026f73;hpb=95052d708bdce348996e9c77de7ee6ba2c1746e1

diff --git a/contrib/pulseview_cross.nsi b/contrib/pulseview_cross.nsi
index 3c4b355c..ed2f3171 100644
--- 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"
@@ -70,12 +70,6 @@ RequestExecutionLevel admin
 !define MUI_LICENSEPAGE_BUTTON $(^NextBtn)
 !define MUI_LICENSEPAGE_TEXT_BOTTOM "Click Next to continue."
 
-# File name of the Python installer MSI file.
-!define PY_INST "python-3.2.3.msi"
-
-# Standard install path of the Python installer (do not change!).
-!define PY_BIN "c:\Python32"
-
 # Path where the cross-compiled sigrok tools and libraries are located.
 # Change this to where-ever you installed libsigrok.a and so on.
 !define CROSS "$%HOME%/sr_mingw"
@@ -134,13 +128,14 @@ 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"
 
+	# Python
+	File "${CROSS}/python32.dll"
+	File "${CROSS}/python32.zip"
+
 	# Protocol decoders.
 	SetOutPath "$INSTDIR\decoders"
 	File /r /x "__pycache__" "${CROSS}/share/libsigrokdecode/decoders/*"
@@ -185,7 +180,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" \
@@ -198,23 +193,6 @@ Section "PulseView (required)" Section1
 SectionEnd
 
 
-# --- Python installer section ------------------------------------------------
-
-Section "Python" Section2
-
-	# Copy the Python installer MSI file into the temporary directory.
-	SetOutPath "$TEMP"
-	File "${CROSS}/${PY_INST}"
-
-	# Run the Python installer MSI file from within our installer.
-	ExecWait '"msiexec" /i "$TEMP\${PY_INST}" /QB- /passive ALLUSERS=1'
-
-	# Remove Python installer MSI file again.
-	Delete "$TEMP\${PY_INST}"
-
-SectionEnd
-
-
 # --- Uninstaller section -----------------------------------------------------
 
 Section "Uninstall"
@@ -225,9 +203,10 @@ 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"
+	Delete "$INSTDIR\python32.zip"
 
 	# Delete all decoders and everything else in decoders/.
 	# There could be *.pyc files or __pycache__ subdirs and so on.
@@ -262,10 +241,8 @@ SectionEnd
 # --- Component selection section descriptions --------------------------------
 
 LangString DESC_Section1 ${LANG_ENGLISH} "This installs the PulseView sigrok GUI, 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
 !insertmacro MUI_DESCRIPTION_TEXT ${Section1} $(DESC_Section1)
-!insertmacro MUI_DESCRIPTION_TEXT ${Section2} $(DESC_Section2)
 !insertmacro MUI_FUNCTION_DESCRIPTION_END