doylet/DEVenv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Tweak scripts

Browse Source
This commit is contained in:
doyle 2023-04-16 00:01:24 +10:00
parent f82efcf67e
commit 9041cebcc0
2 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app_manifest_dev.py
View File

@ -785,12 +785,14 @@ def get_manifest(is_windows):
# -------------------------------------------------------------------------- # --------------------------------------------------------------------------
label = "NodeJS"
version = "16.19.0" version = "16.19.0"
download_url = "" download_url = ""
download_checksum = "" download_checksum = ""
exe_path = "" exe_path = ""
checksum = "" checksum = ""
symlink = [] symlink = []
add_to_devenv_script = []
if is_windows: if is_windows:
download_url = f"https://nodejs.org/dist/v{version}/node-v{version}-win-x64.7z" download_url = f"https://nodejs.org/dist/v{version}/node-v{version}-win-x64.7z"
@ -821,7 +823,7 @@ def get_manifest(is_windows):
"checksum": checksum, "checksum": checksum,
} }
], ],
"add_to_devenv_script": [], "add_to_devenv_script": add_to_devenv_script,
} }
], ],
}) })
@ -832,6 +834,9 @@ def get_manifest(is_windows):
download_checksum = "cad3cc0910dc216e8b6dcfc3c5b3be0a619c2d4a4b29f2e674820b70e4f374dd" download_checksum = "cad3cc0910dc216e8b6dcfc3c5b3be0a619c2d4a4b29f2e674820b70e4f374dd"
checksum = "17fd75d8a41bf9b4c475143e19ff2808afa7a92f7502ede731537d9da674d5e8" checksum = "17fd75d8a41bf9b4c475143e19ff2808afa7a92f7502ede731537d9da674d5e8"
symlink = [f"node-{version}.exe"] symlink = [f"node-{version}.exe"]
add_to_devenv_script = [
f"set PATH=%~dp0{label}\\{version}\\node_modules\\corepack\\shims;%PATH%",
]
else: else:
download_url = f"https://nodejs.org/dist/v{version}/node-v{version}-linux-x64.tar.xz" download_url = f"https://nodejs.org/dist/v{version}/node-v{version}-linux-x64.tar.xz"
download_checksum = "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" download_checksum = "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
@ -855,7 +860,7 @@ def get_manifest(is_windows):
"checksum": checksum, "checksum": checksum,
} }
], ],
"add_to_devenv_script": [], "add_to_devenv_script": add_to_devenv_script,
} }
], ],
}) })
@ -1807,7 +1812,7 @@ def get_manifest(is_windows):
{ {
"path": exe_path, "path": exe_path,
"symlink": symlink, "symlink": symlink,
"add_to_devenv_path": True, "add_to_devenv_path": False,
"checksum": checksum, "checksum": checksum,
} }
], ],

6
win_portable_msvc.py
View File

@ -9,6 +9,10 @@
# folders, skip the downloading of MSVC or the SDK if we only need one of them). # folders, skip the downloading of MSVC or the SDK if we only need one of them).
# #
# Changelog # Changelog
# 2023-04-15
# - Fix "msvc-{version}.bat" script generating trailing "\;" on
# VCToolsInstallDir environment variable
#
# 2023-01-30 # 2023-01-30
# - Generate the short-hand version of the msvc-{version}.bat and # - Generate the short-hand version of the msvc-{version}.bat and
# win-sdk-{version}.bat using the versions passed as the argument parameter. # win-sdk-{version}.bat using the versions passed as the argument parameter.
@ -352,7 +356,7 @@ set MSVC_HOST=Host{HOST}
set MSVC_ARCH={TARGET} set MSVC_ARCH={TARGET}
set MSVC_ROOT=%~dp0VC\\Tools\\MSVC\\%MSVC_VERSION% set MSVC_ROOT=%~dp0VC\\Tools\\MSVC\\%MSVC_VERSION%
set VCToolsInstallDir=%MSVC_ROOT%\\;%VCToolsInstallDir% set VCToolsInstallDir=%MSVC_ROOT%
set PATH=%MSVC_ROOT%\\bin\\%MSVC_HOST%\\%MSVC_ARCH%;%PATH% set PATH=%MSVC_ROOT%\\bin\\%MSVC_HOST%\\%MSVC_ARCH%;%PATH%
set INCLUDE=%MSVC_ROOT%\\include;%INCLUDE% set INCLUDE=%MSVC_ROOT%\\include;%INCLUDE%
set LIB=%MSVC_ROOT%\\lib\\%MSVC_ARCH%;%LIB% set LIB=%MSVC_ROOT%\\lib\\%MSVC_ARCH%;%LIB%