Switch the Windows package to 64-bit Ruby 3.1.2. (#415)

* Switch the Windows package to Ruby 3.1.2 as well. * Use the 64-bit Ruby build. * Use a newer version of grpc on Windows. * Add missing Windows runtime dependency. * Use the locate NSIS plugin to speed up GetSize. Also use https URLs for all NSIS downloads.
GoogleCloudPlatform · Jul 4, 2023 · a002a42 · a002a42
1 parent 2b93624
commit a002a42
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 16 deletions.
diff --git a/core_gems.rb b/core_gems.rb
@@ -9,8 +9,5 @@
 download "oj", "3.3.10"
 download "tzinfo", "1.2.2"
 download "tzinfo-data", "1.2016.5"
-unless windows?
-  # Gems that don't need to be fetched explicitly on Windows.
-  fetch "google-protobuf", "3.22.1"
-  fetch "grpc", "1.52.0"
-end
+fetch "google-protobuf", "3.22.1"
+fetch "grpc", "1.52.0"
diff --git a/plugin_gems.rb b/plugin_gems.rb
@@ -35,6 +35,7 @@
   download "win32-event", "0.6.3"
   download "win32-eventlog", "0.6.7"
   download "win32-service", "2.1.5"
+  download "certstore_c", "0.1.7"
   download "fluent-plugin-windows-eventlog", "0.8.0"
   download "nokogiri", "1.10.10"
   download "fluent-plugin-parser-winevt_xml", "0.2.2"

diff --git a/windows-installer/generate_sdl_agent_exe.ps1 b/windows-installer/generate_sdl_agent_exe.ps1
@@ -39,16 +39,21 @@ Set-PSDebug -Trace 1
 $SD_LOGGING_AGENT_DIR = $BASE_INSTALLER_DIR + "\GoogleStackdriverLoggingAgent"
 
 # The ruby dev kit location.  This is not needed in the final package.
-$RUBY_DEV_DIR = $SD_LOGGING_AGENT_DIR + "\msys32"
+$RUBY_DEV_DIR = $SD_LOGGING_AGENT_DIR + "\msys64"
 
 # The NSIS location.  Used to compile the Stackdriver Logging Agent installer.
 $NSIS_DIR = $BASE_INSTALLER_DIR + "\NSIS"
 
 # The location of the NSIS plugin to unzip files.
 $NSIS_UNZU_DIR = $BASE_INSTALLER_DIR + "\NSISunzU"
 
-# The location for unicode plugins for NSIS.
-$NSIS_UNICODE_PLUGIN_DIR = $NSIS_DIR + "\Plugins\x86-unicode"
+# The location of the NSIS plugin to compute directory sizes.
+$NSIS_LOCATE_DIR = $BASE_INSTALLER_DIR + "\NSISlocate"
+
+# The locations for plugins for NSIS.
+$NSIS_INCLUDE_DIR = $NSIS_DIR + "\Include"
+$NSIS_PLUGIN_DIR = $NSIS_DIR + "\Plugins"
+$NSIS_UNICODE_PLUGIN_DIR = $NSIS_PLUGIN_DIR + "\x86-unicode"
 
 
 ##############################
@@ -59,12 +64,14 @@ $NSIS_UNICODE_PLUGIN_DIR = $NSIS_DIR + "\Plugins\x86-unicode"
 $RUBY_INSTALLER = $SD_LOGGING_AGENT_DIR + "\rubyinstaller.exe"
 $NSIS_INSTALLER = $BASE_INSTALLER_DIR + "\nsisinstaller.exe"
 $NSIS_UNZU_ZIP = $BASE_INSTALLER_DIR + "\NSISunzU.zip"
+$NSIS_LOCATE_ZIP = $BASE_INSTALLER_DIR + "\NSISlocate.zip"
 
 
 # Links for each installer.
-$RUBY_INSTALLER_LINK = "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-3.1.3-1/rubyinstaller-devkit-3.1.3-1-x86.exe"
-$NSIS_INSTALLER_LINK = "http://downloads.sourceforge.net/project/nsis/NSIS%203/3.0/nsis-3.0-setup.exe"
-$NSIS_UNZU_INSTALLER_LINK = "http://nsis.sourceforge.net/mediawiki/images/5/5a/NSISunzU.zip"
+$RUBY_INSTALLER_LINK = "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-3.1.2-1/rubyinstaller-devkit-3.1.2-1-x64.exe"
+$NSIS_INSTALLER_LINK = "https://downloads.sourceforge.net/project/nsis/NSIS%203/3.0/nsis-3.0-setup.exe"
+$NSIS_UNZU_INSTALLER_LINK = "https://nsis.sourceforge.io/mediawiki/images/5/5a/NSISunzU.zip"
+$NSIS_LOCATE_INSTALLER_LINK = "https://nsis.sourceforge.io/mediawiki/images/a/af/Locate.zip"
 
 
 ##############################
@@ -85,6 +92,10 @@ $NSIS_MAKE = $NSIS_DIR + "\makensis.exe"
 # The location of the dll of the plugin to unzip files in an NSIS installer.
 $NSIS_UNZU_DLL = $NSIS_UNZU_DIR + "\NSISunzU\Plugin unicode\nsisunz.dll"
 
+# The location of the dll/include of the plugin to compute directory sizes in an NSIS installer.
+$NSIS_LOCATE_DLL = $NSIS_LOCATE_DIR + "\Plugin\locate.dll"
+$NSIS_LOCATE_INCLUDE = $NSIS_LOCATE_DIR + "\Include\Locate.nsh"
+
 # Output location of the zip compliled into the installer. It will place where ever
 # this script it run from.
 $STACKDRIVER_ZIP = $PSScriptRoot + "\GoogleStackdriverLoggingAgent.zip"
@@ -102,6 +113,8 @@ rm -r -Force $SD_LOGGING_AGENT_DIR -ErrorAction Ignore
 mkdir $SD_LOGGING_AGENT_DIR
 rm -r -Force $NSIS_UNZU_DIR -ErrorAction Ignore
 mkdir $NSIS_UNZU_DIR
+rm -r -Force $NSIS_LOCATE_DIR -ErrorAction Ignore
+mkdir $NSIS_LOCATE_DIR
 
 
 ##############################
@@ -116,6 +129,7 @@ $ProgressPreference = "silentlyContinue"
 Invoke-WebRequest "$RUBY_INSTALLER_LINK" -OutFile "$RUBY_INSTALLER" -UserAgent "curl/7.60.0"
 Invoke-WebRequest "$NSIS_INSTALLER_LINK" -OutFile "$NSIS_INSTALLER" -UserAgent "curl/7.60.0"
 Invoke-WebRequest "$NSIS_UNZU_INSTALLER_LINK" -OutFile "$NSIS_UNZU_ZIP" -UserAgent "curl/7.60.0"
+Invoke-WebRequest "$NSIS_LOCATE_INSTALLER_LINK" -OutFile "$NSIS_LOCATE_ZIP" -UserAgent "curl/7.60.0"
 # Re-enable tracing.
 Set-PSDebug -Trace 1
 
@@ -195,7 +209,7 @@ $replacement = (Get-Content $replacement_file) -join("`r`n")
 ##############################
 # Save the C++ runtime DLL to allow running gems with C++ native extensions
 # such as winevt_c.
-$libstd_cpp_dll = $RUBY_DEV_DIR + "\mingw32\bin\libstdc++-6.dll"
+$libstd_cpp_dll = $RUBY_DEV_DIR + "\ucrt64\bin\libstdc++-6.dll"
 cp $libstd_cpp_dll $SD_LOGGING_AGENT_DIR\bin
 
 
@@ -224,8 +238,13 @@ Add-Type -Assembly System.IO.Compression.FileSystem
 # Unpack the nsis unzip plugin.
 [System.IO.Compression.ZipFile]::ExtractToDirectory($NSIS_UNZU_ZIP, $NSIS_UNZU_DIR)
 
-# Copy the needed DLL from the NSIS plugin into the NSIS pluging directory.
+# Unpack the nsis locate plugin.
+[System.IO.Compression.ZipFile]::ExtractToDirectory($NSIS_LOCATE_ZIP, $NSIS_LOCATE_DIR)
+
+# Copy the needed DLLs from the NSIS plugins into the NSIS plugins directory.
 cp $NSIS_UNZU_DLL $NSIS_UNICODE_PLUGIN_DIR
+cp $NSIS_LOCATE_DLL $NSIS_UNICODE_PLUGIN_DIR
+cp $NSIS_LOCATE_INCLUDE $NSIS_INCLUDE_DIR
 
 
 ##############################

diff --git a/windows-installer/setup.nsi b/windows-installer/setup.nsi
@@ -86,7 +86,7 @@ RequestExecutionLevel admin
 ;--------------------------------
 
 ; General includes.
-!include "FileFunc.nsh" ; Needed for GetSize
+!include "Locate.nsh" ; Needed for GetSize
 !include "StrFunc.nsh" ; Needed for StrTrimNewLines and StrRep
 !include "WordFunc.nsh" ; Needed for WordFind
 
@@ -264,9 +264,9 @@ Section "Install"
 
   ; Get the size of the install directory.  This is used to give a proper estimate
   ; in the add/remove programs menu.
-  ; "/S=0K" Gets the size in KB
+  ; "/S=Kb" Gets the size in KB
   ; $0 = size, $1 = number of files, $2 = number of directories.
-  ${GetSize} "$INSTDIR" "/S=0K" $0 $1 $2
+  ${locate::GetSize} "$INSTDIR" "/S=Kb" $0 $1 $2
 
   ; Register the software so it will appear in the add/remove programs menu.
   ${Print} "Registering ${DISPLAY_NAME}..."