TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2025-04-03 07:05:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix scripts on Windows

Browse Source
This commit is contained in:
topjohnwu 2023-06-15 05:57:19 -07:00
parent 53257b6ea1
commit d2eaa6e6c1
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
build.py
View File

@ -117,21 +117,23 @@ def rm(file):
try: try:
os.remove(file) os.remove(file)
vprint(f"rm {file}") vprint(f"rm {file}")
except OSError as e: except FileNotFoundError as e:
if e.errno != errno.ENOENT: pass
raise
def rm_on_error(func, path, _): def rm_on_error(func, path, _):
# Remove a read-only file on Windows will get "WindowsError: [Error 5] Access is denied" # Removing a read-only file on Windows will get "WindowsError: [Error 5] Access is denied"
# Clear the "read-only" and retry # Clear the "read-only" bit and retry
os.chmod(path, stat.S_IWRITE) try:
os.unlink(path) os.chmod(path, stat.S_IWRITE)
os.unlink(path)
except FileNotFoundError as e:
pass
def rm_rf(path): def rm_rf(path):
vprint(f"rm -rf {path}") vprint(f"rm -rf {path}")
shutil.rmtree(path, ignore_errors=True, onerror=rm_on_error) shutil.rmtree(path, ignore_errors=False, onerror=rm_on_error)
def mkdir(path, mode=0o755): def mkdir(path, mode=0o755):
@ -249,7 +251,7 @@ def run_ndk_build(flags):
def run_cargo(cmds, triple="aarch64-linux-android"): def run_cargo(cmds, triple="aarch64-linux-android"):
env = os.environ.copy() env = os.environ.copy()
env["PATH"] = f'{rust_bin}:{env["PATH"]}' env["PATH"] = f'{rust_bin}{os.pathsep}{env["PATH"]}'
env["CARGO_BUILD_RUSTC"] = op.join(rust_bin, "rustc" + EXE_EXT) env["CARGO_BUILD_RUSTC"] = op.join(rust_bin, "rustc" + EXE_EXT)
env["RUSTFLAGS"] = "-Clinker-plugin-lto" env["RUSTFLAGS"] = "-Clinker-plugin-lto"
env["TARGET_CC"] = op.join(llvm_bin, "clang" + EXE_EXT) env["TARGET_CC"] = op.join(llvm_bin, "clang" + EXE_EXT)
@ -531,14 +533,16 @@ def setup_ndk(args):
ndk_ver = config["ondkVersion"] ndk_ver = config["ondkVersion"]
url = f"https://github.com/topjohnwu/ondk/releases/download/{ndk_ver}/ondk-{ndk_ver}-{os_name}.tar.xz" url = f"https://github.com/topjohnwu/ondk/releases/download/{ndk_ver}/ondk-{ndk_ver}-{os_name}.tar.xz"
ndk_archive = url.split("/")[-1] ndk_archive = url.split("/")[-1]
ondk_path = op.join(ndk_root, f"ondk-{ndk_ver}")
header(f"* Downloading and extracting {ndk_archive}") header(f"* Downloading and extracting {ndk_archive}")
rm_rf(ondk_path)
with urllib.request.urlopen(url) as response: with urllib.request.urlopen(url) as response:
with tarfile.open(mode="r|xz", fileobj=response) as tar: with tarfile.open(mode="r|xz", fileobj=response) as tar:
tar.extractall(ndk_root) tar.extractall(ndk_root)
rm_rf(ndk_path) rm_rf(ndk_path)
mv(op.join(ndk_root, f"ondk-{ndk_ver}"), ndk_path) mv(ondk_path, ndk_path)
header("* Patching static libs") header("* Patching static libs")
for target in ["arm-linux-androideabi", "i686-linux-android"]: for target in ["arm-linux-androideabi", "i686-linux-android"]: