electron-userland · beyondkmp · Feb 1, 2023 · Jul 26, 2024 · Jul 26, 2024 · Jul 26, 2024
diff --git a/Squirrel.Windows/7z-arm64.dll b/Squirrel.Windows/7z-arm64.dll
diff --git a/Squirrel.Windows/7z-arm64.exe b/Squirrel.Windows/7z-arm64.exe
diff --git a/Squirrel.Windows/7z-x64.dll b/Squirrel.Windows/7z-x64.dll
diff --git a/Squirrel.Windows/7z-x64.exe b/Squirrel.Windows/7z-x64.exe
diff --git a/Squirrel.Windows/Microsoft.Deployment.Resources.dll b/Squirrel.Windows/Microsoft.Deployment.Resources.dll
diff --git a/Squirrel.Windows/Microsoft.Deployment.WindowsInstaller.dll b/Squirrel.Windows/Microsoft.Deployment.WindowsInstaller.dll
diff --git a/Squirrel.Windows/Setup.exe b/Squirrel.Windows/Setup.exe
diff --git a/Squirrel.Windows/Setup.pdb b/Squirrel.Windows/Setup.pdb
diff --git a/Squirrel.Windows/Squirrel-Mono.exe b/Squirrel.Windows/Squirrel-Mono.exe
diff --git a/Squirrel.Windows/Squirrel-Mono.pdb b/Squirrel.Windows/Squirrel-Mono.pdb
diff --git a/Squirrel.Windows/Update.com → Squirrel.Windows/Squirrel.com b/Squirrel.Windows/Update.com → Squirrel.Windows/Squirrel.com
diff --git a/Squirrel.Windows/Squirrel.exe b/Squirrel.Windows/Squirrel.exe
diff --git a/Squirrel.Windows/Squirrel.pdb b/Squirrel.Windows/Squirrel.pdb
diff --git a/Squirrel.Windows/StubExecutable.exe b/Squirrel.Windows/StubExecutable.exe
diff --git a/Squirrel.Windows/SyncReleases.exe b/Squirrel.Windows/SyncReleases.exe
diff --git a/Squirrel.Windows/SyncReleases.pdb b/Squirrel.Windows/SyncReleases.pdb
diff --git a/Squirrel.Windows/Update-Mono.exe b/Squirrel.Windows/Update-Mono.exe
diff --git a/Squirrel.Windows/Update-Mono.pdb b/Squirrel.Windows/Update-Mono.pdb
diff --git a/Squirrel.Windows/Update.exe b/Squirrel.Windows/Update.exe
diff --git a/Squirrel.Windows/Update.pdb b/Squirrel.Windows/Update.pdb
diff --git a/Squirrel.Windows/WixNetFxExtension.dll b/Squirrel.Windows/WixNetFxExtension.dll
diff --git a/Squirrel.Windows/WriteZipToSetup.exe b/Squirrel.Windows/WriteZipToSetup.exe
diff --git a/Squirrel.Windows/WriteZipToSetup.pdb b/Squirrel.Windows/WriteZipToSetup.pdb
diff --git a/Squirrel.Windows/candle.exe b/Squirrel.Windows/candle.exe
diff --git a/Squirrel.Windows/darice.cub b/Squirrel.Windows/darice.cub
diff --git a/Squirrel.Windows/install-spinner.gif b/Squirrel.Windows/install-spinner.gif
diff --git a/Squirrel.Windows/light.exe b/Squirrel.Windows/light.exe
diff --git a/Squirrel.Windows/nuget.exe b/Squirrel.Windows/nuget.exe
diff --git a/Squirrel.Windows/rcedit.exe b/Squirrel.Windows/rcedit.exe
diff --git a/Squirrel.Windows/signtool.exe b/Squirrel.Windows/signtool.exe
diff --git a/Squirrel.Windows/template.wxs b/Squirrel.Windows/template.wxs
@@ -1,31 +1,32 @@
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension" xmlns:netfx="http://schemas.microsoft.com/wix/NetFxExtension">
-  <Product Id="*" Name="{{Title}} Machine-Wide Installer" Language="1033" Version="{{Version}}" UpgradeCode="{{IdAsGuid1}}" Manufacturer="{{Author}}">
+  <Product Id="*" Name="{{Title}} Deployment Tool" Language="1033" Codepage="{{Codepage}}" Version="!(bind.FileVersion.{{Id}}.exe)" UpgradeCode="{{IdAsGuid1}}" Manufacturer="{{Author}}">
 
-    <Package Description="#Description" Comments="Comments" InstallerVersion="200" Compressed="yes"/>
-		<Media Id="1" Cabinet="contents.cab" EmbedCab="yes" CompressionLevel="high"/>
+    <Package Description="This package installs a deployment tool for {{Title}}. Not {{Title}} itself. {{Title}} is only installed if a user logs into the machine." InstallScope="perMachine" Comments="Comments" InstallerVersion="200" Compressed="yes" Platform="{{Platform}}"/>
+    <MajorUpgrade AllowSameVersionUpgrades="yes" DowngradeErrorMessage="A later version of this product is already installed. Setup will now exit."/>
+    <Media Id="1" Cabinet="contents.cab" EmbedCab="yes" CompressionLevel="high"/>
 
     <PropertyRef Id="NETFRAMEWORK45" />
 
-    <Condition Message="This application requires .NET Framework 4.5. Please install the .NET Framework then run this installer again.">
+    <Condition Message="This application requires .NET Framework 4.5 or higher. Please install the latest .NET Framework then run this installer again.">
       <![CDATA[Installed OR NETFRAMEWORK45]]>
     </Condition>
 
     <Directory Id="TARGETDIR" Name="SourceDir">
-      <Directory Id="ProgramFilesFolder">
-        <Directory Id="APPLICATIONROOTDIRECTORY" Name="{{Title}} Installer" />
+      <Directory Id="{{ProgramFilesFolder}}">
+        <Directory Id="APPLICATIONROOTDIRECTORY" Name="{{Title}} Deployment" />
       </Directory>
     </Directory>
 
     <DirectoryRef Id="APPLICATIONROOTDIRECTORY">
-      <Component Id="{{Id}}.exe" Guid="{{IdAsGuid2}}">
-        <File Id="{{Id}}.exe" Name="{{Id}}.exe" Source="{{SetupExecutable}}" KeyPath="yes" />
+      <Component Id="{{Id}}.exe" Guid="{{IdAsGuid2}}" Win64="{{Win64YesNo}}">
+        <File Id="{{Id}}.exe" Name="{{Id}}DeploymentTool.exe" Source="./Setup.exe" KeyPath="yes"/>
       </Component>
     </DirectoryRef>
 
     <DirectoryRef Id="TARGETDIR">
-      <Component Id="RegistryEntries" Guid="{{IdAsGuid3}}">
+      <Component Id="RegistryEntries" Guid="{{IdAsGuid3}}" Win64="{{Win64YesNo}}">
         <RegistryKey Root="HKLM" Key="SOFTWARE\Microsoft\Windows\CurrentVersion\Run">
-          <RegistryValue Type="expandable" Name="{{Id}}MachineInstaller" Value="%ProgramFiles%\{{Title}} Installer\{{Id}}.exe --checkInstall" />
+          <RegistryValue Type="expandable" Name="{{Id}}Deployment" Value="&quot;[#{{Id}}.exe]&quot; --checkInstall" />
         </RegistryKey>
       </Component>
     </DirectoryRef>

diff --git a/Squirrel.Windows/wconsole.dll b/Squirrel.Windows/wconsole.dll
diff --git a/Squirrel.Windows/winterop.dll b/Squirrel.Windows/winterop.dll
diff --git a/Squirrel.Windows/wix.dll b/Squirrel.Windows/wix.dll
diff --git a/wine/wine-mac-ia32-and-x64.sh b/wine/wine-mac-ia32-and-x64.sh
@@ -4,19 +4,20 @@ set -ex
 # Issues with FreeType (works, but list of warnings), in any case 1) we need to bundle also Net framework as part of wine home 2) no need to ia32+x64, to reduce size, the only arch should be used
 # So, for now our existing wine 2.0.3 is used on macOS
 
-rm -rf /tmp/wine-stage
-mkdir -p /tmp/wine-stage/wine
-cd /tmp/wine-stage/wine
+TMP_WINE=/tmp/wine-stage-all
+rm -rf $TMP_WINE
+mkdir -p $TMP_WINE/wine
+cd $TMP_WINE/wine
 
-WINE_VERSION=4.0.1
+WINE_VERSION=5.0
 curl https://dl.winehq.org/wine-builds/macosx/pool/portable-winehq-stable-$WINE_VERSION-osx64.tar.gz | tar xz
 
-cd usr
+cd $TMP_WINE/wine/usr
 
 unlink bin/wine
 
 # prepare wine home
-WINEPREFIX=/tmp/wine-stage/wine/usr/wine-home WINEARCH=win64 ./bin/wineboot --init
+WINEPREFIX=$TMP_WINE/wine/usr/wine-home WINEARCH=win64 ./bin/wineboot --init
 
 rm -rf share/man
 rm -rf share/doc

diff --git a/wine/wine-only-x64.sh b/wine/wine-only-x64.sh
@@ -1,15 +1,15 @@
 #!/usr/bin/env bash
-set -e
+set -ex
 
 # custom homebrew prefix and DYLD_FALLBACK_LIBRARY_PATH doesn't work due to unknown reasons on Travis
 # homebrew bottle and DYLD_FALLBACK_LIBRARY_PATH doesn't work due to not found library on Travis
 # so, we just build it without brew http://mybyways.com/blog/compiling-wine-from-scratch-on-macos-with-retina-mode
 # also, we build very minimal wine (~ 15 MB compressed)
 
-WINE_VERSION=3.0.3
+WINE_VERSION=5.0
 LIBPNG_VERSION=1.6.35
 # 2.8.1 leads to error - https://forums.gentoo.org/viewtopic-p-8119832.html
-FREETYPE_VERSION=2.9.1
+FREETYPE_VERSION=2.13.2
 
 rm -rf /tmp/wine-stage
 mkdir -p /tmp/wine-stage/wine