From 862c4ccf91d2cfc48d1ce2f38b194885eccb3069 Mon Sep 17 00:00:00 2001
From: Michael Buesch <m@bues.ch>
Date: Tue, 11 Sep 2018 17:53:29 +0200
Subject: setup: Remove py2exe support

Signed-off-by: Michael Buesch <m@bues.ch>
---
 setup.py | 40 ++++++++++++++++------------------------
 1 file 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" : {
-- 
cgit v1.2.3