From 402ad02514451de87797ffd03e85d8dff8160bcc Mon Sep 17 00:00:00 2001 From: Mathieu Virbel Date: Mon, 27 Feb 2012 03:36:41 +0100 Subject: [PATCH] fix pyinstaller packaging + macosx docs. Seem that __import__ is not supported by pyinstalled, so the last pep8/pyflakes fixes broke it. --- doc/sources/guide/packaging-macosx.rst | 8 ++++---- kivy/tools/packaging/pyinstaller_hooks/hook-kivy.py | 13 +++++++++++++ 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/doc/sources/guide/packaging-macosx.rst b/doc/sources/guide/packaging-macosx.rst index 71bc1807d..caaea7230 100644 --- a/doc/sources/guide/packaging-macosx.rst +++ b/doc/sources/guide/packaging-macosx.rst @@ -27,10 +27,10 @@ able to package your Kivy application. VERSIONER_PYTHON_PREFER_32_BIT=yes python Configure.py mkdir -p support/loader/Darwin-64bit pushd support/loader/Darwin-64bit - wget http://www.pyinstaller.org/export/1488/trunk/support/loader/Darwin-64bit/run - wget http://www.pyinstaller.org/export/1488/trunk/support/loader/Darwin-64bit/run_d - wget http://www.pyinstaller.org/export/1488/trunk/support/loader/Darwin-64bit/runw - wget http://www.pyinstaller.org/export/1488/trunk/support/loader/Darwin-64bit/runw_d + wget http://www.pyinstaller.org/export/d9bfa9a291cbc0fe77a99e38acb92c79631df5b8/project/support/loader/Darwin-64bit/run + wget http://www.pyinstaller.org/export/d9bfa9a291cbc0fe77a99e38acb92c79631df5b8/project/support/loader/Darwin-64bit/run_d + wget http://www.pyinstaller.org/export/d9bfa9a291cbc0fe77a99e38acb92c79631df5b8/project/support/loader/Darwin-64bit/runw + wget http://www.pyinstaller.org/export/d9bfa9a291cbc0fe77a99e38acb92c79631df5b8/project/support/loader/Darwin-64bit/runw_d chmod +x run* popd diff --git a/kivy/tools/packaging/pyinstaller_hooks/hook-kivy.py b/kivy/tools/packaging/pyinstaller_hooks/hook-kivy.py index adf6c0571..36749f3be 100644 --- a/kivy/tools/packaging/pyinstaller_hooks/hook-kivy.py +++ b/kivy/tools/packaging/pyinstaller_hooks/hook-kivy.py @@ -39,6 +39,19 @@ _kivy_modules = [ 'kivy.lib.osc.OSC', 'kivy.lib.osc.oscAPI', 'kivy.lib.mtdev', + 'kivy.lib.debug', + 'kivy.factory_registers', + 'kivy.input.providers', + 'kivy.input.providers.tuio', + 'kivy.input.providers.mouse', + 'kivy.input.providers.wm_common', + 'kivy.input.providers.wm_touch', + 'kivy.input.providers.wm_pen', + 'kivy.input.providers.hidinput', + 'kivy.input.providers.linuxwacom', + 'kivy.input.providers.mactouch', + 'kivy.input.providers.mouse', + 'kivy.input.providers.mtdev', # compiled modules 'kivy.event',