subsystems,bits
This commit is contained in:
parent
c09a71b322
commit
21464b0035
2 changed files with 12 additions and 11 deletions
11
msys.py
11
msys.py
|
@ -1,7 +1,16 @@
|
|||
ARCHIVE = '.tar.xz'
|
||||
ARCHITECTURES = ['x86_64', 'i686']
|
||||
ARCHITECTURES_BITS = {
|
||||
'x86_64': 64,
|
||||
'i686': 32,
|
||||
}
|
||||
ARCHITECTURES_SUBSYSTEMS = {
|
||||
'x86_64': ['msys', 'clang64', 'mingw64', 'ucrt64'],
|
||||
'i686': ['msys', 'clang32', 'mingw32'],
|
||||
}
|
||||
CATALOG = '.files'
|
||||
CHARSET = 'u8'
|
||||
DISTRIBUTION = 'distrib'
|
||||
SIGNATURE = '.sig'
|
||||
SUBSYSTEMS = ['msys', 'clang', 'mingw', 'ucrt']
|
||||
SUBSYSTEM = 'msys'
|
||||
SUBSYSTEMS = [SUBSYSTEM, 'clang', 'mingw', 'ucrt']
|
||||
|
|
12
remote.py
12
remote.py
|
@ -7,14 +7,6 @@ import hypertext
|
|||
import msys
|
||||
|
||||
|
||||
ARCHITECTURES_BITS = {
|
||||
'x86_64': 64,
|
||||
'i686': 32,
|
||||
}
|
||||
ARCHITECTURES_SUBSYSTEMS = {
|
||||
'x86_64': ['msys', 'clang64', 'mingw64', 'ucrt64'],
|
||||
'i686': ['msys', 'clang32', 'mingw32'],
|
||||
}
|
||||
MINGW = 'mingw'
|
||||
|
||||
|
||||
|
@ -40,9 +32,9 @@ class Remote:
|
|||
subsystem = ss
|
||||
location = os.path.join(location, subsystem, architecture)
|
||||
else:
|
||||
subsystem = f'{ss}{ARCHITECTURES_BITS[architecture]}'
|
||||
subsystem = f'{ss}{msys.ARCHITECTURES_BITS[architecture]}'
|
||||
location = os.path.join(location, MINGW, subsystem)
|
||||
if subsystem in ARCHITECTURES_SUBSYSTEMS[architecture]:
|
||||
if subsystem in msys.ARCHITECTURES_SUBSYSTEMS[architecture]:
|
||||
location = os.path.join(location,
|
||||
f'{subsystem}{msys.CATALOG}')
|
||||
binary = requests.get(location).content
|
||||
|
|
Loading…
Reference in a new issue