Try a different way of explicitly defining what packages to include and exclude

This commit is contained in:
Micah Lee 2022-03-31 12:31:48 -07:00
parent 6f339a2c62
commit 247528a8f9

View File

@ -24,6 +24,7 @@ import platform
import shutil import shutil
import cx_Freeze import cx_Freeze
from cx_Freeze import setup, Executable from cx_Freeze import setup, Executable
from setuptools import find_packages
# There's an obscure cx_Freeze bug that I'm hitting that's preventing the macOS # There's an obscure cx_Freeze bug that I'm hitting that's preventing the macOS
# package from getting built. This is some monkeypatching to fix it. # package from getting built. This is some monkeypatching to fix it.
@ -148,6 +149,11 @@ setup(
name="onionshare", name="onionshare",
version=version, version=version,
description="Securely and anonymously share files, host websites, and chat with friends using the Tor network", description="Securely and anonymously share files, host websites, and chat with friends using the Tor network",
packages=find_packages(
where=".",
include=["onionshare"],
exclude=["package", "screenshots", "scripts", "tests"],
),
options={ options={
# build_exe, for Windows and macOS # build_exe, for Windows and macOS
"build_exe": { "build_exe": {
@ -166,9 +172,6 @@ setup(
"PySide2.QtWidgets", "PySide2.QtWidgets",
], ],
"excludes": [ "excludes": [
"package",
"screenshots",
"scripts",
"test", "test",
"tkinter", "tkinter",
"PySide2.Qt3DAnimation", "PySide2.Qt3DAnimation",
@ -217,7 +220,7 @@ setup(
# bdist_mac, making the macOS app bundle # bdist_mac, making the macOS app bundle
"bdist_mac": { "bdist_mac": {
"iconfile": os.path.join("onionshare", "resources", "onionshare.icns"), "iconfile": os.path.join("onionshare", "resources", "onionshare.icns"),
"bundle_name": "OnionShare" "bundle_name": "OnionShare",
}, },
}, },
executables=[ executables=[