Merge pull request #256 from gaphor/fix-no-console

Fix AttributeError When Running in Windows with No Console
gaphor · Jan 7, 2020 · 9cd6a70 · 9cd6a70
2 parents 097123b + c65145b
commit 9cd6a70
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/win-installer/gaphor.spec b/win-installer/gaphor.spec
@@ -14,7 +14,8 @@ a = Analysis(['gaphor-script.py'],
 		       ('../gaphor/services/helpservice/*.png', 'gaphor/services/helpservice'),
 		       ('../gaphor/services/helpservice/*.glade', 'gaphor/services/helpservice'),
 		       ('../gaphor/ui/icons/*.svg', 'gaphor/ui/icons'),
-		       ('../LICENSE.txt', 'gaphor')
+		       ('../LICENSE.txt', 'gaphor'),
+		       ('../gaphor/locale/*', 'gaphor/locale')
 		     ]+copy_metadata('gaphor'),
              hiddenimports=[],
              hookspath=[],
@@ -28,16 +29,16 @@ pyz = PYZ(a.pure, a.zipped_data,
              cipher=block_cipher)
 exe = EXE(pyz,
           a.scripts,
-          [('v', None, 'OPTION')],
+          options=[],
           exclude_binaries=True,
-          name='launch-gaphor',
+          name='gaphor',
           debug=False,
           bootloader_ignore_signals=False,
           strip=False,
           upx=True,
           icon='misc/gaphor.ico',
           version='file_version_info.txt',
-          console=True )
+          console=False )
 coll = COLLECT(exe,
                a.binaries,
                a.zipfiles,

diff --git a/win-installer/misc/create-launcher.py b/win-installer/misc/create-launcher.py
@@ -210,7 +210,7 @@ def main():
     misc = os.path.dirname(os.path.realpath(__file__))
 
     build_launcher(
-        os.path.join(target, "launch-gaphor.exe"),
+        os.path.join(target, "gaphor.exe"),
         os.path.join(misc, "gaphor.ico"),
         "Gaphor",
         "Gaphor",