LBRYCommunity/kivy-ios
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' of git://github.com/kivy/kivy-ios

Browse source
This commit is contained in:
Macbook 2016-10-24 08:47:47 +02:00
commit 51402e0520
6 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
recipes/click/__init__.py
View file

@ -16,6 +16,8 @@ class ClickRecipe(PythonRecipe):
build_env = arch.get_env() build_env = arch.get_env()
dest_dir = join(self.ctx.dist_dir, "root", "python") dest_dir = join(self.ctx.dist_dir, "root", "python")
build_env['PYTHONPATH'] = join(dest_dir, 'lib', 'python2.7', 'site-packages') build_env['PYTHONPATH'] = join(dest_dir, 'lib', 'python2.7', 'site-packages')
cmd = sh.Command("sed")
shprint(cmd, "-i", "", "s/setuptools/distutils.core/g", "./setup.py", _env=build_env)
shprint(hostpython, "setup.py", "install", "--prefix", dest_dir, _env=build_env) shprint(hostpython, "setup.py", "install", "--prefix", dest_dir, _env=build_env)
recipe = ClickRecipe() recipe = ClickRecipe()

2
recipes/flask/__init__.py
View file

@ -16,6 +16,8 @@ class FlaskRecipe(PythonRecipe):
build_env = arch.get_env() build_env = arch.get_env()
dest_dir = join(self.ctx.dist_dir, "root", "python") dest_dir = join(self.ctx.dist_dir, "root", "python")
build_env['PYTHONPATH'] = join(dest_dir, 'lib', 'python2.7', 'site-packages') build_env['PYTHONPATH'] = join(dest_dir, 'lib', 'python2.7', 'site-packages')
cmd = sh.Command("sed")
shprint(cmd, "-i", "", "s/setuptools/distutils.core/g", "./setup.py", _env=build_env)
shprint(hostpython, "setup.py", "install", "--prefix", dest_dir, _env=build_env) shprint(hostpython, "setup.py", "install", "--prefix", dest_dir, _env=build_env)
recipe = FlaskRecipe() recipe = FlaskRecipe()

2
recipes/itsdangerous/__init__.py
View file

@ -16,6 +16,8 @@ class ItsDangerousRecipe(PythonRecipe):
build_env = arch.get_env() build_env = arch.get_env()
dest_dir = join(self.ctx.dist_dir, "root", "python") dest_dir = join(self.ctx.dist_dir, "root", "python")
build_env['PYTHONPATH'] = join(dest_dir, 'lib', 'python2.7', 'site-packages') build_env['PYTHONPATH'] = join(dest_dir, 'lib', 'python2.7', 'site-packages')
cmd = sh.Command("sed")
shprint(cmd, "-i", "", "s/setuptools/distutils.core/g", "./setup.py", _env=build_env)
shprint(hostpython, "setup.py", "install", "--prefix", dest_dir, _env=build_env) shprint(hostpython, "setup.py", "install", "--prefix", dest_dir, _env=build_env)
recipe = ItsDangerousRecipe() recipe = ItsDangerousRecipe()

2
recipes/jinja2/__init__.py
View file

@ -16,6 +16,8 @@ class Jinja2Recipe(PythonRecipe):
build_env = arch.get_env() build_env = arch.get_env()
dest_dir = join(self.ctx.dist_dir, "root", "python") dest_dir = join(self.ctx.dist_dir, "root", "python")
build_env['PYTHONPATH'] = join(dest_dir, 'lib', 'python2.7', 'site-packages') build_env['PYTHONPATH'] = join(dest_dir, 'lib', 'python2.7', 'site-packages')
cmd = sh.Command("sed")
shprint(cmd, "-i", "", "s/setuptools/distutils.core/g", "./setup.py", _env=build_env)
shprint(hostpython, "setup.py", "install", "--prefix", dest_dir, _env=build_env) shprint(hostpython, "setup.py", "install", "--prefix", dest_dir, _env=build_env)
recipe = Jinja2Recipe() recipe = Jinja2Recipe()

5
recipes/markupsafe/__init__.py
View file

@ -16,6 +16,11 @@ class MarkupSafeRecipe(PythonRecipe):
build_env = arch.get_env() build_env = arch.get_env()
dest_dir = join(self.ctx.dist_dir, "root", "python") dest_dir = join(self.ctx.dist_dir, "root", "python")
build_env['PYTHONPATH'] = join(dest_dir, 'lib', 'python2.7', 'site-packages') build_env['PYTHONPATH'] = join(dest_dir, 'lib', 'python2.7', 'site-packages')
cmd = sh.Command("sed")
shprint(cmd, "-i", "", "s/,.*Feature//g", "./setup.py", _env=build_env)
shprint(cmd, "-i", "", "s/setuptools/distutils.core/g", "./setup.py", _env=build_env)
shprint(cmd, "-i", "", "/^speedups = Feature/,/^)$/s/.*//g", "./setup.py", _env=build_env)
shprint(cmd, "-i", "", "s/features\['speedups'\].*=.*speedups/pass/g", "./setup.py", _env=build_env)
shprint(hostpython, "setup.py", "install", "--prefix", dest_dir, _env=build_env) shprint(hostpython, "setup.py", "install", "--prefix", dest_dir, _env=build_env)

4
toolchain.py
View file

@ -1076,7 +1076,7 @@ Xcode:
parser.add_argument("command", help="Command to run") parser.add_argument("command", help="Command to run")
args = parser.parse_args(sys.argv[1:2]) args = parser.parse_args(sys.argv[1:2])
if not hasattr(self, args.command): if not hasattr(self, args.command):
print 'Unrecognized command' print('Unrecognized command')
parser.print_help() parser.print_help()
exit(1) exit(1)
getattr(self, args.command)() getattr(self, args.command)()
@ -1244,7 +1244,7 @@ Xcode:
"PYTHONOPTIMIZE": "2", "PYTHONOPTIMIZE": "2",
"PIP_INSTALL_TARGET": ctx.site_packages_dir "PIP_INSTALL_TARGET": ctx.site_packages_dir
} }
print pip_env print(pip_env)
pip_path = sh.which("pip") pip_path = sh.which("pip")
args = [pip_path] + sys.argv[2:] args = [pip_path] + sys.argv[2:]
if not pip_path: if not pip_path: