sb-manual: don't use version controlled symlinks

They are a hassle on Windows.

contrib/STANDARDS

@@ -74,10 +74,7 @@ good place to test that they still exist, etc.
 Each package should provide documentation in SB-MANUAL format.  For the
 documentation to be included in the SBCL manual, you must
 
-- symlink contrib/sb-manual/doc/<some-contrib>/manual.lisp to
-  contrib/<some-contrib>/manual.lisp,
-
-- add the symlink to contrib/sb-manual/sb-manual.asd,
+- add the relevant file to contrib/sb-manual/sb-manual.asd,
 
 - modify SB-MANUAL::*PAGES*.
 

contrib/make-contrib.lisp

@@ -46,6 +46,15 @@
           (unless (= result 0) (error "C execution failed")))))))
 
 (defparameter +genfile+ "generated-constants")
+
+(defun resolve-up-directory-components (pathname-directory)
+  (let ((result ()))
+    (dolist (c pathname-directory)
+      (if (eq c :up)
+          (pop result)
+          (push c result)))
+    (nreverse result)))
+
 (defun logicalize (path generated)
   (make-pathname :host "SYS"
                  :directory
@@ -53,8 +62,9 @@
                          (if generated
                              (list "OBJ" "FROM-SELF" "CONTRIB" *system*)
                              (list* "CONTRIB"
-                                    (append (last (pathname-directory *default-pathname-defaults*))
-                                            (cdr (pathname-directory path))))))
+                                    (resolve-up-directory-components
+                                     (append (last (pathname-directory *default-pathname-defaults*))
+                                             (cdr (pathname-directory path)))))))
                  :name (pathname-name path)
                  :type (pathname-type path)))
 

contrib/sb-manual/TODO.md

@@ -2,8 +2,7 @@
 
     Currently, `sb-manual` loads *all* contribs to be able to query
     the definition docstrings. Each contrib directory has a
-    `manual.lisp` file, which is part of the `sb-manual` contrib (the
-    files are symlinked).
+    `manual.lisp` file, which is part of the `sb-manual` contrib.
 
     On the positive side, this does not load extra stuff until the
     user `require`s `sb-manual`. However, then it loads all contribs.

contrib/sb-manual/doc/contrib-modules.lisp

@@ -16,5 +16,5 @@
   (@sb-posix section)
   (@sb-queue section)
   (@sb-rotate-byte section)
+  #+(or :x86-64 :arm64)
   (@sb-simd section))
-

contrib/sb-manual/doc/networking.lisp

@@ -1 +0,0 @@
-../../sb-bsd-sockets/manual.lisp

contrib/sb-manual/doc/sb-aclrepl.lisp

@@ -1 +0,0 @@
-../../sb-aclrepl/manual.lisp

contrib/sb-manual/doc/sb-concurrency.lisp

@@ -1 +0,0 @@
-../../sb-concurrency/manual.lisp

contrib/sb-manual/doc/sb-cover.lisp

@@ -1 +0,0 @@
-../../sb-cover/manual.lisp

contrib/sb-manual/doc/sb-grovel.lisp

@@ -1 +0,0 @@
-../../sb-grovel/manual.lisp

contrib/sb-manual/doc/sb-introspect.lisp

@@ -1 +0,0 @@
-../../sb-introspect/manual.lisp

contrib/sb-manual/doc/sb-md5.lisp

@@ -1 +0,0 @@
-../../sb-md5/manual.lisp

contrib/sb-manual/doc/sb-posix.lisp

@@ -1 +0,0 @@
-../../sb-posix/manual.lisp

contrib/sb-manual/doc/sb-queue.lisp

@@ -1 +0,0 @@
-../../sb-queue/manual.lisp

contrib/sb-manual/doc/sb-rotate-byte.lisp

@@ -1 +0,0 @@
-../../sb-rotate-byte/manual.lisp

contrib/sb-manual/doc/sb-simd.lisp

@@ -1 +0,0 @@
-../../sb-simd/manual.lisp

contrib/sb-manual/doc/sb-simple-streams.lisp

@@ -1 +0,0 @@
-../../sb-simple-streams/manual.lisp

contrib/sb-manual/sb-manual.asd

@@ -26,19 +26,20 @@
                              (:file "package-locks")
                              (:file "threading")
                              (:file "timers")
-                             (:file "networking")
+                             (:file "../../sb-bsd-sockets/manual")
                              (:file "profiling")
                              (:file "contrib-modules")
-                             (:file "sb-aclrepl")
-                             (:file "sb-concurrency")
-                             (:file "sb-cover")
-                             (:file "sb-grovel")
-                             (:file "sb-introspect")
-                             (:file "sb-md5")
-                             (:file "sb-posix")
-                             (:file "sb-queue")
-                             (:file "sb-rotate-byte")
-                             (:file "sb-simd")
-                             (:file "sb-simple-streams")
+                             (:file "../../sb-aclrepl/manual")
+                             (:file "../../sb-concurrency/manual")
+                             (:file "../../sb-cover/manual")
+                             (:file "../../sb-grovel/manual")
+                             (:file "../../sb-introspect/manual")
+                             (:file "../../sb-md5/manual")
+                             (:file "../../sb-posix/manual")
+                             (:file "../../sb-queue/manual")
+                             (:file "../../sb-rotate-byte/manual")
+                             (:file "../../sb-simd/manual"
+                              :if-feature (:or :x86-64 :arm64))
+                             (:file "../../sb-simple-streams/manual")
                              (:file "deprecation")))
                (:file "late")))