mockito/fixup-ant-script.patch
2012-02-22 15:02:33 +01:00

43 lines
1.4 KiB
Diff

# HG changeset patch
# Parent 5e1ff2ee5aa22b1c22238b520b3e6bd3b4aec0da
diff --git a/build.xml b/build.xml
--- a/build.xml
+++ b/build.xml
@@ -42,6 +42,12 @@
<property name="maven.repository.dir" value="${basedir}/maven/repository" />
<path id="compile.classpath">
+ <fileset dir="/usr/share/java">
+ <include name="hamcrest/core.jar" />
+ <include name="junit4.jar" />
+ <include name="objenesis.jar" />
+ <include name="cglib.jar" />
+ </fileset>
<fileset dir="${lib.dir.run}" includes="*.jar" />
<fileset dir="${lib.dir.compile}" includes="*.jar" />
<fileset dir="${lib.dir.repackaged}" includes="*.jar" />
@@ -204,19 +210,14 @@
<delete file="${target.dir}/${jar.core.osgified}" />
</target>
- <target name="jar" depends="jar.all">
- <jarjar jarfile="${target.dir}/${jar.core}">
+ <target name="jar" depends="compile">
+ <jar jarfile="${target.dir}/${jar.core}">
<manifest>
<attribute name="Built-By" value="${user.name}"/>
<attribute name="Implementation-Version" value="${version}"/>
</manifest>
- <fileset dir="${lib.dir.repackaged}" includes="*.txt" />
- <fileset dir="." file="LICENSE" />
- <fileset dir="." file="NOTICE" />
<fileset dir="${src.classes.dir}" />
- <fileset dir="${src.dir}" />
- <zipfileset src="${lib.dir.repackaged}/cglib-and-asm-1.0.jar"/>
- </jarjar>
+ </jar>
</target>
<target name="sources" >