Merge pull request #35 from MannLabs/develop

Win one-click installer updates
MannLabs · Nov 25, 2020 · ce57dac · ce57dac
2 parents f9e1cdd + 502f47d
commit ce57dac
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 35 deletions.
diff --git 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
@@ -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
@@ -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