--- build.xml.sav 2007-07-12 15:47:45.000000000 +0200 +++ build.xml 2007-07-12 15:49:30.000000000 +0200 @@ -148,7 +148,7 @@ <manifest> <attribute name="Built-By" value="${user.name}"/> <attribute name="Main-Class" value="org.jruby.Main"/> - <attribute name="Class-Path" value="asm-2.2.3.jar asm-commons-2.2.3.jar jline-0.9.91.jar bsf.jar backport-util-concurrent.jar"/> + <attribute name="Class-Path" value="asm2.jar asm2-commons.jar jline.jar bsf.jar backport-util-concurrent.jar"/> </manifest> </jar> </target> @@ -157,7 +157,7 @@ <target name="jar-complete" depends="generate-method-classes" description="Create the 'complete' JRuby jar. Pass 'mainclass' and 'filename' to adjust."> <property name="mainclass" value="org.jruby.Main"/> <property name="filename" value="jruby-complete.jar"/> - <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpath="${lib.dir}/jarjar-0.7.jar"/> + <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpath="${lib.dir}/jarjar.jar"/> <jarjar destfile="${lib.dir}/${filename}"> <fileset dir="${jruby.classes.dir}"> <exclude name="org/jruby/util/ant/**/*.class"/> @@ -165,9 +165,9 @@ <fileset dir="${basedir}/lib/ruby/1.8"> <include name="**/*.rb"/> </fileset> - <zipfileset src="${lib.dir}/asm-2.2.3.jar"/> - <zipfileset src="${lib.dir}/asm-commons-2.2.3.jar"/> - <zipfileset src="${lib.dir}/jline-0.9.91.jar"/> + <zipfileset src="${lib.dir}/asm2.jar"/> + <zipfileset src="${lib.dir}/asm2-commons.jar"/> + <zipfileset src="${lib.dir}/jline.jar"/> <zipfileset src="${lib.dir}/backport-util-concurrent.jar"/> <rule pattern="org.objectweb.asm.**" result="jruby.objectweb.asm.@1"/> <zipfileset dir="${basedir}" prefix="META-INF/jruby.home"> @@ -188,7 +188,7 @@ <target name="jar-light" depends="generate-method-classes" description="Create the 'light' JRuby jar. Pass 'mainclass' and 'filename' to adjust."> <property name="mainclass" value="org.jruby.Main"/> <property name="filename" value="jruby-light.jar"/> - <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpath="${lib.dir}/jarjar-0.7.jar"/> + <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpath="${lib.dir}/jarjar.jar"/> <jarjar destfile="${lib.dir}/${filename}"> <fileset dir="${jruby.classes.dir}"> <include name="**/*.class"/> @@ -215,9 +215,9 @@ <exclude name="**/xmlrpc/**"/> <exclude name="**/xsd/**"/> </fileset> - <zipfileset src="${lib.dir}/asm-2.2.3.jar"/> - <zipfileset src="${lib.dir}/asm-commons-2.2.3.jar"/> - <zipfileset src="${lib.dir}/jline-0.9.91.jar"/> + <zipfileset src="${lib.dir}/asm2.jar"/> + <zipfileset src="${lib.dir}/asm2-commons.jar"/> + <zipfileset src="${lib.dir}/jline.jar"/> <zipfileset src="${lib.dir}/backport-util-concurrent.jar"/> <manifest> <attribute name="Built-By" value="${user.name}"/>