Changeset 12685 for branches/0.20.x

Timestamp:

05/15/10 16:35:47 (14 years ago)

Author:

Mark Evenson

Message:

Backport r1267[35]: Load 'system.lisp' later in boot so conditions trigger debugger.

New command line option '--nosystem' omits the processing of 'system.lisp'.

Location:

branches/0.20.x/abcl

Files:

• build.xml (modified) (2 diffs)
• src/org/armedbear/lisp/Interpreter.java (modified) (5 diffs)
• src/org/armedbear/lisp/boot.lisp (modified) (1 diff)

branches/0.20.x/abcl/build.xml

@@ -242 +242 @@
         <jvmarg value="-Dabcl.home=${abcl.home.dir}${file.separator}"/>
   <arg value="--noinit"/>
+        <arg value="--nosystem"/>
         <arg value="--eval"/>
         <arg value="(setf *load-verbose* t)"/>
@@ -279 +280 @@
 
     <target name="abcl.system.uptodate">
-      <uptodate property="abcl.system.needs-update.p" 
+      <condition property="abcl.system.needs-update.p">
+        <and>
+          <available file="${system.lisp.file}"/>
+          <available file="${abcl.startup.file}"/>
+          <uptodate
                 srcfile="${system.lisp.file}"
                 targetfile="${abcl.startup.file}"/>
+        </and>
+      </condition>
     </target>
     
-    <target name="abcl.system.update.maybe" depends="abcl.system.uptodate" if="abcl.system.needs-update.p">
+    <target name="abcl.system.update.maybe" depends="abcl.system.uptodate" 
+            if="abcl.system.needs-update.p">
       <touch file="${src.dir}/org/armedbear/lisp/compile-system.lisp"/>
     </target>

branches/0.20.x/abcl/src/org/armedbear/lisp/Interpreter.java

@@ -53 +53 @@
 
     private static boolean noinit = false;
+    private static boolean nosystem = false;
     private static boolean noinform = false;
 
@@ -93 +94 @@
         initializeLisp();
         initializeTopLevel();
+        if (!nosystem) 
+            initializeSystem();
         if (!noinit)
             processInitializationFile();
@@ -118 +121 @@
         initializeJLisp();
         initializeTopLevel();
+        initializeSystem();
         processInitializationFile();
         return interpreter;
@@ -212 +216 @@
     }
 
+    private static synchronized void initializeSystem() 
+    {
+        Load.loadSystemFile("system");
+    }
+
     // Check for --noinit; verify that arguments are supplied for --load and
     // --eval options.  Copy all unrecognized arguments into
@@ -225 +234 @@
                 if (arg.equals("--noinit")) {
                     noinit = true;
+                } else if (arg.equals("--nosystem")) {
+                    nosystem = true;
                 } else if (arg.equals("--noinform")) {
                     noinform = true;

branches/0.20.x/abcl/src/org/armedbear/lisp/boot.lisp

@@ -210 +210 @@
              (float (/ (ext:uptime) 1000)))))
 
-;;; "system.lisp" contains system installation specific information
-;;; (currently only the logical pathname definition for "SYS;SRC")
-;;; that is not currently required for ABCL to run.  Since
-;;; LOAD-SYSTEM-FILE exits the JVM if its argument cannot be found, we
-;;; use REQUIRE trapping any error.
-(handler-case 
-    (require 'system)
-  (t ()))
-
+