--- build.xml	2008-09-17 22:45:35.000000000 +0200
+++ build.xml	2008-09-17 22:46:39.000000000 +0200
@@ -171,7 +171,7 @@
 
 	<!-- Run the JPF Code Generator -->
 	<target name="generate" unless="needsNoRegenerate">
-		<java classname="net.sf.jabref.plugin.util.CodeGenerator" fork="true">
+		<java classname="net.sf.jabref.plugin.util.CodeGenerator" fork="true" failonerror="true">
 			<arg value="${plugin.dir}" />
 			<classpath refid="codegenerator" />
 		</java>
@@ -217,7 +217,7 @@
 	</target>
 
 	<!-- Jars up project -->
-	<target name="jars" depends="build, unjarlib">
+	<target name="jars" depends="build">
 		<mkdir dir="${build.lib}" />
 		<mkdir dir="${build.tmp}" />
 		<jar destfile="${build.lib}/${build.jar}">
@@ -403,6 +403,7 @@
 
 
 	<target name="osxjar">
+		<taskdef name="jarbundler" classpath="${lib.dir}/jarbundler-1.4.jar" classname="com.loomcom.ant.tasks.jarbundler.JarBundler" />
 		<jarbundler dir="${build.lib}" name="JabRef" mainclass="net.sf.jabref.JabRef" jars="${build.lib}/${build.jar}" icon="${images.dir}/JabRef-Logo.icns" version="${jabref.version}" jvmversion="1.4+" stubfile="${lib.dir}/JavaApplicationStub" />
 	</target>
 
@@ -611,6 +612,5 @@
 		</jalopy>
 	</target>
 
-	<taskdef name="jarbundler" classpath="${lib.dir}/jarbundler-1.4.jar" classname="com.loomcom.ant.tasks.jarbundler.JarBundler" />
 
 </project>