From: Chris Hanson <org/chris-hanson/cph>
Date: Tue, 1 May 2007 04:55:22 +0000 (+0000)
Subject: Eliminate "lib/shared"; move contents to "lib/lib".
X-Git-Tag: 20090517-FFI~610
X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=9cc9075a39d19ef7834715d3e91dfd216f7763f0;p=mit-scheme.git
Eliminate "lib/shared"; move contents to "lib/lib".
---
diff --git a/v7/src/Setup.sh b/v7/src/Setup.sh
index 7db975383..35835e1c3 100755
--- a/v7/src/Setup.sh
+++ b/v7/src/Setup.sh
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $Id: Setup.sh,v 1.19 2007/04/14 03:54:37 cph Exp $
+# $Id: Setup.sh,v 1.20 2007/05/01 04:54:52 cph Exp $
#
# Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994,
# 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
@@ -48,10 +48,10 @@ maybe_link lib/edwin/etc/TUTORIAL ../../../etc/TUTORIAL
maybe_link lib/edwin/etc/mime.types ../../../etc/mime.types
maybe_link lib/edwin/autoload ../../edwin
-# lib/shared
-maybe_mkdir lib/shared
+# lib/lib
+maybe_mkdir lib/lib
for BUNDLE in 6001 compiler cref edwin imail sf sos ssp star-parser xdoc xml; do
- maybe_link "lib/shared/${BUNDLE}.so" "../../microcode/${BUNDLE}.so"
+ maybe_link "lib/lib/${BUNDLE}.so" "../../microcode/${BUNDLE}.so"
done
for SUBDIR in 6001 compiler cref edwin imail rcs runtime \
diff --git a/v7/src/etc/c-initial-bands.sh b/v7/src/etc/c-initial-bands.sh
index 53c3bed12..6d7af0ab1 100755
--- a/v7/src/etc/c-initial-bands.sh
+++ b/v7/src/etc/c-initial-bands.sh
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $Id: c-initial-bands.sh,v 1.4 2007/04/15 19:21:17 cph Exp $
+# $Id: c-initial-bands.sh,v 1.5 2007/05/01 04:54:57 cph Exp $
#
# Copyright 2007 Massachusetts Institute of Technology
#
@@ -33,7 +33,7 @@ EOF
microcode/scheme --library lib --large <<EOF
(begin
(load-option (quote SF))
- (load "lib/shared/compiler.so")
+ (load "lib/lib/compiler.so")
(with-working-directory-pathname "compiler"
(lambda ()
(load "machines/C/make")))
diff --git a/v7/src/etc/optiondb.scm b/v7/src/etc/optiondb.scm
index d8120a6b4..18a96898c 100644
--- a/v7/src/etc/optiondb.scm
+++ b/v7/src/etc/optiondb.scm
@@ -1,6 +1,6 @@
#| -*-Scheme-*-
-$Id: optiondb.scm,v 1.18 2007/04/04 05:08:19 riastradh Exp $
+$Id: optiondb.scm,v 1.19 2007/05/01 04:55:02 cph Exp $
Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994,
1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
@@ -57,7 +57,7 @@ USA.
(lambda ()
(load (merge-pathnames
place
- (system-library-directory-pathname "shared")))))
+ (system-library-directory-pathname "lib")))))
(let dir-loop ((dirs dirs))
(if (pair? dirs)
(let ((directory
diff --git a/v7/src/microcode/makegen/Makefile.in.in b/v7/src/microcode/makegen/Makefile.in.in
index 38c3ee67a..425f391b2 100644
--- a/v7/src/microcode/makegen/Makefile.in.in
+++ b/v7/src/microcode/makegen/Makefile.in.in
@@ -1,6 +1,6 @@
# -*- Makefile -*-
#
-# $Id: Makefile.in.in,v 1.49 2007/04/30 07:08:54 cph Exp $
+# $Id: Makefile.in.in,v 1.50 2007/05/01 04:55:12 cph Exp $
#
# Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994,
# 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
@@ -237,13 +237,13 @@ c-clean:
-rm -f $(C_CLEAN_FILES)
-rm -rf autom4te.cache
-install: install-auxLIBS install-auxDATA $(LIARC_INSTALL)
+install: install-auxLIBS install-auxDATA
$(mkinstalldirs) $(DESTDIR)$(bindir)
$(INSTALL_PROGRAM) scheme $(DESTDIR)$(bindir)/$(SYSTEM_BASE_NAME)
-install-auxLIBS: $(aux_LIBS)
+install-auxLIBS: $(aux_LIBS) $(LIARC_BUNDLES)
$(mkinstalldirs) $(DESTDIR)$(AUXDIR)/lib
- @list='$(aux_LIBS)'; \
+ @list='$(aux_LIBS) $(LIARC_BUNDLES)'; \
for p in $$list; do \
if test -f $$p; then \
echo "$(INSTALL_DATA) $$p $(DESTDIR)$(AUXDIR)/lib/."; \
diff --git a/v7/src/microcode/makegen/liarc-base-rules b/v7/src/microcode/makegen/liarc-base-rules
index 37dc76a63..f3dedf858 100644
--- a/v7/src/microcode/makegen/liarc-base-rules
+++ b/v7/src/microcode/makegen/liarc-base-rules
@@ -1,6 +1,6 @@
# -*- Makefile -*-
#
-# $Id: liarc-base-rules,v 1.1 2007/04/04 05:08:19 riastradh Exp $
+# $Id: liarc-base-rules,v 1.2 2007/05/01 04:55:07 cph Exp $
#
# Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994,
# 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
@@ -33,14 +33,3 @@ unstackify.o: unstackify.c stackops.h $(LIARC_HEAD_FILES)
compinit.c compinit.h: $(LIARC_SOURCES) Makefile
rm -f $@
sh ../etc/c-bundle.sh static compinit $(LIARC_SOURCES)
-
-install-liarc-bundles: $(LIARC_BUNDLES)
- $(mkinstalldirs) $(DESTDIR)$(AUXDIR)/shared
- @for p in $(LIARC_BUNDLES); do \
- if test -f $$p; then \
- echo "$(INSTALL_DATA) $$p $(DESTDIR)$(AUXDIR)/shared/."; \
- $(INSTALL_DATA) $$p $(DESTDIR)$(AUXDIR)/shared/.; \
- fi; \
- done
-
-.PHONY: install-liarc-bundles
diff --git a/v7/src/microcode/makegen/makegen.scm b/v7/src/microcode/makegen/makegen.scm
index 50069968b..6ae1788fe 100644
--- a/v7/src/microcode/makegen/makegen.scm
+++ b/v7/src/microcode/makegen/makegen.scm
@@ -1,6 +1,6 @@
#| -*-Scheme-*-
-$Id: makegen.scm,v 1.19 2007/04/30 01:35:41 cph Exp $
+$Id: makegen.scm,v 1.20 2007/05/01 04:55:17 cph Exp $
Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994,
1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
@@ -93,8 +93,6 @@ USA.
'("sf" "compiler" "star-parser" "cref"))
output)
(newline output)
- (write-rule "LIARC_INSTALL" "=" '("install-liarc-bundles") output)
- (newline output)
(generate-liarc-static-variables output)
(generate-liarc-dynamic-variables output))))
@@ -128,23 +126,21 @@ USA.
(let ((bundles (liarc-dynamic-bundles)))
(write-rule "LIARC_BUNDLE_CLEAN_FILES"
"="
- (append-map (lambda (bundle)
- (map (lambda (suffix)
- (string-append (car bundle) suffix))
- '("-init.h" "-init.c" "-init.o" ".so")))
- bundles)
+ (cons "$(LIARC_BUNDLES)"
+ (append-map (lambda (bundle)
+ (map (lambda (suffix)
+ (string-append (car bundle) suffix))
+ '("-init.h" "-init.c" "-init.o")))
+ bundles))
output)
(newline output)
(write-rule "LIARC_BUNDLES"
"="
- ;; Adding "all" to this list is a kludge for debugging
- ;; info. Exactly what this kludge accomplishes I have
- ;; totally forgotten.
- (cons "all"
- (map (lambda (bundle)
- (string-append (car bundle) ".so"))
- (liarc-dynamic-bundles)))
- output)))
+ (map (lambda (bundle)
+ (string-append (car bundle) ".so"))
+ bundles)
+ output)
+ (newline output)))
(define (generate-liarc-dynamic-rules output)
(for-each (lambda (bundle)
diff --git a/v7/src/runtime/option.scm b/v7/src/runtime/option.scm
index c1373216e..b9b64ff73 100644
--- a/v7/src/runtime/option.scm
+++ b/v7/src/runtime/option.scm
@@ -1,6 +1,6 @@
#| -*-Scheme-*-
-$Id: option.scm,v 14.53 2007/04/14 03:52:51 cph Exp $
+$Id: option.scm,v 14.54 2007/05/01 04:55:22 cph Exp $
Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994,
1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
@@ -148,10 +148,10 @@ USA.
(fluid-let ((load/suppress-loading-message? #t))
(load
(merge-pathnames shared-library
- (library-directory-pathname "shared")))))))))
+ (library-directory-pathname "lib")))))))))
(define (force* value)
- (cond ((procedure? value) (force* (value)))
+ (cond ((procedure? value) (force* (value)))
((promise? value) (force* (force value)))
(else value)))