wip

Author: mortenpi

src/MultiDocumenter.jl

@@ -74,9 +74,7 @@ function walk_outputs(f, root, docs::Vector{MultiDocRef}, dirs::Vector{String})
         p = joinpath(root, ref.path)
         for dir in dirs
             dirpath = joinpath(p, dir)
-            if !_windows_symlink_wrapper(isdir, dirpath)
-                continue
-            end
+            isdir(dirpath) || continue
             DocumenterTools.walkdocs(dirpath, DocumenterTools.isdochtml) do fileinfo
                 f(relpath(dirname(fileinfo.fullpath), root), fileinfo.fullpath)
             end
@@ -483,30 +481,4 @@ function inject_styles_and_global_navigation(
     end
 end
 
-function _windows_symlink_wrapper(f::Base.Callable, path::AbstractString)
-    if Sys.iswindows() && islink(path)
-        if isinteractive()
-            @warn """
-            A symlink was ignored for $(f) at $(path)
-            This only happens when running interactive on Windows."""
-            return false
-        else
-            throw(SymlinkOnWindowsError())
-        end
-    end
-    return f(path)
-end
-
-struct SymlinkOnWindowsError <: Exception end
-function Base.showerror(io::IO, err::SymlinkOnWindowsError)
-    print(
-        io,
-        """
-SymlinkOnWindowsError: this builds requires symlinks, but these are not properly supported in Windows
- You can still run the build interactively for debugging/testing (i.e. in the REPL), but the
- build will not exactly match the full build.""",
-    )
-    print(io, err.msg)
-end
-
 end

src/documentertools/canonical_urls.jl

@@ -102,7 +102,7 @@ function update_canonical_links(docs_directory::AbstractString; canonical::Abstr
         # directory will likely be the redirect. Also, links should be pointing to other
         # versions, so we'll skip them too.
         # Note: we need to check islink() first, because on windows, calling isdir() on a
-        # symlink can make it throw a permissions IOError...
+        # symlink can make it throw a permissions IOError.
         if islink(path) || !isdir(path)
             continue
         end

test/runtests.jl

@@ -170,12 +170,16 @@ MultiDocumenter.make(
         @test occursin("Infiltrator.jl", store_content)
         @test occursin("@infiltrate", store_content)
         # We can't traverse symlinks on Windows, so stable/ things do not get
-        # written into the search index.
-        if !Sys.iswindows()
+        # written into the search index. Instead, it looks like we write dev/
+        if Sys.iswindows()
+            @test !occursin("$(rootpath)inf/stable/", store_content)
+            @test !occursin("$(rootpath)inf/stable/", store_content)
+            @test occursin("/inf/dev/", store_content)
+        else
             @test occursin("$(rootpath)inf/stable/", store_content)
             @test occursin("$(rootpath)inf/stable/", store_content)
+            @test !occursin("/inf/dev/", store_content)
         end
-        @test !occursin("/inf/dev/", store_content)
     end
 
     @testset "sitemap" begin