Merge branch 'pupil_player'

Conflicts:
	pupil_src/shared_modules/plugin.py

.gitignore

@@ -12,6 +12,7 @@ Thumbs.db
 # user generated files will be ignored if in directory named 'recordings...' #
 recordings/
 settings/
+player_settings/
 *.db
 *.npy
 *.png

deploy_capture/bundle.spec

@@ -0,0 +1,71 @@
+# -*- mode: python -*-
+
+
+import platform
+
+if platform.system() == 'Darwin':
+    from git_version import get_tag_commit
+
+    a = Analysis(['../pupil_src/capture/main.py'],
+                 pathex=['../pupil_src/shared_modules/'],
+                 hiddenimports=[],
+                 hookspath=None,
+                 runtime_hooks=None)
+    pyz = PYZ(a.pure)
+    exe = EXE(pyz,
+              a.scripts,
+              exclude_binaries=True,
+              name='pupil_capture',
+              debug=False,
+              strip=None,
+              upx=False,
+              console=False)
+
+    coll = COLLECT(exe,
+                   a.binaries,
+                   a.zipfiles,
+                   a.datas,
+                   [('methods.so', '../pupil_src/shared_modules/c_methods/methods.so','BINARY')],
+                   [('uvcc.so', '../pupil_src/shared_modules/uvc_capture/mac_video/uvcc.so','BINARY')],
+                   [('libAntTweakBar.dylib', '/usr/local/Cellar/anttweakbar/1.16/lib/libAntTweakBar.dylib','BINARY')],
+                   [('libglfw3.dylib', '/usr/local/Cellar/glfw3/3.0.2/lib/libglfw3.dylib','BINARY')],
+                   strip=None,
+                   upx=True,
+                   name='Pupil Capture')
+
+    app = BUNDLE(coll,
+                 name='Pupil Capture.app',
+                 icon='macos_icon.icns',
+                 version = str(get_tag_commit()))
+
+
+elif platform.system() == 'Linux':
+    a = Analysis(['../pupil_src/capture/main.py'],
+                 pathex=['../pupil_src/shared_modules/'],
+                 hiddenimports=[],
+                 hookspath=None,
+                 runtime_hooks=None)
+    pyz = PYZ(a.pure)
+    exe = EXE(pyz,
+              a.scripts,
+              exclude_binaries=True,
+              name='pupil_capture',
+              debug=False,
+              strip=None,
+              upx=True,
+              console=True)
+
+    coll = COLLECT(exe,
+                   a.binaries,
+                   a.zipfiles,
+                   a.datas,
+                   [('methods.so', '../pupil_src/shared_modules/c_methods/methods.so','BINARY')],
+                   [('capture.so', '../pupil_src/shared_modules/uvc_capture/linux_video/v4l2_capture/capture.so','BINARY')],
+                   [('libAntTweakBar.so', '/usr/lib/libAntTweakBar.so','BINARY')],
+                   [('libglfw.so', '/usr/local/lib/libglfw.so','BINARY')],
+                   [('v4l2-ctl', '/usr/bin/v4l2-ctl','BINARY')],
+                   [('icon.ico', 'linux_icon.ico','DATA')],
+                   strip=None,
+                   upx=True,
+                   name='pupil_capture')
+

deploy_capture/finalize_bundle.py

@@ -0,0 +1,37 @@
+import platform
+
+if platform.system() == 'Darwin':
+    import shutil
+    import write_version_file
+    print "starting version stript:"
+    write_version_file.main('dist/Pupil Capture.app/Contents/MacOS')
+    print "created version file in dist folder"
+
+    print "copy starter app"
+    shutil.copytree('run_pupil_capture_from_mac_terminal.app', 'dist/run_pupil_capture_from_mac_terminal.app')
+
+elif platform.system() == 'Linux':
+    import sys,os
+    import write_version_file
+    import shutil
+
+    distribtution_dir = 'dist'
+    pupil_capture_dir =  os.path.join(distribtution_dir, 'pupil_capture')
+
+
+    shutil.copy('patch_uvc_driver.sh',os.path.join(distribtution_dir,'patch_uvc_driver.sh'))
+    print "Copied a small script to patch uvc driver into the distribution dir"
+    os.chmod(os.path.join(distribtution_dir,'patch_uvc_driver.sh'),0775)
+    print "Gave that file excetion rights"
+
+    shutil.copy('make_shortcut.sh',os.path.join(distribtution_dir,'make_shortcut.sh'))
+    print "Copied a small script that creates a shortcut for the user into distribtution_dir"
+    os.chmod(os.path.join(distribtution_dir,'make_shortcut.sh'),0775)
+    print "Gave that file excetion rights"
+
+    print "starting version stript:"
+    write_version_file.main(pupil_capture_dir)
+    print "created version file in dist folder"
+
+
+

deploy_player/.gitignore

@@ -0,0 +1,3 @@
+# pyinstaller #
+dist/
+build/

deploy_player/bundle.spec

@@ -0,0 +1,69 @@
+# -*- mode: python -*-
+
+
+import platform
+
+if platform.system() == 'Darwin':
+    from git_version import get_tag_commit
+
+    a = Analysis(['../pupil_src/player/main.py'],
+                 pathex=['../pupil_src/shared_modules/'],
+                 hiddenimports=[],
+                 hookspath=None,
+                 runtime_hooks=None)
+    pyz = PYZ(a.pure)
+    exe = EXE(pyz,
+              a.scripts,
+              exclude_binaries=True,
+              name='pupil_player',
+              debug=False,
+              strip=None,
+              upx=False,
+              console=False)
+
+    coll = COLLECT(exe,
+                   a.binaries,
+                   a.zipfiles,
+                   a.datas,
+                   [('methods.so', '../pupil_src/shared_modules/c_methods/methods.so','BINARY')],
+                   [('uvcc.so', '../pupil_src/shared_modules/uvc_capture/mac_video/uvcc.so','BINARY')],
+                   [('libAntTweakBar.dylib', '/usr/local/Cellar/anttweakbar/1.16/lib/libAntTweakBar.dylib','BINARY')],
+                   [('libglfw3.dylib', '/usr/local/Cellar/glfw3/3.0.2/lib/libglfw3.dylib','BINARY')],
+                   strip=None,
+                   upx=True,
+                   name='Pupil Player')
+
+    app = BUNDLE(coll,
+                 name='Pupil Player.app',
+                 icon='macos_icon.icns',
+                 version = str(get_tag_commit()))
+
+elif platform.system() == 'Linux':
+    a = Analysis(['../pupil_src/player/main.py'],
+                 pathex=['../pupil_src/shared_modules/'],
+                 hiddenimports=[],
+                 hookspath=None,
+                 runtime_hooks=None)
+    pyz = PYZ(a.pure)
+    exe = EXE(pyz,
+              a.scripts,
+              exclude_binaries=True,
+              name='pupil_player',
+              debug=False,
+              strip=None,
+              upx=True,
+              console=True)
+
+    coll = COLLECT(exe,
+                   a.binaries,
+                   a.zipfiles,
+                   a.datas,
+                   [('methods.so', '../pupil_src/shared_modules/c_methods/methods.so','BINARY')],
+                   [('capture.so', '../pupil_src/shared_modules/uvc_capture/linux_video/v4l2_capture/capture.so','BINARY')],
+                   [('libAntTweakBar.so', '/usr/lib/libAntTweakBar.so','BINARY')],
+                   [('libglfw.so', '/usr/local/lib/libglfw.so','BINARY')],
+                   [('v4l2-ctl', '/usr/bin/v4l2-ctl','BINARY')],
+                   [('icon.ico', 'linux_icon.ico','DATA')],
+                   strip=None,
+                   upx=True,
+                   name='pupil_player')

deploy_player/finalize_bundle.py

@@ -0,0 +1,29 @@
+import platform
+
+if platform.system() == 'Darwin':
+    import shutil
+    import write_version_file
+    print "starting version stript:"
+    write_version_file.main('dist/Pupil Player.app/Contents/MacOS')
+    print "created version file in dist folder"
+
+elif platform.system() == 'Linux':
+    import sys,os
+    import write_version_file
+    import shutil
+
+    distribtution_dir = 'dist'
+    pupil_capture_dir =  os.path.join(distribtution_dir, 'pupil_player')
+
+
+    shutil.copy('make_shortcut.sh',os.path.join(distribtution_dir,'make_shortcut.sh'))
+    print "Copied a small script that creates a shortcut for the user into distribtution_dir"
+    os.chmod(os.path.join(distribtution_dir,'make_shortcut.sh'),0775)
+    print "Gave that file excetion rights"
+
+    print "starting version stript:"
+    write_version_file.main(pupil_capture_dir)
+    print "created version file in dist folder"
+
+
+