From f71e90a7f3094b8bc5ac81bf88073166af2fd092 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sat, 23 Mar 2024 18:17:05 +0100 Subject: [PATCH] Put gir libraries under lib also for Windows cf5adeee978b did it for darwin but it is also useful for Windows to avoid duplicate dlls. --- tryton/setup-freeze.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/tryton/setup-freeze.py b/tryton/setup-freeze.py index 956b8b2a67..c3dcbcf266 100755 --- a/tryton/setup-freeze.py +++ b/tryton/setup-freeze.py @@ -66,7 +66,10 @@ def replace_path(match): libs = [os.path.basename(p) for p in match.group(1).split(',')] required_libs.update(libs) if sys.platform == 'darwin': - libs = [os.path.join('@executable_path', 'lib', l) for l in libs] + prefix = '@executable_path/lib' + else: + prefix = 'lib' + libs = [os.path.join(prefix, l) for l in libs] return 'shared-library="%s"' % ','.join(libs) @@ -91,10 +94,6 @@ for ns in required_gi_namespaces: include_files.append((typefile_tmp, typefile_file)) -if sys.platform == 'darwin': - lib_dest = 'lib' -else: - lib_dest = '.' if sys.platform == 'win32': required_libs.update([ 'libepoxy-0.dll', @@ -109,7 +108,7 @@ for lib in required_libs: break else: raise Exception('%s not found' % lib) - include_files.append((path, os.path.join(lib_dest, lib))) + include_files.append((path, os.path.join('lib', lib))) ssl_paths = ssl.get_default_verify_paths() include_files.append(