X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=contrib%2Fpulseview_cross.nsi;h=ed2f317158ce5a9737616cb8732dc6e94545c252;hp=d59b47872d9754f7dbf90fade8e188c78422ce0c;hb=d64796ed321a9c755e7426be47359aeca1d1173c;hpb=d8823c8cc5eb8539ec4dc087539f531fea421429

diff --git a/contrib/pulseview_cross.nsi b/contrib/pulseview_cross.nsi
index d59b4787..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,18 +128,26 @@ Section "PulseView (required)" Section1
 	# PulseView (statically linked, includes all libs).
 	File "${CROSS}/bin/pulseview.exe"
 
-	# Install the file(s) specified below into the specified directory.
-	SetOutPath "$INSTDIR\decoders"
+	# 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/*"
 
-	# Install the file(s) specified below into the specified directory.
-	SetOutPath "$INSTDIR\firmware"
-
 	# Firmware files.
+	SetOutPath "$INSTDIR\firmware"
 	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"
 
@@ -154,6 +156,7 @@ Section "PulseView (required)" Section1
 	CreateDirectory "$SMPROGRAMS\sigrok\PulseView"
 
 	# Create a shortcut for the PulseView application.
+	SetOutPath "$INSTDIR"
 	CreateShortCut "$SMPROGRAMS\sigrok\PulseView\PulseView.lnk" \
 		"$INSTDIR\pulseview.exe" "" "$INSTDIR\pulseview.exe" \
 		0 SW_SHOWNORMAL \
@@ -177,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" \
@@ -190,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"
@@ -217,17 +203,25 @@ Section "Uninstall"
 	# Delete the application, the application data, and related libs.
 	Delete "$INSTDIR\COPYING"
 	Delete "$INSTDIR\pulseview.exe"
+	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.
 	RMDir /r "$INSTDIR\decoders\*"
 
 	# Delete the firmware files.
-	File /r "$INSTDIR\firmware\*"
+	RMDir /r "$INSTDIR\firmware\*"
+
+	# Delete the example *.sr files.
+	RMDir /r "$INSTDIR\examples\*"
 
 	# Delete the install directory and its sub-directories.
 	RMDir "$INSTDIR\decoders"
 	RMDir "$INSTDIR\firmware"
+	RMDir "$INSTDIR\examples"
 	RMDir "$INSTDIR"
 
 	# Delete the links from the start menu.
@@ -246,11 +240,9 @@ SectionEnd
 
 # --- Component selection section descriptions --------------------------------
 
-LangString DESC_Section1 ${LANG_ENGLISH} "This installs the PulseView sigrok GUI."
-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."
+LangString DESC_Section1 ${LANG_ENGLISH} "This installs the PulseView sigrok GUI, some firmware files, the protocol decoders, some example files, and all required libraries."
 
 !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
 !insertmacro MUI_DESCRIPTION_TEXT ${Section1} $(DESC_Section1)
-!insertmacro MUI_DESCRIPTION_TEXT ${Section2} $(DESC_Section2)
 !insertmacro MUI_FUNCTION_DESCRIPTION_END