#minor update pyinstaller in build

PresidioCode · Apr 19, 2020 · 667f20b · 667f20b
1 parent 8800b53
commit 667f20b
Showing 1 changed file with 21 additions and 12 deletions.
diff --git a/cucm-exporter.spec b/cucm-exporter.spec
@@ -1,20 +1,26 @@
 # -*- mode: python ; coding: utf-8 -*-
+import ciscoaxl
+from pathlib import Path
+import os
+import gooey
+# gooey_root = os.path.dirname(gooey.__file__)
+# gooey_languages = Tree(os.path.join(gooey_root, 'languages'), prefix = 'gooey/languages')
+# gooey_images = Tree(os.path.join(gooey_root, 'images'), prefix = 'gooey/images')
 
 block_cipher = None
 
-
 a = Analysis(['cucm-exporter.py'],
-             pathex=['C:\\Users\\bradh\\OneDrive - Presidio Networked Solutions, Inc\\code\\cucm-axl-examples'],
+             pathex=[Path.cwd()],
              binaries=[],
-             datas=[('TEMPLATE/email-template.html', 'TEMPLATE/.'),
-                ('.venv/Lib/site-packages/ciscoaxl/schema/8.5/*', 'ciscoaxl/schema/8.5.'),
-                ('.venv/Lib/site-packages/ciscoaxl/schema/10.0/*', 'ciscoaxl/schema/10.0.'),
-                ('.venv/Lib/site-packages/ciscoaxl/schema/10.5/*', 'ciscoaxl/schema/10.5.'),
-                ('.venv/Lib/site-packages/ciscoaxl/schema/11.0/*', 'ciscoaxl/schema/11.0.'),
-                ('.venv/Lib/site-packages/ciscoaxl/schema/11.5/*', 'ciscoaxl/schema/11.5.'),
-                ('.venv/Lib/site-packages/ciscoaxl/schema/12.0/*', 'ciscoaxl/schema/12.0.'),
-                ('.venv/Lib/site-packages/ciscoaxl/schema/12.5/*', 'ciscoaxl/schema/12.5.'),
-                ('.venv/Lib/site-packages/ciscoaxl/schema/current/*', 'ciscoaxl/schema/current/.')
+             datas=[('img', 'img'), ('TEMPLATE', 'TEMPLATE'),('img','gooey/images'),
+                (f'{ciscoaxl.__path__[0]}/schema/8.5/*', 'ciscoaxl/schema/8.5.'),
+                (f'{ciscoaxl.__path__[0]}/schema/10.0/*', 'ciscoaxl/schema/10.0.'),
+                (f'{ciscoaxl.__path__[0]}/schema/10.5/*', 'ciscoaxl/schema/10.5.'),
+                (f'{ciscoaxl.__path__[0]}/schema/11.0/*', 'ciscoaxl/schema/11.0.'),
+                (f'{ciscoaxl.__path__[0]}/schema/11.5/*', 'ciscoaxl/schema/11.5.'),
+                (f'{ciscoaxl.__path__[0]}/schema/12.0/*', 'ciscoaxl/schema/12.0.'),
+                (f'{ciscoaxl.__path__[0]}/schema/12.5/*', 'ciscoaxl/schema/12.5.'),
+                (f'{ciscoaxl.__path__[0]}/schema/current/*', 'ciscoaxl/schema/current/.')
                 ],
              hiddenimports=[],
              hookspath=[],
@@ -32,11 +38,14 @@ exe = EXE(pyz,
           a.zipfiles,
           a.datas,
           [],
+         #  gooey_languages, # Add them in to collected files
+         #  gooey_images, # Same here.
           name='cucm-exporter',
           debug=False,
           bootloader_ignore_signals=False,
           strip=False,
           upx=True,
           upx_exclude=[],
           runtime_tmpdir=None,
-          console=True )
+          console=False,
+         icon="img/program_icon.ico" )