PyInstallerEx 0.1.6__py3-none-any.whl

PyInstallerEx/core/packager.py

@@ -0,0 +1,961 @@
+# -*- coding: utf-8 -*-
+"""
+核心打包逻辑模块
+"""
+
+from __future__ import print_function
+import subprocess
+import tempfile
+import os
+import logging
+import sys
+import json
+import shutil
+
+from ..utils.system_utils import SystemInfo
+from ..utils.file_utils import FileUtils
+from ..utils.compression import CompressionUtils
+from ..utils.logging import PackageError, handle_error
+from .config import PackageConfig
+from .. import __version__
+
+
+class PackageBuilder(object):
+    """包构建器类"""
+
+    def __init__(self, config, verbose=False):
+        self.config = config
+        self.verbose = verbose
+        self.logger = None
+        self._initialize_logger()
+
+    def _initialize_logger(self):
+        """初始化日志系统"""
+        try:
+            # 尝试获取logger
+            self.logger = logging.getLogger(__name__)
+            self.logger.propagate = False
+            # 确保logger有处理器
+            if not self.logger.handlers:
+                # 添加一个默认处理器
+                handler = logging.StreamHandler(sys.stdout)
+                formatter = logging.Formatter('%(asctime)s - %(name)s - %(levelname)s - %(message)s')
+                handler.setFormatter(formatter)
+                self.logger.addHandler(handler)
+                self.logger.setLevel(logging.INFO)
+        except:
+            # 如果日志初始化失败，使用备用方案
+            class DummyLogger:
+                def info(self, msg):
+                    print("INFO: {0}".format(msg))
+
+                def warning(self, msg):
+                    print("WARNING: {0}".format(msg))
+
+                def error(self, msg):
+                    print("ERROR: {0}".format(msg))
+
+                def debug(self, msg):
+                    if self.verbose:
+                        print("DEBUG: {0}".format(msg))
+
+            self.logger = DummyLogger()
+
+    def build(self, script_path, output_dir=None):
+        """执行完整的打包流程"""
+        try:
+            # 1. 验证输入
+            self._validate_inputs(script_path, output_dir)
+
+            # 2. 根据引擎模式调用对应的打包工具
+            engine_mode = getattr(self.config, 'engine_mode', 'pyinstaller')
+            if engine_mode == 'nuitka':
+                engine_dir = self._run_nuitka(script_path)
+            elif engine_mode == 'pyoxidizer':
+                engine_dir = self._run_pyoxidizer(script_path)
+            else:
+                engine_dir = self._run_pyinstaller(script_path)
+
+            # 3. 处理配置文件
+            rendered_config = self._process_configuration(script_path, engine_dir)
+
+            # 4. 压缩目录为ZIP文件
+            zip_path = self._compress_directory(engine_dir)
+
+            # 5. 获取对应的二进制启动器
+            binary_path = self._get_binary_launcher()
+
+            # 6. 合并为最终的单文件
+            final_output = self._combine_final_file(binary_path, zip_path, output_dir, script_path)
+
+            return final_output
+
+        except Exception as e:
+            handle_error(e, "Packaging process failed")
+
+    def build_folder(self, folder_path, output_dir=None):
+        """文件夹直接打包模式：跳过引擎构建，直接将指定文件夹压缩并附加到启动器尾部"""
+        try:
+            # 1. 验证输入
+            if not os.path.isdir(folder_path):
+                raise PackageError("Folder not found: {0}".format(folder_path))
+
+            if output_dir and not os.path.exists(output_dir):
+                FileUtils.ensure_directory_exists(output_dir)
+
+            self.config.validate()
+
+            # 2. 处理配置文件（使用文件夹名作为脚本名）
+            folder_name = os.path.basename(os.path.normpath(folder_path))
+            rendered_config = self._process_configuration_for_folder(folder_name, folder_path)
+
+            # 3. 压缩文件夹为 ZIP
+            self.logger.info("Step 2: Compressing folder to ZIP...")
+            zip_path = folder_path.rstrip(os.sep) + ".zip"
+            CompressionUtils.create_zip_from_directory(folder_path, zip_path)
+            self.logger.info("ZIP file created: {0}".format(zip_path))
+
+            # 4. 获取对应的二进制启动器
+            binary_path = self._get_binary_launcher()
+
+            # 5. 合并为最终单文件（复用现有逻辑，以文件夹名作为 script_path）
+            final_output = self._combine_final_file_for_folder(binary_path, zip_path, output_dir, folder_name)
+
+            return final_output
+
+        except Exception as e:
+            handle_error(e, "Folder packaging failed")
+
+    def _process_configuration_for_folder(self, folder_name, folder_path):
+        """处理文件夹模式的配置文件"""
+        # 确定 main 字段：优先使用 config.main（来自 --run），否则使用文件夹名
+        if self.config.main:
+            main_entry = self.config.main
+        else:
+            # 默认使用文件夹名作为主程序名
+            if SystemInfo().get_platform() in ["windows", "win"]:
+                main_entry = "{0}.exe".format(folder_name)
+            else:
+                main_entry = folder_name
+
+        config_data = {
+            "main": main_entry,
+            "name": self.config.filename or folder_name,
+            "version": self.config.version or "1.0.0",
+            "description": self.config.description or "Application packaged with PyInstallerEx",
+            "tmp_dir": self.config.tmp_dir or "ex_{name}_{md5}",
+            "author": self.config.author or "Unknown",
+            "extract_mode": self.config.extract_mode or "temp"
+        }
+
+        rendered_config = json.dumps(config_data, indent=2, ensure_ascii=False)
+        self._rendered_config = rendered_config
+
+        # 将配置写入目标文件夹
+        config_path = FileUtils.copy_config_to_dir(rendered_config, folder_path, "ex.config.json")
+        self.logger.info("Configuration written to: {0}".format(config_path))
+        return rendered_config
+
+    def _combine_final_file_for_folder(self, binary_path, zip_path, output_dir, folder_name):
+        """合并启动器和 ZIP 文件为最终输出（文件夹模式）"""
+        self.logger.info("Step 4: Combining launcher and ZIP file...")
+
+        # 确定输出目录
+        if output_dir is None:
+            output_dir = os.getcwd()
+
+        FileUtils.ensure_directory_exists(output_dir)
+
+        # 确定输出文件名
+        if SystemInfo().get_platform() in ["windows", "win"]:
+            output_filename = folder_name + ".exe"
+        else:
+            output_filename = folder_name
+
+        output_path = os.path.join(output_dir, output_filename)
+
+        # 在 Windows 上，如果指定了图标，先对启动器设置图标
+        icon = getattr(self.config, 'icon', None)
+        if SystemInfo().get_platform() in ["windows", "win"] and icon and os.path.exists(icon):
+            self.logger.info("Setting custom icon on launcher: {0}".format(icon))
+            temp_launcher_path = binary_path + ".tmp"
+            shutil.copy2(binary_path, temp_launcher_path)
+            self._set_windows_icon(temp_launcher_path, icon)
+            binary_path = temp_launcher_path
+            self.logger.info("Icon set successfully on launcher")
+
+        # 合并文件
+        import hashlib
+        with open(output_path, "wb") as output_file:
+            with open(binary_path, "rb") as launcher_file:
+                launcher_data = launcher_file.read()
+                output_file.write(launcher_data)
+
+            zip_offset = len(launcher_data)
+
+            with open(zip_path, "rb") as zip_file:
+                zip_data = zip_file.read()
+
+            zip_md5 = hashlib.md5(zip_data).hexdigest()
+            self.logger.debug("ZIP MD5: {0}".format(zip_md5))
+
+            output_file.write(zip_data)
+
+            config_data = json.loads(self._rendered_config)
+            config_data["zip_offset"] = zip_offset
+            config_data["zip_md5"] = zip_md5
+            config_json = json.dumps(config_data, indent=2, ensure_ascii=False)
+            output_file.write(config_json.encode("utf-8"))
+
+        # 清理临时启动器文件
+        if SystemInfo().get_platform() in ["windows", "win"] and icon and os.path.exists(icon):
+            try:
+                os.remove(binary_path)
+            except Exception as e:
+                self.logger.debug("Failed to remove temp launcher: {0}".format(e))
+
+        if SystemInfo().get_platform() not in ["windows", "win"]:
+            os.chmod(output_path, 0o755)
+
+        self.logger.info("Final executable created: {0}".format(output_path))
+        return output_path
+
+    def _validate_inputs(self, script_path, output_dir):
+        """验证输入参数"""
+        if not os.path.exists(script_path):
+            raise PackageError("Script file not found: {0}".format(script_path))
+
+        if output_dir and not os.path.exists(output_dir):
+            FileUtils.ensure_directory_exists(output_dir)
+
+        self.config.validate()
+
+    def _run_pyinstaller(self, script_path):
+        """步骤1: 调用PyInstaller --onedir打包"""
+        self.logger.info("Step 1: Running PyInstaller...")
+
+        # 获取脚本的绝对路径和所在目录
+        script_path = os.path.abspath(script_path)
+        script_dir = os.path.dirname(script_path)
+
+        # 在脚本所在目录创建临时工作目录
+        work_dir = os.path.join(script_dir, "_pyinstallerex_temp")
+        
+        # 清理之前的临时目录
+        import shutil
+        if os.path.exists(work_dir):
+            try:
+                shutil.rmtree(work_dir)
+            except OSError as e:
+                self.logger.warning("Failed to remove old temp directory: {0}".format(e))
+        
+        FileUtils.ensure_directory_exists(work_dir)
+
+        # 定义输出目录
+        dist_dir = os.path.join(work_dir, "dist")
+        FileUtils.ensure_directory_exists(dist_dir)
+
+        # 构建PyInstaller命令（添加-y选项自动覆盖）
+        cmd = [
+            sys.executable,
+            "-m",
+            "PyInstaller",
+            "--onedir",
+            "--distpath", os.path.abspath(dist_dir),
+            "--workpath", os.path.abspath(work_dir),
+            "--specpath", os.path.abspath(work_dir),
+            "--clean",
+            "-y",  # 自动覆盖现有输出目录
+        ]
+
+        # 添加图标
+        icon = getattr(self.config, 'icon', None)
+        if icon and os.path.exists(icon):
+            cmd.extend(["--icon", os.path.abspath(icon)])
+
+        cmd.append(script_path)  # 使用完整路径
+
+        if self.verbose:
+            cmd.append("--log-level")
+            cmd.append("DEBUG")
+
+        self.logger.debug("Running command: {0}".format(" ".join(cmd)))
+
+        try:
+            # 在脚本目录中运行PyInstaller
+            result = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE,
+                                    cwd=script_dir, universal_newlines=True)
+            stdout, stderr = result.communicate()
+
+            if result.returncode != 0:
+                raise subprocess.CalledProcessError(result.returncode, cmd, stderr)
+
+            if self.verbose:
+                self.logger.debug("PyInstaller output: {0}".format(stdout))
+                self.logger.debug("PyInstaller errors: {0}".format(stderr))
+        except subprocess.CalledProcessError as e:
+            raise PackageError("PyInstaller failed: {0}".format(e.output or e.stderr))
+
+        # 等待一段时间确保文件系统同步
+        import time
+        time.sleep(1)
+
+        # 查找生成的目录（直接在dist目录下）
+        if not os.path.exists(dist_dir):
+            self.logger.error("PyInstaller dist directory not found: {0}".format(dist_dir))
+            if os.path.exists(work_dir):
+                self.logger.error("Current contents of work_dir: {0}".format(os.listdir(work_dir)))
+            raise PackageError("PyInstaller output directory not found: {0}".format(dist_dir))
+
+        # 获取dist目录下的内容
+        dist_contents = os.listdir(dist_dir)
+        if not dist_contents:
+            self.logger.error("PyInstaller dist directory is empty: {0}".format(dist_dir))
+            raise PackageError("PyInstaller output directory is empty: {0}".format(dist_dir))
+
+        # PyInstaller在dist目录下创建了脚本名称的目录
+        script_name = FileUtils.get_script_name(script_path)
+        expected_dist_path = os.path.join(dist_dir, script_name)
+
+        # 检查预期的目录是否存在
+        if os.path.exists(expected_dist_path):
+            self.logger.info("Found PyInstaller output directory: {0}".format(expected_dist_path))
+            return expected_dist_path
+        else:
+            # 如果预期目录不存在，但dist目录中有内容，则使用dist目录
+            self.logger.warning("Expected PyInstaller output directory not found: {0}".format(expected_dist_path))
+            self.logger.info("Using dist directory: {0}".format(dist_dir))
+            self.logger.info("Contents of dist directory: {0}".format(dist_contents))
+            return dist_dir
+
+    def _run_nuitka(self, script_path):
+        """步骤1(Nuitka模式): 调用Nuitka --onedir打包"""
+        self.logger.info("Step 1: Running Nuitka...")
+
+        script_path = os.path.abspath(script_path)
+        script_dir = os.path.dirname(script_path)
+
+        work_dir = os.path.join(script_dir, "_pyinstallerex_temp")
+
+        import shutil
+        if os.path.exists(work_dir):
+            try:
+                shutil.rmtree(work_dir)
+            except OSError as e:
+                self.logger.warning("Failed to remove old temp directory: {0}".format(e))
+
+        FileUtils.ensure_directory_exists(work_dir)
+
+        dist_dir = os.path.join(work_dir, "dist")
+        FileUtils.ensure_directory_exists(dist_dir)
+
+        cmd = [
+            sys.executable,
+            "-m", "nuitka",
+            "--standalone",
+            "--output-dir=" + os.path.abspath(dist_dir),
+        ]
+
+        # 添加图标
+        icon = getattr(self.config, 'icon', None)
+        if icon and os.path.exists(icon):
+            cmd.append("--windows-icon-from-ico=" + os.path.abspath(icon))
+
+        cmd.append(script_path)
+
+        if self.verbose:
+            cmd.append("--verbose")
+
+        self.logger.debug("Running command: {0}".format(" ".join(cmd)))
+
+        try:
+            result = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE,
+                                      cwd=script_dir, universal_newlines=True)
+            stdout, stderr = result.communicate()
+
+            if result.returncode != 0:
+                raise subprocess.CalledProcessError(result.returncode, cmd, stderr)
+
+            if self.verbose:
+                self.logger.debug("Nuitka output: {0}".format(stdout))
+                self.logger.debug("Nuitka errors: {0}".format(stderr))
+        except subprocess.CalledProcessError as e:
+            raise PackageError("Nuitka failed: {0}".format(e.output or e.stderr))
+
+        import time
+        time.sleep(1)
+
+        if not os.path.exists(dist_dir):
+            raise PackageError("Nuitka output directory not found: {0}".format(dist_dir))
+
+        dist_contents = os.listdir(dist_dir)
+        if not dist_contents:
+            raise PackageError("Nuitka output directory is empty: {0}".format(dist_dir))
+
+        script_name = FileUtils.get_script_name(script_path)
+        expected_dist_path = os.path.join(dist_dir, script_name + ".dist")
+
+        if os.path.exists(expected_dist_path):
+            self.logger.info("Found Nuitka output directory: {0}".format(expected_dist_path))
+            return expected_dist_path
+        else:
+            self.logger.warning("Expected Nuitka output directory not found: {0}".format(expected_dist_path))
+            return dist_dir
+
+    def _run_pyoxidizer(self, script_path):
+        """步骤1(PyOxidizer模式): 调用PyOxidizer打包"""
+        self.logger.info("Step 1: Running PyOxidizer...")
+
+        script_path = os.path.abspath(script_path)
+        script_dir = os.path.dirname(script_path)
+
+        work_dir = os.path.join(script_dir, "_pyinstallerex_temp")
+
+        import shutil
+        if os.path.exists(work_dir):
+            try:
+                shutil.rmtree(work_dir)
+            except OSError as e:
+                self.logger.warning("Failed to remove old temp directory: {0}".format(e))
+
+        FileUtils.ensure_directory_exists(work_dir)
+
+        dist_dir = os.path.join(work_dir, "dist")
+        FileUtils.ensure_directory_exists(dist_dir)
+
+        # 生成 pyoxidizer.bzl 配置文件
+        icon = getattr(self.config, 'icon', None)
+        icon_line = ""
+        if icon and os.path.exists(icon):
+            icon_line = '    exe.windows_icon_path = "{0}"'.format(os.path.abspath(icon).replace("\\", "\\\\"))
+
+        pyoxidizer_config = '''
+def make_exe():
+    dist = default_python_distribution()
+    policy = dist.make_python_packaging_policy()
+    policy.resources_location = "filesystem-relative:lib"
+    python_config = dist.make_python_interpreter_config()
+    python_config.run_command = open("{script_path}", "r").read()
+    exe = dist.to_python_executable(
+        name="{script_name}",
+        packaging_policy=policy,
+        config=python_config,
+    )
+{icon_line}
+    exe.add_python_resources(file="{script_path}")
+    return exe
+
+def make_embedded_resources(exe):
+    return exe.to_embedded_resources()
+
+def make_install(exe):
+    files = exe.to_install_files()
+    return files
+
+register_target("exe", make_exe)
+register_target("resources", make_embedded_resources, depends_on=["exe"], default_build_script=True)
+register_target("install_files", make_install, depends_on=["exe"])
+resolve_targets()
+'''.format(script_path=script_path, script_name=FileUtils.get_script_name(script_path), icon_line=icon_line)
+
+        bzl_path = os.path.join(work_dir, "pyoxidizer.bzl")
+        with open(bzl_path, 'w') as f:
+            f.write(pyoxidizer_config)
+
+        cmd = [
+            "pyoxidizer",
+            "run",
+            "--path", os.path.abspath(work_dir),
+            "install",
+            "--path", os.path.abspath(dist_dir)
+        ]
+
+        self.logger.debug("Running command: {0}".format(" ".join(cmd)))
+
+        try:
+            result = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE,
+                                      cwd=work_dir, universal_newlines=True)
+            stdout, stderr = result.communicate()
+
+            if result.returncode != 0:
+                raise subprocess.CalledProcessError(result.returncode, cmd, stderr)
+
+            if self.verbose:
+                self.logger.debug("PyOxidizer output: {0}".format(stdout))
+                self.logger.debug("PyOxidizer errors: {0}".format(stderr))
+        except subprocess.CalledProcessError as e:
+            raise PackageError("PyOxidizer failed: {0}".format(e.output or e.stderr))
+
+        import time
+        time.sleep(1)
+
+        if not os.path.exists(dist_dir):
+            raise PackageError("PyOxidizer output directory not found: {0}".format(dist_dir))
+
+        dist_contents = os.listdir(dist_dir)
+        if not dist_contents:
+            raise PackageError("PyOxidizer output directory is empty: {0}".format(dist_dir))
+
+        self.logger.info("Found PyOxidizer output directory: {0}".format(dist_dir))
+        return dist_dir
+
+    def _get_binary_launcher(self):
+        """获取对应平台的二进制启动器（如果指定了图标则动态编译）"""
+        # 确定平台
+        system_info = SystemInfo()
+        platform_name = system_info.get_platform()
+
+        # 根据平台选择启动器（处理不同平台名称）
+        if platform_name in ["windows", "win"]:
+            launcher_name = "launcher_windows.exe" if sys.maxsize > 2**32 else "launcher_windows.exe"
+        elif platform_name in ["linux", "linux2", "linux_x86"]:
+            launcher_name = "launcher_linux_x86"
+        elif platform_name in ["linux_arm"]:
+            launcher_name = "launcher_linux_arm"
+        elif platform_name in ["linux_arm64"]:
+            launcher_name = "launcher_linux_arm64"
+        else:
+            raise PackageError("Unsupported platform: {0}".format(platform_name))
+
+        # 图标设置已移至 _combine_final_file 中通过 win32api.UpdateResource 实现
+        # 这样可以在合并 ZIP 数据之前对纯启动器设置图标，避免破坏附加数据
+
+        # 多种方式查找启动器文件
+        launcher_paths = []
+        
+        # 1. 首先尝试从安装包的数据文件中查找启动器
+        try:
+            import pkg_resources
+            launcher_path = pkg_resources.resource_filename(
+                'PyInstallerEx', 
+                '../bin/' + launcher_name
+            )
+            launcher_paths.append(launcher_path)
+        except:
+            pass
+
+        # 2. 尝试使用pkg_resources查找（适用于wheel包）
+        try:
+            import pkg_resources
+            launcher_path = pkg_resources.resource_filename(
+                'pyinstallerex', 
+                'bin/' + launcher_name
+            )
+            launcher_paths.append(launcher_path)
+        except:
+            pass
+
+        # 3. 尝试从wheel包的data目录查找启动器
+        try:
+            import pkg_resources
+            launcher_path = pkg_resources.resource_filename(
+                'pyinstallerex', 
+                'pyinstallerex-0.1.6.data/data/bin/' + launcher_name
+            )
+            launcher_paths.append(launcher_path)
+        except:
+            pass
+            
+        # 4. 尝试从wheel包的data目录查找启动器(动态版本)
+        try:
+            # 获取当前模块路径
+            current_path = os.path.dirname(os.path.abspath(__file__))
+            # 动态生成所有可能的版本路径
+            parent_dir = os.path.dirname(os.path.dirname(current_path))
+            data_dirs = []
+            # 尝试当前版本及几个历史版本
+            versions_to_try = [__version__] + ['0.1.' + str(i) for i in range(5, -1, -1)]
+            for ver in versions_to_try:
+                data_dir = os.path.join(parent_dir, 'pyinstallerex-{0}.data/data/bin'.format(ver))
+                data_dirs.append(data_dir)
+                    
+            for data_dir in data_dirs:
+                launcher_path = os.path.join(data_dir, launcher_name)
+                launcher_paths.append(os.path.abspath(launcher_path))
+        except Exception:
+            pass
+
+        # 5. 尝试从源码目录查找启动器
+        launcher_path = os.path.join(
+            os.path.dirname(os.path.dirname(os.path.abspath(__file__))),  # src/PyInstallerEx
+            "..",  # src
+            "..",  # 项目根目录
+            "bin",
+            launcher_name
+        )
+        launcher_paths.append(os.path.abspath(launcher_path))
+        
+        # 6. 尝试从site-packages的数据目录查找启动器
+        try:
+            # 获取当前模块的路径
+            current_module_path = os.path.dirname(os.path.abspath(__file__))
+            # 构造从site-packages开始的路径
+            launcher_path = os.path.join(
+                os.path.dirname(os.path.dirname(os.path.dirname(current_module_path))),  # site-packages
+                "bin",
+                launcher_name
+            )
+            launcher_paths.append(os.path.abspath(launcher_path))
+        except:
+            pass
+        
+        # 7. 尝试从通过data_files安装的数据目录查找启动器
+        try:
+            # 查找通过data_files安装的文件通常在site-packages同级目录的bin目录下
+            for path in sys.path:
+                # 检查标准的data_files安装路径
+                if 'site-packages' in path:
+                    # 构造bin目录路径
+                    launcher_path = os.path.join(
+                        os.path.dirname(path),  # site-packages的上级目录
+                        "bin", 
+                        launcher_name
+                    )
+                    launcher_paths.append(os.path.abspath(launcher_path))
+                    
+                # 检查site-packages下的bin目录（直接安装）
+                launcher_path = os.path.join(path, "bin", launcher_name)
+                launcher_paths.append(os.path.abspath(launcher_path))
+        except:
+            pass
+
+        # 8. 尝试从标准数据目录查找
+        try:
+            for path in sys.path:
+                launcher_path = os.path.join(path, "bin", launcher_name)
+                launcher_paths.append(os.path.abspath(launcher_path))
+        except:
+            pass
+
+        # 查找第一个存在的启动器文件
+        found_launcher_path = None
+        for launcher_path in launcher_paths:
+            if os.path.exists(launcher_path):
+                found_launcher_path = launcher_path
+                break
+
+        # 如果找不到启动器文件，则提供详细的错误信息
+        if not found_launcher_path:
+            error_msg = "Binary launcher not found: {0}".format(launcher_name)
+            error_msg += "\nSearched platform: {0}".format(platform_name)
+            error_msg += "\nTried paths:"
+            for path in launcher_paths:
+                error_msg += "\n  - {0} (exists: {1})".format(path, os.path.exists(path))
+            raise PackageError(error_msg)
+
+        self.logger.info("Using binary launcher: {0}".format(found_launcher_path))
+        return found_launcher_path
+
+    def _process_configuration(self, script_path, pyinstaller_dir):
+        """处理配置文件"""
+        # 获取脚本名称
+        script_name = FileUtils.get_script_name(script_path)
+
+        # 生成配置内容
+        import os
+        script_exe_name = "{0}.exe".format(script_name) if SystemInfo().get_platform() in ["windows", "win"] else script_name
+        config_data = {
+            "main": script_exe_name,
+            "name": self.config.filename or script_name,
+            "version": self.config.version or "1.0.0",
+            "description": self.config.description or "Application packaged with PyInstallerEx",
+            "tmp_dir": self.config.tmp_dir or "ex_{name}_{md5}",
+            "author": self.config.author or "Unknown",
+            "extract_mode": self.config.extract_mode or "temp"
+        }
+
+        # 渲染配置为JSON
+        rendered_config = json.dumps(config_data, indent=2, ensure_ascii=False)
+
+        # 保存配置供后续合并使用
+        self._rendered_config = rendered_config
+
+        # 将配置写入PyInstaller输出目录
+        config_path = FileUtils.copy_config_to_dir(rendered_config, pyinstaller_dir, "ex.config.json")
+
+        self.logger.info("Configuration written to: {0}".format(config_path))
+        return rendered_config
+
+    def _compress_directory(self, directory):
+        """压缩目录为ZIP文件"""
+        self.logger.info("Step 4: Compressing directory to ZIP...")
+
+        # 创建临时ZIP文件路径
+        zip_path = directory + ".zip"
+
+        # 压缩目录
+        CompressionUtils.create_zip_from_directory(directory, zip_path)
+
+        self.logger.info("ZIP file created: {0}".format(zip_path))
+        return zip_path
+
+    def _calculate_file_md5(self, file_path):
+        """计算文件的MD5哈希值"""
+        import hashlib
+        hash_md5 = hashlib.md5()
+        with open(file_path, "rb") as f:
+            for chunk in iter(lambda: f.read(4096), b""):
+                hash_md5.update(chunk)
+        return hash_md5.hexdigest()
+
+    def _combine_final_file(self, binary_path, zip_path, output_dir, script_path):
+        """合并启动器和ZIP文件为最终输出"""
+        self.logger.info("Step 6: Combining launcher and ZIP file...")
+
+        # 确定输出目录
+        if output_dir is None:
+            output_dir = os.path.dirname(os.path.abspath(script_path))
+
+        FileUtils.ensure_directory_exists(output_dir)
+
+        # 确定输出文件名
+        script_name = FileUtils.get_script_name(script_path)
+        if SystemInfo().get_platform() in ["windows", "win"]:
+            output_filename = script_name + ".exe"
+        else:
+            output_filename = script_name
+
+        output_path = os.path.join(output_dir, output_filename)
+
+        # 在Windows上，如果指定了图标，先对启动器设置图标
+        icon = getattr(self.config, 'icon', None)
+        if SystemInfo().get_platform() in ["windows", "win"] and icon and os.path.exists(icon):
+            self.logger.info("Setting custom icon on launcher: {0}".format(icon))
+            
+            # 创建临时启动器文件用于设置图标
+            temp_launcher_path = binary_path + ".tmp"
+            shutil.copy2(binary_path, temp_launcher_path)
+            
+            # 对临时启动器设置图标
+            self._set_windows_icon(temp_launcher_path, icon)
+            
+            # 使用设置了图标的启动器
+            binary_path = temp_launcher_path
+            self.logger.info("Icon set successfully on launcher")
+        
+        # 合并文件
+        with open(output_path, "wb") as output_file:
+            # 写入启动器
+            with open(binary_path, "rb") as launcher_file:
+                launcher_data = launcher_file.read()
+                output_file.write(launcher_data)
+
+            # 记录 ZIP 数据的起始偏移
+            zip_offset = len(launcher_data)
+
+            # 读取 ZIP 文件内容
+            with open(zip_path, "rb") as zip_file:
+                zip_data = zip_file.read()
+            
+            # 计算 ZIP 数据的 MD5 哈希值（仅 ZIP 数据，不包括配置）
+            import hashlib
+            zip_md5 = hashlib.md5(zip_data).hexdigest()
+            self.logger.debug("ZIP MD5: {0}".format(zip_md5))
+
+            # 追加ZIP数据
+            output_file.write(zip_data)
+
+            # 写入配置JSON到文件末尾（启动器从尾部读取）
+            config_data = json.loads(self._rendered_config)
+            config_data["zip_offset"] = zip_offset
+            config_data["zip_md5"] = zip_md5
+            config_json = json.dumps(config_data, indent=2, ensure_ascii=False)
+            output_file.write(config_json.encode("utf-8"))
+
+        # 清理临时启动器文件
+        if SystemInfo().get_platform() in ["windows", "win"] and icon and os.path.exists(icon):
+            try:
+                os.remove(binary_path)
+            except Exception as e:
+                self.logger.debug("Failed to remove temp launcher: {0}".format(e))
+
+        # 在Unix系统上设置可执行权限
+        if SystemInfo().get_platform() not in ["windows", "win"]:
+            os.chmod(output_path, 0o755)
+
+        self.logger.info("Final executable created: {0}".format(output_path))
+        return output_path
+
+    def _set_windows_icon(self, exe_path, icon_path):
+        """在Windows上为exe文件设置图标（使用 pywin32 - 参考 PyInstaller 实现）"""
+        try:
+            import win32api
+            import struct
+
+            # 定义资源类型常量
+            RT_ICON = 3
+            RT_GROUP_ICON = 14
+
+            # 读取 ICO 文件
+            with open(icon_path, 'rb') as f:
+                icon_data = f.read()
+
+            # 验证 ICO 文件格式
+            if len(icon_data) < 6:
+                self.logger.warning("Invalid ICO file: too short")
+                return
+
+            reserved, icon_type, count = struct.unpack('<HHH', icon_data[:6])
+            if icon_type != 1:
+                self.logger.warning("Not a valid ICO file")
+                return
+
+            # 解析图标入口（参考 PyInstaller 的 ICONDIRENTRY 格式：bbbbhhii）
+            offset = 6
+            icon_entries = []
+            images = []
+            for i in range(count):
+                if offset + 16 > len(icon_data):
+                    break
+                # 使用与 PyInstaller 相同的格式：BBBBHHII (width, height, colors, reserved, planes, bitcount, size, offset)
+                entry_data = icon_data[offset:offset+16]
+                width, height, colors, reserved2, planes, bitcount, size, file_offset = \
+                    struct.unpack('<BBBBHHII', entry_data)
+                icon_entries.append({
+                    'width': width,
+                    'height': height,
+                    'planes': planes,
+                    'bitcount': bitcount,
+                    'size': size,
+                    'file_offset': file_offset
+                })
+                # 提取图像数据
+                img_data = icon_data[file_offset:file_offset + size]
+                images.append(img_data)
+                offset += 16
+
+            if not icon_entries:
+                self.logger.warning("No icons found in ICO file")
+                return
+
+            # 使用 win32api.BeginUpdateResource 开始更新（和 PyInstaller 一样）
+            hdst = win32api.BeginUpdateResource(exe_path, 0)
+
+            # 写入 RT_ICON 资源（直接使用 ICO 中的原始图像数据）
+            iconid = 1
+            for data in images:
+                win32api.UpdateResource(hdst, RT_ICON, iconid, data)
+                self.logger.debug("Writing RT_ICON %d resource with %d bytes", iconid, len(data))
+                iconid = iconid + 1
+
+            # 构建并写入 RT_GROUP_ICON 资源（参考 PyInstaller 的 GRPICONDIRENTRY 格式）
+            # GRPICONDIRENTRY 格式: bbbb h h i h (width, height, colors, reserved, planes, bitcount, size, id)
+            group_data = struct.pack('<HHH', 0, 1, len(icon_entries))  # GRPICONDIR header
+            for idx, entry in enumerate(icon_entries, start=1):
+                # 使用与 PyInstaller 相同的格式：bbbbhhih
+                group_entry = struct.pack('<BBBBHHIH',
+                    entry['width'],      # bWidth (BYTE)
+                    entry['height'],     # bHeight (BYTE)
+                    0,                   # bColorCount (BYTE)
+                    0,                   # bReserved (BYTE)
+                    entry['planes'],     # wPlanes (WORD) - 可能超过65535，需要截断
+                    entry['bitcount'],   # wBitCount (WORD)
+                    entry['size'],       # dwBytesInRes (DWORD)
+                    idx                  # nID (WORD)
+                )
+                group_data += group_entry
+            
+            win32api.UpdateResource(hdst, RT_GROUP_ICON, 1, group_data)
+            self.logger.debug("Writing RT_GROUP_ICON resource with %d bytes", len(group_data))
+
+            # 完成更新
+            win32api.EndUpdateResource(hdst, 0)
+            self.logger.info("Icon set successfully using win32api: {0}".format(icon_path))
+
+        except ImportError as e:
+            self.logger.warning("pywin32 not available, skipping icon setting: {0}".format(e))
+        except Exception as e:
+            self.logger.warning("Failed to set icon: {0}".format(e))
+            import traceback
+            self.logger.debug(traceback.format_exc())
+
+    def _compile_rust_launcher_with_icon(self, icon_path):
+        """动态编译带图标的 Rust 启动器
+        
+        Args:
+            icon_path: 图标文件路径（必须是 .ico 格式）
+        
+        Returns:
+            str: 编译后的启动器路径，失败则返回 None
+        """
+        try:
+            import shutil
+            import subprocess
+            
+            # 获取 Rust 项目目录
+            current_dir = os.path.dirname(os.path.abspath(__file__))
+            # packager.py 在 src/PyInstallerEx/core/
+            # Rust 项目在 src/launcher/
+            rust_project_dir = os.path.join(
+                os.path.dirname(os.path.dirname(current_dir)),  # 向上两级到 src/
+                'launcher'
+            )
+            
+            if not os.path.exists(rust_project_dir):
+                self.logger.warning("Rust project directory not found: {0}".format(rust_project_dir))
+                return None
+            
+            # 创建临时工作目录
+            temp_work_dir = os.path.join(rust_project_dir, '_temp_build')
+            if os.path.exists(temp_work_dir):
+                shutil.rmtree(temp_work_dir)
+            os.makedirs(temp_work_dir)
+            
+            # 复制所有 Rust 源文件到临时目录
+            for item in ['src', 'Cargo.toml', 'build.rs']:
+                src_item = os.path.join(rust_project_dir, item)
+                dst_item = os.path.join(temp_work_dir, item)
+                if os.path.isdir(src_item):
+                    shutil.copytree(src_item, dst_item)
+                elif os.path.isfile(src_item):
+                    shutil.copy2(src_item, dst_item)
+            
+            # 复制图标文件并重命名为 icon.ico
+            icon_dst = os.path.join(temp_work_dir, 'icon.ico')
+            shutil.copy2(icon_path, icon_dst)
+            self.logger.info("Copied icon to: {0}".format(icon_dst))
+            
+            # 执行 cargo build --release
+            self.logger.info("Compiling Rust launcher with custom icon...")
+            result = subprocess.run(
+                ['cargo', 'build', '--release'],
+                cwd=temp_work_dir,
+                capture_output=True,
+                text=True,
+                timeout=300  # 5分钟超时
+            )
+            
+            if result.returncode != 0:
+                self.logger.error("Rust compilation failed:")
+                self.logger.error(result.stderr)
+                return None
+            
+            # 获取编译后的启动器路径
+            target_dir = os.path.join(temp_work_dir, 'target', 'release')
+            compiled_launcher = os.path.join(target_dir, 'pyinstallerex-launcher.exe')
+            
+            if not os.path.exists(compiled_launcher):
+                self.logger.warning("Compiled launcher not found: {0}".format(compiled_launcher))
+                return None
+            
+            # 复制到 bin 目录以便后续使用
+            bin_dir = os.path.join(os.path.dirname(os.path.dirname(current_dir)), 'bin')
+            FileUtils.ensure_directory_exists(bin_dir)
+            final_launcher = os.path.join(bin_dir, 'launcher_windows_custom.exe')
+            shutil.copy2(compiled_launcher, final_launcher)
+            
+            self.logger.info("Custom launcher compiled successfully: {0}".format(final_launcher))
+            
+            # 清理临时目录
+            try:
+                shutil.rmtree(temp_work_dir)
+            except Exception as e:
+                self.logger.debug("Failed to cleanup temp dir: {0}".format(e))
+            
+            return final_launcher
+            
+        except Exception as e:
+            self.logger.error("Error compiling Rust launcher: {0}".format(e))
+            import traceback
+            self.logger.debug(traceback.format_exc())
+            return None