From 93e4abf8435acf7182d04eeff6871ebf8d27485e Mon Sep 17 00:00:00 2001 From: Matt Birkholz Date: Wed, 28 Nov 2018 14:06:04 -0700 Subject: [PATCH] Fix merge: undo relative references to uninstalled plugins. --- src/blowfish/compile.scm | 13 +++++------- src/gdbm/compile.scm | 13 +++++------- src/imail/compile.scm | 43 +++++++++++++++----------------------- src/mcrypt/compile.scm | 13 +++++------- src/pgsql/compile.scm | 13 +++++------- src/x11-screen/compile.scm | 27 +++++++++++++----------- src/x11/compile.scm | 29 ++++++++++++------------- 7 files changed, 65 insertions(+), 86 deletions(-) diff --git a/src/blowfish/compile.scm b/src/blowfish/compile.scm index fc0c28cc1..0ff7cff1d 100644 --- 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 39e88aadf..b42ddec57 100644 --- 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 cc00ef572..ff870dee3 100644 --- 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 5be57ba73..e0a3fc740 100644 --- 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 91c447aea..32e7bc73c 100644 --- 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 8bb53f120..415533420 100644 --- 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-timeenvironment '(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 197e2a759..0a4befc59 100644 --- 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 -- 2.25.1