Bump Pkg to 1.1-beta(ish) (#30257)

* Fix doc-build for external stdlib docs. * Bump Pkg to v1.1-beta(ish).
JuliaLang · Dec 4, 2018 · 7c03b12 · 7c03b12
1 parent 5976236
commit 7c03b12
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 4 deletions.
diff --git a/deps/checksums/Pkg-193e494c22f7ce8b5956829286c6212133edcbf1.tar.gz/md5 b/deps/checksums/Pkg-193e494c22f7ce8b5956829286c6212133edcbf1.tar.gz/md5
@@ -0,0 +1 @@
+006468f2f3090f1c5fd64eac3105981e
diff --git a/deps/checksums/Pkg-193e494c22f7ce8b5956829286c6212133edcbf1.tar.gz/sha512 b/deps/checksums/Pkg-193e494c22f7ce8b5956829286c6212133edcbf1.tar.gz/sha512
@@ -0,0 +1 @@
+fee2e9731acfc70a2488fe7d0ff6656ccc36f3620ab654dc147e554006fe630409ccd823a1b44b9bd235ba008c7a4c649f785299dff435d68f118741aacacb68
diff --git a/deps/checksums/Pkg-f9180e48b27a843aeee864db814dce57cb296b9b.tar.gz/md5 b/deps/checksums/Pkg-f9180e48b27a843aeee864db814dce57cb296b9b.tar.gz/md5
diff --git a/deps/checksums/Pkg-f9180e48b27a843aeee864db814dce57cb296b9b.tar.gz/sha512 b/deps/checksums/Pkg-f9180e48b27a843aeee864db814dce57cb296b9b.tar.gz/sha512
diff --git a/doc/make.jl b/doc/make.jl
@@ -23,11 +23,17 @@ cp_q(src, dest) = isfile(dest) || cp(src, dest)
 # make links for stdlib package docs, this is needed until #522 in Documenter.jl is finished
 const STDLIB_DOCS = []
 const STDLIB_DIR = Sys.STDLIB
+const EXT_STDLIB_DOCS = ["Pkg"]
 cd(joinpath(@__DIR__, "src")) do
     Base.rm("stdlib"; recursive=true, force=true)
     mkdir("stdlib")
     for dir in readdir(STDLIB_DIR)
-        sourcefile = joinpath(STDLIB_DIR, dir, "docs", "src", "index.md")
+        sourcefile = joinpath(STDLIB_DIR, dir, "docs", "src")
+        if dir in EXT_STDLIB_DOCS
+            sourcefile = joinpath(sourcefile, "basedocs.md")
+        else
+            sourcefile = joinpath(sourcefile, "index.md")
+        end
         if isfile(sourcefile)
             targetfile = joinpath("stdlib", dir * ".md")
             push!(STDLIB_DOCS, (stdlib = Symbol(dir), targetfile = targetfile))

diff --git a/stdlib/Pkg.version b/stdlib/Pkg.version
@@ -1,2 +1,2 @@
 PKG_BRANCH = master
-PKG_SHA1 = f9180e48b27a843aeee864db814dce57cb296b9b
+PKG_SHA1 = 193e494c22f7ce8b5956829286c6212133edcbf1
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		fee2e9731acfc70a2488fe7d0ff6656ccc36f3620ab654dc147e554006fe630409ccd823a1b44b9bd235ba008c7a4c649f785299dff435d68f118741aacacb68