Split windows arch (32bit, 64bit). Add win64 1.2.7 version. Fix aarch64

master
Бородин Роман 2020-06-02 19:10:39 +03:00
parent 7a053dca7d
commit 94e0bbf905
24 changed files with 20 additions and 12 deletions

View File

@ -107,10 +107,13 @@ def get_platform():
ret["arch"] = "mipsel_ucs4"
elif system == 12:
ret["os"] = "linux"
ret["arch"] = "linux_aarch64_ucs2"
ret["arch"] = "aarch64_ucs2"
elif system == 13:
ret["os"] = "linux"
ret["arch"] = "linux_aarch64_ucs4"
ret["arch"] = "aarch64_ucs4"
elif system == 14:
ret["os"] = "windows"
ret["arch"] = "x64"
else:
ret = {
@ -157,7 +160,7 @@ def get_system(ret):
ret["message"] = ['', '']
if ret["os"] == 'windows':
ret["system"] = 'windows'
ret["system"] = 'windows_' + ret['arch']
ret["message"] = ['Windows has static compiled python-libtorrent included.',
'You should install "script.module.libtorrent" from "MyShows.me Kodi Repo"']
elif ret["os"] == "linux" and ret["arch"] == "x64":
@ -172,7 +175,7 @@ def get_system(ret):
ret["system"] = 'linux_' + ret["arch"]
ret["message"] = ['Linux has static compiled python-libtorrent included but it didn\'t work.',
'You should install it by "sudo apt-get install python-libtorrent"']
elif ret["os"] == "linux" and ("arm" or "mips" in ret["arch"]):
elif ret["os"] == "linux" and ("arm" in ret["arch"] or 'mips' in ret["arch"]):
ret["system"] = 'linux_'+ret["arch"]
ret["message"] = ['As far as I know you can compile python-libtorrent for ARMv6-7.',
'You should search for "OneEvil\'s OpenELEC libtorrent" or use Ace Stream.']
@ -192,4 +195,4 @@ def get_system(ret):
ret["message"] = ['It is probably NOT possible to compile python-libtorrent for iOS.',
'But you can use torrent-client control functions.']
return ret
return ret

View File

@ -107,10 +107,13 @@ def get_platform():
ret["arch"] = "mipsel_ucs4"
elif system == 12:
ret["os"] = "linux"
ret["arch"] = "linux_aarch64_ucs2"
ret["arch"] = "aarch64_ucs2"
elif system == 13:
ret["os"] = "linux"
ret["arch"] = "linux_aarch64_ucs4"
ret["arch"] = "aarch64_ucs4"
elif system == 14:
ret["os"] = "windows"
ret["arch"] = "x64"
else:
ret = {
@ -157,7 +160,7 @@ def get_system(ret):
ret["message"] = ['', '']
if ret["os"] == 'windows':
ret["system"] = 'windows'
ret["system"] = 'windows_' + ret['arch']
ret["message"] = ['Windows has static compiled python-libtorrent included.',
'You should install "script.module.libtorrent" from "MyShows.me Kodi Repo"']
elif ret["os"] == "linux" and ret["arch"] == "x64":
@ -172,7 +175,7 @@ def get_system(ret):
ret["system"] = 'linux_' + ret["arch"]
ret["message"] = ['Linux has static compiled python-libtorrent included but it didn\'t work.',
'You should install it by "sudo apt-get install python-libtorrent"']
elif ret["os"] == "linux" and ("arm" or "mips" in ret["arch"]):
elif ret["os"] == "linux" and ("arm" in ret["arch"] or 'mips' in ret["arch"]):
ret["system"] = 'linux_'+ret["arch"]
ret["message"] = ['As far as I know you can compile python-libtorrent for ARMv6-7.',
'You should search for "OneEvil\'s OpenELEC libtorrent" or use Ace Stream.']
@ -192,4 +195,4 @@ def get_system(ret):
ret["message"] = ['It is probably NOT possible to compile python-libtorrent for iOS.',
'But you can use torrent-client control functions.']
return ret
return ret

View File

@ -0,0 +1 @@
5052416

View File

@ -9,7 +9,7 @@
<string id="1006">Custom python-libtorrent version</string>
<string id="1007">Use python-libtorrent (if available)</string>
<string id="1100">Windows 32-bit, 64-bit</string>
<string id="1100">Windows 32-bit</string>
<string id="1101">Linux 32-bit</string>
<string id="1102">Linux 64-bit</string>
<string id="1103">Linux ARM v7 (RPi 2)</string>
@ -23,6 +23,7 @@
<string id="1111">Linux MIPSEL (UCS4)</string>
<string id="1112">Linux ARM v8 AARCH64 (UCS2)</string>
<string id="1113">Linux ARM v8 AARCH64 (UCS4)</string>
<string id="1114">Windows 64-bit</string>
<string id="1150">0.16.19</string>
<string id="1151">1.0.6</string>

View File

@ -5,7 +5,7 @@
<setting id="dirname" type="folder" label="1002" visible="eq(-1,true)" />
<setting id="ask_dirname" type="bool" label="1005" default="false" />
<setting id="custom_system" type="bool" label="1003" default="false" />
<setting id="set_system" type="enum" label="1004" visible="eq(-1,true)" default="0" lvalues="1100|1101|1102|1103|1104|1105|1106|1107|1108|1109|1110|1111|1112"/>
<setting id="set_system" type="enum" label="1004" visible="eq(-1,true)" default="0" lvalues="1100|1101|1102|1103|1104|1105|1106|1107|1108|1109|1110|1111|1112|1113|1114"/>
<setting id="custom_version" type="bool" label="1006" default="false" />
<setting id="set_version" type="enum" label="1007" visible="eq(-1,true)" default="0" lvalues="1150|1151|1152|1153|1154|1155|1156|1157|1158|1159"/>
</category>