aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Buesch <m@bues.ch>2018-09-11 17:53:29 +0200
committerMichael Buesch <m@bues.ch>2018-09-15 22:00:29 +0200
commit862c4ccf91d2cfc48d1ce2f38b194885eccb3069 (patch)
treed2d8f293e89d6ce193494b7b4bbe0de1b5cf2687
parentf12fbffae026a6cbf6d36a56fe5773f1e0ed4732 (diff)
downloadawlsim-862c4ccf91d2cfc48d1ce2f38b194885eccb3069.tar.xz
awlsim-862c4ccf91d2cfc48d1ce2f38b194885eccb3069.zip
setup: Remove py2exe support
Signed-off-by: Michael Buesch <m@bues.ch>
-rwxr-xr-xsetup.py40
1 files changed, 16 insertions, 24 deletions
diff --git a/setup.py b/setup.py
index 787532a9..3bd9ba8a 100755
--- a/setup.py
+++ b/setup.py
@@ -34,15 +34,9 @@ import warnings
from distutils.core import setup
from awlsim.common.version import VERSION_STRING
try:
- import py2exe
-except ImportError as e:
- py2exe = None
-try:
- if py2exe and "py2exe" in sys.argv:
- raise ImportError
from cx_Freeze import setup, Executable
cx_Freeze = True
-except ImportError as e:
+except ImportError:
cx_Freeze = False
sys.path.insert(0, "./misc")
@@ -128,30 +122,28 @@ hwmodules = [
]
# Create freeze executable list.
-guiBase = None
-if isWindows:
- guiBase = "Win32GUI"
-freezeExecutables = [ ("awlsim-gui", None, guiBase),
- ("awlsim-client", None, None),
- ("awlsim-server", None, None),
- ("awlsim-symtab", None, None),
- ("awlsim-proupgrade", None, None),
- ("awlsim-test", None, None),
- ("awlsim/coreserver/run.py", "awlsim-server-module", None), ]
-if py2exe:
- extraKeywords["console"] = [ s for s, e, b in freezeExecutables ]
if cx_Freeze:
+ guiBase = "Win32GUI" if isWindows else None
+ freezeExecutables = [
+ ("awlsim-gui", None, guiBase),
+ ("awlsim-client", None, None),
+ ("awlsim-server", None, None),
+ ("awlsim-symtab", None, None),
+ ("awlsim-proupgrade", None, None),
+ ("awlsim-test", None, None),
+ ("awlsim/coreserver/run.py", "awlsim-server-module", None),
+ ]
executables = []
for script, exe, base in freezeExecutables:
if exe:
if isWindows:
exe += ".exe"
- executables.append(Executable(script = script,
- targetName = exe,
- base = base))
+ executables.append(Executable(script=script,
+ targetName=exe,
+ base=base))
else:
- executables.append(Executable(script = script,
- base = base))
+ executables.append(Executable(script=script,
+ base=base))
extraKeywords["executables"] = executables
extraKeywords["options"] = {
"build_exe" : {
bues.ch cgit interface