Fix data paths for build

tacaswell · Jul 3, 2019 · 602ede1 · 602ede1
1 parent e6a1d4b
commit 602ede1
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/Xi-cam.spec b/Xi-cam.spec
@@ -1,4 +1,5 @@
 # -*- mode: python -*-
+# Usage: pyinstall --path=C:\Windows\System32\downlevel Xi-cam.spec
 
 import glob, os
 import distributed
@@ -15,7 +16,7 @@ import PyQt5
 block_cipher = None
 
 from xicam.gui import static
-datas_src = glob.glob(os.path.join(static.__path__[0],'**/*.*'), recursive=True)
+datas_src = [path for path in glob.glob(os.path.join(static.__path__[0],'**/*.*'), recursive=True) if '__init__.py' not in path]
 datas_dst = [os.path.dirname(os.path.relpath(path,static.__path__[0])) for path in datas_src]
 
 datas_src.append(os.path.join(distributed.__path__[0],'distributed.yaml'))
@@ -41,15 +42,12 @@ pluginmanager.collectPlugins(paths=[xicam.core.__path__[0],xicam.plugins.__path_
 plugins = pluginmanager.getAllPlugins()
 datas_src.extend([plugin.path for plugin in plugins])
 datas_dst.extend(['plugins']*len(plugins))
-markerfiles = glob.glob('../**/*.yapsy-plugin', recursive=True)
+
+markerfiles = list(map(os.path.abspath, glob.glob('**/*.yapsy-plugin', recursive=True)))
 datas_src.extend(markerfiles)
 datas_dst.extend(['plugins']*len(markerfiles))
 
 
-print('datas:')
-for data in zip(datas_dst, datas_src):
-    print(data)
-
 a = Analysis(['run_xicam.py'],
              pathex=['C:\\Users\\rp\\PycharmProjects\\Xi-cam'],
              binaries=[],