setup.py bdist_msi & CHANGELOG/README update

CHANGELOG.md

@@ -13,12 +13,13 @@
 - Transitioned to Python 3.
 - Transitioned to PyQt5.
 - Changed character encoding in some placed from ascii to UTF-8 (Emojis should work now)
-- Rewrote setup.py file
+- Rewrote setup.py file & added bdist_msi
 
 ### Fixed
 - Fixed sRGB profile issue with certain images.
 - Fixed issue where Pesterchum crashed if a quirk was malformed.
 - Fixed Pesterchum icon getting stuck on the system tray even after shutdown on windows.
+- Fixed floating "PESTERLOGS:" in pesterchum & pesterchum2.5 themes.
 
 ### Deprecated
 - Removed update system (it seemed to be non-functional).

README.md

@@ -30,6 +30,7 @@ Building Pesterchum yourself is not required to run it!!! This is only relevant
  - [feedparser]
  - [python-magic]
  - [ostools]
+ - [requests]
 
 [Python 3]: https://www.python.org/downloads/
 [PyQt5]: https://pypi.org/project/PyQt5/
@@ -37,11 +38,13 @@ Building Pesterchum yourself is not required to run it!!! This is only relevant
 [feedparser]: https://pypi.org/project/feedparser/
 [python-magic]: https://pypi.org/project/python-magic/
 [ostools]: https://pypi.org/project/ostools/
-
+[requests]: https://pypi.org/project/requests/
 ### CX_FREEZE METHOD
 
 #### Windows:
 ``python setup.py build``
+or
+``python setup.py bdist_msi``
 
 #### Mac:
 ~~``python setup.py py2app``~~ Currently doesn't work!! Give me a few days, it's hard to test this kind of stuff since I don't have a mac :(

setup.py

@@ -1,5 +1,5 @@
 # Windows-only cx_freeze setup file
-from cx_Freeze import setup, Executable
+from cx_Freeze import *
 import sys
 
 from version import buildVersion
@@ -34,20 +34,66 @@ build_exe_options = {
                  "collections._struct",
                  "collections.array",
                  "collections._weakref"],
-    'include_files': includefiles
+    "include_files": includefiles
-    #'build_exe': ["build"]
 }
+
+description = "Instant messaging client copying the look and feel of clients from Andrew Hussie's webcomic Homestuck."
+icon = "pesterchum.ico"
+
+# See https://stackoverflow.com/questions/15734703/use-cx-freeze-to-create-an-msi-that-adds-a-shortcut-to-the-desktop
+shortcut_table = [
+    ("DesktopShortcut",        # Shortcut
+     "DesktopFolder",          # Directory_
+     "Pesterchum",             # Name
+     "TARGETDIR",              # Component_
+     "[TARGETDIR]pesterchum.exe",# Target
+     None,                     # Arguments
+     description,              # Description
+     None,                     # Hotkey
+     None,                     # Icon (Is inherited from pesterchum.exe)
+     None,                     # IconIndex
+     None,                     # ShowCmd
+     'TARGETDIR'               # WkDir
+     ),
+    ("StartMenuShortcut",        # Shortcut
+     "StartMenuFolder",          # Directory_
+     "Pesterchum",             # Name
+     "TARGETDIR",              # Component_
+     "[TARGETDIR]pesterchum.exe",# Target
+     None,                     # Arguments
+     description,              # Description
+     None,                     # Hotkey
+     None,                     # Icon
+     None,                     # IconIndex
+     None,                     # ShowCmd
+     'TARGETDIR'               # WkDir
+     )
+    ]
+
+msi_data = {"Shortcut": shortcut_table}
+bdist_msi_options = {'data': msi_data,
+                     'summary_data': {
+                         'comments': "FL1P",
+                         'keywords': "Pesterchum"},
+                     'upgrade_code': "{86740d75-f1f2-48e8-8266-f36395a2d77f}",
+                     'add_to_path': False, # !!!
+                     'all_users': True,
+                     'install_icon': "pesterchum.ico"}
+
 #print("type(includefiles) = " + str(type(includefiles)))
 #print("type(build_exe_options) = " + str(type(build_exe_options))
 
-if is_64bit() == True:
+
-    setup(
+setup(
-            name = "PESTERCHUM ALT.",
+            name = "Pesterchum",
             version = buildVersion,
             url = "https://github.com/Dpeta/pesterchum-alt-servers",
-            description = "P3ST3RCHUM ALT.",
+            description = description,#"P3ST3RCHUM",
-            options = {"build_exe": build_exe_options},
+            options = {"build_exe": build_exe_options,
+                       "bdist_msi": bdist_msi_options,},
             executables = [Executable("pesterchum.py",
                                       base=base,
-                                      icon="pesterchum.ico"
+                                      icon=icon#,
+                                      #shortcut_name="Pesterchum",
+                                      #shortcut_dir="DesktopFolder"
                                       )])