From 5d3670537a685237b483efdefe0a3e733fd2cb10 Mon Sep 17 00:00:00 2001 From: doyle Date: Tue, 21 Dec 2021 11:02:53 +1100 Subject: [PATCH 1/3] Add symchk to download PDBs --- ...mat-style-file => clang_format_style_file} | 0 ...y.asc => geth_windows_builder_gpg_key.asc} | 0 .../win32_download_windows_symbols_pdb.bat | 19 +++++++++++++++++++ win32_install.bat | 5 +++-- 4 files changed, 22 insertions(+), 2 deletions(-) rename Installer/{clang-format-style-file => clang_format_style_file} (100%) rename Installer/{geth-windows-builder-gpg-key.asc => geth_windows_builder_gpg_key.asc} (100%) create mode 100644 Installer/win32_download_windows_symbols_pdb.bat diff --git a/Installer/clang-format-style-file b/Installer/clang_format_style_file similarity index 100% rename from Installer/clang-format-style-file rename to Installer/clang_format_style_file diff --git a/Installer/geth-windows-builder-gpg-key.asc b/Installer/geth_windows_builder_gpg_key.asc similarity index 100% rename from Installer/geth-windows-builder-gpg-key.asc rename to Installer/geth_windows_builder_gpg_key.asc diff --git a/Installer/win32_download_windows_symbols_pdb.bat b/Installer/win32_download_windows_symbols_pdb.bat new file mode 100644 index 0000000..d8ea824 --- /dev/null +++ b/Installer/win32_download_windows_symbols_pdb.bat @@ -0,0 +1,19 @@ +@echo off +set dest_dir="%~dp0Windows_Symbols_PDBs" +set symchk="C:\Program Files (x86)\Windows Kits\10\Debuggers\x64\symchk.exe" + +if "%~1"=="" goto :usage + +if not exist %symchk% ( + echo Symchk binary not found but is required to run script [path=%symchk%] + exit /b 1 +) +goto :eof + +if not exist %dest_dir% mkdir %dest_dir% +echo Downloading to %dest_dir% with %symchk% +%symchk% /r "%1" /s srv*%dest_dir%*https://msdl.microsoft.com/download/symbols +goto :eof + +:usage +echo Usage: download_windows_symbol_pdb.bat executable_to_check diff --git a/win32_install.bat b/win32_install.bat index dbbe657..f88ed54 100644 --- a/win32_install.bat +++ b/win32_install.bat @@ -461,7 +461,8 @@ REM uncap: Bind capslock to escape via run-time program call :CopyAndAlwaysOverwriteFile "!install_dir!\win32_ctags.exe" "!bin_dir!\ctags.exe" || exit /B call :CopyAndAlwaysOverwriteFile "!install_dir!\win32_scanmapset.exe" "!bin_dir!\scanmapset.exe" || exit /B call :CopyAndAlwaysOverwriteFile "!install_dir!\win32_uncap.exe" "!bin_dir!\uncap.exe" || exit /B -call :CopyAndAlwaysOverwriteFile "!install_dir!\clang-format-style-file" "!home_dir!\_clang-format" || exit /B +call :CopyAndAlwaysOverwriteFile "!install_dir!\clang_format_style_file" "!home_dir!\_clang-format" || exit /B +call :CopyAndAlwaysOverwriteFile "!install_dir!\win32_download_windows_symbols_pdb" "!bin_dir!\download_windows_symbols_pdb.bat" || exit /B REM ------------------------------------------------------------------------ REM MobaXTerm @@ -561,7 +562,7 @@ if !install_geth! == 1 ( set geth_dir=!tools_dir!\geth-windows-amd64-!geth_version! set geth_exe=!geth_dir!\geth.exe - set geth_gpg_key=!downloads_dir!\..\geth-windows-builder-gpg-key.asc + set geth_gpg_key=!downloads_dir!\..\geth_windows_builder_gpg_key.asc set geth_gpg_sig=!geth_zip!.asc if not exist "!geth_exe!" ( From d3bb928726f43f204ae9fdb40faee8d215330d75 Mon Sep 17 00:00:00 2001 From: doyle Date: Tue, 21 Dec 2021 11:05:06 +1100 Subject: [PATCH 2/3] Correctly specify the symchk bat file --- win32_install.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/win32_install.bat b/win32_install.bat index f88ed54..a5ceee1 100644 --- a/win32_install.bat +++ b/win32_install.bat @@ -462,7 +462,7 @@ call :CopyAndAlwaysOverwriteFile "!install_dir!\win32_ctags.exe" "!bin_dir!\ctag call :CopyAndAlwaysOverwriteFile "!install_dir!\win32_scanmapset.exe" "!bin_dir!\scanmapset.exe" || exit /B call :CopyAndAlwaysOverwriteFile "!install_dir!\win32_uncap.exe" "!bin_dir!\uncap.exe" || exit /B call :CopyAndAlwaysOverwriteFile "!install_dir!\clang_format_style_file" "!home_dir!\_clang-format" || exit /B -call :CopyAndAlwaysOverwriteFile "!install_dir!\win32_download_windows_symbols_pdb" "!bin_dir!\download_windows_symbols_pdb.bat" || exit /B +call :CopyAndAlwaysOverwriteFile "!install_dir!\win32_download_windows_symbols_pdb.bat" "!bin_dir!\download_windows_symbols_pdb.bat" || exit /B REM ------------------------------------------------------------------------ REM MobaXTerm From 5aab09dc2f9ce5d81c3df4aae4046b0c4ab1c6f2 Mon Sep 17 00:00:00 2001 From: doyle Date: Tue, 21 Dec 2021 11:15:41 +1100 Subject: [PATCH 3/3] Vendor symchk script directly into ToolsY --- .../download_windows_symbols_pdb.bat | 8 +------- win32_install.bat | 1 - 2 files changed, 1 insertion(+), 8 deletions(-) rename Installer/win32_download_windows_symbols_pdb.bat => Tools/download_windows_symbols_pdb.bat (64%) diff --git a/Installer/win32_download_windows_symbols_pdb.bat b/Tools/download_windows_symbols_pdb.bat similarity index 64% rename from Installer/win32_download_windows_symbols_pdb.bat rename to Tools/download_windows_symbols_pdb.bat index d8ea824..ad498f4 100644 --- a/Installer/win32_download_windows_symbols_pdb.bat +++ b/Tools/download_windows_symbols_pdb.bat @@ -2,18 +2,12 @@ set dest_dir="%~dp0Windows_Symbols_PDBs" set symchk="C:\Program Files (x86)\Windows Kits\10\Debuggers\x64\symchk.exe" -if "%~1"=="" goto :usage - if not exist %symchk% ( echo Symchk binary not found but is required to run script [path=%symchk%] exit /b 1 ) -goto :eof if not exist %dest_dir% mkdir %dest_dir% echo Downloading to %dest_dir% with %symchk% -%symchk% /r "%1" /s srv*%dest_dir%*https://msdl.microsoft.com/download/symbols +%symchk% /r C:\Windows /s srv*%dest_dir%*https://msdl.microsoft.com/download/symbols goto :eof - -:usage -echo Usage: download_windows_symbol_pdb.bat executable_to_check diff --git a/win32_install.bat b/win32_install.bat index a5ceee1..f6367a0 100644 --- a/win32_install.bat +++ b/win32_install.bat @@ -462,7 +462,6 @@ call :CopyAndAlwaysOverwriteFile "!install_dir!\win32_ctags.exe" "!bin_dir!\ctag call :CopyAndAlwaysOverwriteFile "!install_dir!\win32_scanmapset.exe" "!bin_dir!\scanmapset.exe" || exit /B call :CopyAndAlwaysOverwriteFile "!install_dir!\win32_uncap.exe" "!bin_dir!\uncap.exe" || exit /B call :CopyAndAlwaysOverwriteFile "!install_dir!\clang_format_style_file" "!home_dir!\_clang-format" || exit /B -call :CopyAndAlwaysOverwriteFile "!install_dir!\win32_download_windows_symbols_pdb.bat" "!bin_dir!\download_windows_symbols_pdb.bat" || exit /B REM ------------------------------------------------------------------------ REM MobaXTerm