diff --git a/docs/change_logs/0-3.md b/docs/change_logs/0-3.md index bfc439d..a3dd666 100644 --- a/docs/change_logs/0-3.md +++ b/docs/change_logs/0-3.md @@ -1,5 +1,15 @@ # lndl 0.3 +## 0.3.7 + +- lndl-nuitka 现在不会再输出那一堆 debug 信息了 + +### CompilerHelper + +- 修复了如果未定义 `icon_path` 时 会报错的问题 +- 这大概是最后一次修复了 +- 0.4 会删除这一部分 + ## 0.3.6 - logger 的 `info` 更白了 diff --git a/src/lib_not_dr/nuitka/compile.py b/src/lib_not_dr/nuitka/compile.py index 4225be4..11bf047 100644 --- a/src/lib_not_dr/nuitka/compile.py +++ b/src/lib_not_dr/nuitka/compile.py @@ -480,16 +480,17 @@ class CompilerHelper(Options): self.product_version, self.product_version, ) - cmd_list += format_cmd( - "--macos-app-icon=", self.icon_path.absolute(), self.icon_path - ) - elif platform.system() == "Windows": + if self.icon_path is not None: + cmd_list += format_cmd( + "--macos-app-icon=", self.icon_path.absolute(), self.icon_path + ) + elif platform.system() == "Windows" and self.icon_path is not None: cmd_list += format_cmd( "--windows-icon-from-ico=", self.icon_path.absolute(), self.icon_path, ) - elif platform.system() == "Linux": + elif platform.system() == "Linux" and self.icon_path is not None: cmd_list += format_cmd( "--linux-icon=", self.icon_path.absolute(), self.icon_path ) diff --git a/src/lib_not_dr/nuitka/reader/__init__.py b/src/lib_not_dr/nuitka/reader/__init__.py index 2b2b846..c92fd7b 100644 --- a/src/lib_not_dr/nuitka/reader/__init__.py +++ b/src/lib_not_dr/nuitka/reader/__init__.py @@ -9,7 +9,6 @@ import platform import subprocess from pathlib import Path -from typing import Dict, Union, List from lib_not_dr.nuitka import nuitka_config_type @@ -141,7 +140,6 @@ def cli_main() -> None: toml = toml_loads(f.read()) nuitka_config = pyproject_toml(toml) - print(f"config is: {nuitka_config}") cli_config = parse_raw_config_by_script(nuitka_config) subprocess_command = gen_subprocess_args(cli_config) diff --git a/src/lib_not_dr/nuitka/reader/arg_parser.py b/src/lib_not_dr/nuitka/reader/arg_parser.py index 37c35b8..073a8b4 100644 --- a/src/lib_not_dr/nuitka/reader/arg_parser.py +++ b/src/lib_not_dr/nuitka/reader/arg_parser.py @@ -94,7 +94,6 @@ def get_cli_nuitka_args() -> dict: arg_value = True arg_dict[arg_name] = arg_value - print(f"cli config: {arg_dict}") return arg_dict @@ -222,10 +221,6 @@ def parse_raw_config_by_script(raw_config: raw_config_type) -> nuitka_config_typ traceback.print_exc() return raw_config["cli"] - # if not isinstance(parsed_config, dict): - # print(f"script {script_path} parse failed ignore it") - # return raw_config["cli"] - return parsed_config