X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=music_sampler.spec;h=37943974dd483538a203073f7483b5c251dcb8bb;hb=63ba5a8dc2aa4ec3e6f203b0ba4db249ecf0b00e;hp=7a885fd5ac837da5b90142debaf6531057214610;hpb=cc008de481bf1b67790d48b648d7c8207b9f50ea;p=perso%2FImmae%2FProjets%2FPython%2FMusicSampler.git

diff --git a/music_sampler.spec b/music_sampler.spec
index 7a885fd..3794397 100644
--- a/music_sampler.spec
+++ b/music_sampler.spec
@@ -1,24 +1,67 @@
 # -*- mode: python -*-
 import os
-from kivy.tools.packaging.pyinstaller_hooks import  get_deps_minimal, hookspath, runtime_hooks
+from kivy.tools.packaging.pyinstaller_hooks import get_deps_minimal,\
+        hookspath, runtime_hooks
 
-excluded_and_hidden_modules = get_deps_minimal(video=None, camera=None, audio=None, clipboard=None, spelling=None)
-excluded_and_hidden_modules['hiddenimports'] += [ 'six', 'packaging', 'packaging.version', 'packaging.specifiers', 'packaging.requirements']
+import importlib.machinery
+sysfont = importlib.machinery\
+        .SourceFileLoader('sysfont', os.getcwd() + '/music_sampler/sysfont.py') \
+        .load_module()
+
+excluded_and_hidden_modules = get_deps_minimal(
+        video=None,
+        camera=None,
+        audio=None,
+        clipboard=None,
+        spelling=None)
+
+excluded_and_hidden_modules['hiddenimports'] += [
+        'six',
+        'packaging',
+        'packaging.version',
+        'packaging.specifiers',
+        'packaging.requirements' ]
 
 commit_message = os.popen('git log -1 --format="%h  %ci"').read()
 pyinstaller_file = open(".pyinstaller_commit", "w")
 pyinstaller_file.write(commit_message)
 pyinstaller_file.close()
 
+data = [
+  ('music_sampler.kv', '.'),
+  ('.pyinstaller_commit', '.')
+]
+
 a = Analysis(['music_sampler.py'],
              binaries=None,
-             datas=[
-              ('fonts/*', 'fonts'),
-              ('music_sampler.kv', '.'),
-              ('.pyinstaller_commit', '.')
-             ],
+             datas=data,
              hookspath=hookspath(),
              runtime_hooks=runtime_hooks(),
              **excluded_and_hidden_modules)
+
+for fontname, style in [("Ubuntu", sysfont.STYLE_NORMAL), ("Ubuntu", sysfont.STYLE_BOLD), ("Symbola", sysfont.STYLE_NONE)]:
+    font = sysfont.get_font(fontname, style=style)
+    a.datas.append((
+        'fonts/{}_{}.ttf'.format(fontname, style),
+        font[4],
+        'DATA'
+        ))
+
 pyz = PYZ(a.pure, a.zipped_data)
-exe = EXE(pyz, a.scripts, a.binaries, a.zipfiles, a.datas, name='music_sampler')
+
+# Single file
+exe = EXE(pyz, a.scripts, a.binaries, a.zipfiles, a.datas,
+        name='music_sampler')
+
+# Directory
+# exe = EXE(pyz, a.scripts,
+#     exclude_binaries=True,
+#     name='music_sampler_dir',
+#     debug=False,
+#     strip=False,
+#     upx=True,
+#     console=True)
+# coll = COLLECT(exe, a.binaries, a.zipfiles, a.datas,
+#     strip=False,
+#     upx=True,
+#     name='music_sampler_dir')