Merge branch 'maint'

Author: frazze-jobb

lib/crypto/configure

@@ -7581,10 +7581,12 @@ then :
 then :
 
                         lib_bits=64
+                        arch=64
 
 else case e in #(
   e)
                         lib_bits=32
+                        arch=86
                      ;;
 esac
 fi
@@ -7609,6 +7611,26 @@ then :
 
 fi
 
+# openssl 3.5+
+              if test -f "$dir/lib/VC/x$arch/MD/libcrypto_static.lib"
+then :
+
+                        static_crypto_lib_name=libcrypto
+                        static_ssl_lib_name="libssl"
+                        static_extra_libs="$static_extra_libs -lCRYPT32 -lWS2_32"
+                        static_lib_dir="$dir/lib/VC/x$arch/MD"
+                        found_static_lib=yes
+fi
+              if test -f "$dir/lib/VC/x$arch/MD/libcrypto.lib"
+then :
+
+                        dynamic_crypto_lib_name=libcrypto
+                        dynamic_ssl_lib_name="libssl"
+                        dynamic_runtime_lib_dir="$rdir/lib/VC/x$arch/MD"
+                        dynamic_lib_dir="$dir/lib/VC/x$arch/MD"
+                        found_dynamic_lib=yes
+fi
+
 else case e in #(
   e)
               # Not windows...
@@ -8108,10 +8130,12 @@ then :
 then :
 
                         lib_bits=64
+                        arch=64
 
 else case e in #(
   e)
                         lib_bits=32
+                        arch=86
                      ;;
 esac
 fi
@@ -8136,6 +8160,26 @@ then :
 
 fi
 
+# openssl 3.5+
+              if test -f "$dir/lib/VC/x$arch/MD/libcrypto_static.lib"
+then :
+
+                        static_crypto_lib_name=libcrypto
+                        static_ssl_lib_name="libssl"
+                        static_extra_libs="$static_extra_libs -lCRYPT32 -lWS2_32"
+                        static_lib_dir="$dir/lib/VC/x$arch/MD"
+                        found_static_lib=yes
+fi
+              if test -f "$dir/lib/VC/x$arch/MD/libcrypto.lib"
+then :
+
+                        dynamic_crypto_lib_name=libcrypto
+                        dynamic_ssl_lib_name="libssl"
+                        dynamic_runtime_lib_dir="$rdir/lib/VC/x$arch/MD"
+                        dynamic_lib_dir="$dir/lib/VC/x$arch/MD"
+                        found_dynamic_lib=yes
+fi
+
 else case e in #(
   e)
               # Not windows...

lib/stdlib/src/man_docs.erl

@@ -67,16 +67,7 @@ markdown_to_manpage(Markdown, Path, Section) ->
         markdown_to_manpage1(shell_docs_markdown:parse_md(Markdown), Path, Section).
 markdown_to_manpage1(MarkdownChunks, Path, Section) ->
     Path1 = filename:absname(Path),
-    App = case filename:split(string:prefix(Path1, os:getenv("ERL_TOP"))) of
-        ["/", "lib", AppStr | _] ->
-            list_to_atom(AppStr);
-        ["lib", AppStr | _] ->
-            list_to_atom(AppStr);
-        ["/", "erts" | _] ->
-            list_to_atom("erts");
-        ["nomatch"] ->
-            error("ERL_TOP environment variable doesn't match the PATH " ++ Path)
-    end,
+    App = get_app(Path1),
     Version = case application:load(App) of
         ok -> {ok,Vsn} = application:get_key(App, vsn), Vsn;
         {error, {"no such file or directory","erts.app"}} -> erlang:system_info(version);
@@ -91,6 +82,19 @@ markdown_to_manpage1(MarkdownChunks, Path, Section) ->
     I = conv(MarkdownChunks, Name),
     iolist_to_binary([Prelude|I]).
 
+get_app(Path) ->
+    case string:split(Path, "/erts/") of
+            [_, _] -> list_to_atom("erts");
+            _ -> case string:split(Path, "/lib/") of
+                [_, Rest] ->
+                    case string:split(Rest, "/") of
+                        [AppStr, _] -> list_to_atom(AppStr);
+                        _ -> error("Could not find app from path " ++ Path)
+                    end;
+                _ -> error("Could not find app from path " ++ Path)
+        end
+    end.
+
 get_name([{h1,_,[Name]}|_], _) when is_binary(Name) ->
     Name;
 get_name(_, Default) when is_binary(Default) ->

lib/stdlib/test/shell_docs_SUITE.erl

@@ -319,17 +319,16 @@ render_callback(_Config) ->
     ok.
 
 render_man(_Config) ->
-    Old_ERL_TOP = os:getenv("ERL_TOP"),
-    case Old_ERL_TOP of
-        false -> os:putenv("ERL_TOP", code:root_dir());
-        _ -> ok
-    end,
     docsmap(
         fun(Mod, #docs_v1{metadata = Metadata} = D) ->
             try
                 Path1 = case Metadata of
                     #{source_path := Path} -> Path;
-                    #{} -> proplists:get_value(source, proplists:get_value(compile, Mod:module_info()))
+                    #{} -> try
+                            proplists:get_value(source, proplists:get_value(compile, Mod:module_info()))
+                        catch _:_ ->
+                            throw({error, no_path_to_source})
+                        end
                 end,
                 man_docs:module_to_manpage(Mod, Path1, D, "3")
             catch _E:R:ST ->
@@ -338,10 +337,6 @@ render_man(_Config) ->
                 exit(R)
             end
         end),
-    case Old_ERL_TOP of
-        false -> os:unsetenv("ERL_TOP");
-        _ -> os:putenv("ERL_TOP", Old_ERL_TOP)
-    end,
     ok.
 
 docsmap(Fun) ->
@@ -365,9 +360,11 @@ docsmap(Fun) ->
                 try
                   _ = Fun(Mod, Docs),
                   {ok, self(), Mod}
-                catch E:R:ST ->
-                    io:format("Failed to render ~p~n~p:~p:~p~n",[Mod,E,R,ST]),
-                    erlang:raise(E,R,ST)
+                catch throw:{error, no_path_to_source} ->
+                        ok;
+                    E:R:ST ->
+                        io:format("Failed to render ~p~n~p:~p:~p~n",[Mod,E,R,ST]),
+                        erlang:raise(E,R,ST)
                 end
             end
       end,