Fix merge: undo relative references to uninstalled plugins.

diff --git a/src/blowfish/compile.scm b/src/blowfish/compile.scm
index fc0c28cc11ca282c8965ffb582acecf484a7080f..0ff7cff1d798cff64f4af3bde2e1860dbb4deda8 100644 (file)
--- a/src/blowfish/compile.scm
+++ b/src/blowfish/compile.scm
@@ -2,11 +2,8 @@
 
 ;;;; Compile the BLOWFISH option.
 
-(load-option 'cref)
-(with-working-directory-pathname (directory-pathname (current-load-pathname))
-  (lambda ()
-    (with-working-directory-pathname (merge-pathnames "../ffi")
-      (lambda ()
-       (load "make")))
-    (compile-file "blowfish" '() (->environment '(runtime)))
-    (cref/generate-constructors "blowfish")))
\ No newline at end of file
+(for-each load-option '(cref ffi))
+
+(compile-file "blowfish" '() (->environment '(runtime)))
+
+(cref/generate-constructors "blowfish")
\ No newline at end of file

diff --git a/src/gdbm/compile.scm b/src/gdbm/compile.scm
index 39e88aadfcb148b424b86b017694b5fc866a6d3f..b42ddec57a8c8c3588f74a54c5a9ee699c4da8eb 100644 (file)
--- a/src/gdbm/compile.scm
+++ b/src/gdbm/compile.scm
@@ -2,11 +2,8 @@
 
 ;;;; Compile the GDBM option.
 
-(load-option 'cref)
-(with-working-directory-pathname (directory-pathname (current-load-pathname))
-  (lambda ()
-    (with-working-directory-pathname (merge-pathnames "../ffi")
-      (lambda ()
-       (load "make")))
-    (compile-file "gdbm" '() (->environment '(runtime)))
-    (cref/generate-constructors "gdbm")))
\ No newline at end of file
+(for-each load-option '(cref ffi))
+
+(compile-file "gdbm" '() (->environment '(runtime)))
+
+(cref/generate-constructors "gdbm")
\ No newline at end of file

diff --git a/src/imail/compile.scm b/src/imail/compile.scm
index cc00ef572d045ac92120b7688f8a7df45556699a..ff870dee36c87221788a369969c425ee8d9ef140 100644 (file)
--- a/src/imail/compile.scm
+++ b/src/imail/compile.scm
@@ -26,30 +26,21 @@ USA.
 
 ;;;; IMAIL mail reader: compilation
 
-(load-option 'cref)
-(with-working-directory-pathname (directory-pathname (current-load-pathname))
-  (lambda ()
-    (with-working-directory-pathname (merge-pathnames "../sos")
-      (lambda ()
-       (load "load")))
-    (with-working-directory-pathname (merge-pathnames "../star-parser")
-      (lambda ()
-       (load "load")))
-    (with-working-directory-pathname (merge-pathnames "../edwin")
-      (lambda ()
-       (load "make")))
-    (for-each (lambda (filename)
+(for-each load-option '(cref sos *parser))
+
+(for-each (lambda (filename)
                (compile-file filename '() (->environment '(edwin))))
-             '("imail-browser"
-               "imail-core"
-               "imail-file"
-               "imail-imap"
-               "imail-mime"
-               "imail-rmail"
-               "imail-summary"
-               "imail-top"
-               "imail-umail"
-               "imail-util"
-               "imap-response"
-               "imap-syntax"))
-    (cref/generate-constructors "imail")))
\ No newline at end of file
+         '("imail-browser"
+           "imail-core"
+           "imail-file"
+           "imail-imap"
+           "imail-mime"
+           "imail-rmail"
+           "imail-summary"
+           "imail-top"
+           "imail-umail"
+           "imail-util"
+           "imap-response"
+           "imap-syntax"))
+
+(cref/generate-constructors "imail")
\ No newline at end of file

diff --git a/src/mcrypt/compile.scm b/src/mcrypt/compile.scm
index 5be57ba73836a9e74e1cdd7a5a5b5c79b15ac1c9..e0a3fc740d47192c45e27d4683746c7163b75e2b 100644 (file)
--- a/src/mcrypt/compile.scm
+++ b/src/mcrypt/compile.scm
@@ -2,11 +2,8 @@
 
 ;;;; Compile the MCRYPT option.
 
-(load-option 'cref)
-(with-working-directory-pathname (directory-pathname (current-load-pathname))
-  (lambda ()
-    (with-working-directory-pathname (merge-pathnames "../ffi")
-      (lambda ()
-       (load "make")))
-    (compile-file "mcrypt" '() (->environment '(runtime)))
-    (cref/generate-constructors "mcrypt")))
\ No newline at end of file
+(for-each load-option '(cref ffi))
+
+(compile-file "mcrypt" '() (->environment '(runtime)))
+
+(cref/generate-constructors "mcrypt")
\ No newline at end of file

diff --git a/src/pgsql/compile.scm b/src/pgsql/compile.scm
index 91c447aea8984fa8242431888365fae75fec5d85..32e7bc73c124875253070309db2561f8e544dcfd 100644 (file)
--- a/src/pgsql/compile.scm
+++ b/src/pgsql/compile.scm
@@ -2,11 +2,8 @@
 
 ;;;; Compile the PGSQL option.
 
-(load-option 'cref)
-(with-working-directory-pathname (directory-pathname (current-load-pathname))
-  (lambda ()
-    (with-working-directory-pathname (merge-pathnames "../ffi")
-      (lambda ()
-       (load "make")))
-    (compile-file "pgsql" '() (->environment '()))
-    (cref/generate-constructors "pgsql")))
\ No newline at end of file
+(for-each load-option '(cref ffi))
+
+(compile-file "pgsql" '() (->environment '()))
+
+(cref/generate-constructors "pgsql")
\ No newline at end of file

diff --git a/src/x11-screen/compile.scm b/src/x11-screen/compile.scm
index 8bb53f120a56e96eacabab33ccde36966e5a628a..415533420bcf85e857420515cd499a8c1e05d476 100644 (file)
--- a/src/x11-screen/compile.scm
+++ b/src/x11-screen/compile.scm
@@ -24,15 +24,18 @@ USA.
 
 |#
 
-(load-option 'cref)
-(with-working-directory-pathname (directory-pathname (current-load-pathname))
-  (lambda ()
-    (with-working-directory-pathname (merge-pathnames "../edwin")
-      (lambda ()
-       (load "make")))
-    (for-each (lambda (filename)
-               (compile-file filename '() (->environment '(edwin))))
-             '("x11-screen"
-               "x11-key"
-               "x11-command"))
-    (cref/generate-constructors "x11-screen")))
\ No newline at end of file
+(parameterize ((param:suppress-loading-message? #t))
+  (for-each load-option '(cref x11 edwin)))
+
+(if (name->package '(edwin screen x11-screen))
+    (error "The (edwin screen x11-screen) package already exists."))
+(let ((package-set (package-set-pathname "x11-screen")))
+  (if (not (file-modification-time<? "x11-screen.pkg" package-set))
+      (cref/generate-trivial-constructor "x11-screen"))
+  (construct-packages-from-file (fasload package-set)))
+
+(compile-file "x11-screen" '() (->environment '(edwin screen x11-screen)))
+(compile-file "x11-key" '() (->environment '(edwin x11-keys)))
+(compile-file "x11-command" '() (->environment '(edwin x11-commands)))
+
+(cref/generate-constructors "x11-screen")
\ No newline at end of file

diff --git a/src/x11/compile.scm b/src/x11/compile.scm
index 197e2a759347b908bbc36e41f7fa102ac4b9b36a..0a4befc5968351f0a061dcc2b8ae79706caea5ff 100644 (file)
--- a/src/x11/compile.scm
+++ b/src/x11/compile.scm
@@ -25,19 +25,16 @@ USA.
 |#
 
 
-(load-option 'cref)
-(with-working-directory-pathname (directory-pathname (current-load-pathname))
-  (lambda ()
-    (with-working-directory-pathname (merge-pathnames "../ffi")
-      (lambda ()
-       (load "make")))
-    (for-each (let ((env (->environment '(runtime))))
-               (lambda (filename)
-                 (compile-file filename '() env)))
-             '("x11"
-               "x11-base"
-               "x11-color"
-               "x11-graphics"
-               "x11-device"
-               "x11-terminal"))
-    (cref/generate-constructors "x11")))
\ No newline at end of file
+(for-each load-option '(cref ffi))
+
+(for-each (let ((env (->environment '(runtime))))
+           (lambda (filename)
+             (compile-file filename '() env)))
+         '("x11"
+           "x11-base"
+           "x11-color"
+           "x11-graphics"
+           "x11-device"
+           "x11-terminal"))
+
+(cref/generate-constructors "x11")
\ No newline at end of file