From 0b7e16bb78d7715409c44bf6b41f9fb234b8f987 Mon Sep 17 00:00:00 2001
From: dos-reis <gdr@axiomatics.org>
Date: Thu, 7 Aug 2008 22:27:42 +0000
Subject: 	* lisp/core.lisp.in (boot-completed-p): New. 
 (|$useDynamicLink|): Likewise. 	(|$effectiveFaslType|): Hold extension
 of linkable FASL. 	(|$NativeModuleExt|): Tidy. 	(|$CoreLibName|): New.
 	(|$ExtraRuntimeLibraries|): Likewise. 	(extra-runtime-libs):
 Likewise. 	(complete-fasl-list-for-link): Likewise. 	(|link|)
 [ECL]: Link against system libraries. 	(|compileLispFile|): Tidy. 
 (begin-compile-time): New. 	(end-compile-time): Likewise. 
 (compile-time-p): Likewise. 	(import-module): Use it. 	*
 lisp/Makefile.in ($(OUT)/lisp$(EXEEXT)): Use oa_c_runtime_extra. 	*
 lib/Makefile.in (oa_installed_corelib): New. 	* boot/initial-env.lisp: Don't
 export systemRootDirectory and 	systemLibraryDirectory from here. 
 * boot/translator.boot (systemRootDirectory): Move to lisp/core.lisp. 
 (systemLibraryDirectory): Likewise. 	(loadSystemRuntimeCore): Do nothing
 for GCL and ECL. 	* interp/boot-pkg.lisp: Inform that Boot system is
 compleye.

---
 src/boot/translator.boot | 25 ++++---------------------
 1 file changed, 4 insertions(+), 21 deletions(-)

(limited to 'src/boot/translator.boot')

diff --git a/src/boot/translator.boot b/src/boot/translator.boot
index 86aada78..8bb98271 100644
--- a/src/boot/translator.boot
+++ b/src/boot/translator.boot
@@ -837,7 +837,7 @@ defaultBootToLispFile file ==
 getIntermediateLispFile(file,options) ==
   out := NAMESTRING getOutputPathname(options)
   out ^= nil => 
-    strconc(shoeRemoveStringIfNec($effectiveFaslType,out),'".clisp")
+    strconc(shoeRemoveStringIfNec($effectiveFaslType,out),'"clisp")
   defaultBootToLispFile file
 
 translateBootFile(progname, options, file) ==
@@ -859,26 +859,6 @@ associateRequestWithFileType(Option '"translate", '"boot",
 associateRequestWithFileType(Option '"compile", '"boot", 
                              function compileBootHandler)
 
---% System wide properties
-
-++ Returns the root directory of the running system.
-++ A directory specified on command line takes precedence
-++ over directory specified at configuration time.
-systemRootDirectory() ==
-  dir := ASSOC(Option '"system", %systemOptions()) =>
-    ensureTrailingSlash rest dir
-  $systemInstallationDirectory
-
-++ Returns the directory containing the core runtime support
-++ libraries, either as specified on command line, or as inferred
-++ from the system root directory.
-
-systemLibraryDirectory() ==
-  dir := ASSOC(Option "syslib",%systemOptions()) =>
-    ensureTrailingSlash rest dir
-  strconc(systemRootDirectory(),'"lib/")
-
-
 --% Runtime support
 
 ++ Load native dynamically linked module
@@ -887,8 +867,11 @@ loadNativeModule m ==
     FUNCALL(bfColonColon("SB-ALIEN","LOAD-SHARED-OBJECT"),m)
   %hasFeature KEYWORD::CLISP =>
     EVAL [bfColonColon("FFI","DEFAULT-FOREIGN-LIBRARY"), m]
+  %hasFeature KEYWORD::ECL =>
+    EVAL [bfColonColon("FFI","LOAD-FOREIGN-LIBRARY"), m]
   coreError '"don't know how to load a dynamically linked module"
 
 loadSystemRuntimeCore() ==
+  %hasFeature KEYWORD::ECL or %hasFeature KEYWORD::GCL => nil
   loadNativeModule strconc(systemLibraryDirectory(),
     '"libopen-axiom-core",$NativeModuleExt)
-- 
cgit v1.2.3