Changeset 12675

Timestamp:

05/13/10 16:38:10 (13 years ago)

Author:

Mark Evenson

Message:

Fix build from scratch breakage in r12673.

Location:

trunk/abcl

Files:

• build.xml (modified) (2 diffs)
• src/org/armedbear/lisp/Interpreter.java (modified) (3 diffs)

trunk/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>

trunk/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();
-        initializeSystem();
+        if (!nosystem) 
+            initializeSystem();
         if (!noinit)
             processInitializationFile();
@@ -232 +234 @@
                 if (arg.equals("--noinit")) {
                     noinit = true;
+                } else if (arg.equals("--nosystem")) {
+                    nosystem = true;
                 } else if (arg.equals("--noinform")) {
                     noinform = true;