Create pupil_external/ to hold all 3rd party dll

Update bundle spec files, create wrapper batch files to run capture and player
pupil-labs · Dec 10, 2016 · 36d7e95 · 36d7e95
1 parent 6e39b2f
commit 36d7e95
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 4 deletions.
diff --git a/deployment/deploy_capture/bundle.spec b/deployment/deploy_capture/bundle.spec
@@ -118,7 +118,7 @@ elif platform.system() == 'Windows':
         scipy_imports += ['scipy.integrate.vode', 'scipy.integrate.lsoda', 'scipy.integrate._dop', 'scipy.special._ufuncs', 'scipy.special._ufuncs_cxx']
 
         a = Analysis(['../../pupil_src/capture/main.py'],
-                     pathex=['../../pupil_src/shared_modules/'],
+                     pathex=['../../pupil_src/shared_modules/', '../../pupil_external'],
                      binaries=None,
                      datas=None,
                      hiddenimports=pyglui_hidden_imports+scipy_imports+av_hidden_imports,
@@ -144,7 +144,7 @@ elif platform.system() == 'Windows':
                        a.binaries,
                        a.zipfiles,
                        a.datas,
-                       [('glfw3.dll', '../../pupil_src/shared_modules/external/glfw3.dll','BINARY')],
+                       [('glfw3.dll','../../pupil_external/glfw3.dll','BINARY')],
                        [('OpenSans-Regular.ttf', os.path.join(package_path, 'pyglui/OpenSans-Regular.ttf'),'DATA')],
                  [('Roboto-Regular.ttf', os.path.join(package_path, 'pyglui/Roboto-Regular.ttf'),'DATA')],
                  [('fontawesome-webfont.ttf', os.path.join(package_path, 'pyglui/fontawesome-webfont.ttf'),'DATA')],

diff --git a/deployment/deploy_player/bundle.spec b/deployment/deploy_player/bundle.spec
@@ -116,7 +116,7 @@ elif platform.system() == 'Windows':
         scipy_imports += ['scipy.integrate.vode', 'scipy.integrate.lsoda', 'scipy.integrate._dop', 'scipy.special._ufuncs', 'scipy.special._ufuncs_cxx']
 
         a = Analysis(['../../pupil_src/player/main.py'],
-                     pathex=['../../pupil_src/shared_modules/'],
+                     pathex=['../../pupil_src/shared_modules/', '../../pupil_external'],
                      hiddenimports=['pyglui.cygl.shader']+scipy_imports+av_hidden_imports+pyndsi_hidden_imports,
                      hookspath=None,
                      runtime_hooks=None,
@@ -139,7 +139,7 @@ elif platform.system() == 'Windows':
                        a.binaries,
                        a.zipfiles,
                        a.datas,
-                       [('glfw3.dll', '../../pupil_src/shared_modules/external/glfw3.dll','BINARY')],
+                       [('glfw3.dll', '../../pupil_external/glfw3.dll','BINARY')],
                        [('OpenSans-Regular.ttf', os.path.join(package_path, 'pyglui/OpenSans-Regular.ttf'),'DATA')],
                        [('Roboto-Regular.ttf', os.path.join(package_path, 'pyglui/Roboto-Regular.ttf'),'DATA')],
                        [('fontawesome-webfont.ttf', os.path.join(package_path, 'pyglui/fontawesome-webfont.ttf'),'DATA')],

diff --git a/pupil_external/.gitignore b/pupil_external/.gitignore
@@ -0,0 +1,4 @@
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore
diff --git a/pupil_src/capture/run_capture.bat b/pupil_src/capture/run_capture.bat
@@ -0,0 +1,2 @@
+PATH %PATH%..\..\pupil_external
+python main.py
diff --git a/pupil_src/player/run_player.bat b/pupil_src/player/run_player.bat
@@ -0,0 +1,2 @@
+PATH %PATH%..\..\pupil_external
+python main.py %1%