Skip to content

Commit eaed4a5

Browse files
committed
Build options are now correctly set.
Before the build options were set but overwritten afterwards. You can now use msi packages to upgrade the software (thanks to upgrade_code).
1 parent aee97be commit eaed4a5

File tree

1 file changed

+14
-17
lines changed

1 file changed

+14
-17
lines changed

setup.py

Lines changed: 14 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,7 @@
11
import sys
22
from cx_Freeze import setup, Executable
33

4-
# Dependencies are automatically detected, but it might need
5-
# fine tuning.
6-
copyfiles = [
7-
('C:\Python34\Lib\site-packages\PyQt5\libEGL.dll', 'libEGL.dll'),
8-
'tardis.ico', # Google for a fancy tardis icon until I've made one
9-
'LICENSE'
10-
]
11-
buildOptions = dict(packages=[], excludes=[], include_files=copyfiles)
4+
125

136
# GUI applications require a different base on Windows (the default is for a
147
# console application).
@@ -26,14 +19,17 @@
2619
)
2720
]
2821

29-
options = {
30-
'build_exe': {
31-
'include_files': [],
32-
'path': sys.path + ['modules']
33-
},
34-
"bdist_msi": {
35-
'upgrade-code': '{22456291-8eb9-4383-86db-e34658f10242}'
36-
}
22+
# Dependencies are automatically detected, but it might need
23+
# fine tuning.
24+
copyfiles = [
25+
('C:\Python34\Lib\site-packages\PyQt5\libEGL.dll', 'libEGL.dll'),
26+
'tardis.ico', # Google for a fancy tardis icon until I've made one
27+
'LICENSE'
28+
]
29+
build_exe_options = dict(packages=[], excludes=[], include_files=copyfiles)
30+
31+
bdist_msi_options = {
32+
"upgrade_code": "{22456291-8eb9-4383-86db-e34658f10242}"
3733
}
3834

3935

@@ -46,6 +42,7 @@
4642
install_requires=[
4743
'uptime',
4844
],
49-
options=dict(build_exe=buildOptions),
45+
options=dict(build_exe=build_exe_options,
46+
bdist_msi=bdist_msi_options),
5047
executables=executables
5148
)

0 commit comments

Comments
 (0)