Skip to content

Commit

Permalink
Merge pull request #68 from NHDaly/nhd-compat-bounds
Browse files Browse the repository at this point in the history
Add compat bounds for old PackageCompiler and old julia
  • Loading branch information
NHDaly authored Jan 3, 2021
2 parents 4e22cc2 + 0e947c5 commit 0873872
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 5 deletions.
12 changes: 9 additions & 3 deletions Manifest.toml
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ uuid = "522f3ed2-3f36-55e3-b6df-e94fee9b0c07"
version = "0.5.0"

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

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

[[NetworkOptions]]
git-tree-sha1 = "ed3157f48a05543cce9b241e1f2815f7e843d96e"
uuid = "ca575930-c2e3-43a9-ace4-1e988b2c1908"
version = "1.2.0"

[[PackageCompiler]]
deps = ["ArgParse", "Libdl", "Pkg", "REPL", "Serialization", "Test", "UUIDs", "WinRPM"]
git-tree-sha1 = "3db96de5bc51934d50872b1122f3ebe258a5b4f2"
uuid = "9b87118b-4619-50d2-8e1e-99f35a4d4d9d"
version = "0.6.3"

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

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

[[REPL]]
deps = ["InteractiveUtils", "Markdown", "Sockets"]
deps = ["InteractiveUtils", "Markdown", "Sockets", "Unicode"]
uuid = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb"

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

[[Test]]
deps = ["Distributed", "InteractiveUtils", "Logging", "Random"]
deps = ["InteractiveUtils", "Logging", "Random", "Serialization"]
uuid = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

[[TextWrap]]
Expand Down
6 changes: 5 additions & 1 deletion Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,11 @@ Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
REPL = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb"

[compat]
julia = "1"
ApplicationBuilderAppUtils = "0.1"
ArgParse = "0.6"
Glob = "1.2"
PackageCompiler = "v0.6"
julia = "1.0, 1.1, 1.2, 1.3"

[extras]
ApplicationBuilderAppUtils = "96374992-6a10-11e9-2fa0-73472aac04df"
Expand Down
5 changes: 4 additions & 1 deletion test/build_app-cli.jl
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,18 @@ res2 = joinpath(@__DIR__, "runtests.jl") # lol sure this is a resource, why not.
NEWARGS = Base.shell_split("""--verbose
-R $res1 --resource $res2 -L $res1 --lib $res2
$examples_hello "HelloWorld" $builddir""")
eval(:(ARGS = $NEWARGS))
OLDARGS = copy(ARGS)
@eval (empty!(ARGS); append!(ARGS, $NEWARGS))
@test 0 == include("$build_app_jl")
@eval (empty!(ARGS); append!(ARGS, $OLDARGS))
@test isdir("$builddir/HelloWorld.app")
@test isfile("$builddir/HelloWorld.app/Contents/MacOS/hello")

# Make sure the specified resources and libs were copied:
@test isfile("$builddir/HelloWorld.app/Contents/Resources/$(basename(res1))")
@test isfile("$builddir/HelloWorld.app/Contents/Resources/$(basename(res2))")
@test isfile("$builddir/HelloWorld.app/Contents/Libraries/$(basename(res1))")

end

@testset "Exits without juliaprog_main" begin
Expand Down

2 comments on commit 0873872

@NHDaly
Copy link
Owner Author

@NHDaly NHDaly commented on 0873872 Jan 3, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@JuliaRegistrator() register

@JuliaRegistrator
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Registration pull request created: JuliaRegistries/General/27226

After the above pull request is merged, it is recommended that a tag is created on this repository for the registered package version.

This will be done automatically if the Julia TagBot GitHub Action is installed, or can be done manually through the github interface, or via:

git tag -a v0.4.1 -m "<description of version>" 087387290a8b5d3893d1742848f3bae585f0fcc1
git push origin v0.4.1

Please sign in to comment.