Update Windows release process, version 1.1.1

Author: ocdtrekkie

CHANGELOG.md

@@ -1,3 +1,7 @@
+### v1.1.1 (2021-04-19)
+- Updated Windows build to Python 3.8.9.
+- No longer includes ssh.exe in Windows release.
+
 ### v1.1 (2021-04-10)
 - Upgraded vagrant-spk to Python 3.x. (Thanks @troyjfarrell)
 - Upgraded base image to Debian Buster.

vagrant-spk

@@ -23,7 +23,7 @@
 from __future__ import print_function
 
 # TODO(someday): Increment version number and commit as part of release.sh
-__version__ = "v1.1"
+__version__ = "v1.1.1"
 
 import argparse
 import os

windows-support/Makefile

@@ -19,7 +19,7 @@ state:
 	mkdir -p state
 
 vendor/python.exe: | vendor state/wineprefix
-	wget https://www.python.org/ftp/python/3.6.1/python-3.6.1.exe -O vendor/python.exe
+	wget https://www.python.org/ftp/python/3.8.9/python-3.8.9.exe -O vendor/python.exe
 	touch vendor/python.exe
 
 vendor/python.exe.installed: | vendor/python.exe
@@ -28,11 +28,11 @@ vendor/python.exe.installed: | vendor/python.exe
 	touch vendor/python.exe.installed
 
 state/pyinstaller.installed: | vendor/python.exe.installed
-	$(WINEARGS) $(WINE) 'c:/Program Files (x86)/Python36-32/python.exe' -m pip install pyinstaller==3.4
+	$(WINEARGS) $(WINE) 'c:/Program Files (x86)/Python38-32/python.exe' -m pip install pyinstaller
 	touch state/pyinstaller.installed
 
 dist/vagrant-spk.exe: ../vagrant-spk | state/pyinstaller.installed
-	$(WINEARGS) $(WINE) 'c:/Program Files (x86)/Python36-32/Scripts/pyinstaller' -F ../vagrant-spk
+	$(WINEARGS) $(WINE) 'c:/Program Files (x86)/Python38-32/Scripts/pyinstaller' -F ../vagrant-spk
 
 vendor/innosetup.exe: | vendor
 	wget 'http://www.jrsoftware.org/download.php/is.exe?site=1' -O vendor/innosetup.exe
@@ -44,19 +44,12 @@ vendor/innosetup.exe.installed: | state/wineprefix vendor/innosetup.exe
 state/version.iss: ../vagrant-spk
 	../vagrant-spk --version | sed -e 's,vagrant-spk ,,' | xargs printf '#define MyAppVersion "%s"\n' > state/version.iss
 
-dist/innosetup/vagrant-spk-setup.exe: dist/vagrant-spk.exe | vendor/innosetup.exe.installed vendor/msysgit.7z vendor/msysgit/bin state/version.iss
+dist/innosetup/vagrant-spk-setup.exe: dist/vagrant-spk.exe | vendor/innosetup.exe.installed state/version.iss
 	# Some WINE installs are seemingly 64-bit but install InnoSetup to Program Files, not
 	# Program Files (x86). We work around this with a symlink.
 	if [ ! -d 'state/wineprefix/drive_c/Program Files (x86)' ] ; then ln -s 'Program Files' 'state/wineprefix/drive_c/Program Files (x86)' ; fi
 	$(WINEARGS) $(WINE) 'c:/program files (x86)/inno setup 6/iscc.exe' windows-installer.iss
 
-vendor/msysgit.7z:
-	wget https://github.com/msysgit/msysgit/releases/download/Git-1.9.5-preview20150319/PortableGit-1.9.5-preview20150319.7z -O vendor/msysgit.7z
-
-vendor/msysgit/bin:
-	mkdir -p vendor/msysgit
-	(cd vendor/msysgit ; 7z e -aoa ../msysgit.7z)
-
 state/regdata: | state
 	printf '[HKEY_CURRENT_USER\\Software\\Wine\\WineDbg]\n"ShowCrashDialog"=dword:00000000\n' > state/regdata
 

windows-support/windows-installer.iss

@@ -44,15 +44,11 @@ Source: "..\stacks\*"; DestDir: "{app}\stacks"; Flags: recursesubdirs
 ; "helpers" - right now just the enter_grain binary and its sha1
 Source: "..\helpers\*"; DestDir: "{app}\helpers"; Flags: recursesubdirs
 
-; ssh binary + required DLLs, so that `vagrant ssh` can work
-Source: "vendor\msysgit\ssh.exe"; DestDir: "{app}"; Flags: ignoreversion
-Source: "vendor\msysgit\msys-crypto-1.0.0.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "vendor\msysgit\msys-minires.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "vendor\msysgit\msys-1.0.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "vendor\msysgit\msys-z.dll"; DestDir: "{app}"; Flags: ignoreversion
-
 ; NOTE: Don't use "Flags: ignoreversion" on any shared system files
 
+[InstallDelete]
+Type: files; Name: "{app}\ssh.exe"
+
 [Code]
 const
 	ModPathName = 'modifypath';