Skip to content

Commit

Permalink
vsdownload: kits -> Windows Kits
Browse files Browse the repository at this point in the history
So that the dest dir is valid for clang /winsysroot without installation
on Unix and Windows.
  • Loading branch information
huangqinjin authored and mstorsjo committed Sep 12, 2024
1 parent c45cfe7 commit 209623e
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 deletions.
2 changes: 1 addition & 1 deletion install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ ln_s() {
if [ -n "$VC_ZIP" ]; then
unzip $VC_ZIP
fi
ln_s kits "Windows Kits"
ln_s "Windows Kits" kits
ln_s VC vc
ln_s Tools vc/tools
ln_s MSVC vc/tools/msvc
Expand Down
4 changes: 1 addition & 3 deletions vsdownload.py
Original file line number Diff line number Diff line change
Expand Up @@ -605,14 +605,12 @@ def moveVCSDK(unpack, dest):
# Move the VC and Program Files\Windows Kits\10 directories
# out from the unpack directory, allowing the rest of unpacked
# files to be removed.
makedirs(os.path.join(dest, "kits"))
mergeTrees(os.path.join(unpack, "VC"), os.path.join(dest, "VC"))
kitsPath = unpack
# msiexec extracts to Windows Kits rather than Program Files\Windows Kits
if sys.platform != "win32":
kitsPath = os.path.join(kitsPath, "Program Files")
kitsPath = os.path.join(kitsPath, "Windows Kits", "10")
mergeTrees(kitsPath, os.path.join(dest, "kits", "10"))
mergeTrees(os.path.join(kitsPath, "Windows Kits"), os.path.join(dest, "Windows Kits"))

# Move other VC components directories:
# The DIA SDK isn't necessary for normal use, but can be used when e.g.
Expand Down

0 comments on commit 209623e

Please sign in to comment.