From 52bdc750c17652bc289895150778434380d4c49a Mon Sep 17 00:00:00 2001 From: Khaled Hosny Date: Wed, 3 Aug 2022 10:39:52 +0200 Subject: [PATCH] Revert "[meson] Use pathlib in gen-harfbuzzcc.py" This reverts commit eaf7e5686c0d15f2308b35b43aaccdded9967216. Fixes https://github.com/harfbuzz/harfbuzz/issues/3776 No idea what is going on, but lets restore the old code. --- src/gen-harfbuzzcc.py | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/src/gen-harfbuzzcc.py b/src/gen-harfbuzzcc.py index 53cc84859..227384043 100755 --- a/src/gen-harfbuzzcc.py +++ b/src/gen-harfbuzzcc.py @@ -2,24 +2,23 @@ "This tool is intended to be used from meson" -import shutil -import sys - -from pathlib import Path +import os, sys, shutil if len (sys.argv) < 3: sys.exit (__doc__) -OUTPUT = Path (sys.argv[1]) -CURRENT_SOURCE_DIR = Path (sys.argv[2]) +OUTPUT = sys.argv[1] +CURRENT_SOURCE_DIR = sys.argv[2] # make sure input files are unique -sources = [Path(x) for x in sorted(set(sys.argv[3:]))] +sources = sorted(set(sys.argv[3:])) with open (OUTPUT, "wb") as f: - f.write ("".join ('#include "{}"\n'.format (p.resolve ().relative_to (CURRENT_SOURCE_DIR)) for p in sources if p.suffix == ".cc").encode ()) + f.write ("".join ('#include "{}"\n'.format (os.path.relpath (os.path.abspath (x), CURRENT_SOURCE_DIR)) for x in sources if x.endswith (".cc")).encode ()) # copy it also to the source tree, but only if it has changed -baseline = CURRENT_SOURCE_DIR / OUTPUT.name -if baseline.read_bytes() != OUTPUT.read_bytes(): - shutil.copyfile (OUTPUT, baseline) +baseline_filename = os.path.join (CURRENT_SOURCE_DIR, os.path.basename (OUTPUT)) +with open(baseline_filename, "rb") as baseline: + with open(OUTPUT, "rb") as generated: + if baseline.read() != generated.read(): + shutil.copyfile (OUTPUT, baseline_filename)