Updated windows installation

ealbiter · Sep 21, 2019 · 516899c · 516899c
1 parent a16cd6c
commit 516899c
Show file tree

Hide file tree

Showing 2 changed files with 47 additions and 11 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,4 +3,6 @@
 dist
 build
 .*
-releases
+releases
+*.iss
+/Output/
diff --git a/setup-windows.py b/setup-windows.py
@@ -35,6 +35,47 @@
 if sys.platform == 'win32':
     base = 'Win32GUI'
 
+executables = [
+    Executable(
+        'qnotero',
+        base=base,
+        icon='data\qnotero.ico',
+    )
+]
+
+shortcut_table = [
+    ("DesktopShortcut",        # Shortcut
+     "DesktopFolder",          # Directory_
+     "Qnotero",           # Name
+     "TARGETDIR",              # Component_
+     "[TARGETDIR]qnotero.exe",  # Target
+     None,                     # Arguments
+     None,                     # Description
+     None,                     # Hotkey
+     None,                     # Icon
+     None,                     # IconIndex
+     None,                     # ShowCmd
+     'TARGETDIR'               # WkDir
+     ),
+    ("DesktopShortcut",        # Shortcut
+     "DesktopFolder",          # Directory_
+     "Qnotero",           # Name
+     "TARGETDIR",              # Component_
+     "[TARGETDIR]qnotero.exe",  # Target
+     None,                     # Arguments
+     None,                     # Description
+     None,                     # Hotkey
+     None,                     # Icon
+     None,                     # IconIndex
+     None,                     # ShowCmd
+     'TARGETDIR'               # WkDir
+     )
+
+    ]
+
+# Now create the table dictionary
+msi_data = {"Shortcut": shortcut_table}
+
 # Setup options
 options = {
     'build_exe': {
@@ -51,23 +92,16 @@
 		],
         'include_files': [
             'resources',
-            'data\qnotero.ico',
+            '.\data\qnotero.ico',
         ],
     },
     'bdist_msi_options': {
         'upgrade_code': '{69620F3A-DC3A-11E2-B341-002210FE9B01E}',
-        'install_icon': './data/qnotero.ico'
+        'data': msi_data,
+        'install_icon': 'data\qnotero.ico'
     }
 }
 
-executables = [
-    Executable(
-        'qnotero',
-        base=base,
-        shortcutName='Qnotero',
-        shortcutDir='DesktopFolder',
-    )
-]
 
 setup(name="qnotero",
       version=Qnotero.version,