Rooba
/
kivy
mirror of https://github.com/kivy/kivy.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

When working on iOS, the path to the garden module is fixed. Assumes garden flowers have been added to the project by using `garden install --app flower_name`, which adds the flower to a folder named `lib`, which should be in the same directory as main.py

This commit is contained in:
eriksandberg 2019-12-21 13:51:52 -06:00
parent 39f3bafefd
commit c3956b000f
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
kivy/garden/__init__.py
View File

@ -140,6 +140,7 @@ import sys
import imp import imp
from os.path import dirname, join, realpath, exists, abspath from os.path import dirname, join, realpath, exists, abspath
from kivy import kivy_home_dir from kivy import kivy_home_dir
from kivy.utils import platform
import kivy import kivy
#: system path where garden modules can be installed #: system path where garden modules can be installed
@ -151,6 +152,12 @@ if getattr(sys, 'frozen', False) and getattr(sys, '_MEIPASS', False):
garden_app_dir = join(realpath(sys._MEIPASS), 'libs', 'garden') garden_app_dir = join(realpath(sys._MEIPASS), 'libs', 'garden')
else: else:
garden_app_dir = join(realpath(dirname(sys.argv[0])), 'libs', 'garden') garden_app_dir = join(realpath(dirname(sys.argv[0])), 'libs', 'garden')
#: Fixes issue #4030 in kivy where garden path is incorrect on iOS
if platform == "ios":
from os.path import join, dirname
import __main__
main_py_file = __main__.__file__
garden_app_dir = join(dirname(main_py_file), 'libs', 'garden')
class GardenImporter(object): class GardenImporter(object):