Compare commits

...

4 Commits

Author SHA1 Message Date
doylet
7262b36bf6 linux: Add Go checksum for 1.20.1 2023-09-05 15:20:18 +10:00
doylet
eb168cc99b Use installed MSVC 2023-09-05 15:20:18 +10:00
doyle
0c0c506cfa Add go 1.20.1 2023-09-05 15:20:18 +10:00
doylet
8c6455578b linux: Fix script errors on linux 2023-09-05 15:20:08 +10:00
4 changed files with 49 additions and 9 deletions

View File

@ -435,11 +435,11 @@ set errorformat+=%\\%%(CTIME%\\)%\\@=%m " ctime.exe -stat
" ============================================================================== " ==============================================================================
let s:running_windows = has("win16") || has("win32") || has("win64") let s:running_windows = has("win16") || has("win32") || has("win64")
if s:running_windows if s:running_windows
set makeprg=build set makeprg=./build.bat
nnoremap <C-b> :Make ./build.bat<cr>
else else
" Set vim terminal to enter normal mode using escape like normal vim behaviour " Set vim terminal to enter normal mode using escape like normal vim behaviour
tnoremap <Esc> <C-\><C-n> tnoremap <Esc> <C-\><C-n>
nnoremap <C-b> :Make ./build.sh<cr>
set makeprg=./build.sh set makeprg=./build.sh
endif endif
nnoremap <C-b> :Make<cr>

View File

@ -1821,4 +1821,46 @@ def get_manifest(is_windows):
], ],
}) })
# --------------------------------------------------------------------------
version = "1.20.1"
download_url = ""
download_checksum = ""
exe_path = ""
checksum = ""
if is_windows:
exe_path = "bin/go.exe"
download_url = f"https://go.dev/dl/go{version}.windows-amd64.zip"
download_checksum = "3b493969196a6de8d9762d09f5bc5ae7a3e5814b0cfbf9cc26838c2bc1314f9c"
checksum = "89fc8e2c47f2a2a9138e60159781ce377167cf61e30d8136fbad0d77ac9303ed"
symlink = [f"go-{version}.exe"]
else:
exe_path = f"bin/go"
download_url = f"https://go.dev/dl/go{version}.linux-amd64.tar.gz"
download_checksum = "000a5b1fca4f75895f78befeb2eecf10bfff3c428597f3f1e69133b63b911b02"
checksum = "dfaaf2d9212757e0c305c9554f616cac6744de646ef6ef20f5eaf9d9634771c3"
symlink = [f"go-{version}"]
result.append({
"label": "Go",
"manifests": [
{
"download_url": download_url,
"download_checksum": download_checksum,
"version": version,
"unzip_method": 'default',
"executables": [
{
"path": exe_path,
"symlink": symlink,
"add_to_devenv_path": True,
"checksum": checksum,
}
],
"add_to_devenv_script": [],
}
],
})
return result return result

View File

@ -802,8 +802,8 @@ def run(user_app_list,
devenv_script_buffer += "set path=%~dp0Scripts;%PATH%\n" devenv_script_buffer += "set path=%~dp0Scripts;%PATH%\n"
else: else:
devenv_script_buffer += f"devenver_root=\"$( cd -- $( dirname -- \"${{BASH_SOURCE[0]}}\" ) &> /dev/null && pwd )\":$PATH\n" devenv_script_buffer += f"devenver_root=\"$( cd -- $( dirname -- \"${{BASH_SOURCE[0]}}\" ) &> /dev/null && pwd )\":$PATH\n"
devenv_script_buffer += f"path=\"$( cd -- $( dirname -- \"${{BASH_SOURCE[0]}}\" ) &> /dev/null && pwd )/Scripts\":$PATH\n" devenv_script_buffer += f"PATH=\"$( cd -- $( dirname -- \"${{BASH_SOURCE[0]}}\" ) &> /dev/null && pwd )/Scripts\":$PATH\n"
devenv_script_buffer += f"path=\"$( cd -- $( dirname -- \"${{BASH_SOURCE[0]}}\" ) &> /dev/null && pwd )/Symlinks\":$PATH\n" devenv_script_buffer += f"PATH=\"$( cd -- $( dirname -- \"${{BASH_SOURCE[0]}}\" ) &> /dev/null && pwd )/Symlinks\":$PATH\n"
devenv_script_name = f"{devenv_script_name}.bat" if is_windows else f"{devenv_script_name}.sh" devenv_script_name = f"{devenv_script_name}.bat" if is_windows else f"{devenv_script_name}.sh"
devenv_script_path = pathlib.Path(install_dir, devenv_script_name) devenv_script_path = pathlib.Path(install_dir, devenv_script_name)

View File

@ -271,8 +271,7 @@ if wezterm.target_triple == "x86_64-pc-windows-msvc" then
clink_exe = string.format("%s\\\\..\\\\..\\\\{clink_exe_path_for_wezterm}", wezterm.executable_dir) clink_exe = string.format("%s\\\\..\\\\..\\\\{clink_exe_path_for_wezterm}", wezterm.executable_dir)
devenv_bat = string.format("%s\\\\..\\\\..\\\\{dev_env_script_name}.bat", wezterm.executable_dir) devenv_bat = string.format("%s\\\\..\\\\..\\\\{dev_env_script_name}.bat", wezterm.executable_dir)
msvc_bat = string.format("%s\\\\..\\\\..\\\\msvc\\\\msvc-{msvc_version}.bat", wezterm.executable_dir) msvc_bat = "C:\\\\Program Files\\\\Microsoft Visual Studio\\\\2022\\\\Community\\\\VC\\\\Auxiliary\\\\Build\\\\vcvarsall.bat"
win10_sdk_bat = string.format("%s\\\\..\\\\..\\\\msvc\\\\win-sdk-{win10_sdk_version}.bat", wezterm.executable_dir)
clink_profile = string.format("%s\\\\..\\\\..\\\\{clink_profile_path_for_wezterm}", wezterm.executable_dir) clink_profile = string.format("%s\\\\..\\\\..\\\\{clink_profile_path_for_wezterm}", wezterm.executable_dir)
-- Taken from: https://wezfurlong.org/wezterm/shell-integration.html -- Taken from: https://wezfurlong.org/wezterm/shell-integration.html
@ -283,8 +282,7 @@ if wezterm.target_triple == "x86_64-pc-windows-msvc" then
default_prog = {{"cmd.exe", "/s", "/k", default_prog = {{"cmd.exe", "/s", "/k",
clink_exe, "inject", "--profile", clink_profile, "-q", clink_exe, "inject", "--profile", clink_profile, "-q",
"&&", "call", devenv_bat, "&&", "call", devenv_bat,
"&&", "call", msvc_bat, "&&", "call", msvc_bat, "x64"}}
"&&", "call", win10_sdk_bat}}
end end
return {{ return {{