Skip to content

Commit 0873872

Browse files
authored
Merge pull request #68 from NHDaly/nhd-compat-bounds
Add compat bounds for old PackageCompiler and old julia
2 parents 4e22cc2 + 0e947c5 commit 0873872

File tree

3 files changed

+18
-5
lines changed

3 files changed

+18
-5
lines changed

Manifest.toml

+9-3
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ uuid = "522f3ed2-3f36-55e3-b6df-e94fee9b0c07"
8181
version = "0.5.0"
8282

8383
[[LibGit2]]
84+
deps = ["Base64", "NetworkOptions", "Printf", "SHA"]
8485
uuid = "76f85450-5226-5b5a-8eaa-529ad045b433"
8586

8687
[[Libdl]]
@@ -106,22 +107,27 @@ uuid = "d6f4376e-aef5-505a-96c1-9c027394607a"
106107
[[Mmap]]
107108
uuid = "a63ad114-7e13-5084-954f-fe012c677804"
108109

110+
[[NetworkOptions]]
111+
git-tree-sha1 = "ed3157f48a05543cce9b241e1f2815f7e843d96e"
112+
uuid = "ca575930-c2e3-43a9-ace4-1e988b2c1908"
113+
version = "1.2.0"
114+
109115
[[PackageCompiler]]
110116
deps = ["ArgParse", "Libdl", "Pkg", "REPL", "Serialization", "Test", "UUIDs", "WinRPM"]
111117
git-tree-sha1 = "3db96de5bc51934d50872b1122f3ebe258a5b4f2"
112118
uuid = "9b87118b-4619-50d2-8e1e-99f35a4d4d9d"
113119
version = "0.6.3"
114120

115121
[[Pkg]]
116-
deps = ["Dates", "LibGit2", "Markdown", "Printf", "REPL", "Random", "SHA", "UUIDs"]
122+
deps = ["Dates", "LibGit2", "Libdl", "Logging", "Markdown", "Printf", "REPL", "Random", "SHA", "UUIDs"]
117123
uuid = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
118124

119125
[[Printf]]
120126
deps = ["Unicode"]
121127
uuid = "de0858da-6303-5e67-8744-51eddeeeb8d7"
122128

123129
[[REPL]]
124-
deps = ["InteractiveUtils", "Markdown", "Sockets"]
130+
deps = ["InteractiveUtils", "Markdown", "Sockets", "Unicode"]
125131
uuid = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb"
126132

127133
[[Random]]
@@ -150,7 +156,7 @@ deps = ["LinearAlgebra", "SparseArrays"]
150156
uuid = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
151157

152158
[[Test]]
153-
deps = ["Distributed", "InteractiveUtils", "Logging", "Random"]
159+
deps = ["InteractiveUtils", "Logging", "Random", "Serialization"]
154160
uuid = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
155161

156162
[[TextWrap]]

Project.toml

+5-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,11 @@ Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
1212
REPL = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb"
1313

1414
[compat]
15-
julia = "1"
15+
ApplicationBuilderAppUtils = "0.1"
16+
ArgParse = "0.6"
17+
Glob = "1.2"
18+
PackageCompiler = "v0.6"
19+
julia = "1.0, 1.1, 1.2, 1.3"
1620

1721
[extras]
1822
ApplicationBuilderAppUtils = "96374992-6a10-11e9-2fa0-73472aac04df"

test/build_app-cli.jl

+4-1
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,18 @@ res2 = joinpath(@__DIR__, "runtests.jl") # lol sure this is a resource, why not.
1414
NEWARGS = Base.shell_split("""--verbose
1515
-R $res1 --resource $res2 -L $res1 --lib $res2
1616
$examples_hello "HelloWorld" $builddir""")
17-
eval(:(ARGS = $NEWARGS))
17+
OLDARGS = copy(ARGS)
18+
@eval (empty!(ARGS); append!(ARGS, $NEWARGS))
1819
@test 0 == include("$build_app_jl")
20+
@eval (empty!(ARGS); append!(ARGS, $OLDARGS))
1921
@test isdir("$builddir/HelloWorld.app")
2022
@test isfile("$builddir/HelloWorld.app/Contents/MacOS/hello")
2123

2224
# Make sure the specified resources and libs were copied:
2325
@test isfile("$builddir/HelloWorld.app/Contents/Resources/$(basename(res1))")
2426
@test isfile("$builddir/HelloWorld.app/Contents/Resources/$(basename(res2))")
2527
@test isfile("$builddir/HelloWorld.app/Contents/Libraries/$(basename(res1))")
28+
2629
end
2730

2831
@testset "Exits without juliaprog_main" begin

0 commit comments

Comments
 (0)