diff --git a/utils/copy_dependencies.py b/utils/copy_dependencies.py index 570824b..028273c 100644 --- a/utils/copy_dependencies.py +++ b/utils/copy_dependencies.py @@ -28,7 +28,7 @@ def ldd(files): # split output into lines ldd_lines = ldd_output.split(os.linesep) # parse lines that match this format : ==> () - file_pattern = cygpath("/") + "mingw(32|64)/bin/.*" + file_pattern = cygpath("/") + "(ucrt64|(mingw(32|64)))/bin/.*" print(file_pattern) pattern = "(.*) => (" + file_pattern + r") \((.*)\)" regex = re.compile(pattern) diff --git a/utils/make_windows_release.py b/utils/make_windows_release.py index 6492532..01fdb79 100644 --- a/utils/make_windows_release.py +++ b/utils/make_windows_release.py @@ -6,13 +6,15 @@ import shutil import subprocess from pathlib import Path +git_version = subprocess.check_output(["git", "describe", "--tags"]).strip().decode("utf-8") + parser = argparse.ArgumentParser() -parser.add_argument("release_name") +parser.add_argument("--release-version", default=git_version) parser.add_argument("--timestamp", action="store_true") parser.add_argument("--build-dir", type=Path, default=Path("build")) args = parser.parse_args() -release_folder = Path(args.release_name) +release_folder = Path(f"FEIS-{args.release_version}") if release_folder.exists(): shutil.rmtree(release_folder) release_folder.mkdir() @@ -27,11 +29,10 @@ subprocess.run([ "-f", release_folder / "FEIS.exe" ]) -archive_name = args.release_name - +archive_name = release_folder if args.timestamp: timestamp = datetime.datetime.utcnow().strftime("%Y%m%dT%H%M%S") - archive_name = f"{args.release_name}+{timestamp}" + archive_name = f"{release_folder}+{timestamp}" shutil.make_archive( archive_name,