hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2025-12-17 01:03:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Kotlin: make wrapper more robust for windows

Browse Source
This commit is contained in:
Paolo Tranquilli
2024-04-24 13:39:32 +02:00
parent c014cd84f4
commit 4aa0a8ebae
2 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
java/kotlin-extractor/current_kotlin_version.py
View File

@@ -5,9 +5,10 @@ import shutil
kotlinc = shutil.which('kotlinc')
if kotlinc is None:
raise Exception("kotlinc not found")
output = subprocess.run([kotlinc, "-version"], text=True, stdout=subprocess.DEVNULL, stderr=subprocess.PIPE,
check=True).stderr
m = re.match(r'.* kotlinc-jvm ([0-9]+\.[0-9]+\.[0-9]+(-[a-zA-Z][a-zA-Z0-9]*)?) .*', output)
res = subprocess.run([kotlinc, "-version"], text=True, stdout=subprocess.DEVNULL, stderr=subprocess.PIPE)
if res.returncode != 0:
raise Exception(f"kotlinc -version failed: {res.stderr}")
m = re.match(r'.* kotlinc-jvm ([0-9]+\.[0-9]+\.[0-9]+(-[a-zA-Z][a-zA-Z0-9]*)?) .*', res.stderr)
if m is None:
raise Exception(f'Cannot detect version of kotlinc (got {output})')
raise Exception(f'Cannot detect version of kotlinc (got {res.stderr})')
print(m[1])

14
java/kotlin-extractor/deps/dev/kotlinc
View File

@@ -28,7 +28,6 @@ import io
import os
DEFAULT_VERSION = "1.9.0"
DEVNULL = open(os.devnull, "w")
def options():
parser = argparse.ArgumentParser(add_help=False)
@@ -80,7 +79,12 @@ def get_version():
def install(version: str, quiet: bool):
info_out = DEVNULL if quiet else sys.stderr
if quiet:
info_out = subprocess.DEVNULL
info = lambda *args: None
else:
info_out = sys.stderr
info = lambda *args: print(*args, file=sys.stderr)
url = url_template.format(version=version)
if install_dir.exists():
shutil.rmtree(install_dir)
@@ -89,12 +93,12 @@ def install(version: str, quiet: bool):
if ripunzip is None and platform.system() == "Windows" and windows_ripunzip.exists():
ripunzip = windows_ripunzip
if ripunzip:
print(f"downloading and extracting {url} using ripunzip", file=info_out)
info(f"downloading and extracting {url} using ripunzip")
subprocess.run([ripunzip, "unzip-uri", url], stdout=info_out, stderr=info_out, cwd=install_dir,
check=True)
return
with io.BytesIO() as buffer:
print(f"downloading {url}", file=info_out)
info(f"downloading {url}")
with urllib.request.urlopen(url) as response:
while True:
bytes = response.read()
@@ -102,7 +106,7 @@ def install(version: str, quiet: bool):
break
buffer.write(bytes)
buffer.seek(0)
print(f"extracting kotlin-compiler-{version}.zip", file=info_out)
info(f"extracting kotlin-compiler-{version}.zip")
with ZipFilePreservingPermissions(buffer) as archive:
archive.extractall(install_dir)