64 lines
2.5 KiB
Diff
64 lines
2.5 KiB
Diff
--- build.xml.sav 2005-10-13 11:31:30.000000000 +0200
|
|
+++ build.xml 2006-02-17 17:48:16.000000000 +0100
|
|
@@ -29,7 +29,7 @@
|
|
<property name="source.test" value="src/test"/>
|
|
<property name="source.asm" value="../asm-src"/>
|
|
|
|
- <property name="compile.target" value="1.2"/>
|
|
+ <property name="compile.target" value="1.5"/>
|
|
<property name="compile.bootclasspath" value=""/>
|
|
<property name="compile.extdirs" value=""/>
|
|
|
|
@@ -41,6 +41,7 @@
|
|
<pathelement location="${build.home}/classes"/>
|
|
<fileset dir="./lib">
|
|
<include name="*.jar"/>
|
|
+ <exclude name="asm2*.jar"/>
|
|
</fileset>
|
|
</path>
|
|
|
|
@@ -123,14 +124,18 @@
|
|
<exclude name="samples/**" />
|
|
</jar>
|
|
|
|
- <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpathref="compile.classpath"/>
|
|
- <jarjar basedir="${build.home}/classes" jarfile="${dist.home}/${component.name}-nodep-${component.version}.jar" >
|
|
- <zipfileset dir="lib" includes="asm*.txt"/>
|
|
- <zipfileset src="lib/asm.jar" excludes="META-INF"/>
|
|
- <zipfileset src="lib/asm-attrs.jar" excludes="META-INF"/>
|
|
+ <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpath="lib/jarjar.jar:lib/asm2_asm2.jar"/>
|
|
+ <echo message="${dist.home}/${component.name}-nodep-${component.version}.jar" />
|
|
+ <echo message="${build.home}/classes"/>
|
|
+ <jarjar destfile="${dist.home}/${component.name}-nodep-${component.version}.jar" >
|
|
+ <fileset dir="lib" includes="asm*.txt"/>
|
|
+ <zipfileset src="lib/asm_asm.jar" excludes="META-INF"/>
|
|
+ <zipfileset src="lib/asm_asm-attrs.jar" excludes="META-INF"/>
|
|
<rule pattern="org.objectweb.asm.**" result="net.sf.cglib.asm.@1"/>
|
|
- <include name="**/*"/>
|
|
- <exclude name="samples/**"/>
|
|
+ <fileset dir="${build.home}/classes">
|
|
+ <include name="**/*"/>
|
|
+ <exclude name="samples/**"/>
|
|
+ </fileset>
|
|
</jarjar>
|
|
</target>
|
|
|
|
@@ -237,8 +242,7 @@
|
|
name="test">
|
|
<java classname="net.sf.cglib.TestAll"
|
|
failonerror="${test.failonerror}"
|
|
- fork="yes"
|
|
- >
|
|
+ fork="yes" >
|
|
|
|
<!-- jvmarg value="-Xrunhprof:heap=all,file=debug.txt"/ -->
|
|
<!-- <jvmarg value="-verbose:gc"/> -->
|
|
@@ -259,6 +263,7 @@
|
|
<pathelement path="${samples.build.home}/classes" />
|
|
<fileset dir="./lib">
|
|
<include name="*.jar"/>
|
|
+ <exclude name="asm2*.jar"/>
|
|
</fileset>
|
|
</classpath>
|
|
</java>
|