From 4b40f0a5ece99cf1058e0d36d8269fb7ad8bfc72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sat, 4 Nov 2023 19:51:52 +0100 Subject: [PATCH] Do not copy tryton data and plugins in frozen build Since d94c92c1de67 the library is no more compressed so those package data are already in the usual place. (grafted from 867d962ffbe4657643961554fefc952eb007d9f7) --HG-- branch : 7.0 --- tryton/setup-freeze.py | 2 -- tryton/tryton/config.py | 2 -- 2 files changed, 4 deletions(-) diff --git a/tryton/setup-freeze.py b/tryton/setup-freeze.py index 3e304eea9c..4969835d38 100755 --- a/tryton/setup-freeze.py +++ b/tryton/setup-freeze.py @@ -23,8 +23,6 @@ except IOError: include_files = [ - (os.path.join('tryton', 'data'), 'data'), - (os.path.join('tryton', 'plugins'), 'plugins'), (os.path.join(sys.prefix, 'share', 'glib-2.0', 'schemas'), os.path.join('share', 'glib-2.0', 'schemas')), (os.path.join(sys.prefix, 'lib', 'gtk-3.0'), diff --git a/tryton/tryton/config.py b/tryton/tryton/config.py index c20c656ca1..cb3ad26f21 100644 --- a/tryton/tryton/config.py +++ b/tryton/tryton/config.py @@ -219,8 +219,6 @@ class ConfigManager(object): CONFIG = ConfigManager() CURRENT_DIR = os.path.dirname(__file__) -if hasattr(sys, 'frozen'): - CURRENT_DIR = os.path.dirname(sys.executable) if not isinstance(CURRENT_DIR, str): CURRENT_DIR = str(CURRENT_DIR, sys.getfilesystemencoding())