--- build.xml.orig	2011-08-02 06:36:42.000000000 -0400
+++ build.xml	2011-08-02 06:37:31.000000000 -0400
@@ -331,42 +331,6 @@
   <target name="jar-jruby" depends="init, compile, unzip-native-libs" unless="jar-up-to-date, jar-jruby.hasrun">
       <jar destfile="${lib.dir}/jruby.jar" compress="true" index="true" update="true">
         <fileset dir="${jruby.classes.dir}"/>
-        <zipfileset src="${asm.jar}"/>
-        <zipfileset src="${asm.commons.jar}"/>
-        <zipfileset src="${asm.util.jar}"/>
-        <zipfileset src="${asm.analysis.jar}"/>
-        <zipfileset src="${asm.tree.jar}"/>
-        <zipfileset src="${build.lib.dir}/bytelist.jar"/>
-        <zipfileset src="${build.lib.dir}/constantine.jar"/>
-        <zipfileset src="${build.lib.dir}/jline-${jline.version}.jar"/>
-        <zipfileset src="${build.lib.dir}/jcodings.jar"/>
-        <zipfileset src="${build.lib.dir}/joni.jar"/>
-        <zipfileset src="${build.lib.dir}/jnr-netdb.jar"/>
-        <zipfileset src="${build.lib.dir}/jnr-posix.jar"/>
-        <zipfileset src="${build.lib.dir}/jaffl.jar"/>
-        <zipfileset src="${build.lib.dir}/jffi.jar"/>
-        <zipfileset src="${build.lib.dir}/jffi-i386-Linux.jar"/>
-        <zipfileset src="${build.lib.dir}/jffi-x86_64-Linux.jar"/>
-        <zipfileset src="${build.lib.dir}/jffi-Darwin.jar"/>
-        <zipfileset src="${build.lib.dir}/jffi-i386-SunOS.jar"/>
-        <zipfileset src="${build.lib.dir}/jffi-x86_64-SunOS.jar"/>
-        <zipfileset src="${build.lib.dir}/jffi-ppc-AIX.jar"/>
-        <zipfileset src="${build.lib.dir}/jffi-ppc-Linux.jar"/>
-        <zipfileset src="${build.lib.dir}/jffi-ppc64-Linux.jar"/>
-        <zipfileset src="${build.lib.dir}/jffi-sparc-SunOS.jar"/>
-        <zipfileset src="${build.lib.dir}/jffi-sparcv9-SunOS.jar"/>
-        <zipfileset src="${build.lib.dir}/jffi-i386-FreeBSD.jar"/>
-        <zipfileset src="${build.lib.dir}/jffi-x86_64-FreeBSD.jar"/>
-        <zipfileset src="${build.lib.dir}/jffi-i386-OpenBSD.jar"/>
-        <zipfileset src="${build.lib.dir}/jffi-x86_64-OpenBSD.jar"/>
-        <zipfileset src="${build.lib.dir}/jffi-i386-Windows.jar"/>
-        <zipfileset src="${build.lib.dir}/jffi-x86_64-Windows.jar"/>
-        <zipfileset src="${build.lib.dir}/jffi-s390x-Linux.jar"/>
-        <zipfileset src="${build.lib.dir}/joda-time-${joda.time.version}.jar"/>
-        <zipfileset src="${build.lib.dir}/snakeyaml-1.8.jar"/>
-        <zipfileset src="${build.lib.dir}/yecht.jar"/>
-        <zipfileset src="${build.lib.dir}/yydebug.jar"/>
-        <zipfileset src="${build.lib.dir}/nailgun-0.7.1.jar"/>
         <metainf dir="spi">
           <include name="services/**"/>
         </metainf>
@@ -405,9 +369,6 @@
       <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpath="${build.lib.dir}/jarjar-1.0.jar"/>
       <jarjar destfile="${lib.dir}/jruby-core.jar" compress="true" index="true">
         <fileset dir="${jruby.classes.dir}"/>
-        <zipfileset src="${asm.jar}"/>
-        <zipfileset src="${asm.util.jar}"/>
-        <zipfileset src="${build.lib.dir}/yecht.jar"/>
         <metainf dir="spi">
           <include name="services/**"/>
         </metainf>
@@ -431,42 +392,6 @@
       <echo message="jarjaring for dist"/>
       <jarjar destfile="${lib.dir}/jruby.jar" compress="true">
         <fileset dir="${jruby.classes.dir}"/>
-        <zipfileset src="${asm.jar}"/>
-        <zipfileset src="${asm.commons.jar}"/>
-        <zipfileset src="${asm.util.jar}"/>
-        <zipfileset src="${asm.analysis.jar}"/>
-        <zipfileset src="${asm.tree.jar}"/>
-        <zipfileset src="${build.lib.dir}/constantine.jar"/>
-        <zipfileset src="${build.lib.dir}/bytelist.jar"/>
-        <zipfileset src="${build.lib.dir}/jline-${jline.version}.jar"/>
-        <zipfileset src="${build.lib.dir}/jcodings.jar"/>
-        <zipfileset src="${build.lib.dir}/joni.jar"/>
-        <zipfileset src="${build.lib.dir}/jnr-netdb.jar"/>
-        <zipfileset src="${build.lib.dir}/jnr-posix.jar"/>
-        <zipfileset src="${build.lib.dir}/jaffl.jar"/>
-        <zipfileset src="${build.lib.dir}/jffi.jar"/>
-        <zipfileset src="${build.lib.dir}/jffi-i386-Linux.jar"/>
-        <zipfileset src="${build.lib.dir}/jffi-x86_64-Linux.jar"/>
-        <zipfileset src="${build.lib.dir}/jffi-Darwin.jar"/>
-        <zipfileset src="${build.lib.dir}/jffi-i386-SunOS.jar"/>
-        <zipfileset src="${build.lib.dir}/jffi-x86_64-SunOS.jar"/>
-        <zipfileset src="${build.lib.dir}/jffi-ppc-AIX.jar"/>
-        <zipfileset src="${build.lib.dir}/jffi-ppc-Linux.jar"/>
-        <zipfileset src="${build.lib.dir}/jffi-ppc64-Linux.jar"/>
-        <zipfileset src="${build.lib.dir}/jffi-sparc-SunOS.jar"/>
-        <zipfileset src="${build.lib.dir}/jffi-sparcv9-SunOS.jar"/>
-        <zipfileset src="${build.lib.dir}/jffi-i386-FreeBSD.jar"/>
-        <zipfileset src="${build.lib.dir}/jffi-x86_64-FreeBSD.jar"/>
-        <zipfileset src="${build.lib.dir}/jffi-i386-OpenBSD.jar"/>
-        <zipfileset src="${build.lib.dir}/jffi-x86_64-OpenBSD.jar"/>
-        <zipfileset src="${build.lib.dir}/jffi-i386-Windows.jar"/>
-        <zipfileset src="${build.lib.dir}/jffi-x86_64-Windows.jar"/>
-        <zipfileset src="${build.lib.dir}/jffi-s390x-Linux.jar"/>
-        <zipfileset src="${build.lib.dir}/joda-time-${joda.time.version}.jar"/>
-        <zipfileset src="${build.lib.dir}/snakeyaml-1.8.jar"/>
-        <zipfileset src="${build.lib.dir}/yecht.jar"/>
-        <zipfileset src="${build.lib.dir}/yydebug.jar"/>
-        <zipfileset src="${build.lib.dir}/nailgun-0.7.1.jar"/>
         <metainf dir="spi">
           <include name="services/**"/>
         </metainf>
@@ -589,42 +514,6 @@
       <fileset dir="${build.dir}/jar-complete">
         <exclude name="META-INF/jruby.home/lib/ruby/site_ruby/shared/builtin/**"/>
       </fileset>
-      <zipfileset src="${asm.jar}"/>
-      <zipfileset src="${asm.commons.jar}"/>
-      <zipfileset src="${asm.util.jar}"/>
-      <zipfileset src="${asm.analysis.jar}"/>
-      <zipfileset src="${asm.tree.jar}"/>
-      <zipfileset src="${build.lib.dir}/bytelist.jar"/>
-      <zipfileset src="${build.lib.dir}/constantine.jar"/>
-      <zipfileset src="${build.lib.dir}/jline-${jline.version}.jar"/>
-      <zipfileset src="${build.lib.dir}/jcodings.jar"/>
-      <zipfileset src="${build.lib.dir}/joni.jar"/>
-      <zipfileset src="${build.lib.dir}/jnr-netdb.jar"/>
-      <zipfileset src="${build.lib.dir}/jnr-posix.jar"/>
-      <zipfileset src="${build.lib.dir}/jaffl.jar"/>
-      <zipfileset src="${build.lib.dir}/jffi.jar"/>
-      <zipfileset src="${build.lib.dir}/jffi-i386-Linux.jar"/>
-      <zipfileset src="${build.lib.dir}/jffi-x86_64-Linux.jar"/>
-      <zipfileset src="${build.lib.dir}/jffi-Darwin.jar"/>
-      <zipfileset src="${build.lib.dir}/jffi-i386-SunOS.jar"/>
-      <zipfileset src="${build.lib.dir}/jffi-x86_64-SunOS.jar"/>
-      <zipfileset src="${build.lib.dir}/jffi-ppc-AIX.jar"/>
-      <zipfileset src="${build.lib.dir}/jffi-ppc-Linux.jar"/>
-      <zipfileset src="${build.lib.dir}/jffi-ppc64-Linux.jar"/>
-      <zipfileset src="${build.lib.dir}/jffi-sparc-SunOS.jar"/>
-      <zipfileset src="${build.lib.dir}/jffi-sparcv9-SunOS.jar"/>
-      <zipfileset src="${build.lib.dir}/jffi-i386-FreeBSD.jar"/>
-      <zipfileset src="${build.lib.dir}/jffi-x86_64-FreeBSD.jar"/>
-      <zipfileset src="${build.lib.dir}/jffi-i386-OpenBSD.jar"/>
-      <zipfileset src="${build.lib.dir}/jffi-x86_64-OpenBSD.jar"/>
-      <zipfileset src="${build.lib.dir}/jffi-i386-Windows.jar"/>
-      <zipfileset src="${build.lib.dir}/jffi-x86_64-Windows.jar"/>
-      <zipfileset src="${build.lib.dir}/jffi-s390x-Linux.jar"/>
-      <zipfileset src="${build.lib.dir}/joda-time-${joda.time.version}.jar"/>
-      <zipfileset src="${build.lib.dir}/snakeyaml-1.8.jar"/>
-      <zipfileset src="${build.lib.dir}/yecht.jar"/>
-      <zipfileset src="${build.lib.dir}/yydebug.jar"/>
-      <zipfileset src="${build.lib.dir}/nailgun-0.7.1.jar"/>
       <metainf dir="spi">
         <include name="services/**"/>
       </metainf>