Changeset 13036

Timestamp:

11/20/10 15:31:14 (13 years ago)

Author:

Mark Evenson

Message:

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

File:

• branches/0.23.x/abcl/build.xml (modified) (1 diff)

branches/0.23.x/abcl/build.xml

@@ -380 +380 @@
 
     <!-- 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* &quot;${basedir}/contrib/asdf-install/&quot;) (asdf:operate 'asdf:compile-op :asdf-install)) (t (x) (progn (format t &quot;~A: ~A~%&quot; (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"