Skip to content

Commit

Permalink
add dummy MozillaCACerts_jll stdlib
Browse files Browse the repository at this point in the history
  • Loading branch information
StefanKarpinski committed Sep 16, 2020
1 parent 8bdf569 commit 5dc6201
Show file tree
Hide file tree
Showing 6 changed files with 30 additions and 2 deletions.
1 change: 1 addition & 0 deletions base/sysimg.jl
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ let
:Test,
:REPL,
:Statistics,
:MozillaCACerts_jll,
]

maxlen = reduce(max, textwidth.(string.(stdlibs)); init=0)
Expand Down
4 changes: 3 additions & 1 deletion stdlib/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@ $(build_datarootdir)/julia/stdlib/$(VERSDIR):
STDLIBS = Artifacts Base64 CRC32c Dates DelimitedFiles Distributed FileWatching \
Future InteractiveUtils Libdl LibGit2 LinearAlgebra Logging \
Markdown Mmap Printf Profile Random REPL Serialization SHA \
SharedArrays Sockets SparseArrays SuiteSparse Test TOML Unicode UUIDs
SharedArrays Sockets SparseArrays SuiteSparse Test TOML Unicode UUIDs \
MozillaCACerts_jll

STDLIBS_EXT = Pkg Statistics
PKG_GIT_URL := git://github.com/JuliaLang/Pkg.jl.git
PKG_TAR_URL = https://api.github.com/repos/JuliaLang/Pkg.jl/tarball/$1
Expand Down
8 changes: 8 additions & 0 deletions stdlib/MozillaCACerts_jll/Project.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
name = "MozillaCACerts_jll"
uuid = "14a3606d-f60d-562e-9121-12d972cd8159"

[extra]
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

[targets]
test = ["Test"]
11 changes: 11 additions & 0 deletions stdlib/MozillaCACerts_jll/src/MozillaCACerts_jll.jl
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# This file is a part of Julia. License is MIT: https://julialang.org/license

## dummy stub for https://github.com/JuliaBinaryWrappers/MozillaCACerts_jll.jl

module MozillaCACerts_jll

function __init__()
global cacert = normpath(Sys.BINDIR, Base.DATAROOTDIR, "julia", "cert.pem")
end

end # module
6 changes: 6 additions & 0 deletions stdlib/MozillaCACerts_jll/test/runtests.jl
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
using Test
using MozillaCACerts_jll

@testset "MozillaCACerts_jll" begin
@test isfile(MozillaCACerts_jll.cacert)

This comment has been minimized.

Copy link
@nalimilan

nalimilan Feb 11, 2021

Member

This check fails when USE_SYSTEM_LIBGIT=1 as in that case the cert.pem file isn't downloaded/installed. If MozillaCACerts_jll is exposed as an artifact it should probably always ship with the file, shouldn't it?

end
2 changes: 1 addition & 1 deletion test/precompile.jl
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,7 @@ try
:Future, :Libdl, :LinearAlgebra, :Logging, :Mmap, :Printf,
:Profile, :Random, :Serialization, :SharedArrays, :SparseArrays, :SuiteSparse, :Test,
:Unicode, :REPL, :InteractiveUtils, :Pkg, :LibGit2, :SHA, :UUIDs, :Sockets,
:Statistics, :TOML]),
:Statistics, :TOML, :MozillaCACerts_jll,]),
# Plus precompilation module generated at build time
let id = Base.PkgId("__PackagePrecompilationStatementModule")
Dict(id => Base.module_build_id(Base.root_module(id)))
Expand Down

0 comments on commit 5dc6201

Please sign in to comment.