[armedbear-cvs] r12675 - in trunk/abcl: . src/org/armedbear/lisp

[Mark Evenson]

Author: mevenson
Date: Thu May 13 12:38:10 2010
New Revision: 12675

Log:
Fix build from scratch breakage in r12673.



Modified:
   trunk/abcl/build.xml
   trunk/abcl/src/org/armedbear/lisp/Interpreter.java

Modified: trunk/abcl/build.xml
==============================================================================
--- trunk/abcl/build.xml	(original)
+++ trunk/abcl/build.xml	Thu May 13 12:38:10 2010
@@ -241,6 +241,7 @@
 	    classname="org.armedbear.lisp.Main">
         <jvmarg value="-Dabcl.home=${abcl.home.dir}${file.separator}"/>
 	<arg value="--noinit"/>
+        <arg value="--nosystem"/>
         <arg value="--eval"/>
         <arg value="(setf *load-verbose* t)"/>
       </java>
@@ -278,12 +279,19 @@
     </target>
 
     <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>
 

Modified: trunk/abcl/src/org/armedbear/lisp/Interpreter.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/Interpreter.java	(original)
+++ trunk/abcl/src/org/armedbear/lisp/Interpreter.java	Thu May 13 12:38:10 2010
@@ -52,6 +52,7 @@
     private final OutputStream outputStream;
 
     private static boolean noinit = false;
+    private static boolean nosystem = false;
     private static boolean noinform = false;
 
     public static synchronized Interpreter getInstance()
@@ -92,7 +93,8 @@
         }
         initializeLisp();
         initializeTopLevel();
-        initializeSystem();
+        if (!nosystem) 
+            initializeSystem();
         if (!noinit)
             processInitializationFile();
         if (args != null)
@@ -231,6 +233,8 @@
                 String arg = args[i];
                 if (arg.equals("--noinit")) {
                     noinit = true;
+                } else if (arg.equals("--nosystem")) {
+                    nosystem = true;
                 } else if (arg.equals("--noinform")) {
                     noinform = true;
                 } else if (arg.equals("--batch")) {