hmn
/
orca
5
Fork 2
Code Issues 21 Pull Requests 1 Packages Projects Releases Wiki Activity

Go back to ANGLE 2023-07-05 and fix some checksum bugs

This commit is contained in:
Ben Visness 2023-07-15 19:00:34 -05:00 committed by Ben Visness
parent 4337b9bffa
commit b398b74ac9
2 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
scripts/build_runtime.py
View File

@ -13,7 +13,7 @@ from log import *
from utils import pushd, removeall from utils import pushd, removeall
ANGLE_VERSION = "2023-07-09" ANGLE_VERSION = "2023-07-05"
def attach_build_runtime(subparsers): def attach_build_runtime(subparsers):
@ -207,6 +207,15 @@ def ensure_programs():
def ensure_angle(): def ensure_angle():
if not verify_angle():
download_angle()
print("Verifying ANGLE download...")
if not verify_angle():
log_error("automatic ANGLE download failed")
exit(1)
def verify_angle():
checkfiles = None checkfiles = None
if platform.system() == "Windows": if platform.system() == "Windows":
checkfiles = [ checkfiles = [
@ -225,22 +234,19 @@ def ensure_angle():
] ]
if checkfiles is None: if checkfiles is None:
log_warning("could not verify if the correct version of ANGLE is present; the build will probably fail.") log_warning("could not verify if the correct version of ANGLE is present")
return return False
angle_exists = True ok = True
for file in checkfiles: for file in checkfiles:
if not os.path.isfile(file): if not os.path.isfile(file):
print(f"Required ANGLE file {file} not found.") ok = False
angle_exists = False continue
break
if not checksum.checkfile(file): if not checksum.checkfile(file):
angle_exists = False ok = False
log_warning("wrong version of ANGLE libraries installed") continue
break
if not angle_exists: return ok
download_angle()
def download_angle(): def download_angle():

8
scripts/checksums.json
View File

@ -1,8 +1,10 @@
{ {
"scripts/files/angle-windows-2019-2023-07-09.zip": "f58ee3ba5bbc4a6aec08c1c3ef3b9ac7b991676862c641a9bff27b6cdc5519e4", "scripts/files/angle-windows-2019-2023-07-05.zip": "a333b5ccc8462151ee8df65c43cfacd70d9db2413f2e495da65670737b5b2d96",
"scripts/files/angle-mac-2023-07-05.zip": "a3422c456278ff037ef89a7808e0ba256d972d4832d5272fc3d4aa4f7912c1e0", "scripts/files/angle-mac-2023-07-05.zip": "a3422c456278ff037ef89a7808e0ba256d972d4832d5272fc3d4aa4f7912c1e0",
"milepost/lib/libEGL.dll": "5ed4d609ea11015473c89d3b5da91e831a0a8d9608608f840a77d49ccef6867a", "milepost/lib/libEGL.dll": "b7bf51f83e88129ddc20c0c2cb904ec04c89059a30a2cd29b9b1ea11c80388fb",
"milepost/lib/libGLESv2.dll": "f36811acdbc59f6cddd33f6a96b5d6e75559af76bdd73bcc56514455e9bffd16", "milepost/lib/libEGL.dll.lib": "4cec54c534136da413dea86bd271ccb9c5ae88e40aa91d1de7a01e701be8e1d7",
"milepost/lib/libGLESv2.dll": "193b53b0a16b702eaa28a73e84527acf7aecfd665e3e3f54a8d9db9ae73111e1",
"milepost/lib/libGLESv2.dll.lib": "ee87aac129efe8fe871825d181b85da1b1ea6626cb48be52c2e689f2804b953f",
"milepost/lib/libEGL.dylib": "227445d896047207d1dcef91a8182d886692bc470f402033a6f0831eacb82592", "milepost/lib/libEGL.dylib": "227445d896047207d1dcef91a8182d886692bc470f402033a6f0831eacb82592",
"milepost/lib/libGLESv2.dylib": "c814948060494796cda4a3febd8652e1bbf0787a69c2f7e9afd41fc666dc91fe" "milepost/lib/libGLESv2.dylib": "c814948060494796cda4a3febd8652e1bbf0787a69c2f7e9afd41fc666dc91fe"
} }