[armedbear-cvs] r12434 - trunk/abcl

[Mark Evenson]

Author: mevenson
Date: Mon Feb  8 13:01:03 2010
New Revision: 12434

Log:
Revert r12430 because it fails to signal errors in a meaningful manner.


Modified:
   trunk/abcl/build.xml

Modified: trunk/abcl/build.xml
==============================================================================
--- trunk/abcl/build.xml	(original)
+++ trunk/abcl/build.xml	Mon Feb  8 13:01:03 2010
@@ -220,19 +220,43 @@
 
     <path id="abcl.lisp.output.path"
           location="${build.classes.dir}/org/armedbear/lisp/"/>
-    <pathconvert dirsep="/" property="abcl.lisp.output" refid="abcl.lisp.output.path"/>
     
     <target name="abcl.compile.lisp" 
 	    depends="abcl.copy.lisp,abcl.compile.java,abcl.fasls.uptodate"
 	    unless="abcl.fasls.uptodate.p">
-      <java classpath="${build.classes.dir}" 
+
+      <!-- The following shenanigans are necessary to get something
+           that ABCL under Windows can parse as a pathname with the
+           drive syntax not being interpreted as a Lisp package
+           namespace, and with backslash characters not starting
+           escape sequences.  -->
+      <tempfile property="abcl.compile.lisp.tmp" suffix=".lisp"/>
+
+      <echo file="${abcl.compile.lisp.tmp}">
+      (compile-system :zip nil :quit t 
+          :output-path "${toString:abcl.lisp.output.path}${file.separator}")
+      </echo>
+
+      <tempfile property="abcl.compile.lisp.tmp.2"  suffix=".lisp"/>
+	    
+      <copy file="${abcl.compile.lisp.tmp}"
+            tofile="${abcl.compile.lisp.tmp.2}">
+	 <filterchain>
+	    <replacestring from="\" to="/"/>
+	 </filterchain>
+      </copy>
+
+      <java classpath="${build.classes.dir}"
 	    fork="true"
 	    failonerror="true"
-	    inputstring="(compile-system :zip nil :quit t :output-path "${abcl.lisp.output}/")'"
 	    classname="org.armedbear.lisp.Main">
         <jvmarg value="-Dabcl.home=${abcl.home.dir}${file.separator}"/>
 	<arg value="--noinit"/>
+	<arg value="--load"/>
+	<arg value="${abcl.compile.lisp.tmp.2}"/>
       </java>
+            <delete file="${abcl.compile.lisp.tmp}"/> 
+	    <delete file="${abcl.compile.lisp.tmp.2}"/> 
     </target>
 
     <property name="abcl.build.path"
@@ -698,7 +722,7 @@
       <record name="${abcl.test.log.file}" emacsmode="true" action="stop"/>
       <echo>Finished recording test output in ${abcl.test.log.file}.</echo>
     </target>
-    
+
     <target name="abcl.release" 
             depends="abcl.binary.tar,abcl.source.tar,abcl.binary.zip,abcl.source.zip">
       <copy file="${abcl.jar.path}"