[armedbear-cvs] r13036 - branches/0.23.x/abcl

[Mark Evenson]

Author: mevenson
Date: Sat Nov 20 10:31:14 2010
New Revision: 13036

Log:
[backport r13029] Ensure that build process exits with error if abcl.contrib.compile fails.


Modified:
   branches/0.23.x/abcl/build.xml

Modified: branches/0.23.x/abcl/build.xml
==============================================================================
--- branches/0.23.x/abcl/build.xml	(original)
+++ branches/0.23.x/abcl/build.xml	Sat Nov 20 10:31:14 2010
@@ -379,15 +379,17 @@
     </target>
 
     <!-- XXX Generalize when (if?) we get more contribs --> 
-    <target name="abcl.contrib" depends="abcl.jar">
+    <target name="abcl.contrib.compile" depends="abcl.jar">
       <java fork="true"
-            failonerror="true"
+	    failonerror="true"
             classpathref="abcl.classpath.dist"
-            dir="${basedir}/contrib/asdf-install/"
-            inputstring="(require 'asdf) (asdf:operate 'asdf:compile-op :asdf-install)"
+            inputstring="(require 'asdf) (handler-case (progn (setf *default-pathname-defaults* "${basedir}/contrib/asdf-install/") (asdf:operate 'asdf:compile-op :asdf-install)) (t (x) (progn (format t "~A: ~A~%" (type-of x) x) (exit :status -1))))"
             classname="org.armedbear.lisp.Main">
         <arg value="--noinit"/>
       </java>
+    </target>
+    
+    <target name="abcl.contrib" depends="abcl.contrib.compile">
       <jar destfile="dist/abcl-contrib.jar"
            compress="true"
            basedir="contrib">