Skip to content

Commit 15908a6

Browse files
aminyaaminya
authored
Merge pull request #49 from fingolfin/mh/version-bounds
Resolves #46
2 parents b2fdf6b + dd49220 commit 15908a6

File tree

2 files changed

+22
-26
lines changed

2 files changed

+22
-26
lines changed

‎src/precompile_include.jl‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -149,15 +149,11 @@ function _multiversion(package_name, precompiles_rootpath, version_in, else_vers
149149
for (iversion, eachversion) in enumerate(version)
150150

151151
if iversion == 1
152-
lowerbound = VersionNumber(eachversion.major, eachversion.minor, 0, ("DEV",))
153-
higherbound = VersionNumber(eachversion.major, eachversion.minor, 999)
154-
version_phrase = "@static if v\"$lowerbound\" <= VERSION <= v\"$higherbound\""
152+
version_phrase = "@static if (VERSION.major,VERSION.minor) == ($(eachversion.major),$(eachversion.minor))"
155153
elseif iversion == version_length
156154
version_phrase = "else"
157155
else
158-
lowerbound = VersionNumber(eachversion.major, eachversion.minor, 0, ("DEV",))
159-
higherbound = VersionNumber(eachversion.major, eachversion.minor, 999)
160-
version_phrase = "elseif v\"$lowerbound\" <= VERSION <= v\"$higherbound\""
156+
version_phrase = "elseif (VERSION.major,VERSION.minor) == ($(eachversion.major),$(eachversion.minor))"
161157
end
162158
multiversionstr = multiversionstr * "$version_phrase \n"
163159

‎test/runtests.jl‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -146,12 +146,12 @@ bottestdir = GoodPath(@__DIR__)
146146
_precompile_()
147147
end
148148
else
149-
@static if v"1.2.0-DEV" <= VERSION <= v"1.2.999"
149+
@static if (VERSION.major,VERSION.minor) == (1,2)
150150
@static if isfile(joinpath(@__DIR__, "$precompiles_rootpath_rel//1.2/precompile_$package_name.jl"))
151151
include("$precompiles_rootpath_rel//1.2/precompile_$package_name.jl")
152152
_precompile_()
153153
end
154-
elseif v"1.5.0-DEV" <= VERSION <= v"1.5.999"
154+
elseif (VERSION.major,VERSION.minor) == (1,5)
155155
@static if isfile(joinpath(@__DIR__, "$precompiles_rootpath_rel//1.5/precompile_$package_name.jl"))
156156
include("$precompiles_rootpath_rel//1.5/precompile_$package_name.jl")
157157
_precompile_()
@@ -179,12 +179,12 @@ bottestdir = GoodPath(@__DIR__)
179179
_precompile_()
180180
end
181181
else
182-
@static if v"1.2.0-DEV" <= VERSION <= v"1.2.999"
182+
@static if (VERSION.major,VERSION.minor) == (1,2)
183183
@static if isfile(joinpath(@__DIR__, "$precompiles_rootpath_rel//1.2/precompile_$package_name.jl"))
184184
include("$precompiles_rootpath_rel//1.2/precompile_$package_name.jl")
185185
_precompile_()
186186
end
187-
elseif v"1.5.0-DEV" <= VERSION <= v"1.5.999"
187+
elseif (VERSION.major,VERSION.minor) == (1,5)
188188
@static if isfile(joinpath(@__DIR__, "$precompiles_rootpath_rel//1.5/precompile_$package_name.jl"))
189189
include("$precompiles_rootpath_rel//1.5/precompile_$package_name.jl")
190190
_precompile_()
@@ -216,12 +216,12 @@ bottestdir = GoodPath(@__DIR__)
216216
end
217217
else
218218
@static if Sys.islinux()
219-
@static if v"1.2.0-DEV" <= VERSION <= v"1.2.999"
219+
@static if (VERSION.major,VERSION.minor) == (1,2)
220220
@static if isfile(joinpath(@__DIR__, "$precompiles_rootpath_rel/linux/1.2/precompile_$package_name.jl"))
221221
include("$precompiles_rootpath_rel/linux/1.2/precompile_$package_name.jl")
222222
_precompile_()
223223
end
224-
elseif v"1.5.0-DEV" <= VERSION <= v"1.5.999"
224+
elseif (VERSION.major,VERSION.minor) == (1,5)
225225
@static if isfile(joinpath(@__DIR__, "$precompiles_rootpath_rel/linux/1.5/precompile_$package_name.jl"))
226226
include("$precompiles_rootpath_rel/linux/1.5/precompile_$package_name.jl")
227227
_precompile_()
@@ -230,12 +230,12 @@ bottestdir = GoodPath(@__DIR__)
230230
end
231231
232232
elseif Sys.iswindows()
233-
@static if v"1.2.0-DEV" <= VERSION <= v"1.2.999"
233+
@static if (VERSION.major,VERSION.minor) == (1,2)
234234
@static if isfile(joinpath(@__DIR__, "$precompiles_rootpath_rel/windows/1.2/precompile_$package_name.jl"))
235235
include("$precompiles_rootpath_rel/windows/1.2/precompile_$package_name.jl")
236236
_precompile_()
237237
end
238-
elseif v"1.5.0-DEV" <= VERSION <= v"1.5.999"
238+
elseif (VERSION.major,VERSION.minor) == (1,5)
239239
@static if isfile(joinpath(@__DIR__, "$precompiles_rootpath_rel/windows/1.5/precompile_$package_name.jl"))
240240
include("$precompiles_rootpath_rel/windows/1.5/precompile_$package_name.jl")
241241
_precompile_()
@@ -244,12 +244,12 @@ bottestdir = GoodPath(@__DIR__)
244244
end
245245
246246
else
247-
@static if v"1.2.0-DEV" <= VERSION <= v"1.2.999"
247+
@static if (VERSION.major,VERSION.minor) == (1,2)
248248
@static if isfile(joinpath(@__DIR__, "$precompiles_rootpath_rel/linux/1.2/precompile_$package_name.jl"))
249249
include("$precompiles_rootpath_rel/linux/1.2/precompile_$package_name.jl")
250250
_precompile_()
251251
end
252-
elseif v"1.5.0-DEV" <= VERSION <= v"1.5.999"
252+
elseif (VERSION.major,VERSION.minor) == (1,5)
253253
@static if isfile(joinpath(@__DIR__, "$precompiles_rootpath_rel/linux/1.5/precompile_$package_name.jl"))
254254
include("$precompiles_rootpath_rel/linux/1.5/precompile_$package_name.jl")
255255
_precompile_()
@@ -279,12 +279,12 @@ bottestdir = GoodPath(@__DIR__)
279279
end
280280
else
281281
@static if Sys.islinux()
282-
@static if v"1.2.0-DEV" <= VERSION <= v"1.2.999"
282+
@static if (VERSION.major,VERSION.minor) == (1,2)
283283
@static if isfile(joinpath(@__DIR__, "$precompiles_rootpath_rel/linux/1.2/precompile_$package_name.jl"))
284284
include("$precompiles_rootpath_rel/linux/1.2/precompile_$package_name.jl")
285285
_precompile_()
286286
end
287-
elseif v"1.5.0-DEV" <= VERSION <= v"1.5.999"
287+
elseif (VERSION.major,VERSION.minor) == (1,5)
288288
@static if isfile(joinpath(@__DIR__, "$precompiles_rootpath_rel/linux/1.5/precompile_$package_name.jl"))
289289
include("$precompiles_rootpath_rel/linux/1.5/precompile_$package_name.jl")
290290
_precompile_()
@@ -297,12 +297,12 @@ bottestdir = GoodPath(@__DIR__)
297297
end
298298
299299
elseif Sys.iswindows()
300-
@static if v"1.2.0-DEV" <= VERSION <= v"1.2.999"
300+
@static if (VERSION.major,VERSION.minor) == (1,2)
301301
@static if isfile(joinpath(@__DIR__, "$precompiles_rootpath_rel/windows/1.2/precompile_$package_name.jl"))
302302
include("$precompiles_rootpath_rel/windows/1.2/precompile_$package_name.jl")
303303
_precompile_()
304304
end
305-
elseif v"1.5.0-DEV" <= VERSION <= v"1.5.999"
305+
elseif (VERSION.major,VERSION.minor) == (1,5)
306306
@static if isfile(joinpath(@__DIR__, "$precompiles_rootpath_rel/windows/1.5/precompile_$package_name.jl"))
307307
include("$precompiles_rootpath_rel/windows/1.5/precompile_$package_name.jl")
308308
_precompile_()
@@ -315,12 +315,12 @@ bottestdir = GoodPath(@__DIR__)
315315
end
316316
317317
else
318-
@static if v"1.2.0-DEV" <= VERSION <= v"1.2.999"
318+
@static if (VERSION.major,VERSION.minor) == (1,2)
319319
@static if isfile(joinpath(@__DIR__, "$precompiles_rootpath_rel/linux/1.2/precompile_$package_name.jl"))
320320
include("$precompiles_rootpath_rel/linux/1.2/precompile_$package_name.jl")
321321
_precompile_()
322322
end
323-
elseif v"1.5.0-DEV" <= VERSION <= v"1.5.999"
323+
elseif (VERSION.major,VERSION.minor) == (1,5)
324324
@static if isfile(joinpath(@__DIR__, "$precompiles_rootpath_rel/linux/1.5/precompile_$package_name.jl"))
325325
include("$precompiles_rootpath_rel/linux/1.5/precompile_$package_name.jl")
326326
_precompile_()
@@ -354,12 +354,12 @@ bottestdir = GoodPath(@__DIR__)
354354
end
355355
else
356356
@static if Sys.islinux()
357-
@static if v"1.2.0-DEV" <= VERSION <= v"1.2.999"
357+
@static if (VERSION.major,VERSION.minor) == (1,2)
358358
@static if isfile(joinpath(@__DIR__, "$precompiles_rootpath_rel/linux/1.2/precompile_$package_name.jl"))
359359
include("$precompiles_rootpath_rel/linux/1.2/precompile_$package_name.jl")
360360
_precompile_()
361361
end
362-
elseif v"1.5.0-DEV" <= VERSION <= v"1.5.999"
362+
elseif (VERSION.major,VERSION.minor) == (1,5)
363363
@static if isfile(joinpath(@__DIR__, "$precompiles_rootpath_rel/linux/1.5/precompile_$package_name.jl"))
364364
include("$precompiles_rootpath_rel/linux/1.5/precompile_$package_name.jl")
365365
_precompile_()
@@ -368,12 +368,12 @@ bottestdir = GoodPath(@__DIR__)
368368
end
369369
370370
elseif Sys.iswindows()
371-
@static if v"1.2.0-DEV" <= VERSION <= v"1.2.999"
371+
@static if (VERSION.major,VERSION.minor) == (1,2)
372372
@static if isfile(joinpath(@__DIR__, "$precompiles_rootpath_rel/windows/1.2/precompile_$package_name.jl"))
373373
include("$precompiles_rootpath_rel/windows/1.2/precompile_$package_name.jl")
374374
_precompile_()
375375
end
376-
elseif v"1.5.0-DEV" <= VERSION <= v"1.5.999"
376+
elseif (VERSION.major,VERSION.minor) == (1,5)
377377
@static if isfile(joinpath(@__DIR__, "$precompiles_rootpath_rel/windows/1.5/precompile_$package_name.jl"))
378378
include("$precompiles_rootpath_rel/windows/1.5/precompile_$package_name.jl")
379379
_precompile_()

0 commit comments

Comments
 (0)