From 0b34fecd023e6b2d2fd70e67c6c4f59bb06e299b Mon Sep 17 00:00:00 2001
From: Uwe Hermann <uwe@hermann-uwe.de>
Date: Fri, 4 Apr 2014 19:57:23 +0200
Subject: [PATCH] nsis: Drop embedded Python installer, ship local DLL and
 modules.

---
 contrib/sigrok-cli_cross.nsi.in | 33 +++++++--------------------------
 1 file changed, 7 insertions(+), 26 deletions(-)

diff --git a/contrib/sigrok-cli_cross.nsi.in b/contrib/sigrok-cli_cross.nsi.in
index d55f919..e7172bd 100644
--- a/contrib/sigrok-cli_cross.nsi.in
+++ b/contrib/sigrok-cli_cross.nsi.in
@@ -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"
@@ -131,7 +125,7 @@ Section "@PACKAGE_NAME@ (required)" Section1
 	# License file.
 	File "../COPYING"
 
-	# sigrok-cli.
+	# sigrok-cli.exe.
 	File "${CROSS}/bin/@PACKAGE_NAME@.exe"
 
 	# libusb0.dll (needed for libusb-0.1).
@@ -141,6 +135,10 @@ Section "@PACKAGE_NAME@ (required)" Section1
 	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/*"
@@ -203,23 +201,6 @@ Section "@PACKAGE_NAME@ (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"
@@ -233,6 +214,8 @@ Section "Uninstall"
 	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.
@@ -267,10 +250,8 @@ 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_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
 
-- 
2.30.2