From 502f47de5160b9653382f0f84cb83b39a382bb3d Mon Sep 17 00:00:00 2001
From: Sander Willems <swillems89@hotmail.com>
Date: Wed, 25 Nov 2020 15:41:16 +0100
Subject: [PATCH] Win one-click installer updates

---
 misc/alphatims.spec           | 65 ++++++++++++++++++-----------------
 misc/alphatims_pyinstaller.py |  2 ++
 misc/create_installer.bat     |  6 ++--
 3 files changed, 38 insertions(+), 35 deletions(-)

diff --git a/misc/alphatims.spec b/misc/alphatims.spec
index 03adbbd9..0a5608a5 100644
--- a/misc/alphatims.spec
+++ b/misc/alphatims.spec
@@ -73,45 +73,46 @@ pyz = PYZ(
 		a.zipped_data,
 		cipher=block_cipher
 )
-# exe = EXE(
-# 		pyz,
-# 	  a.scripts,
-# 	  [],
-# 	  exclude_binaries=True,
-# 	  name=exe_name,
-# 	  debug=False,
-# 	  bootloader_ignore_signals=False,
-# 	  strip=False,
-# 	  upx=True,
-# 	  console=True
-# )
-# coll = COLLECT(
-# 		exe,
-# 		a.binaries,
-# 		a.zipfiles,
-# 		a.datas,
-# 		*pkg_data,
-# 		strip=False,
-# 		upx=True,
-# 		upx_exclude=[],
-# 		name=exe_name
-# )
-
 exe = EXE(
 		pyz,
-		a.scripts,
+	  a.scripts,
+	  [],
+	  exclude_binaries=True,
+	  name=exe_name,
+	  debug=False,
+	  bootloader_ignore_signals=False,
+	  strip=False,
+	  upx=True,
+	  console=True,
+		icon=icon
+)
+coll = COLLECT(
+		exe,
 		a.binaries,
 		a.zipfiles,
 		a.datas,
 		*pkg_data,
-		[],
-		name=exe_name,
-		debug=False,
-		bootloader_ignore_signals=False,
 		strip=False,
 		upx=True,
 		upx_exclude=[],
-		runtime_tmpdir=None,
-		console=True,
-		icon=icon
+		name=exe_name
 )
+
+# exe = EXE(
+# 		pyz,
+# 		a.scripts,
+# 		a.binaries,
+# 		a.zipfiles,
+# 		a.datas,
+# 		*pkg_data,
+# 		[],
+# 		name=exe_name,
+# 		debug=False,
+# 		bootloader_ignore_signals=False,
+# 		strip=False,
+# 		upx=True,
+# 		upx_exclude=[],
+# 		runtime_tmpdir=None,
+# 		console=True,
+# 		icon=icon
+# )
diff --git a/misc/alphatims_pyinstaller.py b/misc/alphatims_pyinstaller.py
index 49babd17..bd970b28 100644
--- a/misc/alphatims_pyinstaller.py
+++ b/misc/alphatims_pyinstaller.py
@@ -1,5 +1,7 @@
 if __name__ == "__main__":
     import alphatims.gui
+    import alphatims.utils
     import multiprocessing
     multiprocessing.freeze_support()
+    alphatims.utils.set_logger()
     alphatims.gui.run()
diff --git a/misc/create_installer.bat b/misc/create_installer.bat
index 87433d9c..32f04373 100644
--- a/misc/create_installer.bat
+++ b/misc/create_installer.bat
@@ -1,10 +1,10 @@
 call conda create -n alphatimsinstaller python=3.8 -y
 call conda activate alphatimsinstaller
 REM call conda install git -y
-REM call pip install 'git+https://github.com/MannLabs/alphatims.git#egg=alphatims[gui,cli]' --use-feature=2020-resolver
-call pip install ../.[gui,cli] --use-feature=2020-resolver
+REM call pip install 'git+https://github.com/MannLabs/alphatims.git#egg=alphatims[gui]' --use-feature=2020-resolver
+call pip install ../.[gui] --use-feature=2020-resolver
 call pip install pyinstaller
 call pyinstaller alphatims.spec -y
+call conda deactivate
 REM call "C:\Program Files (x86)\Inno Setup 6\ISCC.exe" alphatims_innoinstaller.iss
 call iscc alphatims_innoinstaller.iss
-call conda deactivate