diff options
| author | dos-reis <gdr@axiomatics.org> | 2008-08-07 22:27:42 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2008-08-07 22:27:42 +0000 |
| commit | 0b7e16bb78d7715409c44bf6b41f9fb234b8f987 (patch) | |
| tree | 5213ebcd45ff338825d2d41bb3cea47e44d0e3bb /src/boot | |
| parent | b026c698fddcfeba5d125e09583555f6fbffd5e9 (diff) | |
| download | open-axiom-0b7e16bb78d7715409c44bf6b41f9fb234b8f987.tar.gz | |
* 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.
Diffstat (limited to 'src/boot')
| -rw-r--r-- | src/boot/initial-env.lisp | 4 | ||||
| -rw-r--r-- | src/boot/translator.boot | 25 |
2 files changed, 5 insertions, 24 deletions
diff --git a/src/boot/initial-env.lisp b/src/boot/initial-env.lisp index 96785ab6..7c98e734 100644 --- a/src/boot/initial-env.lisp +++ b/src/boot/initial-env.lisp @@ -46,9 +46,7 @@ (:use "AxiomCore") #+:common-lisp (:use "COMMON-LISP") #-:common-lisp (:use "LISP") - (:export "systemRootDirectory" - "systemLibraryDirectory" - "loadNativeModule" + (:export "loadNativeModule" "loadSystemRuntimeCore" "$InteractiveMode" "string2BootTree")) 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) |