diff --git a/.appveyor.yml b/.appveyor.yml index 5638e4dda..c952f9098 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -414,7 +414,7 @@ for: install: - . ci/common.sh - - flutter upgrade --force + - source ci/install_flutter.sh build_script: # Flutter Web client diff --git a/sdk/python/packages/flet-cli/src/flet_cli/__pyinstaller/hook-flet.py b/sdk/python/packages/flet-cli/src/flet_cli/__pyinstaller/hook-flet.py index 78d2bef4d..6338d355d 100644 --- a/sdk/python/packages/flet-cli/src/flet_cli/__pyinstaller/hook-flet.py +++ b/sdk/python/packages/flet-cli/src/flet_cli/__pyinstaller/hook-flet.py @@ -8,8 +8,4 @@ bin_path = get_flet_bin_path() if bin_path: - # package "bin/fletd" only - if os.getenv("PACKAGE_FLETD_ONLY"): - bin_path = os.path.join(bin_path, "fletd*") - - datas = [(bin_path, "flet/bin")] + datas = [(bin_path, "flet_desktop/app")] diff --git a/sdk/python/packages/flet-desktop/src/flet_desktop/__init__.py b/sdk/python/packages/flet-desktop/src/flet_desktop/__init__.py index b5849c882..45ce37ecd 100644 --- a/sdk/python/packages/flet-desktop/src/flet_desktop/__init__.py +++ b/sdk/python/packages/flet-desktop/src/flet_desktop/__init__.py @@ -9,6 +9,8 @@ import zipfile from pathlib import Path +import flet_desktop +import flet_desktop.version from flet.utils import ( get_arch, is_linux, @@ -18,9 +20,6 @@ safe_tar_extractall, ) -import flet_desktop -import flet_desktop.version - logger = logging.getLogger(flet_desktop.__name__) @@ -74,6 +73,7 @@ def __locate_and_unpack_flet_view(page_url, assets_dir, hidden): # check if flet_view.exe exists in "bin" directory (user mode) flet_path = os.path.join(get_package_bin_dir(), "flet", flet_exe) + logger.info(f"Looking for Flet executable at: {flet_path}") if os.path.exists(flet_path): logger.info(f"Flet View found in: {flet_path}") else: @@ -109,6 +109,7 @@ def __locate_and_unpack_flet_view(page_url, assets_dir, hidden): # check if flet.tar.gz exists gz_filename = "flet-macos.tar.gz" tar_file = os.path.join(get_package_bin_dir(), gz_filename) + logger.info(f"Looking for Flet.app archive at: {tar_file}") if not os.path.exists(tar_file): tar_file = __download_flet_client(gz_filename) @@ -145,6 +146,7 @@ def __locate_and_unpack_flet_view(page_url, assets_dir, hidden): # check if flet.tar.gz exists gz_filename = f"flet-linux-{get_arch()}.tar.gz" tar_file = os.path.join(get_package_bin_dir(), gz_filename) + logger.info(f"Looking for Flet bundle archive at: {tar_file}") if not os.path.exists(tar_file): tar_file = __download_flet_client(gz_filename)