isledecomp/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2026-01-20 23:01:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Avoid creating a MSVC420-master directory

Browse Source
This commit is contained in:
Anonymous Maarten 2023-07-03 01:35:47 +02:00
parent 51da768c03
commit 8db73f59c5
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
configure.py
View File

@ -36,9 +36,20 @@
url = "https://github.com/itsmattkc/MSVC420/archive/refs/heads/master.zip" url = "https://github.com/itsmattkc/MSVC420/archive/refs/heads/master.zip"
print("Downloading MSVC420...") print("Downloading MSVC420...")
r = requests.get(url, stream=True) r = requests.get(url, stream=True)
print(f"Unzipping MSVC420 to {compilerdir}/...")
z = zipfile.ZipFile(io.BytesIO(r.content)) z = zipfile.ZipFile(io.BytesIO(r.content))
z.extractall(path=str(compilerdir)) print(f"Unzipping MSVC420 to {compilerdir}/...")
for name in z.namelist():
info = z.getinfo(name)
# Remove the MSVC420-master prefix
extract_name = name.split("/", 1)[1]
if not extract_name:
continue
fullpath = compilerdir / extract_name
if info.is_dir():
fullpath.mkdir(parents=True, exist_ok=True)
else:
with fullpath.open("wb") as f:
f.write(z.read(name))
# Run cmake in the build folder # Run cmake in the build folder
cmake_cmd = [ cmake_cmd = [
@ -63,8 +74,8 @@
if not ninjadir.exists(): if not ninjadir.exists():
print("Downloading Ninja...") print("Downloading Ninja...")
r = requests.get(ninja_urls[sys], stream=True) r = requests.get(ninja_urls[sys], stream=True)
print(f"Unzipping Ninja to {ninjadir}/...")
z = zipfile.ZipFile(io.BytesIO(r.content)) z = zipfile.ZipFile(io.BytesIO(r.content))
print(f"Unzipping Ninja to {ninjadir}/...")
z.extractall(path=str(ninjadir)) z.extractall(path=str(ninjadir))
specific_ninja = ninjadir / ("ninja" + ".exe" if sys == "Windows" else "") specific_ninja = ninjadir / ("ninja" + ".exe" if sys == "Windows" else "")
@ -76,7 +87,7 @@
extra_library_dirs = [] extra_library_dirs = []
if set_compiler_paths: if set_compiler_paths:
full_compiler_path = compilerdir / "MSVC420-master" full_compiler_path = compilerdir
cl_path = (full_compiler_path / "bin" / "CL.EXE").as_posix() cl_path = (full_compiler_path / "bin" / "CL.EXE").as_posix()
link_path = (full_compiler_path / "bin" / "LINK.EXE").as_posix() link_path = (full_compiler_path / "bin" / "LINK.EXE").as_posix()
rc_path = (full_compiler_path / "bin" / "RC.EXE").as_posix() rc_path = (full_compiler_path / "bin" / "RC.EXE").as_posix()