Skip to content

Commit

Permalink
Fix build
Browse files Browse the repository at this point in the history
  • Loading branch information
mar10 committed Dec 26, 2021
1 parent e1a9fae commit c2c67ee
Show file tree
Hide file tree
Showing 9 changed files with 238 additions and 392 deletions.
397 changes: 215 additions & 182 deletions Pipfile.lock

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bdist_wheel]
universal = 1
; universal = 1

[metadata]
name = WsgiDAV
Expand Down
38 changes: 22 additions & 16 deletions setup_bdist_msi.py
Original file line number Diff line number Diff line change
Expand Up @@ -65,22 +65,22 @@

# These dependencies are for plain WsgiDAV:
install_requires = [
"defusedxml",
"jinja2", # NOTE: we must use lower-case name, otherwise import will fail
"json5",
"yaml", # NOTE: must import 'yaml' (but dependency is names 'PyYAML')
# "defusedxml",
# "jinja2", # NOTE: we must use lower-case name, otherwise import will fail
# "json5",
# "yaml", # NOTE: must import 'yaml' (but dependency is named 'PyYAML')
# Used by wsgidav.dc.nt_dc:
"win32net",
"win32netcon",
"win32security",
# "win32net",
# "win32netcon",
# "win32security",
]
# ... The Windows MSI Setup should include lxml and CherryPy
install_requires.extend(
[
"cheroot",
"cheroot.ssl.builtin",
# "cheroot.ssl.builtin",
"lxml",
"wsgidav.dc.nt_dc",
# "wsgidav.dc.nt_dc",
]
)
setup_requires = install_requires
Expand All @@ -91,9 +91,9 @@
script="wsgidav/server/server_cli.py",
base=None,
# base="Win32GUI",
targetName="wsgidav.exe",
icon="docs/logo.ico",
shortcutName="WsgiDAV",
target_name="wsgidav.exe",
icon="docs/source/logo.ico",
shortcut_name="WsgiDAV",
copyright="(c) 2009-2021 Martin Wendt",
# trademarks="...",
)
Expand All @@ -106,9 +106,11 @@
"packages": [
"asyncio", # https://stackoverflow.com/a/41881598/19166
"wsgidav.dir_browser",
# "wsgidav.dc.nt_dc",
"wsgidav.dc.nt_dc",
],
"excludes": [
"tkinter",
],
"excludes": ["tkinter"],
"constants": "BUILD_COPYRIGHT='(c) 2009-2021 Martin Wendt'",
# "init_script": "Console",
"include_msvcr": True,
Expand All @@ -119,7 +121,8 @@
"upgrade_code": "{92F74137-38D1-48F6-9730-D5128C8B611E}",
"add_to_path": True,
# "all_users": True,
"install_icon": "docs/logo.ico",
"install_icon": "docs/source/logo.ico",
# "summary_data": {"author": "Martin Wendt"},
}

setup(
Expand Down Expand Up @@ -150,7 +153,10 @@
extras_require={},
# cmdclass={"test": ToxCommand, "sphinx": SphinxCommand},
entry_points={"console_scripts": ["wsgidav = wsgidav.server.server_cli:run"]},
options={"build_exe": build_exe_options, "bdist_msi": bdist_msi_options},
options={
"build_exe": build_exe_options,
"bdist_msi": bdist_msi_options,
},
# Used by cx_Freeze:
executables=executables,
)
File renamed without changes.
7 changes: 0 additions & 7 deletions tools/_map_w.bat

This file was deleted.

4 changes: 0 additions & 4 deletions tools/_unmap_all.bat

This file was deleted.

132 changes: 0 additions & 132 deletions tools/release_wsgidav.ps1

This file was deleted.

25 changes: 0 additions & 25 deletions tools/upload_RELEASE_BUILD.bat

This file was deleted.

25 changes: 0 additions & 25 deletions tools/upload_daily_build.bat

This file was deleted.

0 comments on commit c2c67ee

Please sign in to comment.