feat(windows): create Keyman for Windows installer without buildpkg

Author: mcdurdin

docs/build/windows.md

@@ -101,7 +101,7 @@ Building:
 * Ant
 * Gradle
 * Maven
-* OpenJDK 11
+* Optional: OpenJDK 11 (https://learn.microsoft.com/en-us/java/openjdk/download)
 
 ```ps1
 # Elevated PowerShell
@@ -254,8 +254,8 @@ choco install openjdk
   choco install visualstudio2019community visualstudio2019-workload-nativedesktop visualstudio2019buildtools
   ```
   * Verify required build tools are installed
-    * Run `Visual Studio Installer` 
-    * Check the `Individual components` tab 
+    * Run `Visual Studio Installer`
+    * Check the `Individual components` tab
     * Verify `MSVC v142 - VS 2019 c++ x64/x86 build tools (Latest)` is installed. If not, install it.
 
   Recommended: configure Visual Studio to use two-space tab stops:

windows/src/desktop/inst/Makefile

@@ -28,11 +28,19 @@ prereq-resources:
     $(SIGNCODE) /d "Keyman Resources" desktop_resources.dll
 
 desktop: prereq
+    rem compile .msi
     $(MAKE) -fdownload.mak candle
     $(WIXLIGHT) -dWixUILicenseRtf=License.rtf -out keymandesktop.msi -ext WixUIExtension $(DESKTOP_FILES)
     $(SIGNCODE) /d "Keyman" keymandesktop.msi
-# TODO: replace buildpkg with kmc? Or promote it to developer?
-    $(ROOT)\bin\buildtools\buildpkg -m keymandesktop.msi -s $(ROOT)\bin\desktop -l license.html
+
+    rem build self-extracting archive
+    $(MAKE) -fdownload.mak setup-inf
+    $(WZZIP) keymandesktop.zip keymandesktop.msi license.html setup.inf
+    -del setup.inf
+    $(COPY) /b $(ROOT)\bin\desktop\setup-redist.exe + keymandesktop.zip keymandesktop.exe
+    -del keymandesktop.zip
+
+    rem sign and copy files
     $(SIGNCODE) /d "Keyman" keymandesktop.exe
     $(MAKE) -fdownload.mak copyredist-desktop
 
@@ -51,6 +59,8 @@ clean:
     -del /Q desktopui.wxs
     -del /Q cef.wxs
     -del /Q locale.wxs
+    -del keymandesktop.zip
+    -del setup.inf
 
 check:
     if not exist $(ROOT)\src\engine\inst\keymanengine.msm $(MAKE) check-engine

windows/src/desktop/inst/download.in

@@ -63,3 +63,15 @@ candle-locale:
 # locale files are in desktop/locale/*
   $(WIXHEAT) dir ..\kmshell\locale -o locale.wxs -ag -cg Locale -dr INSTALLDIR -var var.LOCALESOURCE -wx -nologo
   $(WIXCANDLE) -dVERSION=$VersionWin -dRELEASE=$VersionRelease -dPRODUCTID=$GUID1 -dLOCALESOURCE=..\kmshell\locale locale.wxs
+
+#
+# Build setup.inf
+#
+
+setup-inf:
+  echo [Setup] > setup.inf
+  echo Version=$VersionWin >> setup.inf
+  echo MSIFileName=keymandesktop.msi >> setup.inf
+  echo MSIOptions= >> setup.inf
+  echo License=license.html >> setup.inf
+  echo [Packages] >> setup.inf