Better install logging

Author: ndabas

build.ps1

@@ -146,13 +146,6 @@ if (-not (Test-Path $MSYS2Path)) {
   exec { & .\downloads\msys2.exe -y "-o$(Resolve-Path (Split-Path $MSYS2Path -Parent))" }
 }
 
-if (-not (Test-Path build\NSIS)) {
-  Write-Host 'Extracting NSIS'
-  Expand-Archive '.\downloads\nsis.zip' -DestinationPath '.\build'
-  Rename-Item (Resolve-Path '.\build\nsis-*').Path 'NSIS'
-  Expand-Archive '.\downloads\nsis-log.zip' -DestinationPath '.\build\NSIS' -Force
-}
-
 function sign {
   param ([string[]] $filesToSign)
 
@@ -257,7 +250,7 @@ Name "`${TITLE}"
 Caption "`${TITLE}"
 XPStyle on
 ManifestDPIAware true
-Unicode True
+Unicode true
 SetCompressor $Compression
 RequestExecutionLevel admin
 
@@ -391,6 +384,8 @@ $($componentSelection ? '!insertmacro MUI_PAGE_COMPONENTS' : '')
 
 !insertmacro MUI_LANGUAGE "English"
 
+!include "packages\pico-setup-windows\DumpLog.nsh"
+
 Function .onInit
 
   StrCpy `$ReposDir "`${PICO_REPOS_DIR}"
@@ -416,9 +411,7 @@ FunctionEnd
 
 Section
 
-  ; Make sure that `$INSTDIR exists before enabling logging
   SetOutPath `$INSTDIR
-  LogSet on
 
   $(if ($bitness -eq '64') {
   '${IfNot} ${IsNativeAMD64}
@@ -562,6 +555,7 @@ Section "-Pico environment" SecPico
   `${IfNot} `${FileExists} "`$1"
     # Just use the default install location for the icon, in case the user installs VS Code later
     StrCpy `$1 "%LOCALAPPDATA%\Programs\Microsoft VS Code\Code.exe"
+    DetailPrint "Could not find Visual Studio Code."
     MessageBox MB_OK|MB_ICONEXCLAMATION "Installation of Visual Studio Code failed. Please install it manually by downloading the installer from:${endl}${endl}https://code.visualstudio.com/" /SD IDOK
   `${EndIf}
 

packages/pico-setup-windows/DumpLog.nsh

@@ -0,0 +1,31 @@
+; Based on https://nsis.sourceforge.io/Dump_log_to_file
+; This should be included after the MUI2 defines.
+
+!include "WinMessages.nsh"
+
+!define /ifndef LOG_PATH "$INSTDIR\install.log"
+
+Function DumpLog
+  System::Store "S"
+
+  FileOpen $5 ${LOG_PATH} "w"
+  ${If} $5 != ""
+    SendMessage $mui.InstFilesPage.Log ${LVM_GETITEMCOUNT} 0 0 $6
+    System::Call "*(&t${NSIS_MAX_STRLEN})p.r3"
+    System::Call "*(i, i, i, i, i, p, i, i, i) p  (0, 0, 0, 0, 0, r3, ${NSIS_MAX_STRLEN}) .r1"
+
+    StrCpy $2 0
+    ${While} $2 < $6
+      System::Call "User32::SendMessage(p, i, p, p) p ($mui.InstFilesPage.Log, ${LVM_GETITEMTEXT}, $2, r1)"
+      System::Call "*$3(&t${NSIS_MAX_STRLEN} .r4)"
+      FileWriteUTF16LE $5 "$4$\r$\n"
+      IntOp $2 $2 + 1
+    ${EndWhile}
+
+    FileClose $5
+    System::Free $1
+    System::Free $3
+  ${EndIf}
+
+  System::Store "L"
+FunctionEnd