Change way that plugins are registered so that lib and doc are separate.

This is needed when building just the documentation, as for the release.

diff --git a/src/blowfish/Makefile.am b/src/blowfish/Makefile.am
index 1c48110db9bbcdc62561f23254bb150034c9b380..12f666774a8351d2a40066419cea972a8d5f421f 100644 (file)
--- a/src/blowfish/Makefile.am
+++ b/src/blowfish/Makefile.am
@@ -96,13 +96,13 @@ install-data-hook:
        ( echo '(add-plugin "blowfish" "@MIT_SCHEME_PROJECT@"'; \
          echo '            ""'; \
          echo '            "$(DESTDIR)$(scmlibdir)"'; \
-         echo '            "$(DESTDIR)$(scmdocdir)")' ) \
+         echo '            "")' ) \
        | $(MIT_SCHEME_EXE) --batch-mode
 
 install-html: install-html-am
        ( echo '(add-plugin "blowfish" "@MIT_SCHEME_PROJECT@"'; \
          echo '            ""'; \
-         echo '            "$(DESTDIR)$(scmlibdir)"'; \
+         echo '            ""'; \
          echo '            "$(DESTDIR)$(scmdocdir)")' ) \
        | $(MIT_SCHEME_EXE) --batch-mode
 

diff --git a/src/ffi/build.scm b/src/ffi/build.scm
index f108574a26098e252b92cae6853657eb011e2726..0cd8f6d6a043b22952f7487142f241daf3ecf255 100644 (file)
--- a/src/ffi/build.scm
+++ b/src/ffi/build.scm
@@ -36,52 +36,19 @@ USA.
   (update-plugin 'remove name project infodir scmlibdir scmdocdir))
 
 (define (update-plugin operation name project infodir scmlibdir scmdocdir)
-  (let ((scmlibdir (->namestring (pathname-as-directory scmlibdir)))
-       (infodir (and (not (string-null? infodir))
-                     (->namestring (pathname-as-directory infodir))))
-       (scmdocdir (and (not (string-null? scmdocdir))
-                       (->namestring (pathname-as-directory scmdocdir)))))
-    (if (file-exists? (string scmlibdir"optiondb.scm"))
-       ;; NOT in dpkg-buildpackage's chroot
-       (let ((plugins
-              (let ((filename (string scmlibdir"plugins.scm")))
-                (if (file-exists? filename)
-                    (rewrite-file
-                     filename
-                     (lambda (in out)
-                       (cond ((eq? operation 'add)
-                              (let ((new (cons name
-                                               (delete! name (read in)))))
-                                (write new out)
-                                new))
-                             ((eq? operation 'remove)
-                              (let ((new (delete! name (read in))))
-                                (write new out)
-                                new))
-                             (else
-                              (error "Unexpected plugin-list operation:"
-                                     operation)))))
-                    (cond ((eq? operation 'add)
-                           (let ((new (list name)))
-                             (call-with-exclusive-output-file
-                              filename
-                              (lambda (out) (write new out)))
-                             new))
-                          ((eq? operation 'remove)
-                           (warn "plugin list not found:" filename)
-                           '())
-                          (else
-                           (error "Unexpected plugin-list operation:"
-                                  operation)))))))
-         (update-optiondb plugins scmlibdir)
-         (update-info-index project plugins infodir scmdocdir)
-         (update-html-index project plugins scmdocdir)))))
+  (let ((infodir (normal-dirname infodir))
+       (scmlibdir (normal-dirname scmlibdir))
+       (scmdocdir (normal-dirname scmdocdir)))
+    (if scmlibdir
+       (update-plugin-lib operation name project scmlibdir))
+    (if scmdocdir
+       (update-plugin-doc operation name project infodir scmdocdir))))
 
 (define (delete-plugin-list)
   ;; For the prerm script: delete the database of plugins (plugins.scm
   ;; file in the system library directory).
-  (let ((filename (string (->namestring (system-library-directory-pathname))
-                         "plugins.scm")))
+  (let ((filename
+        (merge-pathnames "plugins.scm" (system-library-directory-pathname))))
     (if (file-exists? filename)
        (delete-file filename))))
 
@@ -89,20 +56,68 @@ USA.
   ;; For the postinst script: re-initialize the optiondb, Info and
   ;; HTML indices using the list of currently installed plugins.  (The
   ;; indices are presumed clobbered by the core upgrade.)
-  (let ((scmlibdir (->namestring (pathname-as-directory scmlibdir)))
-       (infodir (and (not (string-null? infodir))
-                     (->namestring (pathname-as-directory infodir))))
-       (scmdocdir (and (not (string-null? scmdocdir))
-                       (->namestring (pathname-as-directory scmdocdir)))))
-    (let* ((pathname (string scmlibdir"plugins.scm"))
-          (plugins (if (file-exists? pathname)
-                       (call-with-input-file pathname read)
-                       '())))
-      (if (not (null? plugins))
-         (begin
-           (update-optiondb plugins scmlibdir)
-           (update-info-index project plugins infodir scmdocdir)
-           (update-html-index project plugins scmdocdir))))))
+  (let ((infodir (normal-dirname infodir))
+       (scmlibdir (normal-dirname scmlibdir))
+       (scmdocdir (normal-dirname scmdocdir)))
+    (if scmlibdir
+       (update-optiondb (read-plugins-file scmlibdir)
+                        scmlibdir))
+    (if scmdocdir
+       (let ((plugins (read-plugins-file scmdocdir)))
+         (update-info-index project plugins infodir scmdocdir)
+         (update-html-index project plugins scmdocdir)))))
+
+(define (normal-dirname dirname)
+  (and dirname
+       (not (string-null? dirname))
+       (->namestring (pathname-as-directory dirname))))
+\f
+(define (update-plugin-lib operation name project scmlibdir)
+  (if (file-exists? (merge-pathnames "optiondb.scm" scmlibdir))
+      ;; NOT in dpkg-buildpackage's chroot
+      (update-optiondb plugins
+                      (update-plugins-file operation name scmlibdir)
+                      scmlibdir)))
+
+(define (update-plugin-doc operation name project infodir scmdocdir)
+  (let ((plugins (update-plugins-file operation name scmdocdir)))
+    (update-info-index project plugins infodir scmdocdir)
+    (update-html-index project plugins scmdocdir)))
+
+(define (read-plugins-file dir)
+  (let ((filename (merge-pathnames "plugins.scm" dir)))
+    (if (file-exists? filename)
+       (call-with-input-file filename read)
+       '())))
+
+(define (update-plugins-file operation name dir)
+  (let ((filename (merge-pathnames "plugins.scm" dir)))
+    (if (file-exists? filename)
+       (rewrite-file filename
+         (lambda (in out)
+           (case operation
+             ((add)
+              (let ((new (cons name (delete! name (read in)))))
+                (write new out)
+                new))
+             ((remove)
+              (let ((new (delete! name (read in))))
+                (write new out)
+                new))
+             (else
+              (error "Unexpected plugin-list operation:" operation)))))
+       (case operation
+         ((add)
+          (let ((new (list name)))
+            (call-with-exclusive-output-file filename
+              (lambda (out)
+                (write new out)))
+            new))
+         ((remove)
+          (warn "plugin list not found:" filename)
+          '())
+         (else
+          (error "Unexpected plugin-list operation:" operation))))))
 
 (define (update-optiondb plugins scmlibdir)
   (let ((filename (string scmlibdir"optiondb.scm")))
@@ -123,7 +138,7 @@ USA.
               (write-string "\"))\n" out))
             (sort plugins string<?))))
        (warn "optiondb not found:" filename))))
-
+\f
 (define (update-info-index project plugins infodir scmdocdir)
   (if infodir
       (let ((filename (string infodir project".info")))
@@ -141,21 +156,20 @@ USA.
 (define (write-direntry project plugin scmdocdir out)
   (let ((filename (string scmdocdir"info/"plugin".info")))
     (if (file-exists-or-compressed? filename)
-       (call-with-input-file-uncompressed
-        filename
-        (lambda (in)
-          (skip-to-line "START-INFO-DIR-ENTRY" in)
-          (transform-to-line
-           "END-INFO-DIR-ENTRY" in out #f
-           (let* ((str (string "("project"/"))
-                  (str-len (string-length str)))
-             (lambda (line)
-               (let ((index (string-search-forward str line)))
-                 (if index
-                     (string (substring line 0 index)
-                             "("scmdocdir"info/"
-                             (substring line (fix:+ index str-len)))
-                     line))))))))))
+       (call-with-input-file-uncompressed filename
+         (lambda (in)
+           (skip-to-line "START-INFO-DIR-ENTRY" in)
+           (transform-to-line
+            "END-INFO-DIR-ENTRY" in out #f
+            (let* ((str (string "("project"/"))
+                   (str-len (string-length str)))
+              (lambda (line)
+                (let ((index (string-search-forward str line)))
+                  (if index
+                      (string (substring line 0 index)
+                              "("scmdocdir"info/"
+                              (substring line (fix:+ index str-len)))
+                      line))))))))))
 
 (define (update-html-index project plugins scmdocdir)
   (let* ((scmhtmldir (if (file-exists? (string scmdocdir"html/index.html"))
@@ -204,7 +218,7 @@ USA.
             (write-string line out)
             (newline out))))
        (warn "Scheme html index not found:" filename))))
-
+\f
 (define (html-filenames.titles project plugins scmhtmldir)
 
   (define (existing-file . strings)
@@ -269,7 +283,7 @@ USA.
           (string-prefix? prefix line))
        (if (eof-object? line)
           (error "Skipped to eof without seeing line:" prefix)))))
-
+\f
 (define (rewrite-file filename rewriter)
   (let ((suffix.progs (compressed? filename)))
     (if suffix.progs
@@ -319,7 +333,7 @@ USA.
                                   replacement)
                 (rename-file replacement compressed))))
            value)))))))
-
+\f
 (define (call-with-input-file-uncompressed filename receiver)
   (let ((suffix.progs (compressed? filename)))
     (if suffix.progs

diff --git a/src/gdbm/Makefile.am b/src/gdbm/Makefile.am
index 3df4736cf4de946312e363ccade8972d8a85f3a0..f196ec55a6c02cc73bf2c439b7b3ee6ed2186df3 100644 (file)
--- a/src/gdbm/Makefile.am
+++ b/src/gdbm/Makefile.am
@@ -96,13 +96,13 @@ install-data-hook:
        ( echo '(add-plugin "gdbm" "@MIT_SCHEME_PROJECT@"'; \
          echo '            ""'; \
          echo '            "$(DESTDIR)$(scmlibdir)"'; \
-         echo '            "$(DESTDIR)$(scmdocdir)")' ) \
+         echo '            "")' ) \
        | $(MIT_SCHEME_EXE) --batch-mode
 
 install-html: install-html-am
        ( echo '(add-plugin "gdbm" "@MIT_SCHEME_PROJECT@"'; \
          echo '            ""'; \
-         echo '            "$(DESTDIR)$(scmlibdir)"'; \
+         echo '            ""'; \
          echo '            "$(DESTDIR)$(scmdocdir)")' ) \
        | $(MIT_SCHEME_EXE) --batch-mode
 

diff --git a/src/imail/Makefile.am b/src/imail/Makefile.am
index 44097456d46b6d0e2a4354fc408806968693c131..21eb79f619a09a74b4bc393ff9c5e06f4baf6d3d 100644 (file)
--- a/src/imail/Makefile.am
+++ b/src/imail/Makefile.am
@@ -95,5 +95,10 @@ EXTRA_DIST += $(sources) compile.sh make.scm compile.scm imail.pkg
 install-data-hook:
 
 install-html: install-html-am
+       ( echo '(add-plugin "imail" "@MIT_SCHEME_PROJECT@"'; \
+         echo '            ""'; \
+         echo '            ""'; \
+         echo '            "$(DESTDIR)$(scmdocdir)")' ) \
+       | $(MIT_SCHEME_EXE) --batch-mode
 
 uninstall-hook: