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

now that version is a string, fix major computation

Browse source
This commit is contained in:
Kjell Wooding 2019-01-12 13:28:52 -05:00
parent 1d85617b76
commit 7691b541a4
5 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
recipes/hostpython2/__init__.py
View file

@ -14,7 +14,7 @@ class Hostpython2Recipe(Recipe):
def init_with_ctx(self, ctx): def init_with_ctx(self, ctx):
super(Hostpython2Recipe, self).init_with_ctx(ctx) super(Hostpython2Recipe, self).init_with_ctx(ctx)
self.set_hostpython(self, 2.7) self.set_hostpython(self, "2.7")
self.ctx.so_suffix = ".so" self.ctx.so_suffix = ".so"
self.ctx.hostpython = join(self.ctx.dist_dir, "hostpython2", "bin", "python") self.ctx.hostpython = join(self.ctx.dist_dir, "hostpython2", "bin", "python")
self.ctx.hostpgen = join(self.ctx.dist_dir, "hostpython2", "bin", "pgen") self.ctx.hostpgen = join(self.ctx.dist_dir, "hostpython2", "bin", "pgen")

2
recipes/hostpython3/__init__.py
View file

@ -14,7 +14,7 @@ class Hostpython3Recipe(Recipe):
def init_with_ctx(self, ctx): def init_with_ctx(self, ctx):
super(Hostpython3Recipe, self).init_with_ctx(ctx) super(Hostpython3Recipe, self).init_with_ctx(ctx)
self.set_hostpython(self, 3.7) self.set_hostpython(self, "3.7")
self.ctx.so_suffix = ".cpython-37m-darwin.so" self.ctx.so_suffix = ".cpython-37m-darwin.so"
self.ctx.hostpython = join(self.ctx.dist_dir, "hostpython3", "bin", "python") self.ctx.hostpython = join(self.ctx.dist_dir, "hostpython3", "bin", "python")
self.ctx.hostpgen = join(self.ctx.dist_dir, "hostpython3", "bin", "pgen") self.ctx.hostpgen = join(self.ctx.dist_dir, "hostpython3", "bin", "pgen")

2
recipes/python2/__init__.py
View file

@ -14,7 +14,7 @@ class Python2Recipe(Recipe):
def init_with_ctx(self, ctx): def init_with_ctx(self, ctx):
super(Python2Recipe, self).init_with_ctx(ctx) super(Python2Recipe, self).init_with_ctx(ctx)
self.set_python(self, 2.7) self.set_python(self, "2.7")
ctx.python_ver_dir = "python2.7" ctx.python_ver_dir = "python2.7"
ctx.python_prefix = join(ctx.dist_dir, "root", "python2") ctx.python_prefix = join(ctx.dist_dir, "root", "python2")
ctx.site_packages_dir = join( ctx.site_packages_dir = join(

2
recipes/python3/__init__.py
View file

@ -14,7 +14,7 @@ class Python3Recipe(Recipe):
def init_with_ctx(self, ctx): def init_with_ctx(self, ctx):
super(Python3Recipe, self).init_with_ctx(ctx) super(Python3Recipe, self).init_with_ctx(ctx)
self.set_python(self, 3.7) self.set_python(self, "3.7")
ctx.python_ver_dir = "python3.7" ctx.python_ver_dir = "python3.7"
ctx.python_prefix = join(ctx.dist_dir, "root", "python3") ctx.python_prefix = join(ctx.dist_dir, "root", "python3")
ctx.site_packages_dir = join( ctx.site_packages_dir = join(

2
toolchain.py
View file

@ -657,7 +657,7 @@ class Recipe(object):
hostpython)) hostpython))
print("ERROR: You can have only one hostpython version compiled") print("ERROR: You can have only one hostpython version compiled")
sys.exit(1) sys.exit(1)
self.ctx.python_major = int(version) self.ctx.python_major = version.split('.')[0]
self.ctx.hostpython_ver = version self.ctx.hostpython_ver = version
self.ctx.hostpython_recipe = instance self.ctx.hostpython_recipe = instance