Compare commits

...

4 Commits

Author SHA1 Message Date
doylet
00ce72f6ab linux: Add Go checksum for 1.20.1 2023-08-30 11:30:13 +10:00
doylet
6b691209a6 Use installed MSVC 2023-08-30 11:29:24 +10:00
doyle
2262e67fdd Add go 1.20.1 2023-08-30 11:29:24 +10:00
doylet
05cc918c69 linux: Add checksum for new deps 2023-08-30 11:29:10 +10:00
3 changed files with 47 additions and 7 deletions

View File

@ -213,7 +213,7 @@ def get_manifest(is_windows):
exe_path = f"bin/doxygen" exe_path = f"bin/doxygen"
download_url = f"https://github.com/doxygen/doxygen/releases/download/Release_{version.replace('.', '_')}/doxygen-{version}.linux.bin.tar.gz" download_url = f"https://github.com/doxygen/doxygen/releases/download/Release_{version.replace('.', '_')}/doxygen-{version}.linux.bin.tar.gz"
download_checksum = "8bcb7cbdb9d8ae78d0bf65a383bc533db5232e2527ab10743f1e58cba92a7d43" download_checksum = "8bcb7cbdb9d8ae78d0bf65a383bc533db5232e2527ab10743f1e58cba92a7d43"
checksum = "" checksum = "230cc485bff7535c1a39addcc8c9893615092cfbb46a4a134510d41deb53807c"
symlink = [f"doxygen-{version}"] symlink = [f"doxygen-{version}"]
result.append({ result.append({
@ -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

@ -693,8 +693,8 @@ def run(user_app_list,
else: else:
download_url = f"https://www.7-zip.org/a/7z{version}-linux-x64.tar.xz" download_url = f"https://www.7-zip.org/a/7z{version}-linux-x64.tar.xz"
download_checksum = "a" download_checksum = "23babcab045b78016e443f862363e4ab63c77d75bc715c0b3463f6134cbcf318"
checksum = "a" checksum = "c7f8769e2bc8df6bcbfba34571ee0340670a52dec824dbac844dd3b5bd1a69e1"
exe_path = "7zz" exe_path = "7zz"
internal_app_list[-1]["manifests"].append({ # Download proper 7zip, extract this exe with the bootstrap 7zip internal_app_list[-1]["manifests"].append({ # Download proper 7zip, extract this exe with the bootstrap 7zip

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 {{