Update Pyinstaller spec (#202)

* Updated pyinstaller spec file for OCP

* Put OCP path in the correct place

* Removed extra Library part of path for MacOS

Author: jmwright

pyinstaller.spec

@@ -9,15 +9,20 @@ spyder_data = Path(site.getsitepackages()[-1]) / 'spyder'
 parso_grammar = (Path(site.getsitepackages()[-1]) / 'parso/python').glob('grammar*')
 
 if sys.platform == 'linux':
-    oce_dir = Path(sys.prefix) / 'share' / 'oce-0.18'
-else:
-    oce_dir = Path(sys.prefix) / 'Library' / 'share' / 'oce'
+    occt_dir = os.path.join(Path(sys.prefix), 'share', 'opencascade')
+    ocp_path = (os.path.join(HOMEPATH, 'OCP.cpython-38-x86_64-linux-gnu.so'), '.')
+elif sys.platform == 'darwin':
+    occt_dir = os.path.join(Path(sys.prefix), 'share', 'opencascade')
+    ocp_path = (os.path.join(HOMEPATH, 'OCP.cpython-38-darwin.so'), '.')
+elif sys.platform == 'win32':
+    occt_dir = os.path.join(Path(sys.prefix), 'Library', 'share', 'opencascade')
+    ocp_path = (os.path.join(HOMEPATH, 'OCP.cp38-win_amd64.pyd'), '.')
 
 a = Analysis(['run.py'],
-             pathex=['/home/adam/cq/CQ-editor'],
-             binaries=[],
+             pathex=['.'],
+             binaries=[ocp_path],
              datas=[(spyder_data, 'spyder'),
-                    (oce_dir, 'oce')] +
+                    (occt_dir, 'opencascade')] +
                     [(p, 'parso/python') for p in parso_grammar],
              hiddenimports=['ipykernel.datapub'],
              hookspath=[],

pyinstaller/pyi_rth_occ.py

@@ -1,7 +1,7 @@
 from os import environ as env
 
-env['CASROOT'] = 'oce'
+env['CASROOT'] = 'opencascade'
 
-env['CSF_ShadersDirectory'] = 'oce/src/Shaders'
-env['CSF_UnitsLexicon'] = 'oce/src/UnitsAPI/Lexi_Expr.dat'
-env['CSF_UnitsDefinition'] = 'oce/src/UnitsAPI/Units.dat'
+env['CSF_ShadersDirectory'] = 'opencascade/src/Shaders'
+env['CSF_UnitsLexicon'] = 'opencascade/src/UnitsAPI/Lexi_Expr.dat'
+env['CSF_UnitsDefinition'] = 'opencascade/src/UnitsAPI/Units.dat'