From 3671ea512ffc177c3ef8f6691098d99da3a31ac6 Mon Sep 17 00:00:00 2001 From: dmiller Date: Mon, 20 Apr 2026 17:03:42 +0000 Subject: [PATCH] Fix zenmap packaging to include translations --- zenmap/install_scripts/windows/PKGBUILD | 3 ++- zenmap/pyproject.toml | 28 ++++--------------------- 2 files changed, 6 insertions(+), 25 deletions(-) diff --git a/zenmap/install_scripts/windows/PKGBUILD b/zenmap/install_scripts/windows/PKGBUILD index c855af0e8..392ad670e 100644 --- a/zenmap/install_scripts/windows/PKGBUILD +++ b/zenmap/install_scripts/windows/PKGBUILD @@ -28,7 +28,8 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-python-build" build() { cd "${NMAP_DIR}/zenmap" - ${MINGW_PREFIX}/bin/python -m build --wheel --skip-dependency-check --no-isolation + cp "${NMAP_DIR}/ndiff/ndiff.py" . + ${MINGW_PREFIX}/bin/python -m build --wheel --no-isolation } package() { diff --git a/zenmap/pyproject.toml b/zenmap/pyproject.toml index 28cb2d2c3..5fe3b9ba6 100644 --- a/zenmap/pyproject.toml +++ b/zenmap/pyproject.toml @@ -28,35 +28,15 @@ zenmap = "zenmapGUI.App:run" ndiff = "ndiff:run_main" [tool.setuptools] -packages = [ -"zenmapCore", -"zenmapCore.data.config", -"zenmapCore.data.docs", -"zenmapCore.data.locale", -"zenmapCore.data.misc", -"zenmapCore.data.pixmaps", -"zenmapCore.data.pixmaps.radialnet", -"zenmapGUI", -"zenmapGUI.higwidgets", -"radialnet", -"radialnet.bestwidgets", -"radialnet.core", -"radialnet.gui", -"radialnet.util", -] py-modules = ["ndiff"] +include-package-data = true + +[tool.setuptools.packages.find] +include = ["zenmapCore", "zenmapGUI", "radialnet"] [tool.setuptools.dynamic] version = {attr = "zenmapCore.Version.VERSION"} -[tool.setuptools.package-data] -"zenmapCore.data.pixmaps" = ["*.gif", "*.png"] -"zenmapCore.data.pixmaps.radialnet" = ["*.png"] -"zenmapCore.data.config" = ["zenmap.conf", "scan_profile.usp", "zenmap_version"] -"zenmapCore.data.docs" = ["*.html"] -"zenmapCore.data.locale" = ["*/LC_MESSAGES/zenmap.mo"] -"zenmapCore.data.misc" = ["*.xml"] - [tool.setuptools-gettext] source_dir = "zenmapCore/data/locale" build_dir = "zenmapCore/data/locale"