Skip to content

Commit e7dfb58

Browse files
committed
Split version number
1 parent a9986f5 commit e7dfb58

File tree

1 file changed

+41
-15
lines changed

1 file changed

+41
-15
lines changed

src/app/store/Run.js

Lines changed: 41 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -29,21 +29,47 @@ const raxmlAscertainmentOptions = raxmlSettings.ascertainmentOptions;
2929
export const MAX_NUM_CPUS = cpus().length;
3030

3131
// On Windows 7 (= 6.1) use older versions of RAxML
32-
const winBinaries = os.release() === "6.1" ? [
33-
// TODO: add raxml ng windows exe
34-
{ name: 'modeltest-ng.exe', version: '0.1.7' },
35-
{ name: 'raxmlHPC_Win7.exe', multithreaded: false, version: '8.2.10' },
36-
{ name: 'raxmlHPC-SSE3_Win7.exe', multithreaded: false, version: '8.2.10' },
37-
{ name: 'raxmlHPC-PTHREADS-AVX_Win7.exe', multithreaded: true, version: '8.2.10' },
38-
{ name: 'raxmlHPC-PTHREADS-SSE3_Win7.exe', multithreaded: true, version: '8.2.10', initial: true }
39-
] : [
40-
// TODO: add raxml ng windows exe
41-
{ name: 'modeltest-ng.exe', version: '0.1.7' },
42-
{ name: 'raxmlHPC.exe', multithreaded: false, version: '8.2.12' },
43-
{ name: 'raxmlHPC-SSE3.exe', multithreaded: false, version: '8.2.12' },
44-
{ name: 'raxmlHPC-PTHREADS-AVX.exe', multithreaded: true, version: '8.2.12' },
45-
{ name: 'raxmlHPC-PTHREADS-SSE3.exe', multithreaded: true, version: '8.2.12', initial: true }
46-
];
32+
const [majorVersion, minorVersion] = os.release().split('.');
33+
const winBinaries =
34+
majorVersion === '6' && minorVersion === '1'
35+
? [
36+
// TODO: add raxml ng windows exe
37+
{ name: 'modeltest-ng.exe', version: '0.1.7' },
38+
{ name: 'raxmlHPC_Win7.exe', multithreaded: false, version: '8.2.10' },
39+
{
40+
name: 'raxmlHPC-SSE3_Win7.exe',
41+
multithreaded: false,
42+
version: '8.2.10',
43+
},
44+
{
45+
name: 'raxmlHPC-PTHREADS-AVX_Win7.exe',
46+
multithreaded: true,
47+
version: '8.2.10',
48+
},
49+
{
50+
name: 'raxmlHPC-PTHREADS-SSE3_Win7.exe',
51+
multithreaded: true,
52+
version: '8.2.10',
53+
initial: true,
54+
},
55+
]
56+
: [
57+
// TODO: add raxml ng windows exe
58+
{ name: 'modeltest-ng.exe', version: '0.1.7' },
59+
{ name: 'raxmlHPC.exe', multithreaded: false, version: '8.2.12' },
60+
{ name: 'raxmlHPC-SSE3.exe', multithreaded: false, version: '8.2.12' },
61+
{
62+
name: 'raxmlHPC-PTHREADS-AVX.exe',
63+
multithreaded: true,
64+
version: '8.2.12',
65+
},
66+
{
67+
name: 'raxmlHPC-PTHREADS-SSE3.exe',
68+
multithreaded: true,
69+
version: '8.2.12',
70+
initial: true,
71+
},
72+
];
4773

4874
const allBinaries = electronutil.is.windows
4975
? winBinaries

0 commit comments

Comments
 (0)